public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,310 Commits 655 Branches 650 Tags
9e4537fe032ea2f6bb08971ac54cdde97dafebda
Commit Graph
56310 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
grafana-delivery-bot[bot]andAndreas Christou 9e4537fe03 [release-11.5.3] InfluxDB: Improve handling of template variables contained in regular expressions (InfluxQL) (#100977) 
InfluxDB: Improve handling of template variables contained in regular expressions (InfluxQL) (#100762)

* Improve handling of template vars in regex

* Review

* Minor update

(cherry picked from commit 8b3047ba1e)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
 2025-02-19 17:09:26 +00:00
grafana-delivery-bot[bot]andMisi 68e70b4c5a [release-11.5.2] Auth: Fix AzureAD config UI's ClientAuthentication dropdown (#100869) 
Auth: Fix AzureAD config UI's ClientAuthentication dropdown (#100752)

* wip

* Address feedback

(cherry picked from commit 768ec4c2c5)

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
 2025-02-19 12:33:28 +01:00
grafana-delivery-bot[bot]andPepe Cano d732324f53 [release-11.5.3] Alerting docs: fix heading anchor (#100959) 
Alerting docs: fix heading anchor (#100783)

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit 8646961c3f)

Co-authored-by: Pepe Cano <825430+ppcano@users.noreply.github.com>
 2025-02-19 12:17:58 +01:00
grafana-delivery-bot[bot]andPepe Cano a6fb0f44ba [release-11.5.3] Alerting docs: fix tutorial URL (#100955) 
Alerting docs: fix tutorial URL (#100954)

(cherry picked from commit 1fdb36022d)

Co-authored-by: Pepe Cano <825430+ppcano@users.noreply.github.com>
 2025-02-19 11:13:32 +01:00
github-actions[bot]github-actions[bot]jev forsberg
 		9e942dcb9a Release: 11.5.2 (#100919) 
* Update changelog

* Update version to 11.5.2

* baldm0mma/ update version

* baldm0mma/ run yarn

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: jev forsberg <jev.forsberg@grafana.com>
 2025-02-18 17:12:07 -07:00
Kevin Minehart f16a6dc98c [release-11.5.2] CI: Post-release process branch / PR migration (#100936) 
CI: Post-release process branch / PR migration (#100930)

* update output for token in release-comms

* use token from needs

* generate token in individual workflows

* Set secrets

* define secrest in referenced workflows

* wrong secret lol

* oops

* grafana/grafana -> grafana/grafana-enterprise

(cherry picked from commit 75189de4f7)
 2025-02-19 01:53:08 +02:00
grafana-delivery-bot[bot]andPepe Cano 25e6d2780b [release-11.5.2] Alerting docs: Update Amazon SNS integration (#100921) 
Alerting docs: Update `Amazon SNS` integration (#100754)

* Update `Configure Amazon SNS notifications`

* Clarify templateable fields

* correct prop description

(cherry picked from commit e1c1cc34af)

Co-authored-by: Pepe Cano <825430+ppcano@users.noreply.github.com>
 2025-02-18 23:05:26 +01:00
github-actions[bot] 880e5fecb9 apply security patch: release-11.5.2/317-202502130459.patch 
commit 4fee27d372e0e4f00a60ecef1d9640bd8165c1c8
Author: AgnesToulet <35176601+AgnesToulet@users.noreply.github.com>
Date:   Tue Feb 11 10:57:05 2025 +0100

    Dashboards: Prevent title longer than 5 000 characters

    (cherry picked from commit f9e0789210004b0bd7902255644ef348ae7b3aa8)
 2025-02-18 20:54:59 +00:00
grafana-delivery-bot[bot]andKevin Minehart 62b5a147fd [release-11.5.2] CI: release comms should trigger on merges to release- branches (#100904) 
CI: release comms should trigger on merges to release- branches (#100901)

release comms should trigger on merges to release- branches

(cherry picked from commit 14477a7fe9)

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>
 2025-02-18 22:53:34 +02:00
Matheus MacabuandRobert Goltz 75890ecc58 [release-11.5.2] Chore: Update alpine docker image (minor) - 3.20.5 to 3.20.6 [security] (#100827) 
Chore: Update alpine docker image (minor) - 3.20.5 to 3.20.6 [security] (#100791)

* Chore: Update alpine docker image (minor) - 3.20.5 to 3.20.6 [sec-fixes]

* Chore: Regenerate .drone.yml

---------

Co-authored-by: Matheus Macabu <macabu.matheus@gmail.com>
(cherry picked from commit 27837ee937)

Co-authored-by: Robert Goltz <github@rgoltz.de>
 2025-02-18 10:09:58 +01:00
grafana-delivery-bot[bot]andKevin Minehart 50a0247c22 [release-11.5.2] Update whatsnewURL in package.json (#100756) 
Update whatsnewURL in package.json (#100753)

(cherry picked from commit cd30f3839d)

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>
 2025-02-14 20:05:14 +02:00
grafana-delivery-bot[bot]andKevin Minehart 9908a78c5c [release-11.5.2] Docker: Missing libresolv.so.2 from glibc (#100739) 
Docker: Missing libresolv.so.2 from glibc (#100729)

* Docker: Missing libresolv.so.2 from glibc

* Misplaced &&

(cherry picked from commit 3a8a24e662)

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>
 2025-02-14 17:17:00 +02:00
Kevin Minehart 4683c0f157 [release-11.5.2] CI: Backport to release branches (#100691) 
CI: Backport to release branches (#100067)

* update backport and release comms

* Backport to release branches and change docs source branch for publishing

* Add new workflows to CODEOWNERS

* Re-add removed line oops

* backport-testing -> grafana

* checkout grafana repo in backport action, reference repo / branch in reusable action

* generate -> create

(cherry picked from commit 6787cdccb9)
 2025-02-14 07:56:07 -06:00
grafana-delivery-bot[bot]andPepe Cano 72e8b57597 [release-11.5.2] Alerting docs: update Configure Webhook notifications (#100708) 
Alerting docs: update `Configure Webhook notifications` (#100650)

* Alerting docs: update `Configure Webhook notifications`

* fix typo

* fix typo

* Update docs/sources/alerting/configure-notifications/manage-contact-points/integrations/webhook-notifier.md

Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>

* Update docs/sources/alerting/configure-notifications/manage-contact-points/integrations/webhook-notifier.md

Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>

* fix typo

* Add `Note` to  configure either HTTP Basic Authentication or the Authorization request header

* Use `inline` format for JSON keys

---------

Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>
(cherry picked from commit f1b4678012)

Co-authored-by: Pepe Cano <825430+ppcano@users.noreply.github.com>
 2025-02-14 11:20:14 +01:00
grafana-delivery-bot[bot]Jack BaldryKim Nylander
 		b774d0d569 [release-11.5.2] [DOC] Update links, page weights for mounting content in Tempo data source (#100668) 
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
 2025-02-13 18:40:09 -05:00
grafana-delivery-bot[bot]andTodd Treece 0faf11835b [release-11.5.2] Metrics: Use correct gatherer in graphite bridge (#100628) 
Metrics: Use correct gatherer in graphite bridge (#100624)

(cherry picked from commit 5a74a1a0f6)

Co-authored-by: Todd Treece <360020+toddtreece@users.noreply.github.com>
 2025-02-13 15:30:44 -05:00
Jack Baldry 7776a6c1af Fix publishing workflow (#100657) 2025-02-13 18:30:33 +00:00
grafana-delivery-bot[bot] 6c3e9e5976 [release-11.5.2] IAM: log error when malformed json arrays are found in SSO configs (#100649) 
IAM: Log error when malformed json arrays are found in SSO configs (#99896)

(cherry picked from commit eeadb7e771)
 2025-02-13 18:37:38 +01:00
grafana-delivery-bot[bot]andOscar Kilhed 327ca47f51 [release-11.5.2] Dashboards: Fix repeats not being added on refresh when using searchLayout (#100632) 
Dashboards: Fix repeats not being added on refresh when using searchLayout (#100621)

Fix repeats not being added

(cherry picked from commit 1018aec6bc)

Co-authored-by: Oscar Kilhed <oscar.kilhed@grafana.com>
 2025-02-13 18:50:05 +02:00
Dominik Prokop a957c28316 [release-11.5.2] Dashboards: Bring back scripted dashboards (#100633) 
Dashboards: Bring back scripted dashboards (#100575)

* Dashboards: Bring back scripted dashboards

* Fix scripted dashboard examples

* Fix dashboard-solo page not respecnig scripted dashboards

(cherry picked from commit 7edcde6365)
 2025-02-13 17:48:45 +01:00
grafana-delivery-bot[bot]andHugo Kiyodi Oshiro b321585bde [release-11.5.2] Docs: Improve instructions to change basic roles (#100637) 
Co-authored-by: Hugo Kiyodi Oshiro <hugo.oshiro@grafana.com>
 2025-02-13 17:58:13 +02:00
grafana-delivery-bot[bot] cfa529295f [release-11.5.2] Docs: Fix URLs to auth providers from Team Sync page (#100620) 
Co-authored-by: Victor Cinaglia <victor@grafana.com>
Fix URLs to auth providers from Team Sync page (#100563)
 2025-02-13 15:41:34 +01:00
grafana-delivery-bot[bot]andKarl Persson 3881a173fe [release-11.5.2] AuthN: Refetch user on "ErrUserAlreadyExists" (#100582) 
AuthN: Refetch user on "ErrUserAlreadyExists" (#100346)

* AuthN: Refetch user on "ErrUserAlreadyExists"

(cherry picked from commit 0b4c622df8)

Co-authored-by: Karl Persson <23356117+kalleep@users.noreply.github.com>
 2025-02-13 12:03:29 +01:00
grafana-delivery-bot[bot]andMisi 5533f62a71 [release-11.5.2] Auth: Add early return if auth_token is in the URL for JWT auth (#100574) 
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)

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
 2025-02-13 11:28:21 +01:00
grafana-delivery-bot[bot]Isabel Matwawanamargotphelps
 		49a32d71be [release-11.5.2] Docs: updated supported versions with 11.5 (#100557) 
Co-authored-by: Isabel Matwawana <isabel.matwawana@grafana.com>
Co-authored-by: margotphelps <123196595+margotphelps@users.noreply.github.com>
 2025-02-12 16:20:32 -05:00
grafana-delivery-bot[bot]andMisi d3cab8217f [release-11.5.2] Auth: Fix redirect with JWT auth URL login (#100355) 
Auth: Fix redirect with JWT auth URL login (#100295)

fix

(cherry picked from commit acc1521929)

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
 2025-02-12 20:37:03 +02:00
grafana-delivery-bot[bot]andKevin Minehart e8887275ae [release-11.5.2] CI: Add release branches to patch automation (#100527) 
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)

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>
 2025-02-12 18:21:07 +02:00
Josh Hunt b8d8a94ebc [release-11.5.2] Chore: pin tonistiigi/binfmt version (#100518) 
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:10 +00:00
grafana-delivery-bot[bot]andPepe Cano c30b9bd0bb [release-11.5.2] Alerting docs: remove admonition about auto-generated policies (#100514) 
Alerting docs: remove admonition about auto-generated policies (#100501)

(cherry picked from commit 983829e47b)

Co-authored-by: Pepe Cano <825430+ppcano@users.noreply.github.com>
 2025-02-12 15:22:49 +01:00
Moustafa Baiou fb0d6be79e Alerting: Allow specifying uid for new rules added to groups (#99858) 
When modifying rule groups the `uid` can be specified but only if the rule already existed in the DB. If the rule is new the update would be rejected.

This updates the RuleGroup provisioning apis to allow specifying the `uid` when creating/updating rule groups.

Additionally, the RuleGroupIdx was not being updated when rules were reordered in the group.

Context: https://github.com/grafana/terraform-provider-grafana/pull/1971#issuecomment-2599223897
Relates to: https://github.com/grafana/terraform-provider-grafana/issues/1928

Fixes: #98283
(cherry picked from commit 7dee4d1808)
 2025-02-12 09:10:39 -05:00
Yuri Tseretyan 2728e5cf14 Alerting: Refactor integration tests (#99519) 
---------

Signed-off-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
(cherry picked from commit af663dadc7)
 2025-02-12 09:10:39 -05:00
grafana-delivery-bot[bot]andSolomon Himelbloom 822e5fb1a1 [release-11.5.2] docs: Copy code to clipboard (set-up-https.md) (#100512) 
Co-authored-by: Solomon Himelbloom <7608183+TechSolomon@users.noreply.github.com>
 2025-02-12 15:48:15 +02:00
Pepe Cano f433b8c240 [release-11.5.2] Update Intro > Queries and Conditions (#100490) 
Update `Intro > Queries and Conditions` (#95109) * Update `Intro > Queries and Conditions`
* Small tweaks (advanced options) and screenshots

* Change `Expressions` heading

* Set links from Alert rules introduction

* Minor intro changes

* small change due to recent updates

* fix vale errors

* fix vale error

* Remove unnecessary mention to `alertingQueryAndExpressionsStepMode` feature flag

(cherry picked from commit 99c8d4b0c6)
 2025-02-12 12:02:25 +01:00
grafana-delivery-bot[bot]andPepe Cano 676599ad7a [release-11.5.2] Alerting docs: Add Enable notifications section to Configure contact points docs (#100493) 
Alerting docs: Add `Enable notifications` section to `Configure contact points` docs (#100446)

Alerting docs: Add `Enable notifications` section to `Configure contact points` page

(cherry picked from commit 8e436fc473)

Co-authored-by: Pepe Cano <825430+ppcano@users.noreply.github.com>
 2025-02-12 12:01:41 +01:00
grafana-delivery-bot[bot]andPepe Cano 34cdea5bb5 [release-11.5.2] Alerting docs: clarify that silences and mute timings do not interrupt alert evaluation (#100491) 
Alerting docs: clarify that `silences` and `mute timings` do not interrupt alert evaluation (#100414)

* Alerting docs: clarify that `silences` and `mute timings` do not interrupt alert evaluation

* replace `ad-hoc` word

(cherry picked from commit 2b4e1f3c51)

Co-authored-by: Pepe Cano <825430+ppcano@users.noreply.github.com>
 2025-02-12 11:29:36 +01:00
grafana-delivery-bot[bot]andJack Westbrook b857272fa2 [release-11.5.2] Fix: Optimise frontend Postgresql plugin cache busting (#100411) 
Fix: Optimise frontend Postgresql plugin cache busting (#100406)

fix(postgresql): add version for optimised cache busting

(cherry picked from commit cbe5741096)

Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
 2025-02-11 15:34:49 +01:00
grafana-delivery-bot[bot] 6d67738b5f [release-11.5.2] Docs: Fixed hyperlinks pointing to supported auth providers (#100408) 
Co-authored-by: Vishal N <dev@vishalnandagopal.com>
Fixed hyperlinks pointing to supported auth providers (#100404)
 2025-02-11 12:46:55 +02:00
grafana-delivery-bot[bot]andAlex Khomenko f73c2fdf7a [release-11.5.2] grafana-ui: Update InlineField error prop type to React.ReactNode (#100373) 
grafana-ui: Update InlineField error prop type to React.ReactNode (#100347)

(cherry picked from commit 2518012569)

Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
 2025-02-10 18:17:07 +02:00
Josh Hunt 100c91ca14 [release-11.5.2] Chore: Remove unused knip dependency (#100358) 
manually implement change from PR #100351 for backporting
 2025-02-10 15:06:37 +01:00
Jev Forsberg 7beb0a1ff6 [release-11.5.2] Chore: Update grabpl version to v3.1.2 (#100243) 
Chore: Update grabpl version to v3.1.2 (#100157)

baldm0mma/ update grabpl version

(cherry picked from commit 8e3327a446)
 2025-02-07 08:29:30 -07:00
grafana-delivery-bot[bot]andJacob Valdez 9bdd480326 [release-11.5.2] Docs: adding actions_allow_post_url example to plugin docs (#100203) 
Co-authored-by: Jacob Valdez <jacob.valdez@grafana.com>
 2025-02-07 08:55:58 -06:00
grafana-delivery-bot[bot]andAgnès Toulet 273a9b17c9 [release-11.5.2] Share: Fix short links when root_url is different from the browser URL (#100202) 
Share: Fix short links when root_url is different from the browser URL (#99950)

Share: Fix short links when appUrl is misconfigured
(cherry picked from commit cd7c9f8666)

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>
 2025-02-07 10:53:10 +01:00
grafana-delivery-bot[bot]andMatheus Macabu b11b012240 [release-11.5.2] CloudMigrations: save snapshot of alert rule groups (#100184) 
CloudMigrations: save snapshot of alert rule groups (#100109)

(cherry picked from commit fde475e3d9)

Co-authored-by: Matheus Macabu <macabu@users.noreply.github.com>
 2025-02-07 10:50:52 +01:00
grafana-delivery-bot[bot]andMatias Chomicki 234d3d16e4 [release-11.5.2] Loki query direction: run initialization only in Explore and Dashboards (#100192) 
Loki query direction: run initialization only in Explore and Dashboards (#100182)

(cherry picked from commit 4e6bdce41c)

Co-authored-by: Matias Chomicki <matyax@gmail.com>
 2025-02-06 14:51:57 +01:00
grafana-delivery-bot[bot]andIsabel Matwawana ed62b50def [v11.5.x] Docs: move missing ref URI to correct page (#100134) 
Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
 2025-02-05 12:16:37 -05:00
grafana-delivery-bot[bot]andIeva 967a5d3fc3 [v11.5.x] RBAC: Don't check folder access if annotationPermissionUpdate FT is enabled (#100117) 
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:36:15 +02:00
grafana-delivery-bot[bot]andJev Forsberg 6b4c70d6a3 [v11.5.x] Chore: Update alpine build docker image (#100018) 
Chore: Update alpine build docker image (#99998)

baldm0mma/ update alpine build image

(cherry picked from commit 46af49f907)

Co-authored-by: Jev Forsberg <46619047+baldm0mma@users.noreply.github.com>
 2025-02-04 14:33:29 -07:00
grafana-delivery-bot[bot]andChristopher Lord d75d140554 [v11.5.x] Plugin Metrics: Eliminate data race in plugin metrics middleware (#100078) 
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 20:08:52 +02:00
grafana-delivery-bot[bot] cbfb776273 [v11.5.x] Docs: fix link text (#100052) 
Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>
fix link text (#99932)
 2025-02-04 09:39:14 -05:00
grafana-delivery-bot[bot] b45af3e8a0 [v11.5.x] DashboardList: Throttle the re-renders (#100046) 2025-02-04 14:34:21 +02:00