public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,424 Commits 655 Branches 650 Tags
73e59aec2469dfc77f12fb688e302e1e9900a0e8
Commit Graph
56424 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
github-actions[bot] 73e59aec24 apply security patch: release-11.5.6/432-202505231913.patch 2025-06-17 20:02:09 +00:00
github-actions[bot]grafana-delivery-bot[bot]Jev Forsberg
 		f6f42773c9 Release: 11.5.6 (#106823) 
* Update changelog

* Update version to 11.5.6

* Update CHANGELOG.md

add cve fix to changelog

---------

Co-authored-by: grafana-delivery-bot[bot] <grafana-delivery-bot[bot]@users.noreply.github.com>
Co-authored-by: Jev Forsberg <46619047+baldm0mma@users.noreply.github.com>
 2025-06-17 19:56:14 +00:00
grafana-delivery-bot[bot]andAndreas Christou ab19d8d3b6 [release-11.5.6] Partner: Add PRs to project (#106652) 
Partner: Add PRs to project (#106641)

Add PRs to project

(cherry picked from commit 45b92f2a98)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
 2025-06-12 18:46:33 +02:00
grafana-delivery-bot[bot]andMatheus Macabu 3806b6eec4 [release-11.5.6] CloudMigrations: Omit autoincremented id for alert snapshots (#106637) 
CloudMigrations: Omit autoincremented id for alert snapshots (#106598)

If you tried to migrate alerts from two differente sources/on-prem instances,
the autoincremented numeric id would be the same, and since we were creating
the resource in cloud with that same id (the API accepts it), it would
return an error "conflicting alert rule found" because that id is the primary key on the table.

We simply omit the numeric id now and let the API for the cloud instance generate it.

(cherry picked from commit a1f2693fd8)

Co-authored-by: Matheus Macabu <macabu@users.noreply.github.com>
 2025-06-12 17:18:57 +02:00
Matheus Macabu fd17222eda [release-11.5.6] Dependencies: Bump Go to v1.24.4 (#106568) 
Dependencies: Bump Go to v1.24.4
 2025-06-11 18:06:13 +02:00
grafana-delivery-bot[bot]andJacob Valdez e624f24f4b [release-11.5.6] Docs: Adding clarification for resetting admin password (#106561) 
Docs: Adding clarification for resetting admin password (#106108)

* Docs: Adding clarification for resetting adming password with CLI with external DB

* adjusting bulleted points

* Cutting unneeded wording

* adjusting wording to avoid Grafana being possessive

* Changing Postgres to PostgreSPQL

(cherry picked from commit 3c6146fd95)

Co-authored-by: Jacob Valdez <jacob.valdez@grafana.com>
 2025-06-11 16:17:54 +02:00
grafana-delivery-bot[bot]andJev Forsberg 98bb22c423 [release-11.5.6] Chore: Also add +security branches on release-comms PR (#106514) 
Chore: Also add `+security` branches on release-comms PR (#105689)

* baldm0mma/ add create-security-branch.yml and update release-comms

* baldm0mma/ update target repo

* baldm0mma/ add enterprise

* baldm0mma/ update naming

* baldm0mma/ update descriptions

* baldm0mma/ use go action

* baldm0mma/ add dispatch

* baldm0mma/ update codwowners

* baldm0mma/ remove old oush step

* baldm0mma/ update to pass branch, not version

* baldm0mma/ add create-security-branch script

* baldm0mma/ move script

* baldm0mma/ update codeowners

* Revert "baldm0mma/ update codeowners"

This reverts commit a68531c62e.

* baldm0mma/ add script to codeowners

* baldm0mma/ alphabetize workflows and templates

* baldm0mma/ update script path

* baldm0mma/ add push conditions

* baldm0mma/ remove trigger

* baldm0mma/ update codeowners

(cherry picked from commit 82d271051a)

Co-authored-by: Jev Forsberg <46619047+baldm0mma@users.noreply.github.com>
 2025-06-10 17:05:33 -06:00
Vadim Stepanov dd4a33adff [release-11.5.6] Alerting: Provisioning API returns 403 on quota exceeded for rule group PUT (#106486) 
Alerting: Provisioning API returns 403 on quota exceeded for rule group PUT (#106409)

(cherry picked from commit 1df888c517)
 2025-06-10 15:21:44 +01:00
Stephanie Hingtgen 500dd6db76 Stats: Fix grafana_stat_totals_folder (#106115) 2025-06-10 04:00:35 +02:00
Matheus Macabu 2e2e89a816 [release-11.5.6] Dependencies: Bump github.com/openfga/openfga to v1.8.13 to address CVE-2025-48371 (#106118) 
* Dependencies: Bump github.com/openfga/openfga to v1.8.13 to address CVE-2025-48371

* Static: Fix failing unit test import
 2025-06-09 13:06:46 +02:00
Sofia Papagiannaki 17c961c11c [release-11.5.6]: Fix static tests (#106133) 2025-05-28 16:04:01 +03:00
github-actions[bot]grafana-delivery-bot[bot]Jev Forsberg
 		ad9314abf4 Release: 11.5.5 (#105907) 
* Update changelog

* Update version to 11.5.5

* Update CHANGELOG.md

update with sec fix

* Update CHANGELOG.md

update with sec fixes

---------

Co-authored-by: grafana-delivery-bot[bot] <grafana-delivery-bot[bot]@users.noreply.github.com>
Co-authored-by: Jev Forsberg <46619047+baldm0mma@users.noreply.github.com>
 2025-05-23 01:16:09 +03:00
github-actions[bot] 40ed88fe86 apply security patch: release-11.5.5/security-patch-202505051005.patch v11.5.5 2025-05-21 20:58:38 +00:00
github-actions[bot] 59fc4b9e98 apply security patch: release-11.5.5/404-202504151210.patch 2025-05-21 20:58:37 +00:00
Kevin YuandKevin Minehart 8c4f33102e CI: update permissions on workflows which get external secrets (#104792) (#105791) 
update permissions

(cherry picked from commit e36d774d0c)

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>
 2025-05-21 13:56:06 -07:00
Kevin YuJev ForsbergKevin Minehart
 		00d84f1364 Chore: Use Vault secrets in sync-mirror-event.yml (#104705) (#105783) 
* baldm0mma/ update to using vault secrets

* Update .github/workflows/sync-mirror-event.yml



* Update .github/workflows/sync-mirror-event.yml



---------


(cherry picked from commit f0686a61ce)

Co-authored-by: Jev Forsberg <46619047+baldm0mma@users.noreply.github.com>
Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>
 2025-05-21 13:19:39 -07:00
Jacob Valdez 7c114b2ee0 [release-11.5.5]docs: fix grammar on set-up-grafana-live.md (#105550) 
Co-authored-by: Navid Mafi <navidmafi2006@gmail.com>
fix grammar on set-up-grafana-live.md (#105545)
 2025-05-16 09:19:11 -05:00
Matheus Macabu c0e2889cea [release-11.5.5] Dependencies: Bump packages in modules with incorrect dependencies or outside of workspace (#105461) 
Dependencies: Bump golang.org/x to latest
 2025-05-15 14:52:51 +02:00
Matheus Macabu f4ad2eb9ec [release-11.5.5] Dependencies: Bump github.com/blevesearch/bleve/v2 from v2.4.3 to v2.5.0 (#105441) 
Dependencies: Bump github.com/blevesearch/bleve/v2 from v2.4.3 to v2.5.0
 2025-05-15 12:05:26 +02:00
Matheus Macabu 2aa89a90a2 [release-11.5.5] Dependencies: Bump github.com/openfga/openfga from v1.8.5 to v1.8.12 (#105373) 
Dependencies: Bump github.com/openfga/openfga from v1.8.5 to v1.8.12
 2025-05-14 14:17:25 +02:00
William Wernert 2ba6cf30cd [release-11.5.5] Alerting: Ensure field validators return the proper type (#105288) 
Alerting: Ensure field validators return the proper type (#104050)

* Ensure field validators return the proper type

This ensures correct error propagation through services up to
the API layer.

* Move error wrapping up to call site

(cherry picked from commit 820c338414)
 2025-05-13 08:49:40 -04:00
Robby Milo 63cec3fe7d [v11.5] update whats-new posts (#105263) 
update whats-new posts
 2025-05-12 17:00:13 +03:00
Matheus Macabu 919f46426c [release-11.5.5] Dependencies: Unpin and bump github.com/getkin/kin-openapi from v0.126.0 to v0.132.0 (#105252) 
Dependencies: Unpin and bump github.com/getkin/kin-openapi from v0.126.0 to v0.132.0
 2025-05-12 14:52:30 +02:00
Jacob ValdezandAlecIsaacson fad9b13312 [release-11.5.5] Update set-up-for-high-availability.md (#105150) 
Co-authored-by: AlecIsaacson <alec.isaacson@grafana.com>
 2025-05-08 16:19:02 -05:00
Matheus Macabu 2e24578a72 [release-11.5.5] Chore: Bump Go version to 1.24.3 (#105109) 
Chore: Bump Go version to 1.24.3
 2025-05-08 16:08:08 +02:00
Josh Hunt 2b3ef62855 [release-11.5.5] CI: Fix Skye and E2E GHA workflows (#104904) 
CI: Fix Skye and E2E GHA workflows (#104811)

* CI: Use pr_automation_app in skye workflow

* CI: Fix e2e workflow artifact name

(cherry picked from commit e9fe1dedf7)

* remove old-arch check

(cherry picked from commit 960e2d057b)
(cherry picked from commit 035ecc15b2)
 2025-05-08 13:26:11 +01:00
Kevin Minehart e3cbeb5e1e [release-11.5.5] CI: Use docker creds from ci/common (#104883) 
* CI: Use docker creds from ci/common (#104827)

Use docker creds from ci/common

(cherry picked from commit fd4afdbd2c)

* CI: move `grafana-delivery-bot` path in Drone (#104886)

* move delivery bot creds to vault

* format-drone

(cherry picked from commit ec35e861e0)
 2025-05-05 17:08:25 -05:00
Matheus Macabu e30143305f [release-11.5.5] Docs: Fix extra whitespace in Prometheus configs on Grafana Monitoring setup (#104936) 
Docs: Fix extra whitespace in Prometheus configs on Grafana Monitoring setup (#104916)

Co-authored-by: danielkenlee <115471695+danielkenlee@users.noreply.github.com>
(cherry picked from commit 7900a53e05)
 2025-05-05 16:20:01 +02:00
Josh Hunt 74099d4ba9 [release-11.5.5] CI: Remove zizmor workflow in favor of org workflow (#104900) 
CI: Remove zizmor workflow in favor of org workflow (#104879)

* CI: Remove zizmor workflow in favor of org workflow

* Update CODEOWNERS

(cherry picked from commit 033dc19b48)
 2025-05-03 01:51:09 +03:00
Kevin Minehart 3a028ac25c [release-11.5.5] CI: move workflows/actions to actions (#104749) 
CI: move workflows/actions to actions (#104711)

* move workflows/actions to actions

* rerun actions

* fix setup-go v5

* unpinned unnecessary pins

* update CODEOWONERS

* update CODEOWONERS

* remove remove-milestone from codeowners

* remove bad key

(cherry picked from commit 2436b4e097)
 2025-04-30 12:23:08 -05:00
Kevin Minehart 7b1be85980 [release-11.5.5] Backport workflow fixes (#104694) 
* Copy workflows and actions from main

* add zizmor.yml
 2025-04-29 11:47:01 -05:00
Josh HuntandSven Grossmann 64a3a01892 [release-11.5.5] Backport pr patch check event release 11.5.5 (#104632) 
ci: move variables to `env` (#104605)

* ci: move variables to `env`

* ci: move sha to `env`

* ci: import `SHA` and `PRE_COMMIT_SHA`

(cherry picked from commit d19f86a736)

Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
 2025-04-28 08:28:34 -05:00
Kevin Minehart 9d6c9b7503 [release-11.5.5] CI: Fix bug in post-release workflow (#104543) 
CI: Fix bug in post-release workflow (#103368)

version should be prefixed with a v

(cherry picked from commit 5a2eedbae1)
 2025-04-25 14:25:56 +01:00
Haris RozajacandScott Lepper 4042e67bfd [release-11.5.5] Dashboard: Support TemplateSrv.containsTemplate in scenes context (#104182) 
* Dashboard: Support TemplateSrv.containsTemplate in scenes context (#104072)

(cherry picked from commit 82184686dc)

* remove flaky

* Update public/app/features/templating/template_srv.ts

Co-authored-by: Scott Lepper <scott.lepper@gmail.com>

---------

Co-authored-by: Scott Lepper <scott.lepper@gmail.com>
 2025-04-24 14:52:12 -06:00
github-actions[bot]github-actions[bot]Jev Forsberg
 		684227f7a5 Release: 11.5.4 (#104410) 
* Update changelog

* Update version to 11.5.4

* Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jev Forsberg <46619047+baldm0mma@users.noreply.github.com>
 2025-04-23 17:08:43 +01:00
github-actions[bot] 2b8c8d45d1 apply security patch: release-11.5.4/379-202504030825.patch 
commit cea32b8fa7979c9960372467eedd2eea18b33220
Author: nmarrs <nathanielmarrs@gmail.com>
Date:   Thu Apr 3 09:22:04 2025 +0100

    backport commit
 2025-04-22 13:47:05 +00:00
github-actions[bot] ea4c33d7cb apply security patch: release-11.5.4/374-202504022116.patch 
commit 5e2b2e88a15f2fd69cd98ce5bb8779a828fb4cb2
Author: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
Date:   Wed Apr 2 16:55:01 2025 -0400

    require editor to fetch config
 2025-04-22 13:47:05 +00:00
github-actions[bot] 6c64b04c39 apply security patch: release-11.5.4/365-202504020730.patch 
commit 27ee68a7899680bcf0763aa6a7b35d93829fa767
Author: Andres Martinez Gotor <andres.martinez@grafana.com>
Date:   Mon Mar 31 12:15:52 2025 +0200

    Sanitize paths before evaluating access to route
 2025-04-22 13:47:05 +00:00
Kevin Minehart df9f37a726 update PR patch check / sync mirror workflows 2025-04-22 08:44:56 -05:00
Kevin Minehart 5492a58f54 update PR patch check / sync mirror workflows 2025-04-22 08:29:29 -05:00
Andreas Christou 754e62bae0 [release-11.5.4] InfluxDB: Fix nested variable interpolation (#104095) 
InfluxDB: Fix nested variable interpolation (#104067)

Validate query type

(cherry picked from commit 519b75bd1e)
 2025-04-17 12:15:10 -04:00
Kevin Yu 1db6d349a7 [release-11.5.4] Prometheus: Add support for cloud partners Prometheus data sources (#103942) 
Prometheus: Add support for cloud partners Prometheus data sources (#103482)

* wip

* Add prom flavor support for data source variables and export/import dashboards (#103321)

* add dashboard and data source var selection

* use match plugin id instead

* use updated matchpluginid

* formatting

* cleanup

* regex anchor

* update error msg

* Alerting: Clean up prometheus-flavored types and functions (#103703)

* clean up types and utility functions for dealing with
prometheus-flavored data sources

* Refactor alerting datasource types to use constants as source of truth

* Alerting: Clean up prometheus-flavored types and functions on the bac… (#103716)

Alerting: Clean up prometheus-flavored types and functions on the backend

* add matchPluginId tests

* Update matchPluginId func to bidirectional (#103746)

* update matchpluginid func to bidirectional

* lint

* formatting

* use actual isSupportedExternalRulesSourceType in test

* add tests in datasource_srv

* betterer

* remove type assertion

* remove unnecessary case

* use satisifies to not have to convert tuple to an array of string

* add prometheus_flavor test

---------

Co-authored-by: Andrew Hackmann <5140848+bossinc@users.noreply.github.com>
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
Co-authored-by: Alexander Akhmetov <me@alx.cx>
(cherry picked from commit fd6fd91115)
 2025-04-14 09:47:18 -07:00
Drew Slobodnjak 22c0856880 [release-11.5.4] Canvas: Fix layout calcs for scale mode (#103945) 
Canvas: Fix layout calcs for scale mode (#103408)

(cherry picked from commit 5efb620f1b)
 2025-04-11 16:08:18 -07:00
Isabel Matwawana 58457c9eff [release-11.5.4] Docs: annotations list visualization refactor (#103932) 2025-04-11 12:54:15 -04:00
Isabel Matwawana 35a4ee70b7 [release-11.5.4] Docs: news visualization refactor (#103920) 2025-04-11 12:22:06 -04:00
Isabel Matwawana 1d58728936 [release-11.5.4] Docs: datagrid visualization refactor (#103908) 2025-04-11 11:00:21 -04:00
xavi 684fbc089e [release-11.5.4] [IAM] Prepend AppSubURL to redirectURI before validating it (#103771) 
[IAM] Prepend AppSubURL to redirectURI before validating it (#103475)

(cherry picked from commit 5053aa576d)
 2025-04-11 14:00:33 +02:00
Sergej-Vlasov 9d02fa97b1 [release-11.5.4] DashboardScenePage: Correct slug in self referencing data links (#103853) 
DashboardScenePage: Correct slug in self referencing data links (#100048)

* switch to useLayoutEffect so queries run after url correction

* add comment

* suparate useEffects to avoid update on slug change

* add url correction for missing slug

* account for slug change during dashboard rename

* simplify fix

* add e2e test for data link without slug

* remove old comment

* remove newly added path from useEffect dependencies

(cherry picked from commit 4648ba396b)
 2025-04-11 11:08:23 +01:00
Isabel Matwawana d4b6dc2a86 [release-11.5.4] Docs: trend visualization refactor (#103814) 2025-04-10 12:47:07 -04:00
Isabel Matwawana 32e85d3c25 Docs: flame graph visualization refactor (#103748) (#103803) 2025-04-10 12:18:35 -04:00