Commit Graph

54495 Commits

Author SHA1 Message Date
Karl Persson bc6beda11e [release-11.4.2] AuthN: Refetch user on "ErrUserAlreadyExists" (#100585)
* AuthN: Refetch user on "ErrUserAlreadyExists" (#100346)

* AuthN: Refetch user on "ErrUserAlreadyExists"

(cherry picked from commit 0b4c622df8)

* Fix test
2025-02-13 13:30:20 +01:00
Misi dff8f508d5 [release-11.4.2] Auth: Add early return if auth_token is in the URL for JWT auth (#100580)
Auth: Add early return if `auth_token` is in the URL for JWT auth (#100539)

* Add early return

* Update public/app/app.ts

Co-authored-by: Victor Cinaglia <victor@grafana.com>

---------

Co-authored-by: Victor Cinaglia <victor@grafana.com>
(cherry picked from commit 5a6d2f2e49)
2025-02-13 12:13:29 +01:00
Misi 08f66dd50c [release-11.4.2] Auth: Fix redirect with JWT auth URL login (#100494)
Auth: Fix redirect with JWT auth URL login (#100295)

fix

(cherry picked from commit acc1521929)
2025-02-12 18:16:02 +01:00
Kevin Minehart e9f564277f [release-11.4.2] CI: Add release branches to patch automation (#100530)
CI: Add release branches to patch automation (#100442)

* CI: Add release branches to patch automation

* Update .github/workflows/create-security-patch-from-security-mirror.yml

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>

---------

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>
(cherry picked from commit a8b98ded66)
2025-02-12 11:05:26 -06:00
Josh Hunt ef65865de0 [release-11.4.2] Chore: pin tonistiigi/binfmt version (#100521)
Chore: pin tonistiigi/binfmt version (#100510)

* Chore: pin tonistiigi/binfmt version

* change version to qemu-v7.0.0-28

* uninstall first, log version

* uninstall first, log version

* uninstall first, log version

(cherry picked from commit a9b4b1e5be)
2025-02-12 16:03:06 +00:00
Jacob Valdez 33cf9d6cd4 [release-11.4.2] Docs: Updating manual installation instructions (#100454)
Docs: Updating manual installation instructions (#98834)

* Docs: adding additional installation steps to Grafana on openSUSE docs

* Docs: Adding systemd service info for grafana manual install

* Finalizing first edit with tested steps

* spacing adjustment and adding steps to RHEL/Fedora

* Adding a note based on Marins feedback

* A slight adjustment based on feedback from Marin and adding steps to Debian installation

* adjusting some wording

* adjusting naming conventions for Debian instructions

* changing "open-source" to "open source"

* vale and review edits

* deleting erroneous character in shortcode

* updating some shortcodes

---------

Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
(cherry picked from commit b6ea06f259)
2025-02-11 15:00:50 -06:00
Jev Forsberg 10b95276ae [release-11.4.2] Chore: Update grabpl version to v3.1.2 (#100242)
Chore: Update grabpl version to v3.1.2 (#100157)

baldm0mma/ update grabpl version

(cherry picked from commit 8e3327a446)
2025-02-07 08:29:23 -07:00
Jacob Valdez 54db7b0992 [v11.4.x] Docs: Adding info on decrypting encrypted certificates (#100155) 2025-02-07 08:57:27 -06:00
grafana-delivery-bot[bot] 30e5410f4e [v11.4.x] RBAC: Don't check folder access if annotationPermissionUpdate FT is enabled (#100116)
RBAC: Don't check folder access if `annotationPermissionUpdate` FT is enabled (#99717)

don't check folder access if annotation permission update is enabled

(cherry picked from commit 095593c018)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
2025-02-05 13:35:57 +02:00
Jev Forsberg 96c8b4bcdf [v11.4.x] Chore: Update alpine build docker image (#100082)
Chore: Update alpine build docker image (#99998)

baldm0mma/ update alpine build image

(cherry picked from commit 46af49f907)
2025-02-04 14:33:19 -07:00
grafana-delivery-bot[bot] e1cde0f2d9 [v11.4.x] Plugin Metrics: Eliminate data race in plugin metrics middleware (#100077)
Plugin Metrics: Eliminate data race in plugin metrics middleware (#99396)

fix: eliminate data race in plugin metrics middleware

A data race was detected when multiple goroutines accessed the `MetricsMiddleware`
simultaneously. The race occurred because a single `MetricsMiddleware` instance
was being shared across goroutines while its `BaseHandler` field was being
modified during middleware chain setup.

Fix by creating a new `MetricsMiddleware` instance for each middleware chain,
while safely sharing the thread-safe Prometheus metrics and plugin registry.
This maintains proper metrics collection while eliminating the mutable shared
state that caused the race condition.

Original error was detected here:

```
WARNING: DATA RACE
Read at 0x00c0039c0790 by goroutine 4486:
  github.com/grafana/grafana-plugin-sdk-go/backend.(*ErrorSourceMiddleware).CallResource()
      /Users/clord/src/grafana/irm-devstack/.devenv/state/go/pkg/mod/github.com/grafana/grafana-plugin-sdk-go@v0.261.0/backend/error_source_middleware.go:93 +0x40
  github.com/grafana/grafana-plugin-sdk-go/backend.BaseHandler.CallResource()
  ...

```

(cherry picked from commit e74cf72d99)

Co-authored-by: Christopher Lord <christopher.lord@grafana.com>
2025-02-04 17:49:35 +00:00
Dan Cech ced52a53ad [v11.4.x] Docker: Use our own glibc 2.40 binaries (#99924)
Docker: Use our own glibc 2.40 binaries (#99903)

* use our own glibc 2.40 binaries

(cherry picked from commit 481f99b07f)
2025-01-31 15:20:49 -05:00
Yuri Tseretyan 47c6551b50 [v11.4.x] Alerting: k8s receivers api encrypt existing unencrypted secureFields on update (#99848)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2025-01-30 16:43:37 -07:00
grafana-delivery-bot[bot] c74bb4952e [v11.4.x] Update make docs procedure (#99835)
Co-authored-by: grafanabot <bot@grafana.com>
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2025-01-30 17:28:23 +00:00
grafana-delivery-bot[bot] 6f95b96fe3 [v11.4.x] Remove old admonition (#99828)
Co-authored-by: Irene Rodríguez <irene.rodriguez@grafana.com>
2025-01-30 18:31:44 +02:00
grafana-delivery-bot[bot] d9bfaa0efe [v11.4.x] Bar Gauge: Add extra padding for scrollbar (#99779)
Bar Gauge: Add extra padding for scrollbar (#99722)

* Add extra padding in bar gauge if scroll exists

* Add thin scroll bars, and fix test

* add comment about height calculation

(cherry picked from commit 1795a2b4e3)

Co-authored-by: Kristina <kristina.durivage@grafana.com>
2025-01-30 08:23:50 -06:00
Sergej-Vlasov d41e17725c DashboardScenes: Fix issue where relative time does not pass properly (#99282) (#99798)
fix issue where relative time does not pass properly

(cherry picked from commit bf1a0837af)

Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
2025-01-30 10:48:25 +00:00
github-actions[bot] c7917bf9c8 Release: 11.4.1 (#99651)
* Update changelog

* Update version to 11.4.1

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2025-01-28 08:42:57 -07:00
grafana-delivery-bot[bot] 3e2b2f35af [v11.4.x] Azure: Correctly set application insights resource values (#99598)
* Azure: Correctly set application insights resource values (#99214)

Correctly set resource values

(cherry picked from commit 30ee8b9813)

* Fix test

---------

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2025-01-27 21:18:06 +02:00
grafana-delivery-bot[bot] e215d16299 [v11.4.x] Graphite: Fix issue where duplicated panels share same query object (#99100)
Graphite: Fix issue where duplicated panels share same query object (#99077)

(cherry picked from commit c0b3932168)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
2025-01-27 18:19:11 +02:00
grafana-delivery-bot[bot] ccb40e3bba [v11.4.x] MSSQL: Correctly type UDPConnectionLimit (#99583)
MSSQL: Correctly type `UDPConnectionLimit` (#99011)

* Correctly type UDPConnectionLimit

* Update tests

* Handle legacy case

(cherry picked from commit cc09f38421)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2025-01-27 18:15:51 +02:00
Jack Baldry 350d9c71ce [v11.4.x] Remove codespell (#99429) 2025-01-24 08:28:21 +00:00
grafana-delivery-bot[bot] a7ea2a3b73 [v11.4.x] LibraryPanel: Fallback to panel title if library panel title is not set (#99410)
LibraryPanel: Fallback to panel title if library panel title is not set (#99377)

(cherry picked from commit c862aa4d68)

Co-authored-by: Ivan Ortega Alba <ivanortegaalba@gmail.com>
2025-01-23 13:30:18 +02:00
grafana-delivery-bot[bot] 690a223f6b [v11.4.x] Docs: add user de-duplication description, update usage billing instructions (#99406)
Co-authored-by: Irene Rodríguez <irene.rodriguez@grafana.com>
Co-authored-by: Mitch Seaman <mjseaman@users.noreply.github.com>
2025-01-23 09:56:59 +02:00
grafana-delivery-bot[bot] 8dd4637706 [v11.4.x] Panel inspect: Fix inspect keyboard shortcut when grafana served from subpath (#99373)
Panel inspect: Fix inspect keyboard shortcut when grafana served from subpath (#99366)

* Panel inspect: Fix inspect keyboard shortcut when grafana served from a subpath

* Add e2e test

(cherry picked from commit 51b4ac50aa)

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
2025-01-22 14:44:57 +02:00
grafana-delivery-bot[bot] 0fc69d16e9 [v11.4.x] docs>alert-rules>templates:example-fix (#99360)
docs>alert-rules>templates:example-fix (#99355)

* docs>alert-rules>templates:example-fix

* second-fix

* fixed 2 other label templates

(cherry picked from commit 88d5ae8153)

Co-authored-by: antonio <45235678+tonypowa@users.noreply.github.com>
2025-01-22 13:21:35 +02:00
grafana-delivery-bot[bot] f433bc770f [v11.4.x] Alerting docs: add Admonitions to Link Doc pages with practical Tutorials (#99323)
Alerting docs: add Admonitions to Link Doc pages with practical Tutorials (#99317)

Alerting docs: add admonitions to link to practical tutorials

(cherry picked from commit c7edbffd82)

Co-authored-by: Pepe Cano <825430+ppcano@users.noreply.github.com>
2025-01-21 16:01:05 +01:00
grafana-delivery-bot[bot] d4331c9d0b [v11.4.x] Alerting docs: add instructions to execute notification template examples (#99303)
Alerting docs: add instructions to execute notification template examples (#99275)

(cherry picked from commit 9ce9ad1777)

Co-authored-by: Pepe Cano <825430+ppcano@users.noreply.github.com>
2025-01-21 10:48:51 +01:00
grafana-delivery-bot[bot] 074a1cf348 [v11.4.x] Azure: Correctly set instance settings based on new credentials (#99212)
Azure: Correctly set instance settings based on new credentials (#99112)

Correctly set value based on new credentials

(cherry picked from commit f39c5bb45c)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2025-01-20 12:54:12 +00:00
grafana-delivery-bot[bot] 9aa8526e7d [v11.4.x] Add Apache instructions (#99210)
Co-authored-by: Joseph Perez <45749060+josmperez@users.noreply.github.com>
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Irene Rodriguez <irene.rodriguez@grafana.com>
Co-authored-by: Jacob Valdez <jacob.valdez@grafana.com>
Co-authored-by: Ronald McCollam <mccollam@gmail.com>
2025-01-17 12:32:37 -06:00
grafana-delivery-bot[bot] 122642a6d7 [v11.4.x] QueryVariable: Default query is not set when creating a new variable (#99197)
QueryVariable: Default query is not set when creating a new variable (#99029)

* QueryVariable: Default query is not set when creating a new variable

* use correct getDefaultQuery

---------

Co-authored-by: Sergej-Vlasov <sergej.s.vlasov@gmail.com>
(cherry picked from commit feae06d81c)

Co-authored-by: Ivan Ortega Alba <ivanortegaalba@gmail.com>
2025-01-17 17:34:15 +02:00
Isabel Matwawana 805ab7bd8a Docs: Updated unsupported and unconfirmed lists (#99119) 2025-01-17 08:27:38 -05:00
Mariell Hoversholm 86bb6dd4b1 Security: Update to Go 1.23.5 - Backport to v11.4.x (#99123)
* feat: update to Go 1.23.5

* chore: make drone

* fix: update in Makefile

* CI: Force re-build

* build: update mariadb connection

The new Alpine base that the Golang images are built on no longer trust the CA of MySQL.

This is a backport of: https://github.com/grafana/grafana/pull/98857

* chore: go mod tidy
2025-01-17 09:33:07 +01:00
grafana-delivery-bot[bot] 7b5235f06d [v11.4.x] Docs: add that traces panel works with traceID to show a singular trace (#99070)
Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com>
Co-authored-by: Gaurav Soni <raveformails@gmail.com>
2025-01-16 11:22:10 -05:00
grafana-delivery-bot[bot] f83e0a8a39 [v11.4.x] setDashboardPanelContext: Allow to add filters from the table with the same key (#99089)
setDashboardPanelContext: Allow to add filters from the table with the same key (#99004)

* always add filters for elastic seach ds when filtering table value

* simplify update filter logic and restore behaviour from old arch

* remove unnecessary modifications

* adjust namig

(cherry picked from commit 3df1fa86ae)

Co-authored-by: Sergej-Vlasov <37613182+Sergej-Vlasov@users.noreply.github.com>
2025-01-16 15:21:44 +00:00
Sergej-Vlasov 0c7f575149 Update scenes to v5.37.0 (#98958) (#99082)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 2594b4f7af)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-16 14:02:55 +00:00
grafana-delivery-bot[bot] 696d22a3fe [v11.4.x] Docs: update broken Play link (#98986)
Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
2025-01-14 22:10:35 -05:00
grafana-delivery-bot[bot] fc1d9c1719 [v11.4.x] Alerting docs: clarify data source-managed rules for Prometheus (#98954)
Alerting docs: clarify data source-managed rules for Prometheus (#98378)

* Clarify DS managed rules support only the creation of Mimir and Loki rules

* additional copy changes

* Extend `Manage alerts via Alerting UI` description

* fix capital letter

* further details for `Manage alerts via Alerting UI`

(cherry picked from commit 7771768363)

Co-authored-by: Pepe Cano <825430+ppcano@users.noreply.github.com>
2025-01-14 14:04:31 +01:00
Larissa Wandzura de310cb88c [v11.4.x] Docs: MySQL data source updates/revamp (#98906)
Docs: MySQL data source updates/revamp (#98652)

* made initial edits

* continued updates

* finished initial config doc updates

* updates

* updates to query editor

* edits to query editor

* final edits prior to PR

* more final edits :-)

* edits based on feedback meeting

* fixed some spelling and grammar issues

* final edits

* ran prettier

* minor change to intro description

* Fix prettier

* Update docs/sources/datasources/mysql/query-editor/_index.md

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>

* Update docs/sources/datasources/mysql/query-editor/_index.md

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>

* Update docs/sources/datasources/mysql/query-editor/_index.md

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>

* edits based on feedback

* fixed mistake

* Fix prettier

* fixed ref UIs, edits based on feedback

* one minor change

* ran prettier again

---------

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
(cherry picked from commit ab6d82a33c)
2025-01-13 14:35:01 -06:00
grafana-delivery-bot[bot] 227c8392e0 [v11.4.x] OAuth: Return SocialError on membership check failure (#98861)
OAuth: Return SocialError on membership check failure (#98330)

use socialerror

(cherry picked from commit ddca09fb02)

Co-authored-by: Daniel-Davies <33356828+Daniel-Davies@users.noreply.github.com>
2025-01-13 12:18:49 +02:00
grafana-delivery-bot[bot] dc2c257c1a [v11.4.x] Alerting docs: fix template example link (#98817)
Alerting docs: fix template example link (#98715)

* Alerting docs: fix template example link

* ran prettier

* adjust spacing

* Update docs/sources/alerting/configure-notifications/template-notifications/manage-notification-templates.md

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>

* Alerting docs: fix `Explore` ref link

* updates other links

* correcting link

* Update docs/sources/alerting/alerting-rules/_index.md

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>

* Update docs/sources/alerting/alerting-rules/templates/_index.md

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>

* fix label ref

---------

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Pepe Cano <825430+ppcano@users.noreply.github.com>
(cherry picked from commit 619e7d3d3f)

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
2025-01-10 15:28:26 +01:00
grafana-delivery-bot[bot] 97517f41cf [v11.4.x] InfluxDB: Adhoc filters can use template vars as values (#98786)
InfluxDB: adhoc filters can use template vars as values (#98567)

---------

Co-authored-by: Ivan Ortega <ivanortegaalba@gmail.com>
(cherry picked from commit be1505f2fb)

Co-authored-by: Andrew Hackmann <5140848+bossinc@users.noreply.github.com>
2025-01-10 15:08:36 +01:00
grafana-delivery-bot[bot] a13443ad11 [v11.4.x] ContactPoints: Remove blank lines prefixes in contact point types (#98766)
ContactPoints: Remove blank lines prefixes in contact point types (#98590)

Remove blank lines prefixes in contact point types

(cherry picked from commit 7cad430ca7)

Co-authored-by: Selene <selenepinillos@gmail.com>
2025-01-10 13:06:22 +01:00
grafana-delivery-bot[bot] 2d06a936c3 [v11.4.x] Grafana UI: Re-add react-router-dom as a dependency (#98422)
Grafana UI: Re-add react-router-dom as a dependency (#97540)

* chore(grafana/ui): add react-router-dom v5 as a dependency

* chore(grafana-ui): align version of react-router with core

---------

Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
(cherry picked from commit 7e4b05c268)

Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com>
2025-01-10 09:51:07 +01:00
grafana-delivery-bot[bot] 860a25f7fd [v11.4.x] Docs: Add 11.4 to supported versions table (#98773)
Co-authored-by: Zach Day <zachary.day@grafana.com>
2025-01-09 17:44:53 -05:00
Ivan Ortega Alba ede278c767 [v11.4.x] Dashboards: Fixes issue with panel header showing even when hide time override was enabled (#98747)
Dashboards: Fixes issue with panel header showing even when hide time override was enabled (#95814)

* Dashboards: Fixes issue with panel header showing even when hide time override was enabled


(cherry picked from commit 6fd3620d50)

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
2025-01-09 18:30:06 +01:00
grafana-delivery-bot[bot] dab5a49df0 [v11.4.x] Docs: Add G12 release date to upgrade guide (#98748)
Co-authored-by: Isabel Matwawana <isabel.matwawana@grafana.com>
Co-authored-by: margotphelps <123196595+margotphelps@users.noreply.github.com>
2025-01-09 11:47:59 -05:00
Oscar Kilhed 49ea20d027 [v11.4.x] Dashboards: Fix issue where filtered panels would not react to variable changes (#98734)
Dashboards: Fix issue where filtered panels would not react to variable changes (#98718)

* Make sure we activate the parent and tree even if current panel is active

* force activate full scene object tree

---------

Co-authored-by: Sergej-Vlasov <sergej.s.vlasov@gmail.com>
(cherry picked from commit 56be39ed4f)
2025-01-09 17:08:12 +01:00
grafana-delivery-bot[bot] ed927a143c [v11.4.x] Alerting: Fix label escaping in rule export (#98649)
Alerting: Fix label escaping in rule export (#97985)

(cherry picked from commit 25538bcfdf)

Co-authored-by: Moustafa Baiou <moustafa.baiou@grafana.com>
2025-01-08 13:35:30 -05:00
grafana-delivery-bot[bot] 4e072ffe50 [v11.4.x] Update index.md [2025 release dates added] (#98636)
Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
Co-authored-by: Isabel Matwawana <isabel.matwawana@grafana.com>
Co-authored-by: margotphelps <123196595+margotphelps@users.noreply.github.com>
2025-01-07 15:26:25 -05:00