Alerting: Expose info about notification delivery errors in a new /receivers endpoint #55429
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
santihernandezc
requested review from
papagian,
idafurjes and
ying-jeanne
and removed request for
a team
|
Drone build failed: https://drone.grafana.net/grafana/grafana-enterprise/35229 |
santihernandezc
changed the title
JacobsonMT
reviewed
Sep 28, 2022
Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>
|
Drone build failed: https://drone.grafana.net/grafana/grafana-enterprise/35439 |
…afana into improve-receivers-api
|
Drone build failed: https://drone.grafana.net/grafana/grafana-enterprise/35591 |
|
Drone build failed: https://drone.grafana.net/grafana/grafana-enterprise/35814 |
grobinson-grafana
approved these changes
Oct 1, 2022
|
Drone build failed: https://drone.grafana.net/grafana/grafana-enterprise/35896 |
santihernandezc
added
backport v9.2.x
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-55429-to-v9.2.x origin/v9.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 09f8e026a19629ddc69c9cba83393202e3bf9671
# Push it to GitHub
git push --set-upstream origin backport-55429-to-v9.2.x
git switch main
# Remove the local backport branch
git branch -D backport-55429-to-v9.2.xThen, create a pull request where the |
santihernandezc
added a commit
that referenced
this pull request
Oct 13, 2022
…ceivers endpoint (#55429) * (WIP) switch to fork AM, first implementation of the API, generate spec * get receivers avoiding race conditions * use latest version of our forked AM, tests * make linter happy, delete TODO comment * update number of expected paths to += 2 * delete unused endpoint code, code review comments, tests * Update pkg/services/ngalert/notifier/alertmanager.go Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com> * remove call to fmt.Println * clear naming for fields * shorter variable names in GetReceivers Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com> (cherry picked from commit 09f8e02)
santihernandezc
added a commit
that referenced
this pull request
Oct 14, 2022
…ceivers endpoint (#55429) (#56899) * (WIP) switch to fork AM, first implementation of the API, generate spec * get receivers avoiding race conditions * use latest version of our forked AM, tests * make linter happy, delete TODO comment * update number of expected paths to += 2 * delete unused endpoint code, code review comments, tests * Update pkg/services/ngalert/notifier/alertmanager.go Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com> * remove call to fmt.Println * clear naming for fields * shorter variable names in GetReceivers Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com> (cherry picked from commit 09f8e02)
matejkubinec
added a commit
to percona/grafana
that referenced
this pull request
Nov 28, 2022
* LDAP: log that organization mapping is skipped (#56796) (#56798)
(cherry picked from commit 5fcec05695dc46a89509efcc116cc3efb2995bc8)
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
* fix typo (#56802) (#56804)
(cherry picked from commit 26e7228cd985d264b10d2afc00f76b5147c910cb)
Co-authored-by: Michael Mandrus <41969079+mmandrus@users.noreply.github.com>
* Alerting: Fix mathexp.NoData for ConditionsCmd (#56816) (#56820)
(cherry picked from commit 004bb7689da17806f0263a9503a2599c424a46dc)
Co-authored-by: George Robinson <george.robinson@grafana.com>
* Canvas: Clear current selection in dashboard mode (#56830) (#56831)
(cherry picked from commit 254bb0c99ef0b5e23a053a11c8a2266ef7701ab5)
Co-authored-by: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
* Alerting: Fix email image embedding on Windows. (#56766) (#56839)
The email notifier was incorrectly handling Windows filepaths. This is
fixed by using the `path/filepath` package.
(cherry picked from commit c7c640d903f4dfc2cc9b685ada1587ce4ae4e4be)
Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>
* Explore: Remove camel case from tracking labels (#56809) (#56856)
* refactor: remove camel case from tracking labels
* refactor: remove camel case from tracking labels
(cherry picked from commit b71e08ad5904266daafec3b21aecc5791bb51aa3)
Co-authored-by: Laura Benz <48948963+L-M-K-B@users.noreply.github.com>
* Propagate all headers on main QueryData (#56896) (#56901)
(cherry picked from commit 145b9705571d7e85f7b2bce04dd731604fb7c04c)
Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
* moves canvas to proper directory, corrects relref (#56902) (#56903)
(cherry picked from commit c137cf60f0e51cb2b4f03377bb91f6e95a8600e5)
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
* Docs: Basics docs refactor (#56905) (#56906)
* renames directory
* fixes relrefs
(cherry picked from commit 385079bea7eaa4ee5d7abbe03c4ccb695516b5e8)
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
* Docs: Fix Canvas doc link and add call to action for feedback (#56908) (#56911)
* Fix canvas documentation link on what's new page; add feedback CTA in canvas doc
* PORK: replace allows with enables for better language
* Fix a few more instances of allow to enable
* Move feedback above video in intro canvas section
* Revert changing link change
(cherry picked from commit 527690d19afd34c9eede248e3b487fe4c7266e87)
Co-authored-by: Nathan Marrs <nathanielmarrs@gmail.com>
* [v9.2.x] Alerting: Fix folder picker clear action (#56915)
Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
* MSSQL/MySQL: Fix variable interpolation (#56879) (#56924)
* MSSQL/MySQL: Fix variable interpolation
* Escape string vars
(cherry picked from commit 902a230867236a2ffa34a71b2bc5531ebe0e1773)
Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
* Heatmap: honor dashboard timezone in x axis and fix tooltip time range (#56909) (#56928)
(cherry picked from commit 53ac77d4a52df29038f995a2fd831f09e38c1bc0)
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
* Candlestick: re-init config when series length changes (#56913) (#56930)
(cherry picked from commit 4eea326ee8331d1dc2f6138530ef67dd3b0c1a79)
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
* MSSQL/MySQL: Add correct refId when fetching variable query results (#56919) (#56925)
(cherry picked from commit b374b012609f1021e0ebd6731bc8ff242ea38a58)
Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
* Last Table Column Not Centered (#56047) (#56938)
Co-authored-by: gitstart <gitstart@gitstart.com>
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: Nitesh Singh <nitesh.singh@gitstart.dev>
Co-authored-by: Thiago Nascimbeni <tnascimbeni@gmail.com>
Co-authored-by: Rubens Rafael <70234898+RubensRafael@users.noreply.github.com>
Co-authored-by: RubensRafael <rubensrafael2@live.com>
Co-authored-by: Rafael Toledo <87545086+Toledodev@users.noreply.github.com>
Co-authored-by: Matheus Muniz <87545749+matheusmuniz03@users.noreply.github.com>
Co-authored-by: Matheus Muniz <matheusmuniz100@hotmail.com>
Co-authored-by: Matheus Benini Ferreira <88898100+MatheusBeniniF@users.noreply.github.com>
Co-authored-by: Murilo Amaral <87545137+MuriloAmarals@users.noreply.github.com>
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: gitstart <gitstart@gitstart.com>
Co-authored-by: Nitesh Singh <nitesh.singh@gitstart.dev>
Co-authored-by: Thiago Nascimbeni <tnascimbeni@gmail.com>
Co-authored-by: Rubens Rafael <70234898+RubensRafael@users.noreply.github.com>
Co-authored-by: RubensRafael <rubensrafael2@live.com>
Co-authored-by: Rafael Toledo <87545086+Toledodev@users.noreply.github.com>
Co-authored-by: Matheus Muniz <87545749+matheusmuniz03@users.noreply.github.com>
Co-authored-by: Matheus Muniz <matheusmuniz100@hotmail.com>
Co-authored-by: Matheus Benini Ferreira <88898100+MatheusBeniniF@users.noreply.github.com>
Co-authored-by: Murilo Amaral <87545137+MuriloAmarals@users.noreply.github.com>
(cherry picked from commit 4ecc9f42acc3b9927a240dc2dbf818ef8df67af0)
Co-authored-by: GitStart <1501599+gitstart@users.noreply.github.com>
* AzureAD: Add option to force fetch the groups from the Graph API (#56916) (#56947)
* AzureAD: Add option to force fetch the groups from the Graph API (#56916)
* Add a new option to systematically fetch AzureAD groups from the Graph API
(cherry picked from commit 0f4d1261095dcd5191eb1136d0687b7c55587c8f)
* Update docs/sources/setup-grafana/configure-security/configure-authentication/azuread.md
Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>
Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>
* Alerting: Remove blank comment (#56889) (#56984)
(cherry picked from commit 2f85172718f5d5173e0904d46fbc605d04a2221c)
Co-authored-by: George Robinson <george.robinson@grafana.com>
* Alerting: Expose info about notification delivery errors in a new /receivers endpoint (#55429) (#56899)
* (WIP) switch to fork AM, first implementation of the API, generate spec
* get receivers avoiding race conditions
* use latest version of our forked AM, tests
* make linter happy, delete TODO comment
* update number of expected paths to += 2
* delete unused endpoint code, code review comments, tests
* Update pkg/services/ngalert/notifier/alertmanager.go
Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>
* remove call to fmt.Println
* clear naming for fields
* shorter variable names in GetReceivers
Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>
(cherry picked from commit 09f8e026a19629ddc69c9cba83393202e3bf9671)
* Docs: Note end of release notes publication (#57013) (#57015)
* Docs: Note cessation of release notes
* Docs: Update What's New index mention of release notes
* Docs: Update links and references to the release notes
* Docs: Fix relrefs
* Docs: Spellcheck
(cherry picked from commit 2b4d57fe60e5495ce32434cb17c83fb4d78a18b2)
Co-authored-by: Garrett Guillotte <100453168+gguillotte-grafana@users.noreply.github.com>
* Alerting: Add Notification error feedback on contact points view (#56225) (#57017)
* Alerting: Receivers integrations error feedback: WIP - Add notifications error at the top right on contact points view (#52390)
* Add interfaces for contact point errors
* [WIP] Create fake response for the new service to get contact point errors
* [WIP] Create action an reducer for the new service to get contact point errors
* Fetch fetchContactPointStates in Contact Points tab every 20s and when AM changes
* [WIP] Use store to get error count
* Show number of integrations errors at the contact points main view
* Add warning icon and refactor styles using getStyles
* Change lastNotify type to string instead of DateTime
* Use Stack component from experimental library when it is possible
* Alerting: Add receivers error feedback in contact point list (#52524)
* Refactor types for contact points state
* Add health column in ReceiversTable in case error state is available for this AM
* Create method for converting contact points state DTO to the FE type used in Redux store
* Update types
* Fix indexOf criteria getting integration type
* Change type name to integrationType name
* Change new components to be named functions to follow the FE style-guide
* Fix typos
Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
* Decouple ReceiversTable from Redux state
* Create private useContactPointsState hook to simplify code in ReceiversTable component
* Add tests for getIntegrationType and refactor the method to validate the name
* Add tests for contactPointsStateDtoToModel method
* Remove unnecessary check
* Use Badge compoment for health status in contact point list
* Create new method parseIntegrationName to simplify getting types and index from integration name
Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
* Alerting: Show integrations error feedback when expanding contact point in list (#52920)
* Use DynamicTable for rendering list of contact points and make them expandable if error status is available
* Render expanded content for contact points integrations
* Style and format last notify column
* Add send resolve column to the integration details
* Fix receiver id for DynamicTable row
* Update clock icon in integration state
* Fix tests
* Add PR review sugestions
* Alerting/integrations error feedback handle null dates in response 3 (#55659)
* Update fake response with lastNotify ISO8601 formatted, to be aligned with latest BE changes
* Update LastNotify in ReceiversTable component to handle null date
* Alerting/integrations error feedback handle 404 state not available (#55803)
* Create fetchContactPointsState using the future contact point url and handle 404 error
* Add contact points state tests
* Alerting/update receivers dto naming 2 (#56201)
* Update NotifierStatus naming and fix sendResolved not being updated in UI
* Return always empty ContactPointsState array when catching an error in the request response
* Fix test
* Show notification status only in notifications main view
* Calculate total error count from the final contactPointsState object, to avoid errors when duplicated entries are returned wronly in the response
* Add PR review suggestions
Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
(cherry picked from commit d8d8ef1aff5fa026c29f1d073108af2e80d531eb)
Co-authored-by: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
* Backport 56822 to v9.2.x (#57023)
* use Prometheus' format for notification attempts durations (#56822)
(cherry picked from commit 9996dbd577b21b373aa0adfb8eaf211b25147be1)
* fix merge errors
* <Documentation> Document usage of environment variables/files in GitHub Auth login (#52891) (#57035)
* Document usage of environment variables/files
* Updating Github Auth Login Documentation
Co-authored-by: Garrett Guillotte <100453168+gguillotte-grafana@users.noreply.github.com>
Co-authored-by: Garrett Guillotte <100453168+gguillotte-grafana@users.noreply.github.com>
(cherry picked from commit a46fa16b4ed6af8e60bab7b63bc8cac199c12387)
Co-authored-by: Ben Golding <60831565+bgolding355@users.noreply.github.com>
* GoogleCloudMonitoring: fix typo tooltip pre-processing (#57049) (#57058)
(cherry picked from commit c8402b4b50e56253854cddaf5c5470f663927d10)
Co-authored-by: Labesse Kévin <kevin@labesse.me>
* [v9.2.x] Alerting: Fix source and rule name decoding on Find route (#56805) (#56922)
* Alerting: Missing config option in the sample (#54179) (#57064)
(cherry picked from commit 03248e9cd8b71013fb4989e11e9e9f992b743078)
Co-authored-by: Jan Garaj <jan.garaj@gmail.com>
* RBAC: Make uid for managed role names deterministic during migrations (#56620) (#57073)
* RBAC: Change the generate uid function to be deterministic so we can avoid collision
* RBAC: Use fmt.Errorf
* RBAC: Add comment
* RBAC: Export GenerateManagedRoleUID
(cherry picked from commit 21792fdf37d84c73424cfd563e27775e35c5870c)
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
* Update grabpl to v3.0.12 (#56823) (#56866)
(cherry picked from commit b9d449529a1ee1959226ab3676d5c11181d5ca26)
* Inspect: Handle JSON tab crash when the provided object is too big to stringify. (#55939) (#56770)
* fix(inspector): handle json tab crash when too much data
* message update when JSON stringify fails due to obj size
(cherry picked from commit 6edce00b1a560e149498a1cace7ae96d713922aa)
Co-authored-by: Alex <TsotosA@users.noreply.github.com>
* Fix duplicated receivers in API response (#56829) (#57027)
(cherry picked from commit 3c56fd8da0e1f2195d9c8eca342e002fd1dd6277)
Co-authored-by: Santiago <santiagohernandez.1997@gmail.com>
* BarChart: use dashboard timezone for x axis (#57047) (#57056)
(cherry picked from commit da39c7297b80407da5d3494e2f2400821bc7ddb6)
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
* Docs: adds modify dashboard settings docs (#56826) (#57086)
* adds modify dashboard settings docs
* Quick updates
* minor corrections
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
(cherry picked from commit de1cfc120fbc7dc08e55dfae1733804c0996e20d)
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
* Make publish packages depend on compile-build-cmd and run from bin/build (#56713) (#57059)
(cherry picked from commit e25475b9c898ac99a2f015afc113828430556750)
* Docs: adds terraform provisioning docs (#55660) (#57091)
* Docs: adds set up section and alertmanager
* deletes info that got copied to new file
(cherry picked from commit b7f356df316f1f2f912360940f5a66dfddc9825b)
* Docs: Clarify and document dashboard URL query parameters for variables (#56055) (#57045)
(cherry picked from commit 0889c3ad07c11378ab6f800be399bd9a2cc5724f)
Co-authored-by: Garrett Guillotte <100453168+gguillotte-grafana@users.noreply.github.com>
* Show No attempts instead of OK when there is no attempt for notifier (#56494) (#57090)
(cherry picked from commit a18a3d76280739b9e05de4282ec15f1773444a81)
* Toolkit: Fix Cannot use "import statement outside" error in tests (#57071) (#57094)
(cherry picked from commit fd0fcffc2468e4e48bae6fdb1bee328a738dc3e7)
Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
* Docs: Contextualize base64 encoding in Basic Authorization (#57046) (#57106)
(cherry picked from commit 2bed4519908aec314d6f0355a8e9398b7a15779b)
Co-authored-by: Garrett Guillotte <100453168+gguillotte-grafana@users.noreply.github.com>
* Docs: Fix broken link (#57083) (#57109)
* Docs: Fix broken link
* Update docs/sources/setup-grafana/configure-security/configure-authentication/auth-proxy.md
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
(cherry picked from commit 5c2b72228769eb750e0a22a884b5ab4c94dbb1df)
Co-authored-by: Ahmed <hello@clivern.com>
* CI: Move `CreateTempFile` - use it for `rpm`/`deb` packages (#56990) (#57102)
* Move CreateTempFile - use it for rpm/deb packages
* Fix typo
* Fix tests:
(cherry picked from commit c96b6a6ab0dc789e4aae49116f12c31c49571b01)
Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
* Grafana UI: Export prop types for queryfield, modal and field components (#57097) (#57108)
* chore(grafana-ui): export prop types for queryfield, modal and field components
* docs(migration-guide): add notes for react peerdependencies and additional type exposure
* Update docs/sources/developers/plugins/migration-guide.md
Co-authored-by: Timur Olzhabayev <timur.olzhabayev@grafana.com>
Co-authored-by: Timur Olzhabayev <timur.olzhabayev@grafana.com>
(cherry picked from commit 24c04740e3d4d47d824ff228d7f27d715b8743be)
Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
* Canvas: Text input cursor jumping (#57133) (#57135)
Co-authored-by: nmarrs <nathanielmarrs@gmail.com>
(cherry picked from commit 7f5914ff05074fdf9a5e8aacafa9703b9f4e6dfb)
Co-authored-by: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
* Alerting: Improve notification policies created during migration (#52071) (#57139)
* Alerting: Improve notification policies created during migration
Previously, migrated legacy alerts were connected to notification policies through
a `rule_uid` label in a 1:1 fashion. While this correctly mimicked pre-migration routing,
it didn't create a notification policy structure that is easy to view/modify. In addition,
having one policy per migrated alert is, in some ways, counter to the recommended approach of
Unified Alerting.
This change replaces `rule_uid`-based migrated notification policies with a private
label called `__contacts__`. This label stores a list of double quoted strings containing the names of
all contact points an AlertRule should route to (based on legacy notification channels). Finally,
one notification policy is created per contact point with each matching AlertRules via regex on this
`__contacts__` label.
The result is a simpler, clearer, and easier to modify notification policy structure, with the
added benefit that you can see which contact points an AlertRule is being routed to from the
AlertRule creation page.
(cherry picked from commit 0db339d82f905a7f4c0db11717bcb22b7fd9f111)
Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>
* Search: Sort alphabetically in the folder view, increase the limit of the folder search from 50 to 1000 (#57078) (#57141)
* search: sort folders
* search: increase the limit for folder search to 1000
* add folder view sort test
* search: getFolderViewSort
* search: revert test
Co-authored-by: Todd Treece <todd.treece@grafana.com>
(cherry picked from commit c26cf6a51791967e1892c8cc2f177401dc4977af)
* Update grabpl to 3.0.14 (#57144) (#57145)
(cherry picked from commit 7a7148237149d90182fe4d2071d19faeb0b39f31)
* Fix sending RelativeTimeRange when requesting eval with resample expressions (#57076)
* Browse: Fix General folder not showing in FolderPicker (#57156) (#57158)
(cherry picked from commit 4d0dd0647eb56bb3ba112bc98dade2f639f25701)
Co-authored-by: Laura Fernández <laura.fernandez@grafana.com>
* Add RPM package publishing (#56797) (#57162)
Just tested deb publishing, and confirmed it works. Noticed that RPM packages aren't published though
It's the exact same step, targetting the RPM files instead
Both steps will run in parallel
Co-authored-by: dsotirakis <dimitrios.sotirakis@grafana.com>
(cherry picked from commit 44ad4ec9d4e63de964fb9e34079deb681da2df3b)
Co-authored-by: Julien Duchesne <julien.duchesne@grafana.com>
* Quota(fix): remove service accounts from quota count (#56700) (#57167)
(cherry picked from commit fa45742abcc5ca4c0cc11b487baa33ec0b0e9f6b)
Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
* TimeseriesPanel: Fix variables in data links (#56729) (#57163)
* TimeseriesPanel: Fix variables in data links
* Refactor variable fix for all Timeseries panels
* cr mods
(cherry picked from commit 76d6e3c07547639dac073c8ea05f7dbf9346518d)
Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
* Publish Linux Packages: Fix bad secret name (#56708) (#57174)
:facepalm:
Co-authored-by: dsotirakis <dimitrios.sotirakis@grafana.com>
(cherry picked from commit 72b9555487ba00c1c3c8212dfb6af3a968c036a9)
Co-authored-by: Julien Duchesne <julien.duchesne@grafana.com>
* Changelog: Updated changelog for 9.2.1 (#57176) (#57180)
(cherry picked from commit 4cee9109711bdcd46e464f290d870a5e6860c4e6)
* "Release: Updated versions in package to 9.2.2" (#57181)
* Revert data links code for sorted vector case (#57175) (#57183)
(cherry picked from commit 9c514748f76be1ecc041c8176de1e813a9ee3e4f)
Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
* Fix NumberInput empty values (#57142) (#57190)
* Fix NumberInput empty values
* tests
* tests
(cherry picked from commit e91135cf19b275deff679349bcc5e0d4ccedaac2)
Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
* PublicDashboards: Fix hidden queries execution (#57004) (#57194)
PublicDashboards: Fix hidden queries execution
* [v9.2.x] Alerting: Use correct response body for silence post API (#57126)
Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com>
* fix swagger spec for receivers API response (#57124) (#57128)
(cherry picked from commit 6ad405e256df2861e7afdf51b38121ceef648c54)
Co-authored-by: Santiago <santiagohernandez.1997@gmail.com>
* Alerting: Add support for wecom apiapp (#55991) (#57238)
This change adds new functionality to the wecom alerting contact point. In addition to a webhook address, you can now send alerts to the wecom apiapp endpoint.
Based on https://github.com/grafana/grafana/discussions/55883
Signed-off-by: aimuz <mr.imuz@gmail.com>
(cherry picked from commit c0cc85b5f150fb6df5b6f262bcd48a215109f271)
Co-authored-by: aimuz <mr.imuz@gmail.com>
* Add token to init-enterprise (#57246) (#57248)
(cherry picked from commit f0b882ebad2a105a49c0a36f5d4d901be135b824)
* Elasticsearch: Fix calculation of trimEdges (#56148) (#57249)
* Elasticsearch: Fix calculation of trimEdges
When a value of trimEdges is set greater than 1 we need to drop both the
first and last sample of the data from the response.
* Elasticsearch: Fix reading trimEdges from the query settings
Currently the trimEdges property in the JSON panel is stored as a string
and not directly as a number.
This caused that the reading of the value failed in the go backend
because the simplejson.Int() method doesn't properly handle this case.
This failure when decoding the value goes unnoticed because of the early
return causing the trimEdges configuration to be ignored.
* Refactor castToInt to also return an error
Add a new test case that sets the `trimEdges` property as a quoted
number.
(cherry picked from commit e4f2006ccedaf72ba46d210e6ab16d9ec0357b64)
Co-authored-by: Jorge Luis Betancourt <jorge-luis.betancourt@trivago.com>
* Loki: Remove already selected options from next label filter options in builder (#57187) (#57250)
* Loki: Filter out duplicated options in loki query builder label name options
* Update test
(cherry picked from commit b997bc4200229d3c59f1106863eaa728b3cac079)
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
* Replace json decoder with io.ReadAll (#57178) (#57251)
(cherry picked from commit 0b72c365277842df5a74ac559726c165230973ee)
Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
* elastic: backend-mode: fix trimEdges functionality (#56985) (#57253)
(cherry picked from commit 0491c19712c7c04c2d9a2d482def2f50762450a2)
Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
* Loki: Fix explain section about $__interval variable (#57188) (#57255)
* Loki: Update explain section
* Update
* Update public/app/plugins/datasource/loki/querybuilder/operationUtils.ts
Co-authored-by: Matias Chomicki <matyax@gmail.com>
Co-authored-by: Matias Chomicki <matyax@gmail.com>
(cherry picked from commit b4a03d0cff2d4a30d0e3a384e980faddf94966f5)
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
* disable double stringify (#57243) (#57254)
(cherry picked from commit 598da14d8835b30fe48a2b28b2a1ebba00bf1148)
Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
* CloudWatch: Make sure adoption tracking is done on valid, migrated queries (#56872) (#57241)
* make sure adoption tracking is done on valid, migrated queries
* ignore hidden queries
* fix test
* remove obsolete test
(cherry picked from commit a30885c523e0ce4a05047c7939df69adc8c2ebbd)
Co-authored-by: Erik Sundell <erik.sundell87@gmail.com>
* Cloudwatch: Fix issue where selected log groups clear from dashboards if there are more than 50 results (#57196) (#57210)
(cherry picked from commit b2e2879b07dc99a41e9d42cc5956472f64f0f2a4)
Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com>
* Fix typo (#57223) (#57229)
(cherry picked from commit cc6245df8e7e309f0fed96ab00efc2ea49d454ce)
Co-authored-by: Sobuno <jesper@sobuno.dk>
* Docs: Fix links in panels and vis docs (#57233) (#57275)
(cherry picked from commit e52c98ba99857376c82c0e291c5a0768935f37a3)
Co-authored-by: Garrett Guillotte <100453168+gguillotte-grafana@users.noreply.github.com>
* [v9.2.x] Docs: Fix broken InfluxDB starting guide links (#57282)
* Docs: Fix broken InfluxDB starting guide links (#57235)
* Docs: Fix broken InfluxDB starting guide links
* Docs: Fix another link to panel adding docs
(cherry picked from commit e14ef50d02a61f913cdf0d90bcca4d9787c0168a)
* Update docs/sources/getting-started/get-started-grafana-influxdb.md
* Update docs/sources/getting-started/get-started-grafana-influxdb.md
Co-authored-by: Garrett Guillotte <100453168+gguillotte-grafana@users.noreply.github.com>
* Loki: Fix adding of adhoc filters to stream selector when query with empty stream selector (#57280) (#57286)
* disable double stringify
* Refactor test for addLabelToQuery
* Add tests (TDD for expected behaviour)
* Fix adding ad hoc filters to correct place when no stream selector
* Update
* Update comment
* Fix getAllPositionsInNodeByType
Co-authored-by: Sven Grossmann <svennergr@gmail.com>
(cherry picked from commit 7928f170ce34cc74f8a9310399f04ff4f04ae7c2)
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
* Tempo: Fix Node Graph visualization type in dashboard (#56931) (#57269)
Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>
(cherry picked from commit f50ab457bd17ab35f9a8b9c1bc776754b5ccddcc)
Co-authored-by: Hamas Shafiq <hamas.shafiq@grafana.com>
* Docs: Fix links in old What's New docs (#57231) (#57283)
* Docs: Fix placeholder URL in release notes link
* Docs: Fix link to refactored docs and add missing alias
* Docs: Fix malformed links
* Docs: Fix alias with correct path
(cherry picked from commit 968024906692c8b170aa1a4d2d622a7796be9c0e)
Co-authored-by: Garrett Guillotte <100453168+gguillotte-grafana@users.noreply.github.com>
* Docs: Add missing alias for field options (#57234) (#57297)
(cherry picked from commit a0d83e7db7ab168109cd462df2de93b97fe937d9)
Co-authored-by: Garrett Guillotte <100453168+gguillotte-grafana@users.noreply.github.com>
* Alerting: Change severity level of fetcher log messages (#57299) (#57304)
(cherry picked from commit 3e6bc28de589d2761f172680d1aff4000930a385)
Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com>
* Routing: an unexpected spelling error happened (#57295) (#57305)
(cherry picked from commit bdb97496ec627cc2ae593333e5b27ee7102f973b)
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
* Docs: Fix reference to Enterprise licensing restrictions (#57230) (#57301)
(cherry picked from commit c70bb592fe863cc819246923d0246c56be99ffad)
Co-authored-by: Garrett Guillotte <100453168+gguillotte-grafana@users.noreply.github.com>
* add correct overscroll-behavior to context modals (#56070) (#57322)
(cherry picked from commit 0c1e4979af7381b2a016f58d1c3d32aed74c96f7)
Co-authored-by: Sven Grossmann <Svennergr@gmail.com>
* MSSQL: Support tables from all schemas (#53099) (#57287)
(cherry picked from commit 09ab1564807040a7c6df8a45cb0663824f870f6d)
Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
* StatuHistoryPanel: Fix zoom not working (#57240) (#57324)
(cherry picked from commit 0dd721d4cea64eb394c0b7b926b0015f600e9295)
Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
* Docs: fixes endpoint for mimir (#57330) (#57333)
(cherry picked from commit ee6ff18122cbf5a9dbfe44c6fbcef4c72d94ad4e)
Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
* StateTimeline: fix hover overlays when browser-zoomed (#57224) (#57351)
(cherry picked from commit 79afad3888768c369624c268a60c6f6c3e972301)
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
* GoogleOAuth: Unlock UI (#57350) (#57355)
(cherry picked from commit f184f9211c751784c58e5b9e8b03662ab3949c94)
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
* User: Fix externalUserId not being populated (#57341) (#57370)
(cherry picked from commit 8cebaf345de8761eaa40998af8e8840f25847bf9)
Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
* Canvas: Improve text element readability (#57371) (#57375)
(cherry picked from commit 5128659d197a9341c3d117300e8ee06fca202f79)
Co-authored-by: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
* Docs: fixes silences typo (#57418) (#57423)
(cherry picked from commit af17123b5fdd99bcd9431172ff91580cc5a03d4d)
Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
* [v9.2.x] Plugin fixes (#57401)
* Plugins: Remove support for V1 manifests
* Plugins: Make proxy endpoints not leak sensitive HTTP headers
* Security: Fix do not forward login cookie in outgoing requests
(cherry picked from commit 4539c33fce5ef23badb08ebcbc09cb0cecb1f539)
Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
* Swap order of login fields (#57426)
Co-authored-by: linoman <2051016+linoman@users.noreply.github.com>
* OutsideRangePlugin: Exclude leading and trailing null values when checking limits (#57335) (#57433)
* OutsideRangePlugin: Exclude null limit values from calculation
* refactor
* Update OutsideRangePlugin.tsx
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
(cherry picked from commit f161c5407a9b24b2cd027f7db1da53f91b5d555d)
Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
* E2E: Remove time zone scenario flackyness (#55458) (#57442)
Co-authored-by: polinaboneva <polina.boneva@grafana.com>
(cherry picked from commit 7fd613ec0d3247c918b1241ce7a3232a62f7c2a2)
Co-authored-by: Ivan Ortega Alba <ivanortegaalba@gmail.com>
* fix: add alerting enabled condition FOR adding alerting tab in folder view (#57434) (#57448)
(cherry picked from commit cd0e0fcc538ce26eca94bd0324f48e72323b5a61)
Co-authored-by: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
* Dashboard: Alerts user to incorrect tag format for JSON import (#54657) (#57277)
* Dashboard: Alerts user to incorrect tag format for JSON import
Fixes #54285: Malformed tags cause hidden title and settings page crash
* Update public/app/features/manage-dashboards/utils/validation.ts
Co-authored-by: Polina Boneva <13227501+polibb@users.noreply.github.com>
* Included Suggestions
- Removed Comments
- Updated Code Block accordingly
- Updated Tests to camelCase over snake_case
* Updates per comments
- Re-wrapped function in try{}, catch{} as I appear to have overlooked including it in the initial refactor
- Re-worded errors to align with initial error
- Added a test case for invalid json
* Update validation.ts
Updated errors to read correctly to the root cause.
Updated dashboard variable as const.
* Update actions.test.ts
Fix tests according to error output rewording
* Update validation.ts
- Included test for an empty string of non-array
* Update actions.test.ts
-- Commented incorrect commit for validation.ts, update:
- Refactored code to better align and separate from generic JSON package tests followed by our manual checks of (1) Is array, and (2) if array, is of strings
- Test cases now include a check for non-array empty string in the tag property
Co-authored-by: Polina Boneva <13227501+polibb@users.noreply.github.com>
(cherry picked from commit 5285d34cc019c77f7eee2e00a2afd8ff6e84a606)
Co-authored-by: AJ Tomko <andrew.j.tomko@gmail.com>
* Use resource call query_result query (#57232) (#57453)
(cherry picked from commit 47eb7f785de9aae6b28c292c12da10a7a5783099)
Co-authored-by: Sergey Kostrukov <sekost@microsoft.com>
* use inherited colors on svg (#57427) (#57447)
(cherry picked from commit 842b629cd1bd8ea21266e5412deb83de24d36cab)
Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
* Tempo: Add start time and end time parameters while querying traces (#48068) (#57459)
* Add start time and end time parameters while querying tempo traces
* Added configurable time shift to query by trace id
* Test that the URL is formatted correctly
* Added test to check for time shift
* Improved label and tooltip of new time shift settings
Co-authored-by: André Pereira <adrapereira@gmail.com>
(cherry picked from commit 98053cfde815f588e1c96ed51f225ea1cf14a508)
Co-authored-by: bikashmishra100 <bikashprakash@gmail.com>
* TimeSeries: Fix stacking when first value is negative zero (#57257) (#57472)
* TimeSeries: Fix stacking when first value is negative zero
* More test + refactor
(cherry picked from commit 7f3b567657b87ea0cd52cdf5efce066bf3c4f596)
Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
* TimeSeries: fix negative stacked percent y-axis range (#57470) (#57478)
(cherry picked from commit 45707ccf99b5e3a129b13a2e53e1c434d160ca74)
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
* Fix broken image links (#57480) (#57487)
(cherry picked from commit 4053cbea3880a491fe2782b7fe4cb5356e96b38c)
Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
* Clarify notification policies. (#57465) (#57507)
* NodeGraph: Fix rendering issues when values of arc are over 1 (#57460) (#57513)
(cherry picked from commit 67aa99af78e5f2c98e840931c9dd1cfbf02261fd)
Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>
* RBAC: Allow access to `/dashboards` when user has dashboards create (#56712) (#57153)
* RBAC: Allow access to dashboards when user has dashboards create
* Remove eval any that I didn't add on purpose
(cherry picked from commit 3963ed37540891d6447d613d3bfc0b0ebbff5c71)
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
* fix merge conflict (#57546)
Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
* Canvas: Button element (alpha) (#57491) (#57557)
(cherry picked from commit 73c215ae410ddc793cf815c53256fb880eeeb76d)
* Docs: Database encryption corrections (#57503) (#57559)
* Docs: Database encryption corrections
* Fix relref links
* Additional corrections
(cherry picked from commit 5d18b41857d474b9425d660466125122f47d308b)
Co-authored-by: Joan López de la Franca Beltran <5459617+joanlopez@users.noreply.github.com>
* Canvas: Improve resource picker initialization (#57319) (#57566)
(cherry picked from commit 9d857f4d61803f6156de5c7d89b04cd2593d0632)
Co-authored-by: Nathan Marrs <nathanielmarrs@gmail.com>
* Storage: Fix initialization on windows (#57504) (#57577)
(cherry picked from commit 749b3b62631e89b07a592ec922447b1c9158afa5)
Co-authored-by: Artur Wierzbicki <artur.wierzbicki@grafana.com>
* TablePanel: Fix updating footer values on data change (#57518) (#57581)
* TablePanel: Fix updating footer values on data change
* tests
(cherry picked from commit c30716a073d0147fe85ddb1102429d04f6a4d6df)
Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
* live: explicitely reply with http 200 (#57428) (#57592)
`pkg/web` triggers a panic when a http handler chain does not return any
response to the client.
This has been put in place, because it usually means a middleware along
the way did not call the next one.
In this specific case however, the handlers meant to return 200, but did
not do so explicitely, instead relying on the default behavior of `net/http`
(cherry picked from commit beaaabd770e540c463800e6d320884e3c6e00ae0)
Co-authored-by: sh0rez <me@shorez.de>
* Changelog: Updated changelog for 9.2.2 (#57601) (#57604)
(cherry picked from commit f64b0e1fae248469ee0fc8fbb2fc8efb90228808)
* "Release: Updated versions in package to 9.2.3" (#57605)
* [v9.2.x] Alerting: Always allow configuring AM configuration (#57614)
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
* move data source permission model to enterprise repo (#57615) (#57659)
(cherry picked from commit 92531c559612dd077f30b186873e23002c5c5ac5)
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
* Prometheus: Flavor/version configuration (#57554) (#57563)
* Backport PR for: Prometheus: Flavor/version configuration (#57554), and /label match parameter support #56510
* Revert "Revert "Prometheus: Type and flavor configuration (#56496)" (#57552)"
This reverts commit 2432ce619a7e62026685df14f60116ea4fb3447d.
* Adds new fields and documentation for Prometheus datasource configuration: prometheus type, and version
(cherry picked from commit f93c3acc51180cee78222f2df95ac7b380d1a616)
* Revert "Revert "Prometheus: Provide label values match parameter API when supported prometheus instance is configured (#56510)" (#57551)" (#57553) (#57564)
This reverts commit e7671bf9092811ecb053466e5b9c9913e2922fe1.
(cherry picked from commit e59ddd6bc5630625e49cafc965764cd8faa23cd6)
Co-authored-by: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
* Prometheus query builder: Replace select with AsyncSelect to support high cardinality prometheus instances (#57300) (#57630)
* Replace current select with AsyncSelect component to facilitate autocomplete via prometheus server instead of client application
Co-authored-by: Kyle Brandt <kyle@grafana.com>
(cherry picked from commit c27aac0d385bfe695dec5f1b268940b4a19d3c50)
Co-authored-by: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
* Docs: (Whats new 9.2) Prom Stream Parser (#57603) (#57693)
* Docs: (Whats new 9.2) Prom Stream Parser
* Update docs/sources/whatsnew/whats-new-in-v9-2.md
Co-authored-by: Garrett Guillotte <100453168+gguillotte-grafana@users.noreply.github.com>
Co-authored-by: Garrett Guillotte <100453168+gguillotte-grafana@users.noreply.github.com>
(cherry picked from commit dfdc9bcbc1491beb746914fcb8645436819d8aee)
Co-authored-by: Kyle Brandt <kyle@grafana.com>
* Fix: Unlock new button based on user permissions (#57733) (#57760)
(cherry picked from commit 4d380978d304029ff17f2c2f0195e1b5b0a0c5b5)
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
* fix GF_AUTH_JWT_URL_LOGIN not working (#57689) (#57761)
(cherry picked from commit cae900c6f9e41b5559d8ed25afa5cd5d2af56aa0)
* [v9.2.x] Alerting: Fall back to "range" query type for unified alerting when "both" is specified (#57765)
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
* Alerting: Fix "Not Implemented" responses (#57710) (#57712)
* Prometheus: fix Raw query is not updated when label op change. (#57492) (#57493) (#57780)
(cherry picked from commit 9aac0d32f9dbb77d0701398bf3d577a55dcce224)
Co-authored-by: yinjialu <37073056+yinjialu@users.noreply.github.com>
* Candlestick: Maintain candle width at different display resolutions (#57709) (#57794)
(cherry picked from commit 7d020d3f6e5476b47ce258dd4315e24a311f0506)
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
* TimeseriesPanel: Fill below to override works with name override (#57728) (#57800)
(cherry picked from commit 953fdfe76f3d6e51b8b32f4285e9501dfab944c5)
Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
* Security: Upgrade x/text to version unaffected by CVE-2022-32149 (#57797)
* Only provide version ot build-frontend-packages if it's a valid semver (has 2 digits) (#57808) (#57810)
(cherry picked from commit fd16cad7da36420148ae5811cfefa9876ce8f782)
Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
* CI: Add `CreateTempDir` func and use it in publish packages logic (#57171) (#57261)
* Add CreateTempDir func and use it in publish packages logic
* Fill err return in defer func
(cherry picked from commit e829b5014911363be862306b34a41fb0eeb13362)
Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
* [v9.2.x] Chore: Fix vulnerabilities in webpack loader-utils (#57753)
* chore: remove unused webpack loaders from core and toolkit
* chore: refresh yarn.lock file
* getting there...I hope..
* making sure we are not using naughty loader-utils.
* fixed storybook.
* Remove Sensu from docs (#57812) (#57823)
We do not support Sensu in Grafana Alerting, only Sensu Go.
(cherry picked from commit ee7adc081b3b2136d3786c069762057e8f428461)
Co-authored-by: Armand Grillet <2117580+armandgrillet@users.noreply.github.com>
* Prometheus: Do not drop errors in streaming parser (#57698) (#57835)
- Fixes #57692
- and also takes care of #42776 when using the streaming parser, not an ideal fix for #42776 but makes explore work better I think. https://github.com/grafana/grafana/issues/57365 might be a better longer term solution
(cherry picked from commit 6126f56ef0a0428ab3021c5a3368c2911000654f)
Co-authored-by: Kyle Brandt <kyle@grafana.com>
* Prometheus: Chore - Remove incorrect FrameType from exemplar frame (#57695) (#57828)
(cherry picked from commit 2cd9cbd35925830dee97d9d18840eadc9d0cbbf3)
Co-authored-by: Kyle Brandt <kyle@grafana.com>
* resolves merge conflicts (#57840)
* Dashboards: Add workaround for react-grid-layout rearrange bug (#57832) (#57836)
(cherry picked from commit e4d1d8d70cd553c262e1095bb3d77f4271b111d6)
Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
* Dashboards: Add workaround for react-grid-layout rearrange bug (#57832) (#57836)
(cherry picked from commit e4d1d8d70cd553c262e1095bb3d77f4271b111d6)
Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
* Docs: Add information about DB version support to upgrade guide. (#57643) (#57868)
In v9.2 Grafana added an official DB version support policy. That change
is now noted in the upgrade guide.
(cherry picked from commit 89d917b196a12bafbec80d043fa1f36e9c825243)
Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>
* Access Control: documentation for RBAC provisioning with Terraform (#57747) (#57882)
* add docs for RBAC provisioning with Terraform
* remove unnecessary bit
* shuffle the structure around, as docs can't go more than four levels deep
* Update index.md
* Update index.md
(cherry picked from commit 7e62352aea20a47589b66f20c2c8ef7ca5847b65)
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
* docs(config): Include admin_email documentation (#55789) (#57725)
(cherry picked from commit 1340c2c358d37c3249246277d4eeb51806faacb1)
Co-authored-by: Pepe Fagoaga <pepe@verica.io>
* RBAC: Allow to list users for dashboard / folder admins (#57080) (#57252)
* RBAC: Use query struct in tests
* RBAC: If access control enforcement is disabled don't filter out users
when fetching permissions
(cherry picked from commit 9adaf1565c2408e3e13668af7d50cdcdd5d77242)
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
* CloudWatch: Fix broken test (#57879) (#57900)
* mock date.now
* fix broken test
(cherry picked from commit 92ed9a4f2f6c3d5b8a0cfeaecda0062f6b77c525)
Co-authored-by: Erik Sundell <erik.sundell87@gmail.com>
* Chore: Update footer changelog link to github (#57871) (#57895)
(cherry picked from commit fd5c14757486ef510741ac344469b1ccfe2a6242)
Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
* Google Cloud Monitoring: Ensure selectors fit in the screen (#57817) (#57899)
(cherry picked from commit ce38840f293bfe94a1d6338a9bab255b3d7cc56c)
Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
* add an endpoint for updating several managed permissions with one call (#57893) (#57898)
(cherry picked from commit 2546437e2052025daaf8ee2ab9ea4262b7364e61)
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
* change json command parameter names from userID to userId and teamID to teamId (#57902) (#57913)
(cherry picked from commit 5c1a1c8318bec43dec6aaf130aaafda3f19e54a6)
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
* Alerting: Add debug logs in validateAndGetPrefix (#57002) (#57923)
(cherry picked from commit b0a927b1385654a6776cbe8deb36f6dfadc914fd)
Co-authored-by: George Robinson <george.robinson@grafana.com>
* Attempt to preserve UID from migrated channel (#57639) (#57919)
(cherry picked from commit 0dfd78c88cbb97df6594dda57d73c705bda106e0)
Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
* [v9.2.x] Alerting: fix filtering in notification policies (#57925)
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
* removes CTAs (#57931) (#57935)
(cherry picked from commit 6aa3003a541552aa9ce6e9b3e95a9dd0b8213e78)
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
* BarChart: Fix stacked hover (#57711) (#57937)
(cherry picked from commit fbfd0fd51b1d61b186957e0b58c2ea60472f55f3)
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
* TimeSeries: Render null-bounded points at data edges (#57798) (#57938)
(cherry picked from commit 45234e76eb82a417d8cee236d7a2ad91dc580bbb)
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
* CloudWatch: Fix `all-log-groups` endpoint when called without logGroupNamePrefix (#57483) (#57945)
(cherry picked from commit 1f7c84f1256ed46fe5099f27aae57a2121da1080)
Co-authored-by: Lion Ralfs <lion.ralfs@gmail.com>
* Add GCP_KEY to publish-grafanacom step (#57910) (#57948)
(cherry picked from commit 1eaf7cbfc0f4aaed8b84c3e50d9c0c352668b363)
* Changelog: Updated changelog for 9.2.3 (#57955) (#57957)
(cherry picked from commit 02add89b530a569f38e38597be294c6b16ef29d8)
* "Release: Updated versions in package to 9.2.4" (#57958)
* metrics: expose when the binary was built as an gauge (#57951) (#57969)
Signed-off-by: bergquist <carl.bergquist@gmail.com>
(cherry picked from commit 3188af9be352feabeb000b204d7375b5626231d5)
* Alerting: Fix flaky test in notifiers (#57927) (#57993)
* Alerting: Fix flaky test in notifiers
* remove TODO comment
(cherry picked from commit a3f828de8aae968f783aeeb648de98e75c421af4)
Co-authored-by: Santiago <santiagohernandez.1997@gmail.com>
* [v9.2.x] Google Cloud Monitoring: Set frame interval to draw null values (#57914)
* Linux Packages: Handle publish to beta (#57528) (#58044)
Uses the feature added here: https://github.com/grafana/deployment_tools/pull/46301
When a version is named "beta", it will be distributed in the beta distribution, rather than in stable
Co-authored-by: dsotirakis <dimitrios.sotirakis@grafana.com>
(cherry picked from commit c46a4a0b260d3b008bfa771cdc103065a6fe6880)
Co-authored-by: Julien Duchesne <julien.duchesne@grafana.com>
* chore: bump code coverage action version (#56710) (#58040)
(cherry picked from commit e3e32c7d04a5d20b45411c118f7e3c7e63d90709)
Co-authored-by: Giordano Ricci <me@giordanoricci.com>
* Alerting: Fix response is not returned for invalid Duration in Provisioning API (#58046) (#58049)
(cherry picked from commit 4c581b5f85db705bd4b01d5679407069dd3b2cfb)
Co-authored-by: George Robinson <george.robinson@grafana.com>
* LibrayPanels: Fix unlinking libray panel (#57825) (#58042)
* remove unneeded package updates (#58005) (#58068)
(cherry picked from commit 6a4a10fa926e89eb0498a4d703ccc8c67b5dd46d)
Co-authored-by: Dan Cech <dcech@grafana.com>
* Alerting: Fix feedback (#57922) (#58104)
(cherry picked from commit f2e4cb7c4ea4ee85a177e27fba3d6bf191e043a7)
Co-authored-by: George Robinson <george.robinson@grafana.com>
* Alerting: Fix screenshot is not taken for stale series (#57982) (#58102)
(cherry picked from commit 215ffee4375adb784526827340bbc8c66fd342cc)
* fix: migration of alert_rules fix (#58123)
* increase select placeholder contrast to be WCAG AA compliant (#58034) (#58125)
(cherry picked from commit c3206167a65babd66ca4d590723c4fd754c4aad9)
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
* Tempo: Make usage of time range for TraceID query optional (#58057) (#58128)
* Added switch to toggle the TraceID query time shift
* Fix and improve tests
(cherry picked from commit 90ac300d1023768f9778bb58e77a05948dea5b2e)
Co-authored-by: Andre Pereira <adrapereira@gmail.com>
* [v9.2.x] Explore: Track data links usage (#56868) (#58037)
* Explore: Track data links usage (#56868)
* Add tracking for data links in explore
* Add tracking for data links in explore
* Fix tests
* Retrigger build
(cherry picked from commit dd5e3a08184b3d875c0ee62aab7ca9a054a8c23e)
# Conflicts:
# public/app/features/explore/Explore.tsx
# public/app/features/explore/LogsContainer.tsx
* Post-merge fixes
Remove unused import
* reduce the number of requests in folder section (#55876) (#58145)
(cherry picked from commit 372ba83534e0fd91e1c25d7c3c27a3ac1f68f62c)
Co-authored-by: Marcos Vinicius <marcos.vinicius.wz@gmail.com>
* TimeSeries: more thorough detection of negative values for stacking dir (#57863) (#58147)
(cherry picked from commit 4d88e2b542c62bf287a60af01fddfa2e6de220b4)
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
* fixed explain handlers for label- and lineformat (#58135) (#58151)
(cherry picked from commit 4b1ddba0a8998884982d275e846ec4af6787a06f)
Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
* fixes typo (#58159) (#58194)
(cherry picked from commit 1722000309c6e6dc36c9e4f5ef9c2e40cc6e6c65)
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
* [v9.2.x] Alerting: Encode path separators to side-step proxies (#58222)
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
* Build: add explicit build step for go codeql (#58195) (#58243)
* add explicit build step for go codeql
* support workflow_dispatch for codeql checks
* syntax fix
* enable on push to codeql-go branch
* test
* use go version from go.mod
* explicitly set go version
* tidy up, add workflow_dispatch support to all codeql actions
(cherry picked from commit da9c646f242fd16ba8a789fa5d1c50094d761ae7)
Co-authored-by: Dan Cech <dcech@grafana.com>
* Search: Fixes searching by current folder when opened by clicking dashboard folder name (#57716) (#57949)
* Search: Read from url on mount no on app boot
* Fixed tests
* Remove unused type
(cherry picked from commit 3991be4c1dd35ff05e1a7dee117710e766b1a3c9)
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
* merge complete (#58272)
* followup fix for backport (#58273)
* merge complete (#58274)
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
* Timeseries: Fix null pointer when matching fill below to field (#58030) (#58298)
* Fix timeseries fill below to error
* wip
* modifications
* add tests for fillBelowTo option
(cherry picked from commit d673c8809b64237690b192d25bb6fefd177ae33d)
Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
* MySQL: make it possible to add CA cert without using tlsAuth (#58226) (#58308)
(cherry picked from commit b1bfae035022d6cedd89014744073e89741e4738)
Co-authored-by: Oscar Kilhed <oscar.kilhed@grafana.com>
* Auth: Check for OrgUsersAdd on frontend to display pending invites (#58217) (#58225)
(cherry picked from commit 9ff2765bb9e7938c88f2333647a6210589a06535)
Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
* Chore: Disable dashboard-time-zone e2e tests (#58320) (#58323)
(cherry picked from commit d4e3d47f563de34cd09372e048943a8698861d59)
Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
* @grafana/e2e: Fix addPanel for small screen size (#57398) (#58314)
(cherry picked from commit d001a1b035bdbbaae384cdaf3d69f9ebfd5193a0)
Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
* Toolkit: Fix Webpack less-loader config (#57950) (#58175)
(cherry picked from commit b799be3052247f6d3da2a10ab18474dcb0705a5d)
Co-authored-by: dessen-xu <1805680163@qq.com>
* fix thanos semver string (#58335) (#58344)
(cherry picked from commit 6bc8ec0f9bbcdc48e6865e8318eb7fb8de7068ab)
Co-authored-by: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
* Chore: Upgrade Go to 1.19.3 (v9.2) (#58339)
* Datasource Loki: preserve header `X-ID-Token` (#57878) (#58346)
(cherry picked from commit bc280d07492f66456e47eb262f935c933312b1ed)
Co-authored-by: Si Mon <85333972+siiimooon@users.noreply.github.com>
* MSSql/Postgres: Fix visual query editor filter disappearing (#58248) (#58354)
(cherry picked from commit b47230623944f01aa6e2367913e2f7596ff284bf)
* Alerting: Fix test fails in some environments (#58251) (#58356)
(cherry picked from commit 8353f307aa2ed842c9045c1e420d51574019e905)
Co-authored-by: George Robinson <george.robinson@grafana.com>
* Alerting: Append org ID to alert notification URLs (#57123) (#58349)
(cherry picked from commit db1fd10ff13d936665210e0c8a86c50ecae09998)
Co-authored-by: Neel <47709856+neel1996@users.noreply.github.com>
* [v9.2.x] CI: Use full `dockerhub` repository name (#57979) (#57983)
* CI: Use full `dockerhub` repository name (#57979)
* Add full dockerhub repo name
* Update grabpl version
(cherry picked from commit 57ee0e4a4b3b6b5536e63b117718c6384920650f)
* sign drone.yml
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
* Docs: corrects outer join example (#58348) (#58366)
* corrects outer join example
* Update docs/sources/panels-visualizations/query-transform-data/transform-data/index.md
* adds query tables back in
(cherry picked from commit 0315f6317e2653da203c9ac0f21eceb9aa9e29de)
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
* Alerting: Remove duplicate Slack notification title (#58107) (#58256)
Move mentions to a markdown-formatted pretext field
to prevent issues mixing blocks and legacy-attachment content.
(cherry picked from commit d581b368bdeeaf8870e495a15dcfdf5aef293be9)
Co-authored-by: Will Jordan <wjordan@users.noreply.github.com>
* CallResource: don't set Content-Type header if status is 204 (#50780) (#58362)
Grafana's HTTPServer ensures that the Content-Type header is always set
in the response to a CallResource call, but when the status code is
204 No Content this shouldn't be done; the body should be empty and no
Content-Type header should be set.
We ran into this in the Grafana ML plugin where we were sending an empty
response with status 204, but the frontend client saw that the content
type was JSON and tried to parse it, resulting in an error that made it
to the JS console.
(cherry picked from commit 480277f6129b61d4f23e85a31b0e46b052cbb498)
Co-authored-by: Ben Sully <ben.sully@grafana.com>
* Prometheus: Upgrades http client to v1.13.1 (#58363) (#58395)
(cherry picked from commit faa0fda6eb846752983447c2590c68d68c6cb173)
* Grafana Enterprise Packaging: Set to conflict with `grafana`, not replace (#58189) (#58418)
* Grafana Enterprise Packaging: Set to conflict with `grafana`, not replace
When `grafana` and `grafana-enterprise` are in the same RPM repository, grafana-enterprise takes precedence over Grafana
This is not what we want. Users should be able to install either OSS or Enterprise
* Set it only one way. It's how it's currently tested
(cherry picked from commit 786c7faff2c70a563bd1f3f391e28564d1c59964)
Co-authored-by: Julien Duchesne <julien.duchesne@grafana.com>
* Changelog: Updated changelog for 9.2.4 (#58429) (#58431)
(cherry picked from commit 94573d3e6109b5a832c21013c83d9464c43ea4b4)
* "Release: Updated versions in package to 9.2.5" (#58430)
* Prometheus: remove /series endpoint calls in query builder label names and values for supported clients (#58087) (#58438)
* add other filter variables to match param for label values query against filter values, in order to resolve bug in which filter value options would display that aren't relevant in the current query editor context, i.e. options would display that upon select would display no data
* expanding current unit test coverage to cover calls to new API
* interpolate the label name string instead of the match promql expression
(cherry picked from commit 92817469143a222e6d1be8b3369151d55c7fe47d)
Co-authored-by: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
* properly format new .drone.yml in verify-drone (#58436) (#58452)
(cherry picked from commit d593aede3d0bc712dbae34d442918532d8c158d4)
Co-authored-by: Dan Cech <dcech@grafana.com>
* pkg/web: avoid shared middleware slice (#58458) (#58463)
(cherry picked from commit 75701695d8a938d4958c12febdf37d96afcd6092)
Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
* Tooltips: Make tooltips in FormField and FormLabel interactive and keyboard friendly (#57706) (#58471)
* Tooltips: add tabindex and interactive
A couple tooltips used in configuration of datasources like ADX were not
clickable or didn't show on keyboard focus.
- fixes #56561
- Same solution as #47137
* test: add test around tabbing to tooltips
(cherry picked from commit 3e92a2dc7725677336534eae4008be6a679ed44b)
Co-authored-by: Adam Simpson <adam@adamsimpson.net>
* Use fnv64 for InmemCacheService (#58468) (#58487)
(cherry picked from commit 72275e97d281f6b4dfb2cd1188db1e7ec5cbb198)
Co-authored-by: George Robinson <george.robinson@grafana.com>
* Alerting: Use hash of opts in singleflight (#58474) (#58488)
(cherry picked from commit ad9ac85ee090f8bb006c5b095c0fe3ac7e1b71cd)
Co-authored-by: George Robinson <george.robinson@grafana.com>
* Alerting: Fix screenshots were not cached (#58493) (#58494)
(cherry picked from commit c646ff0ce3b5d68d6d96a9c98916186b91a3706c)
* Dashboards: Provide better error messages in SaveDashboardAsForm (#57866) (#58432)
The existing code uses `instanceof Error` to check for a `message` field on the thrown object. The objects that are thrown are never instances of the error interface. This change introduces a new type that extends Error so that the check works properly and displays a meaningful error message in the UI.
(cherry picked from commit f07da85d8b64c7df00121b6b9ace36f9eca1b9b2)
Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>
* Tempo: Fix dropdown issue on tag field focus (#57616) (#57883)
(cherry picked from commit 77be89eb1c743c681d0e070cb5f170e58ffa1bfb)
Co-authored-by: xiyu95 <112968312+xiyu95@users.noreply.github.com>
Co-authored-by: Will Browne <will.browne@grafana.com>
* Elasticsearch: fix typo (#58519) (#58523)
(cherry picked from commit fa5a304de862c438e25ab8818b7477d1c8304b13)
Co-authored-by: Gareth Dawson <gareth.dawson@grafana.com>
* Docs: adjusts topics to align with task templates (#58478) (#58531)
* updates topic to align with multiple task template
* updates goal intro
* aligns formatting with single task topic template
* Update docs/sources/administration/team-management/index.md
Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
* adds permissions requirements to two tasks
Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
(cherry picked from commit 2dfe0a4060c84aaff8edc0ce3a07573d114f3f67)
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
* Alerting: Improve debug logs in image service (#58507) (#58533)
(cherry picked from commit b92a0223e3f5f60f2ae082e21ab43243d51469f0)
Co-authored-by: George Robinson <george.robinson@grafana.com>
* Add new PageInfo component (#58421) (#58534)
(cherry picked from commit 831ecb467cfaad7942cbe785f732bd91a43b479a)
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
* Alerting: Fix images cached on rule instead of dashboard panel signature (#58510) (#58536)
(cherry picked from commit 7e852720e3fd6394e62749383d1e502fd9fca83d)
Co-authored-by: George Robinson <george.robinson@grafana.com>
* Alerting: Small improvements to staleResultsHandler (#58007) (#58513)
(cherry picked from commit 1290951b65b75ac6a054b401d3e91388cddfe33d)
* adjusts the stem sentence (#58538) (#58541)
(cherry picked from commit ad374efcbdddfd896cc19bdd98ff1d1cc54c94b4)
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
* Prometheus: Query builder label filters dropdown UI overload fix (#58266) (#58546)
* WIP: try to support removing series endpoint for supported clients
* add other filter variables to match param for label values query against filter values, in order to resolve bug in which filter value options would display that aren't relevant in the current query editor context, i.e. options would display that upon select would display no data
* clean up console logs
* refactor and comment
* expanding current unit test coverage to cover calls to new API
* fix unit test
* whitespace
* prettier
* WIP: need to merge in other PR
* WIP giving up and trying again
* WIP: most functionality is working, split out shared loki/prom code
* fix bug in which search results wouldn't take other label context into the query
* Fix bug in which the previously selected value would conflict with the async search
* interpolate the label name string instead of the match promql expression
* remove type assertions
* remove type assertion
* clean up generic confusing types, and add back in a type assertion
* remove generic type
* make sure to interpolate label names
* fix bugs with variables not interpolating before query
* remove debug
* assert partial properties on QueryBuilderLabelFilter
* Force update betterer results :(
* update regex so dropdown UX more closely matches current behavior
* add eslint ignore
* add eslint ignore and update betterer
(cherry picked from commit ee7348afeea1f746a6ee4e6c7bbfc77743a43204)
Co-authored-by: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
* Linux repositories: Document `apt|rpm.grafana.com` (#57527) (#58475)
* Linux repositories: Document `apt|rpm.grafana.com`
We'll be moving off packages.grafana.com (it will be linked to the new repositories)
The new package repositories are easier to use, so let's document them instead
Question: Are the scripts in `scripts/build/update_repo` and `scripts/verify-repo-update` still used? They seem very old, and seem like the generation of scripts before grabpl was created
* Shorter RPM docs. No need to copy the same snippet twice
* Add warning about repository migration
* oops
(cherry picked from commit f1f401147f5ea3bf71099b6358a5ee81f7c68f6a)
Co-authored-by: Julien Duchesne <julien.duchesne@grafana.com>
* Navigation: Expose new props to extend `Page`/`PluginPage` (#58465) (#58562)
* add extensions and customisation to `Page`
* adjust alignment
(cherry picked from commit b3c761aaa79d374d7dc13c5456e322e1cc294b09)
* Alerting: Log when alert rule cannot be screenshot to help debugging (#58537) (#58563)
(cherry picked from commit 68600c224b36c4668cec75b7acc30369ac8f4eec)
* Plugins: CallResource: Use canonical MIME headers when writing response (#58506) (#58567)
* Plugins: CallResource: use canonical MIME headers when writing response
* Plugins: add tests for canonical mime headers and Set-Cookie filter
* Removed extra new line
(cherry picked from commit 33f02839f0792974a103629136df36528159059a)
Co-authored-by: Giuseppe Guerra <giuseppe.guerra@grafana.com>
* Alerting: Fix logging pointer address of DashboardUID and PanelID variables (#58539) (#58565)
(cherry picked from commit c5ae1bcfe06449fafe6cc4abb8d4a4c17a8c94e4)
* Canvas: Fix setting icon from field data #58499 (#58604)
(cherry picked from commit 47055561ec92ddb6f4d1d1fdcedb09345cb3b0cf)
Co-authored-by: Nathan Marrs <nathanielmarrs@gmail.com>
* [v9.2.x] Canvas: Improve disabled inline editing UX (#58614)
Canvas: Improve disabled inline editing UX (#58610)
(cherry picked from commit fd6edbf8c5a52619f00a7e4e440e8bc93df18260)
Co-authored-by: Nathan Marrs <nathanielmarrs@gmail.com>
* [v9.2.x] Docs: Add feature flag example to override configurati…
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
This PR makes it possible to store the last error for each receiver in case of notification delivery failure. These errors are exposed via the
/receiversendpoint.Sample response:
{ "active": true, "integrations": [ { "lastNotifyAttempt": "2022-09-19T15:34:14.851Z", "lastNotifyAttemptDuration": "139.583µs", "lastNotifyAttemptError": "SMTP not configured, check your grafana.ini config file's [smtp] section", "name": null, "sendResolve": null } ], "name": "grafana-default-email" }Part of the errors in the notification pipeline epic.