Commit Graph
12915 Commits
Author SHA1 Message Date
Scott Lepper 59eea3920d sql expressions - Backport 87277 to v11.0.x (#87315)
sql expressions: improve parser (#87277)

(cherry picked from commit 1a2bbd61fd)
2024-05-03 09:52:13 -04:00
Scott Lepper 1d2e581a39 sql expressions - Backport 87263 to v11.0.x (#87312)
fix: sql expressions parser with join (#87263)

(cherry picked from commit cbe3e3a5e0)
2024-05-03 09:29:48 -04:00
grafana-delivery-bot[bot]andScott Lepper 1c801e283f [v11.0.x] fix: sql expressions - sql parser table name case (#87305)
fix: sql expressions - sql parser table name case (#87196)

* fix: sql parser table name case

(cherry picked from commit 4fd2cb6014)

Co-authored-by: Scott Lepper <scott.lepper@gmail.com>
2024-05-03 15:58:23 +03:00
grafana-delivery-bot[bot]andismail simsek cc53e4fc38 [v11.0.x] InfluxDB: Support cardinality queries with backend mode (#87297)
InfluxDB: Support cardinality queries with backend mode (#87264)

support cardinality queries

(cherry picked from commit 3317691615)

Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
2024-05-03 13:30:08 +02:00
Eric Leijonmarck b219aa7688 [v11.0.x] Auth: Force lowercase login/email for users (#86985)
Auth: Force lowercase login/email for users (#86359)

* [WIP]: Force lowercase login/email for user CRUD

* warn and remove use of userCaseInsensitiveLogin check

* remove log warning

* reimplementation of the caseinsensitive

* need to decide if we want the conflict check or not

* remvoved the tests for conflict user by getEmail, getLogin

* added tests for user lowercase migration

* wip: emails next

* tests for email lowercasing

* review comments

* optimized login and email lookup before migrating

(cherry picked from commit e394e16073)
2024-05-02 13:05:25 +01:00
grafana-delivery-bot[bot]andIeva d47310e457 [v11.0.x] RBAC: Do not set permissions on data sources with wildcard UID in OSS (#87222)
RBAC: Do not set permissions on data sources with wildcard UID in OSS (#87220)

do not set permissions on DS with wildcard UID

(cherry picked from commit 28dd1ddd8e)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
2024-05-02 13:36:10 +03:00
Misi 265c27b97a [v11.0.x] Chore: Remove extra sql select from the Insert function of userimpl.store (#87163)
Chore: Remove extra sql select from the Insert function of userimpl.store (#87060)

Remove getAnyUserType

(cherry picked from commit 1cb3f332a1)
2024-05-01 10:12:00 +02:00
grafana-delivery-bot[bot]andIeva 363e21a63d [v11.0.x] Data source: Maintain the default data source permissions when switching from unlicensed to licensed Grafana (#87142)
* Data source: Maintain the default data source permissions when switching from unlicensed to licensed Grafana (#87119)

set managed data source permissions upon resource creation for unlicensed Grafana, remove them on deletion

(cherry picked from commit 5e060d2d99)

* remove code for older version

---------

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
2024-04-30 17:34:51 +01:00
grafana-delivery-bot[bot]andWilliam Wernert d95cbb7e38 [v11.0.x] Alerting: Use expected field name for receiver in HCL export (#87075)
Alerting: Use expected field name for receiver in HCL export (#87065)

* Use expected field name for receiver in hcl

Terraform provider expects `contact_point` instead of `receiver` in
notification settings on a rule.

(cherry picked from commit 70ff229bed)

Co-authored-by: William Wernert <william.wernert@grafana.com>
2024-04-30 11:00:17 -04:00
Scott Lepper 04d6463abb Backport 87073 to v11.0.x (#87078)
* Chore: Update go-duck dependency to v0.0.18 (#87073)

* Chore: Update go-duck dependency to v0.0.18

(cherry picked from commit 7505af2886)

* backport

* go mod tidy

* remove wrong import
2024-04-29 15:37:20 -04:00
grafana-delivery-bot[bot]andMatthew Jacobson 713cea3d2f [v11.0.x] Alerting: Improve error when receiver or time interval used by rule is deleted (#87070)
Alerting: Improve error when receiver or time interval used by rule is deleted (#86865)

* Alerting: Improve error when receiver used by rule is deleted

* Remove RuleUID from public error and data

* Improve fallback error in am config post

* Refactor to expand to time intervals

* Fix message on unchecked errors to be same as before

(cherry picked from commit 3397e8bf09)

Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>
2024-04-29 13:36:09 -04:00
grafana-delivery-bot[bot]andIsabella Siu 917f53dc1f [v11.0.x] Auth: Sign sigV4 request after adding headers (#87072)
Auth: Sign sigV4 request after adding headers (#87063)

(cherry picked from commit 7b392d40a0)

Co-authored-by: Isabella Siu <Isabella.siu@grafana.com>
2024-04-29 13:28:52 -04:00
Mihai Doarna 9a91f303be [backport to v11.0] SSO: add SSO settings to secrets migrator (#86913) (#86939)
SSO: add SSO settings to secrets migrator (#86913)

* add sso settings to secrets migrator

* unify SSO settings in all log lines

(cherry picked from commit 4bf9405ce4)
2024-04-29 18:42:47 +03:00
grafana-delivery-bot[bot]andSofia Papagiannaki 17b8022ba9 [v11.0.x] SQLStore: Disable redundant create and drop unique index migrations on dashboard table (#86867)
SQLStore: Disable redundant create and drop unique index migrations on dashboard table (#86857)

SQLStore: Disable create and drop unique index migrations
(cherry picked from commit a5a3ee9fa3)

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
2024-04-24 16:37:39 +01:00
Laura Fernández b67879e2ee [v11.0.x] Navigation: Add a return to previous button when navigating to different sections (#86797) 2024-04-24 13:15:53 +02:00
grafana-delivery-bot[bot]andAndreas Christou 39ce4774f7 [v11.0.x] MSSQL: Add SQL_VARIANT converter and update test (#86469)
MSSQL: Add `SQL_VARIANT` converter and update test (#85823)

Add SQL_VARIANT converter and update test

(cherry picked from commit 420067a7e1)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2024-04-19 21:00:59 +01:00
grafana-delivery-bot[bot]andMatthew Jacobson 56cd797d65 [v11.0.x] Alerting: Fix simplified routing group by override (#86563)
Alerting: Fix simplified routing group by override (#86552)

* Alerting: Fix simplified routing custom group by override

Custom group by overrides for simplified routing were missing required fields
GroupBy and GroupByAll normally set during upstream Route validation.

This fix ensures those missing fields are applied to the generated routes.

* Inline GroupBy and GroupByAll initialization instead of normalize after

(cherry picked from commit 71445002b7)

Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>
2024-04-19 03:25:13 +02:00
grafana-delivery-bot[bot]andVanilla ac20c614a3 [v11.0.x] Cli: Check missing plugin parameter of plugin update command (#86522)
Cli: Check missing plugin parameter of plugin update command (#86410)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
(cherry picked from commit 817f787947)

Co-authored-by: Vanilla <osu_Vanilla@126.com>
2024-04-18 16:02:14 +02:00
grafana-delivery-bot[bot]andidafurjes df2fee63a5 [v11.0.x] Add FolderUID for library elements (#86280)
Add FolderUID for library elements (#83819)

(cherry picked from commit 5c4a2de59b)

Co-authored-by: idafurjes <36131195+idafurjes@users.noreply.github.com>
2024-04-17 20:04:37 +02:00
grafana-delivery-bot[bot]andMatthew Jacobson 46353e6a50 [v11.0.x] Alerting: Fix simplified routes '...' groupBy creating invalid routes (#86376)
Alerting: Fix simplified routes '...' groupBy creating invalid routes (#86006)

* Alerting: Fix simplified routes '...' groupBy creating invalid routes

There were a few ways to go about this fix:
1. Modifying our copy of upstream validation to allow this
2. Modify our notification settings validation to prevent this
3. Normalize group by on save
4. Normalized group by on generate

Option 4. was chosen as the others have a mix of the following cons:
- Generated routes risk being incompatible with upstream/remote AM
- Awkward FE UX when using '...'
- Rule definition changing after save and potential pitfalls with TF

With option 4. generated routes stay compatible with external/remote AMs, FE
doesn't need to change as we allow mixed '...' and custom label groupBys, and
settings we save to db are the same ones requested.

In addition, it has the slight benefit of allowing us to hide the internal
implementation details of `alertname, grafana_folder` from the user in the
future, since we don't need to send them with every FE or TF request.

* Safer use of DefaultNotificationSettingsGroupBy

* Fix missed API tests

(cherry picked from commit 533bed6d94)

Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>
2024-04-16 14:41:13 -04:00
grafana-delivery-bot[bot]andLeonard Gram f4539f7e9d [v11.0.x] Cloudmigration: create migration (#86373)
Cloudmigration: create migration (#85386)

* Cloudmigration: create migration

* fix drone build

* lint fix

* fix unit test

---------

Co-authored-by: Michael Mandrus <michael.mandrus@grafana.com>
(cherry picked from commit 383ebb2bc4)

Co-authored-by: Leonard Gram <leo@xlson.com>
2024-04-16 17:05:09 +01:00
grafana-delivery-bot[bot]andRyan McKinley 98401be295 [v11.0.x] Scope: Add basic integration tests (#86367)
Scopes: Add basic integration tests (#85351)

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

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
2024-04-16 17:01:46 +01:00
grafana-delivery-bot[bot]andCharandas 6b6b7601a2 [v11.0.x] K8s: standalone authenticator that allows a type of downstream forwarding (#86362)
K8s: standalone authenticator that allows a type of downstream forwarding (#85130)

(cherry picked from commit 0f1151964c)

Co-authored-by: Charandas <charandas@users.noreply.github.com>
2024-04-16 16:57:06 +01:00
grafana-delivery-bot[bot]andTristan 9bc4d4c5be [v11.0.x] AWS DataSource: Fix namespaces in sagemaker metrics (#86363)
AWS DataSource: Fix namespaces in sagemaker metrics (#85357)

(cherry picked from commit 58b583f0c5)

Co-authored-by: Tristan <tburgessdev@gmail.com>
2024-04-16 16:47:31 +01:00
grafana-delivery-bot[bot]andMichael Mandrus 8de772e55d [v11.0.x] CloudMigrations: Add instance metadata to auth token (#86371)
CloudMigrations: Add instance metadata to auth token (#85381)

* update how tokens are passed around

* rename structs

(cherry picked from commit 5a5f76ae0a)

Co-authored-by: Michael Mandrus <41969079+mmandrus@users.noreply.github.com>
2024-04-16 16:45:57 +01:00
grafana-delivery-bot[bot]andCarl Bergquist 814732e6d1 [v11.0.x] Scopes: Create binding per relationship (#86368)
Scopes: Create binding per relationship (#85332)

scopes: create binding per relationship

Signed-off-by: bergquist <carl.bergquist@gmail.com>
(cherry picked from commit a71dfe806a)

Co-authored-by: Carl Bergquist <carl.bergquist@gmail.com>
2024-04-16 16:43:01 +01:00
grafana-delivery-bot[bot]andlinoman 6f6667d89c [v11.0.x] JWT: Find login and email claims with JMESPATH (#86357)
JWT: Find login and email claims with JMESPATH (#85305)

* add function to static function to static service

* find email and login claims with jmespath

* rename configuration files

* Replace JWTClaims struct for map

* check for subclaims error

(cherry picked from commit e4250a72db)

Co-authored-by: linoman <2051016+linoman@users.noreply.github.com>
2024-04-16 16:25:18 +01:00
grafana-delivery-bot[bot]andKarl Persson 64c17b0ee6 [v11.0.x] User: email verification completion (#86354)
User: email verification completion (#85259)

* TempUser: Include InvitedById in TempUserDTO

* Extract email verfication completion flow to service

(cherry picked from commit 73e426b081)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
2024-04-16 16:24:53 +01:00
grafana-delivery-bot[bot]andlean.dev 23a24bc9af [v11.0.x] CloudMigration: Add service to list all migrations (#86350)
CloudMigration:  Add service to list all migrations (#85308)

(cherry picked from commit 5b147d0847)

Co-authored-by: lean.dev <34773040+leandro-deveikis@users.noreply.github.com>
2024-04-16 16:24:38 +01:00
grafana-delivery-bot[bot]andKyle Brandt 67c976366e [v11.0.x] Scopes: Add Filtering for ScopeDashoardBinding and Update Prometheus for ScopeFilterOperator Changes (#86326)
Scopes: Add Filtering for ScopeDashoardBinding and Update Prometheus for ScopeFilterOperator Changes (#85284)

(cherry picked from commit 136f8e6f0c)

Co-authored-by: Kyle Brandt <kyle@grafana.com>
2024-04-16 14:46:21 +01:00
grafana-delivery-bot[bot]andDan Cech f6606c558e [v11.0.x] Storage: GuaranteedUpdate fix & other improvements (#86323)
Storage: GuaranteedUpdate fix & other improvements (#85206)

make GuaranteedUpdate work when ignoring not found errors, increase poll frequency, fix Delete

(cherry picked from commit ef26fe95dc)

Co-authored-by: Dan Cech <dcech@grafana.com>
2024-04-16 14:42:56 +01:00
grafana-delivery-bot[bot]andKarl Persson 684aca803f [v11.0.x] AuthN: Add IsAuthenticatedBy to identity interface and replace checks (#86321)
AuthN: Add IsAuthenticatedBy to identity interface and replace checks (#85262)

Add IsAuthenticatedBy to identity interface and replace checks

(cherry picked from commit 152cb47692)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
2024-04-16 14:41:15 +01:00
grafana-delivery-bot[bot]andKyle Brandt aef19a4a8f [v11.0.x] QueryLibrary: Use default variable values in render (#86312)
QueryLibrary: Use default variable values in render (#84678)

(cherry picked from commit d71266b8af)

Co-authored-by: Kyle Brandt <kyle@grafana.com>
2024-04-16 14:07:48 +01:00
grafana-delivery-bot[bot]andPablo 18db3762f8 [v11.0.x] CloudWatch : Add missing AWS/ES metrics (#86271)
CloudWatch : Add missing AWS/ES metrics (#85210)

Adding missing ES metrics

(cherry picked from commit ace1cd6301)

Co-authored-by: Pablo <2617411+thepalbi@users.noreply.github.com>
2024-04-16 12:30:09 +01:00
grafana-delivery-bot[bot]andismail simsek 9d1a004180 [v11.0.x] Chore: InfluxQL stream parser improvements (#86268)
Chore: InfluxQL stream parser improvements (#85041)

* don't iterate over first column as it is a time column already

* don't iterate over first column as it was handled earlier

* add more flexibility to run the commands

* Update pkg/tsdb/influxdb/influxql/converter/converter.go

Co-authored-by: Nick Richmond <5732000+NWRichmond@users.noreply.github.com>

---------

Co-authored-by: Nick Richmond <5732000+NWRichmond@users.noreply.github.com>
(cherry picked from commit fec7765111)

Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
2024-04-16 11:38:54 +01:00
grafana-delivery-bot[bot]andBenoit Tigeot 681554c376 [v11.0.x] Alerting: Reduce set of fields that could trigger alert state change (#86266)
Alerting: Reduce set of fields that could trigger alert state change (#83496)

We want to avoid too much change of alert state based on change on
alert's fields. For that we ignore some fields from the diff.

(cherry picked from commit 6f38ac6615)

Co-authored-by: Benoit Tigeot <benoittgt@users.noreply.github.com>
2024-04-16 10:35:59 +01:00
grafana-delivery-bot[bot]andJo 8d8365671b [v11.0.x] Auth: Improve org role sync debugging (#86203)
Auth: Improve org role sync debugging (#85146)

add login to the context of the logger

(cherry picked from commit da40158fed)

Co-authored-by: Jo <joao.guerreiro@grafana.com>
2024-04-16 10:32:11 +01:00
grafana-delivery-bot[bot]andCarl Bergquist 51edeba087 [v11.0.x] Scopes: Name relationship objects *binding (#86202)
Scopes: Name relationship objects *binding (#84955)

Signed-off-by: bergquist <carl.bergquist@gmail.com>
Co-authored-by: Bogdan Matei <bogdan.matei@grafana.com>
(cherry picked from commit b214b07695)

Co-authored-by: Carl Bergquist <carl.bergquist@gmail.com>
2024-04-16 09:48:00 +01:00
grafana-delivery-bot[bot]andRyan McKinley 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]andSven Grossmann 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]andKarl Persson 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]andSofia Papagiannaki 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]andGábor Farkas 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]andGábor Farkas 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]andkay delaney 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]andRyan McKinley 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]andAlexander Weaver 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]andTodd Treece 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]andCharandas 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]andMihai Doarna 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