Commit Graph

10531 Commits

Author SHA1 Message Date
Dimitris Sotirakis 841cd57d4e [v9.5.x] Bug: Compare semver digits for frontend packages config (#71907)
Bug: Compare `semver` digits for frontend packages config (#71829)

* Compare semver digits

* Fix lint

(cherry picked from commit 5f8ace33fb)

# Conflicts:
#	pkg/build/frontend/config_test.go
2023-07-19 10:24:33 +03:00
Matthew Jacobson 10b7bd76f5 [v9.5.x] Alerting: No longer silence paused alerts during legacy migration (#71765)
Alerting: No longer silence paused alerts during legacy migration (#71596)

* Alerting: No longer silence paused alerts during legacy migration

Now that we migrate paused legacy alerts to paused UA alert rules, we no longer need to silence them.

(cherry picked from commit 8c6cdf51fc)
2023-07-17 17:14:27 +03:00
grafana-delivery-bot[bot] 6b12749b57 [v9.5.x] Plugins: Only configure plugin proxy transport once (#71741)
Plugins: Only configure plugin proxy transport once (#71735)

only configure plugin proxy transport once

(cherry picked from commit b59ca7fb22)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
2023-07-17 15:59:48 +03:00
George Robinson 4f944c691a [v9.5.x] Alerting: Fix unique violation when updating rule group with title chains/cycles (#71330)
Alerting: Fix unique violation when updating rule group with title chains/cycles (#67868)

* Alerting: Fix unique violation when updating rule group with title chains/cycles

The uniqueness constraint for titles within an org+folder is enforced on every update within a transaction instead of on commit (deferred constraint). This means that there could be a set of updates that will throw a unique constraint violation in an intermediate step even though the final state is valid. For example, a chain of updates RuleA -> RuleB -> RuleC could fail if not executed in the correct order, or a swap of titles RuleA <-> RuleB cannot be executed in any order without violating the constraint.

The exact solution to this is complex and requires determining directed paths and cycles in the update graph, adding in temporary updates to break cycles, and then executing the updates in reverse topological order (see first commit in PR if curious).

This is not implemented here.

Instead, we choose a simpler solution that works in all cases but might perform more updates than necessary. This simpler solution makes a determination of whether an intermediate collision could occur and if so, adds a temporary title on all updated rules to break any cycles and remove the need for specific ordering.

In addition, we make sure diffs are executed in the following order: DELETES, UPDATES, INSERTS.

Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>
2023-07-13 15:30:43 +01:00
grafana-delivery-bot[bot] 02fe2856da [v9.5.x] Prometheus: Version detect bug (#71243)
Prometheus: Version detect bug (#71198)

* remove redundant request copy in backend, add more versions to semver lists

(cherry picked from commit 7dc071f46b)

Co-authored-by: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
2023-07-07 14:24:57 -05:00
grafana-delivery-bot[bot] a279c804db [v9.5.x] Alerting: Add debug logs when saving instances is finished (#70919)
Alerting: Add debug logs when saving instances is finished (#70447)

(cherry picked from commit 8a13ee3cd4)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2023-07-03 15:23:59 +02:00
grafana-delivery-bot[bot] 4b0b2eede2 [v9.5.x] Fix: Change getExistingDashboardByTitleAndFolder to get dashboard by title, not slug (#70961)
Fix: Change getExistingDashboardByTitleAndFolder to get dashboard by title, not slug (#70723)

* Fix: Change getExistingDashboardByTitleAndFolder to get dashboard by title, not slug

* test: add tests for get dashboard with existing name, get dashboard with non existing name, get dashboard with existing name in a folder

* Update pkg/services/dashboards/database/database_test.go

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>

* require specific error for Should be able to get dashboard with existing name

* Update pkg/services/dashboards/database/database_test.go

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>

* implement sofia suggestions to check for specific err, remove logs

* give test more specific name

* implement daniel suggestion of formatting documentation comment in safe way

* fix test title to refer to root directory not specific folder

---------

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
(cherry picked from commit 67cdae4b7d)

Co-authored-by: Kat Yang <69819079+yangkb09@users.noreply.github.com>
2023-06-30 13:46:04 -04:00
Santiago fd80720221 [v9.5.x] Alerting: Remove and revert flag alertingBigTransactions (#70910)
Alerting: Remove and revert flag alertingBigTransactions (#65976)

* Alerting: Remove and revert flag alertingBigTransactions

This is a partial revert of #56575 and a removal of the `alertingBigTransactions` flag.

Real-word use has seen no clear performance incentive to maintain this flag. Lowered db connection count
came at the cost of significant increase in CPU usage and query latency.

* Fix lint backend

* Removed last bits of alertingBigTransactions

---------

Co-authored-by: Armand Grillet <2117580+armandgrillet@users.noreply.github.com>
(cherry picked from commit 63187fae0c)

Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>
2023-06-29 15:18:34 -03:00
Matthew Jacobson 2745d3b5a1 [v9.5.x] Alerting: Convert 'Both' type Prometheus queries to 'Range' in migration (#70907)
Alerting: Convert 'Both' type Prometheus queries to 'Range' in migration (#70781)

* Alerting: Convert 'Both' type Prometheus queries to 'Range' in migration

(cherry picked from commit 00d5f7fed7)
2023-06-29 11:33:12 -04:00
grafana-delivery-bot[bot] b585067281 [v9.5.x] Alerting: Migrate unknown NoData\Error settings to the default (#70905)
Alerting: Migrate unknown NoData\Error settings to the default (#68403)

* use default execution if legacy is not known

* update docs

* Update docs/sources/alerting/migrating-alerts/migrating-legacy-alerts.md

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>

* Update docs/sources/alerting/migrating-alerts/migrating-legacy-alerts.md

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>

---------

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
(cherry picked from commit 3af95bebe1)

Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
2023-06-29 10:55:05 -04:00
grafana-delivery-bot[bot] 54c462c050 [v9.5.x] SQLStore: Fix Postgres dialect treating "false" migrator default as true (#70687)
SQLStore: Fix Postgres dialect treating "false" migrator default as true (#69353)

* SQLStore: Fix Postgres dialect treating "false" migrator default as true

Previously, when creating a migration you could choose a default value for a new
boolean column that looked correct but would be interpreted incorrectly by the
Postgres dialect. For example, values such as "false" or "FALSE" would be treated
as true by the Postgres dialect.

This refactors how migration dialects determine the Default column value for boolean
type columns. Each dialect now uses the same base code to parse the Default literal
and panics if an unknown value is encountered.

So, now AddColumnMigration and AddTableMigration will ensure that across dialects:

- The exact same Default literals will be allowed.
- The literals are converted to equivalent defaults in their DDL.
- An error will be thrown if an invalid literal is provided.

(cherry picked from commit 44972d0cd5)

Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>
2023-06-27 12:29:49 -04:00
Ieva bef41a5cc9 Auth: Remove Email Lookup from oauth integrations 9.5 (#895)
backport https://github.com/grafana/grafana-private-mirror/pull/894 to 9.5.x
2023-06-23 08:59:35 +02:00
Sofia Papagiannaki 2f713952ba [v9.5.x] Tracing: supply Grafana build version (#70500)
Tracing: supply Grafana build version (#69733)

* tracing: supply Grafana build version

Not etcd client version.

* go mod tidy

(cherry picked from commit c45ff94806)

Co-authored-by: Bryan Boreham <bjboreham@gmail.com>
2023-06-22 12:59:49 +03:00
Dimitris Sotirakis afd6dc96c9 [v9.5.x] CI: Add CI check for what's new link (#70046) (#70122)
CI: Add CI check for `what's new` link (#70046)

* Add whatsnewchecker

* Add whatsnewchecker_test

* Small fixes

* Add step in CI

* Fix lint

* Fix starlark

* t.Cleanup instead of separate func

* Skip check for test tags

(cherry picked from commit 91272ee4f9)

# Conflicts:
#	.drone.yml
#	scripts/drone/events/release.star
2023-06-15 09:44:41 +03:00
Grot (@grafanabot) 9206c8d5f8 [v9.5.x] Bug: Fix build-frontend* config checks (#70077)
Bug: Fix `build-frontend*` config checks (#70076)

* Fix frontend config checks

* Exclude test tag events

(cherry picked from commit 5a36fa5f8a)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
2023-06-15 09:09:07 +03:00
Grot (@grafanabot) 9a3d3a7f8a [v9.5.x] NPM packages: Fail build-frontend-packages step if package.json and input tag differ (#70037)
NPM packages: Fail `build-frontend-packages` step if `package.json` and input tag differ (#70011)

* Fail if package.json version is different than the tag

* Add tests

* Update message

* Small refactoring

* Fix lint

(cherry picked from commit a6b524fd56)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
2023-06-14 10:52:46 +03:00
Grot (@grafanabot) 9f059499e9 [v9.5.x] Docker: Add ARM64 architecture for Docker, for PRs (#69714)
Docker: Add ARM64 architecture for Docker, for PRs (#68295)

* Add ARM64 architecture for Docker

* Add arm64 variants

(cherry picked from commit bbd83cbaeb)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
2023-06-07 17:38:44 +03:00
Grot (@grafanabot) 4784c9a99a [v9.5.x] Prevent crash while executing concurrent mixed queries (#877)
Prevent crash while executing concurrent mixed queries (#874)

limit parallel query execution to 1 at a time

(cherry picked from commit 96579a60e19e2a9f2d6bdaeba64e0e702211eb73)

Co-authored-by: Michael Mandrus <41969079+mmandrus@users.noreply.github.com>
2023-06-06 13:28:19 +02:00
George Robinson 9db334ad95 [v9.5.x] Require alert.notifications:write permissions to test receivers and templates (#867)
Require alert.notifications:write permissions to test receivers and templates (#865)

(cherry picked from commit 3c21ab70075256d4ba8e4fbfdcb15f5a394161fa)
2023-06-06 13:28:18 +02:00
Grot (@grafanabot) f3ee778e1a [v9.5.x] GoogleAPI: Add retries functionallity to GoogleAPI calls (#69143)
GoogleAPI: Add retries functionallity to GoogleAPI calls (#69129)

* Add retryer to GoogleAPI calls

* Add comment

(cherry picked from commit 515270f5fd)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
2023-05-26 13:18:13 +03:00
Grot (@grafanabot) adbcf7dee0 [v9.5.x] Alerting: Fix provenance guard checks for Alertmanager configuration to not cause panic when compared nested objects (#69092)
Alerting: Fix provenance guard checks for Alertmanager configuration to not cause panic when compared nested objects (#69009)

* fix current settings parsed as new
* replace map comparison with cmp.Diff and log the diff

(cherry picked from commit e00260465b)

Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
2023-05-25 19:00:08 +03:00
Grot (@grafanabot) b153b4ede0 [v9.5.x] Auth: Fix visibility of the Invite button on /admin/users page (#69066)
Auth: Fix visibility of the Invite button on /admin/users page (#68991)

* Fix for invite button visibility

* Align test

(cherry picked from commit df4db412cb)

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
2023-05-25 16:44:31 +02:00
Dimitris Sotirakis 676da1c7e9 [v9.5.x] G10: Replace beta with preview references (#68347) (#68949)
G10: Replace `beta` with `preview` references (#68347)

* Update references

* Update grabpl to v3.0.38

(cherry picked from commit 7e816d010c)

# Conflicts:
#	.drone.yml
2023-05-24 10:40:35 +02:00
Grot (@grafanabot) f74b514e1a [v9.5.x] Docker: Add mode label when building docker images (#68870)
Docker: Add `mode` label when building docker images (#68865)

Add mode label when building docker image

(cherry picked from commit bad570ee86)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
2023-05-23 10:59:26 +02:00
Grot (@grafanabot) 86e6d9d377 [v9.5.x] Utils: Reimplement util.GetRandomString to avoid modulo bias (#66970)
Utils: Reimplement util.GetRandomString to avoid modulo bias (#64481)

* reimplement GetRandomString, add tests that results are unbiased

(cherry picked from commit 7e765c870a)

Co-authored-by: Dan Cech <dcech@grafana.com>
2023-05-22 14:55:16 -04:00
Grot (@grafanabot) 8a8d1e6ff2 [v9.5.x] AnonymousAuth: Fix concurrent read-write crash (#68802)
AnonymousAuth: Fix concurrent read-write crash (#68637)

clone http req before tagging

(cherry picked from commit 05e71d4c6b)

Co-authored-by: Jo <joao.guerreiro@grafana.com>
2023-05-22 13:15:32 +00:00
Grot (@grafanabot) 2a566dddfd [v9.5.x] Revert: Allow editors to access GET /datasources (#68654)
Revert: Allow editors to access GET /datasources (#68632)

Revert "Allow editors to access GET /datasources"

This reverts commit 5a830c43c0.

(cherry picked from commit 6a2bcba078)

Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
2023-05-17 19:18:01 +01:00
Ivan Ortega Alba 100d66cf36 [v9.5.x] Dashboards: Remove no-datasource screen (#68574) (#68647)
Dashboards: Remove no-datasource screen (#68574)

* Dashboards: Remove non-ds configured landing page

* Remove `datasourceOnboarding` feature toggle

(cherry picked from commit 1505a188eb)
2023-05-17 19:33:35 +03:00
Gilles De Mey 2a41843a5c Alerting: Omit "description" and "summary" from default email template annotations (#68122) (#68189)
* Alerting: Omit "description" and "summary" from default email template annotations (#68122)

(cherry picked from commit 720b5b3b65)

Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>
2023-05-12 17:45:03 +02:00
Grot (@grafanabot) dd33560f5e [v9.5.x] Settings: Add ability to override skip_org_role_sync with Env variables (#68375)
Settings: Add ability to override `skip_org_role_sync` with Env variables (#68364)

Switch to using the SectionsWithOverride for settings for skip org role sync

(cherry picked from commit 1a79c8a601)

Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
2023-05-12 14:08:24 +01:00
Grot (@grafanabot) ac5bcf32ae [v9.5.x] Alerting: Migration to not fail if alert_configuration table is not empty (#67936)
Alerting: Migration to not fail if alert_configuration table is not empty (#67924)

(cherry picked from commit 0ce7f7eaf4)

Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
2023-05-05 12:34:14 -04:00
Grot (@grafanabot) 0c0a5ed602 [v9.5.x] AzureMonitor: Fix logs query multi-resource and timespan values (#67932)
AzureMonitor: Fix logs query multi-resource and timespan values (#67914)

* Update TimeGrain interface methods

- Make them util functions because it's simpler

* Update logs ds to appropiately set resources and timespan

* Set timespan using RCF times

* Update tests

(cherry picked from commit 9d16718acc)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2023-05-05 19:04:37 +03:00
Grot (@grafanabot) 4b6ce21884 [v9.5.x] Render analytics identifiers (#67925)
Render analytics identifiers (#67860)

* Append analytics identifier upon authenticate session

* Add id and module upon syncing user to identity

* Add authModule & id to `IdentityFromSignedInUser`

* Allow req calls in test to use basic auth

* Add `intercom_secret` to grafana config in tests

* Add test for analytics render in html view

(cherry picked from commit 15e34505e2)

Co-authored-by: linoman <2051016+linoman@users.noreply.github.com>
2023-05-05 18:38:31 +03:00
Yuri Tseretyan 090ef70f95 Alerting: Update alerting module to 20230428154802-ad53acfab07f (#67541) 2023-04-28 20:16:30 +03:00
Grot (@grafanabot) dccb25eae0 [v9.5.x] Grafana Cloud: Put cloud artifacts to */release dir (#67532)
Grafana Cloud: Put cloud artifacts to `*/release` dir (#66168)

Put cloud artifacts to */release dir

(cherry picked from commit a2634495e5)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
2023-04-28 18:27:41 +03:00
Grot (@grafanabot) 535ae47e2f [v9.5.x] Grafana Cloud: Add VariantLinuxAmd64 in build variants (#67529)
Grafana Cloud: Add `VariantLinuxAmd64` in build variants (#66167)

Add VariantLinuxAmd64 in build variants

(cherry picked from commit 8dd87a79f7)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
2023-04-28 18:26:34 +03:00
Grot (@grafanabot) a0587aa6cd [v9.5.x] Alerting: Scheduler use rule fingerprint instead of version (#67516)
Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
2023-04-28 11:16:44 -04:00
Grot (@grafanabot) 792e80b65d [v9.5.x] SQL Datasources: Update behavior of default connection limits (#67465)
* SQL Datasources: Update behavior of default connection limits (#66687)

* Update behavior of defaults in connection limits

* Refactor to use config object instead

* Refactor remove unneeded function

---------

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
(cherry picked from commit 1fbac96bd4)

* SQL Datasources: Update behavior of default connection limits (#66687)

* Update behavior of defaults in connection limits

* Refactor to use config object instead

* Refactor remove unneeded function

---------

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
(cherry picked from commit 1fbac96bd4)

---------

Co-authored-by: Kyle Cunningham <codeincarnate@users.noreply.github.com>
Co-authored-by: Kyle Cunningham <kyle@codeincarnate.com>
2023-04-28 21:23:16 +07:00
Grot (@grafanabot) ff79e2df57 [v9.5.x] Prometheus: Fix regression for $__rate_interval comparison (#67505)
Prometheus: Fix regression for $__rate_interval comparison (#67460)

* fix ,  comparison regression

* intervalMs was not pressent before the regression and this value changes the adjusted interval calculating giving a false positive in favor of the regression

(cherry picked from commit d4a22cff0a)

Co-authored-by: Brendan O'Handley <brendan.ohandley@grafana.com>
2023-04-28 09:32:12 -04:00
Jo 147b0a21d6 AuthJWT: Fix JWT query param leak (CVE-2023-1387) (#825)
fix JWT query param leak

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
Co-authored-by: Kalle Persson <kalle.persson@grafana.com>
2023-04-27 14:28:52 +03:00
Grot (@grafanabot) 0009506829 [v9.5.x] Provisioning: Fix provisioning issues with legacy alerting and data source permissions (#67377)
Provisioning: Fix provisioning issues with legacy alerting and data source permissions (#67308)

extend provisioner permissions

(cherry picked from commit 3303428083)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
2023-04-27 13:56:20 +03:00
Grot (@grafanabot) ed10eebb48 [v9.5.x] Alerting: Fix misleading status code in provisioning API (#67358)
Alerting: Fix misleading status code in provisioning API (#67331)

Fixes #66249

(cherry picked from commit dfc99cdd19)

Co-authored-by: Uwe Sommerlatt <uwe.sommerlatt@gmail.com>
2023-04-27 11:47:49 +03:00
Grot (@grafanabot) f373eca377 [v9.5.x] Alerting: Fix panic when reparenting receivers to groups following an attempted rename via Provisioning (#67175)
Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
Fix panic when reparenting receivers to groups following an attempted rename via Provisioning (#67167)
2023-04-25 04:43:47 +03:00
Steve Simpson c3d1930d05 [v9.5.x] Alerting: Allow hooking into request handler functions. (#67154)
Alerting: Allow hooking into request handler functions. (#67000)

* Alerting: Allow hooking into request handler functions.

Adds a facility to AlertNG for hooking into API handlers, allowing the
replacement of request handlers for specific paths. One of goals of this
approach was to allow hooking as late as possible in the request, e.g.
after all middleware has been applied, to simplfiy usage.

* Update pkg/services/ngalert/api/hooks.go

Co-authored-by: gotjosh <josue.abreu@gmail.com>

* Update pkg/services/ngalert/api/hooks.go

Co-authored-by: gotjosh <josue.abreu@gmail.com>

* Update pkg/services/ngalert/ngalert.go

Co-authored-by: gotjosh <josue.abreu@gmail.com>

* Fixes to review comments

* Fix passing logger in

---------

Co-authored-by: gotjosh <josue.abreu@gmail.com>
(cherry picked from commit 9effb9a708)
2023-04-24 20:43:23 +02:00
Grot (@grafanabot) dda934678d [v9.5.x] AzureMonitor: Correct series name accounting for dimensions (#67068)
AzureMonitor: Correct series name accounting for dimensions (#67050)

Correct displayName accounting for dimensions

(cherry picked from commit a2b97547a6)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2023-04-21 21:42:08 +03:00
Grot (@grafanabot) 8bc2a7144a [v9.5.x] Nested folders: Fix error response codes (#66975)
Nested folders: Fix error response codes (#66943)

* Nested folders: Fix error response codes

Fix error handling

(cherry picked from commit 24696d593b)

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
2023-04-21 15:15:14 +00:00
Ashley Harrison ae716112dc Navigation IA: Update Monitoring to Observability (#66963) (#67023)
* update monitoring -> observability

* update backend test

(cherry picked from commit 1f193f1bad)
2023-04-21 10:40:15 +01:00
Grot (@grafanabot) 32869c96df [v9.5.x] Alerting: Fix DatasourceUID and RefID missing for DatasourceNoData alerts (#66962)
Alerting: Fix DatasourceUID and RefID missing for DatasourceNoData alerts (#66733)

This commit fixes a bug where DatasourceUID and RefID annotations are
missing for DatasourceNoData alerts in Grafana 9.5. This bug affects
datasource plugins that have moved to using the data plane contract.

(cherry picked from commit 35342a3c76)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2023-04-20 16:56:53 +03:00
Grot (@grafanabot) dcc5190620 [v9.5.x] Expressions/threshold: Fix incorrect thresholds args length (#66926)
Expressions/threshold: Fix incorrect thresholds args length (#66859)

(cherry picked from commit 350de3f3bf)

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
2023-04-20 13:15:59 +02:00
Grot (@grafanabot) 384a21d03c [v9.5.x] Alerting: Add tests for Evaluate (#66930)
Alerting: Add tests for Evaluate (#66739)

(cherry picked from commit 883dcc81c0)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2023-04-20 13:42:18 +03:00