15468 Commits (ae23ead4d959aa73a5a0ffada60e4147d679523c)

Author	SHA1	Message	Date
github-actions[bot]	ae23ead4d9	apply security patch: release-11.6.1/394-202504041254.patch ... commit 16b732e9ffe6034f828b3f8e10aa17232da022ef Author: Stephanie Hingtgen <stephanie.hingtgen@grafana.com> Date: Fri Apr 4 13:50:50 2025 +0100 APIs: Remove dashboard and folder registration	2 months ago
github-actions[bot]	e471a96595	apply security patch: release-11.6.1/364-202504020728.patch ... commit e555e18f4974f539e8210f3ce965a3eb56f5a406 Author: Andres Martinez Gotor <andres.martinez@grafana.com> Date: Mon Mar 31 12:15:52 2025 +0200 Sanitize paths before evaluating access to route	2 months ago
Kevin Yu	760b9176fc	[release-11.6.1] Prometheus: Add support for cloud partners Prometheus data sources (#103941) ... 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)	2 months ago
xavi	f393fb76e4	[release-11.6.1] [IAM] Prepend AppSubURL to redirectURI before validating it (#103875) ... [IAM] Prepend AppSubURL to redirectURI before validating it (#103475) (cherry picked from commit 5053aa576d)	3 months ago
Mariell Hoversholm	7a8ca707f9	[release-11.6.1] Go: Bump to 1.24.2 (#103523) ... * Go: Bump to 1.24.2 It is not likely we are actually affected by the CVEs, but updating proactively is not a bad idea nonetheless. Fixes: CVE-2025-22871 Fixes: https://github.com/grafana/grafana-operator-experience-squad/issues/1311 * CI: Update golangci-lint * feat: update swagger * feat: update swagger * fix: remove enterprise imports	3 months ago
grafana-delivery-bot[bot]	7b6db626ad	[release-11.6.1] unistore: use the same connection string as grafana (#103089) ... unistore: use the same connection string as grafana (#102387) (cherry picked from commit 4927376f32) Co-authored-by: Georges Chaudy <chaudyg@gmail.com>	3 months ago
Ashley Harrison	afa4843796	[release-11.6.1] Org redirection: Fix linking between orgs (#102870) ... Org redirection: Fix linking between orgs (#102021) * don't trim path * add unit test (cherry picked from commit f3fb9592da)	3 months ago
Matheus Macabu	798a546f24	[release-11.6.1] Dependencies: Bump github.com/redis/go-redis/v9 to 9.7.3 to address CVE-2025-29923 (#102863) ... Dependencies: Bump github.com/redis/go-redis/v9 from 9.7.0 to 9.7.3	3 months ago
Denis Vodopianov	b2605ed292	Chore: Update JWT library (CVE-2025-30204) (#102727) ... * Chore: Update JWT library (CVE-2025-30204) * Chore: Update JWT library (CVE-2025-30204)	3 months ago
Yuri Tseretyan	b6bc0eeb3f	[release-11.6.0] Alerting: Add migration to clean up rule versions table (#102562) ... Alerting: Add migration to clean up rule versions table (#102484) * add migration to clean up rule versions * drop index right before creating a new one. * fetch only rules which version greater than toKeep (cherry picked from commit 24ebacb10b)	3 months ago
Matheus Macabu	fef74521e9	Chore: Bump github.com/expr-lang/expr to v1.17.0 to address CVE-2025-29786 (#102533)	3 months ago
Mariell Hoversholm	5c0ee5cfcc	[v11.6] App Platform: Pin bleve to fix CVE-2022-31022 (#102531) ... App Platform: Pin bleve to fix CVE-2022-31022 This pins Bleve to a soon-to-be v2.5.0 commit. Fixes CVE-2022-31022. We can unpin when v2.5.0 releases (likely March 25th). We do not need any new features or similar, though there are some fixes that are nice to receive. We will **not** backport this fix farther as we aren't actually vulnerable to anything via CVE-2022-31022; we never use its code, nor does Bleve. The reason we are fixing this is to get Trivy to stop complaining.	3 months ago
Alexander Akhmetov	07698ebbaa	Revert "[release-11.6.0] Alerting: Add an index to alert_rule_versiontable on (rule_org_id, rule_uid) (#102353)" (#102367) ... Revert "[release-11.6.0] Alerting: Add an index to alert_rule_version table on (rule_org_id, rule_uid) (#102353)" This reverts commit c3a547e1c9.	3 months ago
Alexander Akhmetov	c3a547e1c9	[release-11.6.0] Alerting: Add an index to alert_rule_version table on (rule_org_id, rule_uid) (#102353) ... Alerting: Add an index to alert_rule_version table on (rule_org_id, rule_uid) (#102347) (cherry picked from commit 9491fa1895)	3 months ago
Karl Persson	9a3864e603	Auth: Update to authlib (#101863) ... Update to latest authlib	4 months ago
Stephanie Hingtgen	b56db69b32	K8s: Dashboard History: Improve Error Handling (#101816)	4 months ago
Stephanie Hingtgen	9651505cb7	K8s: Dashboards: Fix provisioning (#101844)	4 months ago
Stephanie Hingtgen	473c0b5e89	K8s: Fix plugin updater (#101843)	4 months ago
Stephanie Hingtgen	bd0c645ff0	K8s: Schema v2: Return 406 in /api (#101842)	4 months ago
Matthew Jacobson	19b878ce66	Alerting: Include time range in template dashboard and panel urls (#101095) ... Alerting: Include time range in templated dashboard and panel urls Time range: from=Alert.StartsAt-1hr Firing Alerts: to=Current Timestamp Resolved Alerts: to=Alert.EndsAt	4 months ago
Juan Cabanas	5e21b9e2d1	Invite User: Add invite user button in top bar (#101809)	4 months ago
Matthew Jacobson	b73c59547c	Alerting: Re-encrypt existing contact points before get and patch in legacy config API (#101263) ... * Test covering Get+Save interaction for newly secret fields * Alerting: Re-encrypt existing contact points before get and patch	4 months ago
Yuri Tseretyan	dc75b454f5	Alerting: Improve performance of the setting GUID during migration (#101800)	4 months ago
maicon	8c22459e1f	Add debug info for encodeIdentityInMetadata (#101801) ... Signed-off-by: Maicon Costa <maiconscosta@gmail.com>	4 months ago
Alexander Akhmetov	48ea9b08a2	Alerting: Add recording rule target datasource support to Prometheus conversion API (#101799) ... What is this feature? Adds target datasource UID to the recording rules so that they write to the same datasource used for alerting rule queries after the import. Why do we need this feature? Target datasourse support was added in #101678, and under a feature flag grafanaManagedRecordingRulesDatasources (#101778). This PR makes the importing process: Check if the import contains recording rules Verify both recording rules and the grafanaManagedRecordingRulesDatasources feature flag are enabled If either check fails, return an error If both checks pass, create recording rules with the provided datasource UID set as both the query and target datasource	4 months ago
owensmallwood	827da46c51	Unified Storage: Remove wildcard queries (#101441) ... * WIP adding custom analyzer so we can do substring search efficiently * Adding unit tests for title search * formatting * adds more title search unit tests * organize helpers * fixes issue caused by having two title mappings * Removes camelcase token filter since it prevents you from searching for a substring of chars and numbers. Adds regression test. * adds back mapping for title_phrase * use simple analyzer for input query string so it doesn't filter out english stop words * ran bleve tests, table snapshots updated * ignore linter for "unused" test functions. They are very helpful for troubleshooting search. Keeping them. * only log total hits and query cost if result not nil * fixes failing test - one more field because there are two title mappings now * fix test * fixes test - only take first item when its the title * Adds separate internal field for title ngram mapping. When searching with a query, results are sorted by score desc. When searching without a query, results are sorted by title desc. Adjusts ngram max to be 10. Text queries are a disjunction of an exact match, phrase match, and a match. Boosted to have priority in that order. Adds more unit tests for searching. * linter * fix test * ran tests - generated new test dash json * sort by title phrase instead of title * fix test - not relying on /apis/dashboard/search to apply title sorting anymore	4 months ago
Jean-Philippe Quéméner	2e0d2f3c76	fix(unified-storage): break dependency from dualwriter in resource module (#101788)	4 months ago
Gabriel MABILLE	6a1e5dd128	AuthZ: Test List (#101721) ... * Authz: Test List * Anonymous case * Cover rendering	4 months ago
Ieva	392124de00	Service Accounts: Don't show error pop-ups for Service Account and Renderer UI flows (#101776) ... * don't show error pop-ups for SAs and renderer * only hide non 4xx error pop'ups * linting	4 months ago
Steve Simpson	14ebec527c	Alerting: Allow selection of recording rule write target on per-rule basis. (#101778) ... * Alerting: Allow selection of recording rule write target on per-rule basis. Introduces a new feature flag (`grafanaManagedRecordingRulesDatasources`), disabled by default, to enable the ability to write recording rules data using data source settings, and selecting the data source to use on a per-rule basis. To cope with the scenario of users upgrading, a configuration file option allows setting the default data source to use, if none is specified in the rule, emulating the behaviour of recording rules without the flag enabled. * Lint * Update conf/sample.ini Co-authored-by: Alexander Akhmetov <me@alx.cx> --------- Co-authored-by: Alexander Akhmetov <me@alx.cx>	4 months ago
Matheus Macabu	5917ed8227	Hackaton: Add more unit tests, take 4 (#101704) ... * cloudmigration/cloudmigrationimpl: run integration tests in parallel * tsdb/mysql: run tests with actual service and instance manager * pluginsintegration/angulardetectorsprovider: reduce job interval in test * util: extract test that should only be ran with -race enabled and unskip it	4 months ago
Steve Simpson	cc80681beb	Alerting: Extend recording rules test to exercise writing with data sources. (#101775) ... The change to use WriteDatasource was done in a previous commit, this adds a test case using DatasourceWriter, in addition to the one using PrometheusWriter.	4 months ago
Will Assis	6544674011	fix(unified-storage): Fix dualwriter DELETE mode3 not returning error from legacy (#101728) ... * Fix dualwrite package not returning error when getting a non-not found error from legacy storage in mode	4 months ago
Ieva	f0d260ba5b	Service Accounts: Don't show error pop-ups for Service Account and Renderer UI flows (#101679) ... don't show error pop-ups for SAs and renderer	4 months ago
Alexander Akhmetov	0fa2dbdcdc	Alerting: Generate deterministic UID for folders created for Prometheus rule conversion (#101760)	4 months ago
Misi	d3b3186713	Auth: Make ssoSettingsSAML GA and enabled by default (#101766) ... Make ssoSettingsSAML GA and enabled by default	4 months ago
Steve Simpson	872fbf0208	Alerting: Implement arbitrary data source remote writer. (#101735) ... * Alerting: Implement arbitrary data source remote writer. Recording rules currently remote write to the endpoint speficied in the configuration file, but we want to change this so that it can be specified on a per-rule basis. This change implements the updated RemoteWriter interface, and dispatches writes to the correct data source. Notes about the implementation: - There is a defaulting behaviour, because we will need to handle situations when upgrading from older Grafana versions, where recording rules do not a data source target specified. - In order to avoid re-creating the remote write clients for every request, a cache is used. The entries have a TTL of 30 seconds at which point they are recreated; this is the delay for picking up new data source settings. Known limitations: - There is no per data source configuration for the remote write path suffix. - Not all data source settings will be used, but basic auth and TLS will be. - There is no RBAC. This will be a follow up feature. * Lint	4 months ago
Ryan McKinley	f52b6a5a42	Provisioning: Update spec and dependencies (#101746) ... Co-authored-by: Clarity-89 <homes89@ukr.net>	4 months ago
Alexander Akhmetov	aa5f2e43d4	Alerting: Use upsert to set or update provenance (#101688) ... Alerting: Use upsert to update provenance	4 months ago
Stephanie Hingtgen	c8278a88c2	Revert "K8s: Fix plugin updater" (#101739) ... Revert "K8s: Fix plugin updater (#101646)" This reverts commit 605a4cbff9.	4 months ago
Sarah Zinger	ab56ac515d	DS-Querier: Hopefully fix and debug cases where query data response is nil (#101729)	4 months ago
colin-stuart	32624b3251	Tests: skip failing test TestMigrateToSpannerDialect (#101730) ... skip failing test TestMigrateToSpannerDialect	4 months ago
Sam Jewell	0eafd0641f	SQL Expressions: Simplify test code (#101718) ... Simplify, by retaining quotes when escaping query We also don't need to convert to string when passing to fmt.Sprintf a slice of Bytes is accepted by Sprintf instead.	4 months ago
Lucy Chen	5996e102af	Image Render: Propagate traces in HTTP mode (#100559) ... * Rendering: Propagate traces in HTTP mode * update ini file * update docs * update doc * fix imports * fix go files * fix CI * update ini config * remove servicename --------- Co-authored-by: AgnesToulet <35176601+AgnesToulet@users.noreply.github.com> Co-authored-by: nmarrs <nathanielmarrs@gmail.com>	4 months ago
Alexander Akhmetov	a93a05aebd	Alerting: Support group-level labels in Prometheus to Grafana conversion (#101624)	4 months ago
Steve Simpson	eed07cf503	Alerting: Refactor NewPrometheusWriter function. (#101706) ... * Alerting: Refactor NewPrometheusWriter function. In order to re-use PrometheusWriter, changing the function take a PrometheusWriterConfig instead of RecordingRulesSettings, and adapt the old interface onto the new interface. * Make linter happy	4 months ago
Peter Štibraný	9e690bd620	Spanner support enhancements (#101634) ... * Adds ability to run integration tests against spanner (by using GRAFANA_TEST_DB=spanner env variable. SPANNER_DB variable then specifies database to use: spannertest, emulator or string like /projects/<project>/instances/<instance>/databases/<db>) * Adds feature to migration dialects to create database from a snapshot, instead of running individual migrations. * Adds first version of Spanner snapshot, prepared from "OSS" migrations. * Uses generated bit-reversed-positive values instead of auto_increment. (As an experiment)	4 months ago
Karl Persson	43f56c5ca1	Apiserver: Refactor authenticator and authorizers (#101449) ... * Clean up authenticator * Cleanup authorizers and replace org_id and stack_id with namespace authorizer * Remove dependency on org service * Extract orgID from /apis/ urls and validate stack id	4 months ago
Hugo Kiyodi Oshiro	0a24a7cd4c	Plugins: Remove uninstall plugin step from cli plugins update-all (#101632)	4 months ago
Tania	c9ab1142e1	Add OpenFeature providers (#101071) ... * Add OpenFeature provider * Simplify static provider * Linting * Apply review feedback * Codeowner for deps * Update pkg/services/featuremgmt/openfeature.go Co-authored-by: Dave Henderson <dave.henderson@grafana.com> * Apply review comments part2 * Remove from sample.ini for now * fixup! Apply review comments part2 * Add example of context config * Resolve conflict * Run update workspaces --------- Co-authored-by: Dave Henderson <dave.henderson@grafana.com>	4 months ago