54357 Commits
Author SHA1 Message Date
Konrad LalikandKevin Minehart 9225f4a1cb [v11.3.x] Alerting: Add useReturnTo hook to safely handle returnTo parameter (#96481)
Alerting: Add useReturnTo hook to safely handle returnTo parameter (#96474)

Add useReturnTo hook to safely handle returnTo parameter

Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
(cherry picked from commit 54cc666aa0)

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>
v11.3.1
2024-11-15 10:10:37 +02:00
grafana-delivery-bot[bot]andMatthew Jacobson a09dcda92d [v11.3.x] Alerting: Fix per-receiver RBAC for receivers with long names (#95165)
Alerting: Fix per-receiver RBAC for receivers with long names (#95084)

* Implement uidToResourceID

* add middleware

* Move uidToResourceID to alerting package

* Only hash uid if it's too long

* Use hashed uid in access control

* Move ReceiverUidToResourceId to ScopeProvider

* resolve uid in middleware only if param exists

* Tests

* Linting

---------

Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
(cherry picked from commit 4aad44e848)

Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>
2024-11-14 13:01:31 -05:00
a6bc76df32 [v11.3.x] Docs: Add canvas custom images and icon guidance (#96470)
Co-authored-by: Drew Slobodnjak <60050885+drew08t@users.noreply.github.com>
Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
2024-11-14 11:02:48 -05:00
grafana-delivery-bot[bot]andJacob Valdez d5cbf07090 [v11.3.x] Docs/adding information on using variable expansion and env variable for TLS certs when provisioning data sources (#96471)
Docs/adding information on using variable expansion and env variable for TLS certs when provisioning data sources (#96400)

Docs/adding information on using variable expansion and env variables for TLS certs when provisioning data sources

(cherry picked from commit 28ad9684e9)

Co-authored-by: Jacob Valdez <jacob.valdez@grafana.com>
2024-11-14 17:36:23 +02:00
kay delaney d32c02ae14 [v11.3.x] Dashboard datasource: Return annotations as series when query topic is "annotations" (#95971)
Dashboard datasource: Return annotations as series when query topic is "annotations" (#95965)

(cherry picked from commit 26b0e8f105)
2024-11-14 14:45:17 +00:00
grafana-delivery-bot[bot]andbrendamuir d815e1107d [v11.3.x] Alerting docs: adds cloud alert rule limits (#96442)
Alerting docs: adds cloud alert rule limits (#96441)

(cherry picked from commit 14d868a791)

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
2024-11-14 12:38:07 +02:00
Victor Marin 700f59a0ea [v11.3.x] Fix dashboards listing table appearing distorted (#96390)
Fix dashboards listing table appearing distorted (#96371)

* fix CSS

* approx height calc to account for header div

(cherry picked from commit 19c04168c3)
2024-11-14 09:37:27 +02:00
grafana-delivery-bot[bot]andIsabel Matwawana a6cdb48249 [v11.3.x] Docs: Add auth entries to what's new 11.2 (#96394)
Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
2024-11-13 09:29:15 -05:00
grafana-delivery-bot[bot]andJacob Valdez ecf127c0fa [v11.3.x] Docs/removing outdated versioning info in OSS data source docs (#96352)
Docs/removing outdated versioning info in OSS data source docs (#96351)

docs/removing outdated versioning info in oss data source docs

(cherry picked from commit f83f7332a1)

Co-authored-by: Jacob Valdez <jacob.valdez@grafana.com>
2024-11-12 15:02:20 -06:00
lean.dev 9241bc5f5c [v11.3.x] MigrationAssistant: Restrict dashboards, folders and datasources by the org id of the signed in user (#96345)
apply security patch: v11.3.x/194-202410181505.patch
2024-11-12 16:33:00 -03:00
a2b1cda210 Release: 11.3.0+security-01 (#96295)
* Update changelog

* add relevant CVE fix to the changelog

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Sergej-Vlasov <sergej.s.vlasov@gmail.com>
2024-11-12 16:01:43 +00:00
grafana-delivery-bot[bot] 50762226a0 [v11.3.x] docs: Fixed title wording from bar gauge to canvas (#96319)
Co-authored-by: Señor Performo - Leandro Melendez <54183040+srperf@users.noreply.github.com>
Fixed title wording from bar gauge to canvas (#96312)
2024-11-12 10:13:31 -05:00
grafana-delivery-bot[bot]andSonia Aguilar 58333e0507 [v11.3.x] Alerting: Fix setting datasource uid, when datasource is string in old version (#96273)
Alerting: Fix setting datasource uid, when datasource is string in old version (#96085)

fix setting datasource uid, when datasource is string in old versions rules

(cherry picked from commit 2f58311eea)

Co-authored-by: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
2024-11-12 14:23:44 +01:00
Adela Almasan 5cc78ea219 [v11.3.x] Actions: Fix interpolation (#96247)
øActions: Fix interpolation  (#96161)

(cherry picked from commit 754351273b)
2024-11-12 07:21:59 -06:00
grafana-delivery-bot[bot]andbrendamuir a8cb62f05a [v11.3.x] Alerting docs: adds prereqs to configure data source (#96274)
Alerting docs: adds prereqs to configure data source (#96272)

* Alerting docs: adds prereqs to configure data source

* fixes numbering

(cherry picked from commit 35572c9731)

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
2024-11-12 11:59:30 +01:00
grafana-delivery-bot[bot]andSeñor Performo - Leandro Melendez 89ea2a15ce [v11.3.x] docs: Update CanvasDoc adding video link (#95994)
docs: Update CanvasDoc adding video link (#95953)

Update CanvasDoc adding video link

(cherry picked from commit cd3a71e7cb)

Co-authored-by: Señor Performo - Leandro Melendez <54183040+srperf@users.noreply.github.com>
2024-11-11 15:14:34 +01:00
grafana-delivery-bot[bot]andbrendamuir 5e1479d887 [v11.3.x] Alerting docs: fixes broken oncall link (#96217)
Alerting docs: fixes broken oncall link (#96215)

(cherry picked from commit ca04cf780b)

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
2024-11-11 14:08:58 +01:00
grafana-delivery-bot[bot]andjackyin f1c4e83865 [v11.3.x] Flame Graph: Fix crash when it receives empty data (#96211)
Flame Graph: Fix crash when it receives empty data (#95604)

flame graph crash

(cherry picked from commit 3012d4c043)

Co-authored-by: jackyin <yincong@baidu.com>
2024-11-11 13:00:23 +00:00
grafana-delivery-bot[bot]andbrendamuir cfa3ef73a1 [v11.3.x] Alerting docs: updates to landing page (#96214)
Alerting docs: updates to landing page (#96200)

* Alerting docs: updates to landing page

* Update docs/sources/alerting/_index.md

Co-authored-by: Pepe Cano <825430+ppcano@users.noreply.github.com>

---------

Co-authored-by: Pepe Cano <825430+ppcano@users.noreply.github.com>
(cherry picked from commit 19bed65d9b)

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
2024-11-11 13:45:21 +01:00
grafana-delivery-bot[bot]andPepe Cano c99c8c56e2 [v11.3.x] Alerting docs: Move Meta monitoring to Additional configuration section (#96207)
Alerting docs: Move `Meta monitoring` to `Additional configuration` section (#96150)

(cherry picked from commit 154a2e0d06)

Co-authored-by: Pepe Cano <825430+ppcano@users.noreply.github.com>
2024-11-11 11:23:50 +01:00
grafana-delivery-bot[bot]andKristina 5b1a386dac [v11.3.x] BarChart: Fix threshold lines rendering for horizontal orientation (#96137)
BarChart: Fix threshold lines rendering for horizontal orientation (#95737)

* Use different threshold x/y coordinates depending on orientation

* invert wording / semantics

---------

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
(cherry picked from commit 95692b3d68)

Co-authored-by: Kristina <kristina.durivage@grafana.com>
2024-11-09 13:45:03 -06:00
Fayzal Ghantiwala 8bc0014845 [v11.3.x] Alerting: Make context deadline on AlertNG service startup configurable (#96135)
Alerting: Make context deadline on AlertNG service startup configurable (#96053)

* Make alerting context deadline configurable

* Remove debug logs

* Change default timeout

* Update tests

(cherry picked from commit 1fdc48faba)
2024-11-08 16:46:50 +00:00
grafana-delivery-bot[bot]andKonrad Lalik 8f10dbe12d [v11.3.x] Alerting: Fix editing expressions refId (#95035)
Alerting: Fix editing expressions refId (#94941)

Fix refId editing

(cherry picked from commit 836881b713)

Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
2024-11-08 16:54:01 +01:00
grafana-delivery-bot[bot]andSonia Aguilar 546e0e214b [v11.3.x] Alerting: Force refetch prom rules when refreshing panel (#96125)
Alerting: Force refetch prom rules when refreshing panel (#96120)

Force refetch prom rules when refreshing panel

(cherry picked from commit ea0a6a1f7f)

Co-authored-by: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
2024-11-08 16:36:51 +01:00
grafana-delivery-bot[bot]andPepe Cano 3704073e6f [v11.3.x] Alerting docs: reuse Additional configuration page for Cloud docs (#96121)
Alerting docs: reuse `Additional configuration` page for Cloud docs (#96101)

(cherry picked from commit b953190328)

Co-authored-by: Pepe Cano <825430+ppcano@users.noreply.github.com>
2024-11-08 16:19:04 +01:00
grafana-delivery-bot[bot]andbrendamuir c9c1bbfa6e [v11.3.x] Alerting docs: changes advanced to additional (#96092)
Alerting docs: changes advanced to additional (#96083)

(cherry picked from commit 86bc087257)

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
2024-11-08 14:32:30 +02:00
grafana-delivery-bot[bot]andbrendamuir 402b023b45 [v11.3.x] Alerting docs: adds advanced config section (#96050)
Alerting docs: adds advanced config section (#96013)

* Alerting docs: adds advanced config section

* corrects ref

* feedback from pepe

* renames detect and respond

(cherry picked from commit b2af163dc5)

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
2024-11-08 09:58:18 +01:00
grafana-delivery-bot[bot]andJacob Valdez be895603c8 [v11.3.x] Docs: clarify the description of actions_allow_post_url (#96045)
Docs: clarify the description of actions_allow_post_url (#95995)

* Docs: clarify the description of actions_allow_post_url

* adding a word to clarify this extends the default behavior and doesn't replace it

* Update docs/sources/setup-grafana/configure-grafana/_index.md

Co-authored-by: Beverly Buchanan <131809838+BeverlyJaneJ@users.noreply.github.com>

* Update docs/sources/setup-grafana/configure-grafana/_index.md

Co-authored-by: Beverly Buchanan <131809838+BeverlyJaneJ@users.noreply.github.com>

---------

Co-authored-by: Beverly Buchanan <131809838+BeverlyJaneJ@users.noreply.github.com>
(cherry picked from commit 4cc204affe)

Co-authored-by: Jacob Valdez <jacob.valdez@grafana.com>
2024-11-07 10:15:59 -06:00
grafana-delivery-bot[bot]andPepe Cano c2d85230b1 [v11.3.x] Alerting docs: Introduction - brief overview of notification messages. (#96042)
Alerting docs: Introduction - brief overview of notification messages. (#95987)

* Intro: simplify `Architecture`. Add a new guideline

* Define `Notification policies` as an advanced option

* Intro: include about "Notification messages"

* Minor copy changes

(cherry picked from commit ff2f612412)

Co-authored-by: Pepe Cano <825430+ppcano@users.noreply.github.com>
2024-11-07 16:51:12 +01:00
Jack Westbrook 3824dc412d [v11.3.x] Chore: Resolve duplicate e2e-selectors packages to workspace (#94945)
chore(yarn): resolve scenes e2e selectors to workspace version
2024-11-07 16:40:35 +01:00
grafana-delivery-bot[bot]andAlexander Akhmetov 0e0a2c0371 [v11.3.x] Alerting: Fix saving advanced mode toggle state in the alert rule editor (#95981)
Alerting: Fix saving advanced mode toggle state in the alert rule editor (#95924)

(cherry picked from commit 4ce1abc6f9)

Co-authored-by: Alexander Akhmetov <me@alx.cx>
2024-11-06 19:04:59 +01:00
grafana-delivery-bot[bot]andPepe Cano 8273628550 [v11.3.x] Alerting docs: specify using multiple contact point integrations in the UI and HTTP API (#95967)
Alerting docs: specify using multiple contact point integrations in the UI and HTTP API (#95890)

* Sort list of contact points on the sidebar

* Update `Configure contact points` to clarify contact point integrations

* Alerting HTTP API: fix `EmbeddedContactPoint` properties table

* HTTP Alerting API: clarify how `ContactPoint.name` groups contact points

* Update docs/sources/alerting/configure-notifications/manage-contact-points/_index.md

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>

---------

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
(cherry picked from commit 290612e366)

Co-authored-by: Pepe Cano <825430+ppcano@users.noreply.github.com>
2024-11-06 15:45:52 +01:00
grafana-delivery-bot[bot]andBogdan Matei d489ecf794 [v11.3.x] Dashboard: Append orgId to URL (#95963)
Dashboard: Append orgId to URL (#95960)

(cherry picked from commit 52f4bd64e0)

Co-authored-by: Bogdan Matei <bogdan.matei@grafana.com>
2024-11-06 16:28:37 +02:00
grafana-delivery-bot[bot]andMisi 16411b1b4a [v11.3.x] ServerLock: Fix pg concurrency/locking issue (#95935)
ServerLock: Fix pg concurrency/locking issue (#95916)

Fix pg unique constraint validation in serverlock

(cherry picked from commit ab974ddf14)

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
2024-11-06 11:09:20 +02:00
grafana-delivery-bot[bot]andJacob Valdez 8567089ed2 [v11.3.x] Docs: Updating steps for pulling Grafana metrics into Prometheus (#95918)
Docs: Updating steps for pulling Grafana metrics into Prometheus (#95913)

* Docs: Updating steps for pulling Grafana metrics into Prometheus

* slight update based on review

(cherry picked from commit 9a1e7de79d)

Co-authored-by: Jacob Valdez <jacob.valdez@grafana.com>
2024-11-06 00:17:12 +02:00
grafana-delivery-bot[bot]andKim Nylander 1100a0409f [v11.3.x] [DOC] Add Pyroscope to list of products (#95911)
[DOC] Add Pyroscope to list of products (#95884)

* Add Pyroscope to list of products

* Update docs/sources/shared/basics/what-is-grafana.md

* Apply suggestions from code review

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Co-authored-by: Bryan Huhta <32787160+bryanhuhta@users.noreply.github.com>

---------

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Co-authored-by: Bryan Huhta <32787160+bryanhuhta@users.noreply.github.com>
(cherry picked from commit 78c5fe61df)

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
2024-11-05 15:00:20 -05:00
grafana-delivery-bot[bot]andAndreas Christou a7c1f37435 [v11.3.x] Azure: Handle namespace request rejection (#95909)
Azure: Handle namespace request rejection (#95574)

Handle rejection and add test

(cherry picked from commit da1a5426d0)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2024-11-05 21:06:30 +02:00
grafana-delivery-bot[bot]andJacob Valdez cbf9e323b6 [v11.3.x] Docs: updating auto_refresh_license information (#95902)
Docs: updating auto_refresh_license information (#95804)

(cherry picked from commit a8578484bb)

Co-authored-by: Jacob Valdez <jacob.valdez@grafana.com>
2024-11-05 18:38:53 +01:00
grafana-delivery-bot[bot]andPepe Cano 0826aa0078 [v11.3.x] Alerting docs: Update Create alert rules from panels (#95818)
Alerting docs: Update `Create alert rules from panels` (#95566)

* Alerting docs: Update `Create alert rules from panels`

* Remove screenshots except when the panel displays alert status

* Further changes sync with Brenda

* minor changes

* Relocate admonition

* Specify `dashboardUId` and `panelId` must be set together

* Update docs/sources/alerting/alerting-rules/link-alert-rules-to-dashboards.md

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>

* change title

* change URL

* fix spell error

---------

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
(cherry picked from commit facca37f4d)

Co-authored-by: Pepe Cano <825430+ppcano@users.noreply.github.com>
2024-11-05 10:13:57 +01:00
grafana-delivery-bot[bot]andKristina 9bb7d77cdb [v11.3.x] Timeseries: Utilize min/max on stacking percentage (#95793)
Timeseries: Utilize min/max on stacking percentage (#95581)

* Bring in defined min/max into stacking range

* simplify logic

* different approach

---------

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
(cherry picked from commit 68aefc73b6)

Co-authored-by: Kristina <kristina.durivage@grafana.com>
2024-11-04 15:09:28 -06:00
grafana-delivery-bot[bot]andKonrad Lalik e31c4fc59b [v11.3.x] Alerting: Fix contact points secrets validation (#95777)
Alerting: Fix contact points secrets validation (#95651)

Add new condition to the determineRequired function

(cherry picked from commit e43bec2cd8)

Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
2024-11-04 15:10:03 +01:00
grafana-delivery-bot[bot]andPepe Cano 28f9eb3221 [v11.3.x] Alerting docs: add Time type documentation for notification templates (#95776)
Alerting docs: add `Time` type documentation for notification templates (#95688)

* Improve `tz` and `date` docs

* Add documentation for `Time` type

(cherry picked from commit 9d937725ad)

Co-authored-by: Pepe Cano <825430+ppcano@users.noreply.github.com>
2024-11-04 12:48:55 +01:00
grafana-delivery-bot[bot]andPepe Cano 693ed6dddd [v11.3.x] Alerting docs: fix alertname label name (#95767)
Alerting docs: fix `alertname` label name (#95665)

(cherry picked from commit 8a0c920106)

Co-authored-by: Pepe Cano <825430+ppcano@users.noreply.github.com>
2024-11-04 10:54:58 +01:00
grafana-delivery-bot[bot]andPepe Cano 8f030aa210 [v11.3.x] Alerting docs: Add one notification template example that prints a title or subject (#95766)
Alerting docs: Add one notification template example that prints a title or subject (#95680)

(cherry picked from commit d3a3e53354)

Co-authored-by: Pepe Cano <825430+ppcano@users.noreply.github.com>
2024-11-04 10:54:40 +01:00
grafana-delivery-bot[bot]andSergej-Vlasov ef12cfe67d [v11.3.x] E2E: remove duplicate loki e2e tests (#95667)
E2E: remove duplicate loki e2e tests (#95644)

* remove duplicate loki e2e tests to avoid flakiness

* unskip test

* adjust panel ids

(cherry picked from commit 9f5258717e)

Co-authored-by: Sergej-Vlasov <37613182+Sergej-Vlasov@users.noreply.github.com>
2024-11-01 09:56:38 +00:00
grafana-delivery-bot[bot]andGeorges Chaudy 4f80c4c55c [v11.3.x] Unified Storage: Use ssl_mode instead of sslmode (#95662)
Unified Storage: Use ssl_mode instead of sslmode (#95658)

change unistore to use ssl_mode instead of sslmode

(cherry picked from commit 76b43267c8)

Co-authored-by: Georges Chaudy <chaudyg@gmail.com>
2024-10-31 15:30:34 +00:00
grafana-delivery-bot[bot]andJacob Valdez 66518db34c [v11.3.x] Docs: Updating versions in activating AWS marketplace license (#95656)
Co-authored-by: Jacob Valdez <jacob.valdez@grafana.com>
2024-10-31 15:08:25 +01:00
grafana-delivery-bot[bot]andKarl Persson 855dcd7b7b [v11.3.x] Migration: Remove table aliasing in delete statement to make it work for mariadb (#95232)
Migration: Remove table aliasing in delete statement to make it work for mariadb (#95226)

Migration: remove table aliasing in delete statement to make it work in mariadb
(cherry picked from commit 6f7528f896)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
2024-10-31 07:51:27 +00:00
grafana-delivery-bot[bot]andJacob Valdez ab85eacea6 [v11.3.x] Docs: adding SAML name parameter configuration info (#95621)
Co-authored-by: Jacob Valdez <jacob.valdez@grafana.com>
2024-10-30 18:03:22 +01:00
grafana-delivery-bot[bot]andAlyssa Joyner 11aedea347 [v11.3.x] Graphite: Fix Multi Dimensional Alias Name (#95618)
Graphite: Fix Multi Dimensional Alias Name (#94563)

(cherry picked from commit 89da7d6fe5)

Co-authored-by: Alyssa (Bull) Joyner <58453566+alyssabull@users.noreply.github.com>
2024-10-30 16:12:41 +00:00