Commit Graph

12877 Commits

Author SHA1 Message Date
grafana-delivery-bot[bot] 8d366eb67c [v11.0.x] Prometheus: Create jsonschema spec (#86197)
Prometheus: Create jsonschema spec (#85077)

(cherry picked from commit e5cf863973)

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
2024-04-15 16:52:53 +01:00
grafana-delivery-bot[bot] 98417a579f [v11.0.x] Loki: Support custom X-Query-Tags header (#86189)
Loki: Support custom `X-Query-Tags` header (#85123)

* Loki: Support custom `X-Query-Tags` header

* add comment

(cherry picked from commit 9a8ae3c932)

Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
2024-04-15 16:30:09 +01:00
grafana-delivery-bot[bot] 232798e0d0 [v11.0.x] IDFowrarding: ignore logging context canceled errors (#86187)
IDFowrarding: ignore logging context canceled errors (#85141)

(cherry picked from commit 2f5e3023c2)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
2024-04-15 16:29:45 +01:00
grafana-delivery-bot[bot] 3547c55b52 [v11.0.x] Provisioning: Fix regression when dashboardProvisioner is accessed before being initialised (#86186)
Provisioning: Fix regression when dashboardProvisioner is accessed before being initialised (#85011)

* Provisioning: Fix regression when dashboardProvisioner is accessed before being initialized

* Set dashboard provisioner in the provider

(cherry picked from commit 5ebf2d08f6)

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
2024-04-15 16:29:23 +01:00
grafana-delivery-bot[bot] 708ba6f3ac [v11.0.x] MySQL: snapshot tests (#86184)
MySQL: snapshot tests (#84846)

mysql: add snapshot tests
(cherry picked from commit 3b7ee3a56b)

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
2024-04-15 16:28:08 +01:00
grafana-delivery-bot[bot] bce6d445e9 [v11.0.x] postgres: improved tests (#86181)
postgres: improved tests (#84677)

* postgres: tests: better test aligning time-series results

* postgres: add snapshot test for a backward-compat code

(cherry picked from commit c835022861)

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
2024-04-15 16:27:44 +01:00
grafana-delivery-bot[bot] 6204c035df [v11.0.x] LibraryPanelRBAC: Fix issue with importing dashboards containing library panels (#86149)
LibraryPanelRBAC: Fix issue with importing dashboards containing library panels (#83980)

(cherry picked from commit 6a53864f7a)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
2024-04-15 17:18:23 +02:00
grafana-delivery-bot[bot] 9744f081fc [v11.0.x] Expressions+Testdata: Create json schema for query types (#86164)
Expressions: Create json schema for query types (#84032)

(cherry picked from commit 4cda34ff7d)

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
2024-04-15 16:09:50 +01:00
grafana-delivery-bot[bot] 8c0c45d54a [v11.0.x] Alerting: Return a 400 and errutil error when trying to delete a contact point that is referenced by a policy (#86163)
Alerting: Return a 400 and errutil error when trying to delete a contact point that is referenced by a policy (#85481)

Return a 400 and errutil error when trying to delete a contact point that is referenced by a policy

(cherry picked from commit 5b1498f98f)

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
2024-04-15 09:49:09 -05:00
grafana-delivery-bot[bot] ffe58a03b1 [v11.0.x] Scopes: Add type filter (#86159)
Scopes: Add type filter (#84866)

Co-authored-by: Kyle Brandt <kyle@grafana.com>
(cherry picked from commit dfe61db7a5)

Co-authored-by: Todd Treece <360020+toddtreece@users.noreply.github.com>
2024-04-15 15:42:27 +01:00
grafana-delivery-bot[bot] 19255a23ae [v11.0.x] K8s: replace a noop certKey content func with actual if available (#86154)
K8s: replace a noop certKey content func with actual if available (#84524)

(cherry picked from commit dd7d4e2656)

Co-authored-by: Charandas <charandas@users.noreply.github.com>
2024-04-15 15:27:28 +01:00
grafana-delivery-bot[bot] 2cf73012ab [v11.0.x] SSO: fix reloading settings when a provider contains empty settings (#86142)
SSO: fix reloading settings when a provider contains empty settings (#85102)

* fix reloading settings when a provider contains empty settings

* do not increment reloadFailures if settings are empty

(cherry picked from commit fad6dc4db1)

Co-authored-by: Mihai Doarna <mihai.doarna@grafana.com>
2024-04-15 15:27:04 +01:00
grafana-delivery-bot[bot] e268568add [v11.0.x] Chore: Define promlib depguard rules (#86140)
Chore: Define promlib depguard rules (#85082)

* define promlib depguard rules

* add comment

* test: break linting on purpose

* fix linting

* simple change to trigger backend linting/build in CI pipeline

(cherry picked from commit 92f5a0305c)

Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
2024-04-15 15:06:58 +01:00
grafana-delivery-bot[bot] 0fe31d86fc [v11.0.x] Cloud migrations: create endpoint to create an access token (#86137)
Cloud migrations: create endpoint to create an access token (#84690)

* fix merge conflicts

* make token expiration configurable

(cherry picked from commit a2e21eac8c)

Co-authored-by: Bruno <brunotj2015@hotmail.com>
2024-04-15 14:53:53 +01:00
grafana-delivery-bot[bot] d98e296efb [v11.0.x] K8s: skip invalid items in GetList when not invoked as part of SendInitialEvents (#86135)
K8s: skip invalid items in GetList when not invoked as part of SendInitialEvents (#85050)

(cherry picked from commit e237b89fe7)

Co-authored-by: Charandas <charandas@users.noreply.github.com>
2024-04-15 14:41:24 +01:00
grafana-delivery-bot[bot] b5adee8f92 [v11.0.x] Plugins: Factory for instantiating core plugin (#86134)
Plugins: Factory for instantiating core plugin (#85047)

(cherry picked from commit 8f12fb94f9)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
2024-04-15 14:41:05 +01:00
Ashley Harrison 20d6961030 [v11.0.x] Chore: Bump golangci-lint v1.57.1 (#86131)
Chore: Bump golangci-lint v1.57.1 (#84998)

* bump golangci-lint v1.57.1

* update setting

* remove goconst

* fix linting issues

* prettier

* fix G601

* go mod tidy
go work sync

(cherry picked from commit 6137c4e0a6)

Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
2024-04-15 14:40:35 +01:00
grafana-delivery-bot[bot] aaf233faac [v11.0.x] Server: Fix 'server' subcommand double-registration (#86126)
Server: Fix 'server' subcommand double-registration (#86083)

fix 'server' subcommand double-registration

Signed-off-by: Dave Henderson <dave.henderson@grafana.com>
(cherry picked from commit 44adfea049)

Co-authored-by: Dave Henderson <dave.henderson@grafana.com>
2024-04-15 09:35:33 -04:00
grafana-delivery-bot[bot] 9caf8f6fff [v11.0.x] k8s/query+ds: catch query errors, fix datasourceProvider and expose prometheus (#86119)
k8s/query+ds: catch query errors, fix datasourceProvider and expose prometheus (#85071)

(cherry picked from commit e6fa367d02)

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
2024-04-15 13:59:42 +01:00
grafana-delivery-bot[bot] 524c590462 [v11.0.x] OAuth: Make sub claim required for generic oauth behind feature toggle (#86118)
OAuth: Make sub claim required for generic oauth behind feature toggle (#85065)

* Add feature toggle for sub claims requirement

* OAuth: require valid auth id

* Fix feature toggle description

(cherry picked from commit 2f3a01f79f)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
2024-04-15 13:59:05 +01:00
grafana-delivery-bot[bot] b49a40d319 [v11.0.x] Grafana: define the api for the grafana cloudmigration api (not the csm api) (#86115)
Grafana: define the api for the grafana cloudmigration api (not the csm api) (#84430)

* Add cloud migration endpoints

* Built auth into creating a migration.

* Added more detail to the migration result model

* goimports

* Update pkg/services/cloudmigration/api/api.go

Co-authored-by: lean.dev <34773040+leandro-deveikis@users.noreply.github.com>

* Update pkg/services/cloudmigration/api/api.go

Co-authored-by: lean.dev <34773040+leandro-deveikis@users.noreply.github.com>

---------

Co-authored-by: Leonard Gram <leo@xlson.com>
Co-authored-by: lean.dev <34773040+leandro-deveikis@users.noreply.github.com>
(cherry picked from commit e2f155f9f7)

Co-authored-by: idafurjes <36131195+idafurjes@users.noreply.github.com>
2024-04-15 13:58:39 +01:00
grafana-delivery-bot[bot] 6a14aeae60 [v11.0.x] Chore: Vendor wire into pkg/build (#86110)
Chore: Vendor wire into pkg/build (#84637)

* vendor latest wire into pkg/build

* use vendored wire in builds

* fix wire import path

* remove wire from bingo

* also support google/wire import

* make prettier happy

* change package in tess

* add debug walk for drone

* add wire_gen in tests

* remove debug walk

* restore imports

(cherry picked from commit 4d4c06b480)

Co-authored-by: Serge Zaitsev <serge.zaitsev@grafana.com>
2024-04-15 13:56:44 +01:00
grafana-delivery-bot[bot] 6d0e1bee70 [v11.0.x] samlsettings: api integration (#86109)
samlsettings: api integration (#84300)

* add strategy and tests

* use settings provider service and remove multiple providers strategy

* Move SAML strategy to ssosettings service

* Update codeowners file

* reload from settings provider

* add saml as configurable provider

* Add new SAML strategy

* rename old saml settings interface

* update saml string references

* use OSS license

* validate saml provider depends on license for List

* add tests for list rendering including saml

* change the licensing validation to service init

* replace service struct for provider

(cherry picked from commit fc205db466)

Co-authored-by: linoman <2051016+linoman@users.noreply.github.com>
2024-04-15 13:55:59 +01:00
grafana-delivery-bot[bot] 56ea839a82 [v11.0.x] Alerting: Fix evaluation metrics to not count retries (#86059)
Alerting: Fix evaluation metrics to not count retries (#85873)

* Change evaluation metrics to only count once per eval, and add new metrics.

* Cosmetic: Move eval total Inc() to orginal place.

(cherry picked from commit ad7f804255)

Co-authored-by: Steve Simpson <steve.simpson@grafana.com>
2024-04-12 19:49:57 +02:00
Andreas Christou 2c5f9c83f0 [v11.0.x] plugins: update to latest go plugin sdk version (v0.222.0) (#85963)
plugins: update to latest go plugin sdk version (v0.222.0) (#85943)

plugins: update to latest go plugink sdk (v0.222.0)
(cherry picked from commit 050105e70a)

# Conflicts:
#	go.mod
#	go.sum
#	pkg/apiserver/go.mod
#	pkg/apiserver/go.sum
#	pkg/promlib/go.mod
#	pkg/promlib/go.sum

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
2024-04-12 14:52:45 +02:00
grafana-delivery-bot[bot] d4d69cfd4e [v11.0.x] Google Cloud Monitor: Fix interface conversion for incorrect type in cloudMonitoringProm.run (#85928)
Google Cloud Monitor: Fix interface conversion for incorrect type in `cloudMonitoringProm.run` (#85811)

(cherry picked from commit 0ec8ccbf66)

Co-authored-by: Adam Yeats <16296989+adamyeats@users.noreply.github.com>
2024-04-11 17:52:28 +02:00
Darren Janeczek a39501f9d5 chore: update datatrails feature flag and enable (#85508) (#85822)
* chore: update datatrails feature flag and enable

* fix: rename `datatrails` feature flag to `exploreMetrics`

(cherry picked from commit 66c0fd4dcc)
2024-04-11 14:38:14 +01:00
grafana-delivery-bot[bot] 31cc5a9634 [v11.0.x] Dashboard: Allow auto refresh option when saving a dashboard (#85922) 2024-04-11 11:50:25 +02:00
grafana-delivery-bot[bot] 0b14c95dd8 [v11.0.x] InfluxDB: Fix panic when reading concurrency count during influxql health check (#85877)
InfluxDB: Fix panic when reading concurrency count during influxql health check (#85771)

fix panic when reading concurrency count during influxql health check

(cherry picked from commit 96f49bfaee)

Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
2024-04-10 17:46:42 +02:00
grafana-delivery-bot[bot] 9d01858763 [v11.0.x] PostgreSQL: Fix the verify-ca mode (#85775)
PostgreSQL: Fix the verify-ca mode (#85530)

postgres: fix the verify-ca problem
(cherry picked from commit 8a15ed42ae)

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
2024-04-09 09:28:56 +02:00
Misi e2e9434cb4 [v11.0.x] Auth: Convert SetDefaultOrgHook to PostLoginHook (#85664)
Auth: Convert SetDefaultOrgHook to PostLoginHook (#85649)

* Convert SetDefaultOrgHook to PostLoginHook

(cherry picked from commit 8796d2d307)
2024-04-08 11:38:32 +03:00
grafana-delivery-bot[bot] bb5e1e0c5b [v11.0.x] Loki: Remove API restrictions on resource calls (#85201)
Loki: Remove API restrictions on resource calls (#85191)

Loki: Remove API restrictions
(cherry picked from commit c80b31a0d4)

Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
2024-04-05 16:00:20 +02:00
grafana-delivery-bot[bot] 657a6c2288 [v11.0.x] Applinks: Adds grafana-lokiexplore-app to Explore -> Logs section (#85216)
Applinks: Adds `grafana-lokiexplore-app` to `Explore -> Logs` section (#85200)

(cherry picked from commit e284812796)

Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
2024-04-05 13:00:50 +02:00
Marcus Efraimsson 2be8e4334b [v11.0.x] Chore: Upgrade grafana-plugin-sdk-go to v0.220.0 (#85575)
Chore: Upgrade grafana-plugin-sdk-go (#85562)

(cherry picked from commit bdc492b96c)
2024-04-04 10:03:20 +00:00
Marcus Efraimsson 324c37ff22 [v11.0.x] Update plugin SDK to v0.219.0 (#85573)
Update plugin SDK to v0.219.0 (#85438)

(cherry picked from commit d2ca95d304)

Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
2024-04-04 12:41:36 +03:00
grafana-delivery-bot[bot] fce5a26144 [v11.0.x] RBAC: Fix access checks for interactions with RBAC roles in hosted Grafana (#85520)
RBAC: Fix access checks for interactions with RBAC roles in hosted Grafana (#85485)

* don't check global permissions for cloud instances

* linting

(cherry picked from commit beb15d938b)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
2024-04-03 14:16:50 +01:00
grafana-delivery-bot[bot] ae73f31cf1 [v11.0.x] Revert "Postgres: Switch the datasource plugin from lib/pq to pgx (#8… (#85517)
Revert "Postgres: Switch the datasource plugin from lib/pq to pgx (#8… (#85509)

Revert "Postgres: Switch the datasource plugin from lib/pq to pgx (#83768)"

This reverts commit ecd6de826a.

(cherry picked from commit 8159e1db3a)

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
2024-04-03 12:54:57 +02:00
grafana-delivery-bot[bot] ed1485fa95 [v11.0.x] RBAC: Fix slow user permission search query on MySQL (#85410)
RBAC: Fix slow user permission search query on MySQL (#85058)

* Bench testing search user perm

* Add BenchmarkSearchUsersPermissions_1K_1K

* Clarify benchmark searches by action prefix

* Make MySQL more efficient

* Move all filter options

* Expand after assignments union

* update comments

(cherry picked from commit 5e48804364)

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
2024-04-02 09:52:02 +02:00
grafana-delivery-bot[bot] 0c254bd5e5 [v11.0.x] Plugins: Set correct PDC config values for proxy requests (#85414)
Plugins: Set correct PDC config values for proxy requests (#85412)

pass appropriate values

(cherry picked from commit 22fe7b067c)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
2024-03-29 21:51:56 +02:00
Will Browne 7bec323d23 [v11.0.x] Plugins: Send PDC file paths and contents for backwards compatibility (#85411)
Plugins: Send PDC file paths and contents for backwards compatibility (#85287)

* send paths and contents

* go work sync

(cherry picked from commit 1a0ac381eb)
2024-03-29 12:14:39 -07:00
grafana-delivery-bot[bot] e1dcc847d0 [v11.0.x] RBAC: handle partially resolved scopes (#85333)
RBAC: handle partially resolved scopes (#85323)

* RBAC: handle partially resolved scopes

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
(cherry picked from commit 5dd98a0fd5)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
2024-03-28 16:09:16 +01:00
grafana-delivery-bot[bot] 33c8f8c72d [v11.0.x] AuthProxy: Fix missing session for ldap auth proxy users (#85136)
AuthProxy: Fix missing session for ldap auth proxy users (#85090)

fix missing session for ldap auth proxy users

(cherry picked from commit 7649d93d17)

Co-authored-by: Jo <joao.guerreiro@grafana.com>
2024-03-27 10:57:44 +01:00
grafana-delivery-bot[bot] bd10c543a8 [v11.0.x] Alerting: Fix receiver inheritance when provisioning a notification policy (#85193)
Alerting: Fix receiver inheritance when provisioning a notification policy (#82007)

Terraform Issue: grafana/terraform-provider-grafana#1007
Nested routes should be allowed to inherit the contact point from the root (or direct parent) route but this fails in the provisioning API (it works in the UI)

(cherry picked from commit 2188516a21)

Co-authored-by: Julien Duchesne <julien.duchesne@grafana.com>
2024-03-26 18:54:38 +02:00
grafana-delivery-bot[bot] 9dff069ec3 [v11.0.x] SQLEngine: Use debug method instead of custom implementation (#85155)
SQLEngine: Use `debug` method instead of custom implementation (#85118)

Use debug method instead of custom implementation

(cherry picked from commit 19159a89a2)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2024-03-26 14:20:04 +02:00
grafana-delivery-bot[bot] 27f492a572 [v11.0.x] Access control: Improve annotation delete performance (#85151)
Access control: Improve annotation delete performance (#85068)

* Access control: Improve annotation delete performance

* simplify query string

* Refactor

* remove unnecessary join

(cherry picked from commit 02606be3ed)

Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>
2024-03-26 13:09:33 +02:00
Karl Persson 48fd6f066f SigningKeys: Add added_at when creating new signing key (#85060) 2024-03-26 10:02:34 +00:00
Ryan McKinley 62f97deee8 SQLStore: Cleanup migrationLocking (#85054) 2024-03-26 10:02:34 +00:00
Charandas 295f145f23 K8s: file storage - add sync around resource version (RV) management (#84694) 2024-03-26 10:02:34 +00:00
Brendan O'Handley c40708ffab Prometheus: Use frontend package in Prometheus DS with a feature toggle (#84397)
* add feature toggle usePrometheusFrontendPackage

* add feature toggle logic to Prometheus module

* use config editor with package and remove configOverhaul feature toggle

* update betterer because we will be removing other files as we replace with files from @grafana/prometheus

* fix exemplar ds picker selector

* add more description to ts-ignore

* remove go.work.sum change

* copy go.work.sum from main

* update go.work.sum after talking with ismail

* put back the promlib entry

---------

Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
2024-03-26 10:02:34 +00:00
Matthew Jacobson ecce0d7498 Alerting: Stop persisting silences and nflog to disk (#84706)
With this change, we no longer need to persist silence/nflog states to disk in addition to the kvstore
2024-03-26 10:02:34 +00:00