Commit Graph

38270 Commits

Author SHA1 Message Date
Jack Baldry ca08c889a0 [v9.2.x] Levitate: Only run against the main branch (#61401) (#61462)
Levitate: Only run against the main branch (#61401)

chore: only run Levitate against the main branch
(cherry picked from commit b8aaf85fdc)
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com>
2023-01-13 09:36:34 +00:00
Grot (@grafanabot) 70183bf44d [v9.2.x] Bugfix: Prevent previous query editor to set default values when changing data source (#61285)
Bugfix: Prevent previous query editor to set default values when changing data source (#60218)

* Fixed issue where the query editor of the previous ds sets default values on query passed to the query editor of the next ds.

* Fixed issue with changing data source for query in Alerting.

* Will apply default values from DS if available.

* Fix failing tests.

* fixed spell error.

* reverted getDefaultQuery call so it can be added in a separate PR.

(cherry picked from commit b633d5395d)

Co-authored-by: Marcus Andersson <marcus.andersson@grafana.com>
2023-01-11 21:26:26 +01:00
linoman 364bdce529 Add reference to Google OAuth docs (#61148) 2023-01-11 14:32:14 +01:00
Grot (@grafanabot) f2aecc8762 [v9.2.x] Update publishing workflows to use PATs with fine-grained access control (#61267)
Update publishing workflows to use PATs with fine-grained access control (#61098)

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit 87ccf10ffe)

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
2023-01-11 11:11:45 +00:00
Grot (@grafanabot) dbaaf0da39 [v9.2.x] remove splunk plugin from legacyRunner check (#61180)
remove splunk plugin from legacyRunner check (#60979)

(cherry picked from commit 7db284cfcb)

Co-authored-by: Taewoo K <taewoo.kim@grafana.com>
2023-01-10 10:45:28 +01:00
Grot (@grafanabot) 586908a43f [v9.2.x] Canvas: Inconsistent save behavior (#61012)
Canvas: Save element placement (#61007)

(cherry picked from commit 88a8cba6b0)

Co-authored-by: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
2023-01-09 11:09:31 -05:00
Esteban Beltran 921cdb0d4b Docs: Add source code url field description in publish a plugin documentation (#61080) (#61133) 2023-01-09 10:50:00 +01:00
Jack Baldry e50f648676 [v9.2.x] remove _build param from whatsnew (#59236) (#60888)
remove `_build` param from whatsnew (#59236)

* remove `_build` param from whatsnew

* Update whats-new-in-v9-3.md

Co-authored-by: Robby Milo <robbymilo@fastmail.com>
2023-01-03 15:51:47 +00:00
Emil Tullstedt 70ceefa464 [v9.2.x] Chore: Upgrade Go to 1.19.4 (#60794) (#60826) 2022-12-30 11:51:14 +01:00
Grot (@grafanabot) 596ba76332 [v9.2.x] Alerting: Prevent uid collision in migration when db is case-insensitive (#60834)
Alerting: Prevent uid collision in migration when db is case-insensitive (#60494)

* Alerting: Prevent short uid collision in legacy migration when db is case-insensitive

Two factors come into play that cause sporadic uid conflicts during legacy alert migration:
- MySQL and MySQL-compatible backends use case-insensitive collation.
- Our short uid generator is not a uniform RNG and generates uids in such a way that generations in quick succession have a higher probability of creating similar uids.

Normally we would be guaranteed unique short uid generation, however if the source alphabet contains
duplicate characters (for example, if we use case-insensitive comparison) this guarantee is void.

Generating even ~1000 uids in quick succession is nearly guaranteed to create a case-insensitive
duplicate.

(cherry picked from commit 570b62091c)

Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>
2022-12-29 16:15:42 -05:00
ismail simsek 3863c0d4ba [v9.2.x] Prometheus: Fix Instant query time calculation (#60821)
Prometheus: Fix Instant query time calculation (#60815)

* Use single point in time instead of doing time range calculation

* Comment update

(cherry picked from commit 15d32546ea)
2022-12-29 17:22:30 +01:00
Grot (@grafanabot) ecd1f03a65 [v9.2.x] BarChart: Clear tooltip when cursor exits bar (#60748)
BarChart: Clear tooltip when cursor exits bar (#60617)

(cherry picked from commit 9bd6e471e4)

Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
2022-12-23 14:12:46 -05:00
Grot (@grafanabot) 6fa3d993fa [v9.2.x] Add copyright notice (#60662)
* Add copyright notice (#60658)

* Create copyright

* add copyright notice

(cherry picked from commit c7671b6d1d)

* yarn run prettier:write

(cherry picked from commit 160ea3e262)
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

Co-authored-by: Eve Meelan <81647476+Eve832@users.noreply.github.com>
Co-authored-by: dsotirakis <dimitrios.sotirakis@grafana.com>
2022-12-23 10:02:52 +00:00
Grot (@grafanabot) 32cb54d2a3 [v9.2.x] Alerting: Set Dashboard and Panel IDs on rule group replacement (#60443)
Alerting: Set Dashboard and Panel IDs on rule group replacement (#60374)

* Set Dashboard and Panel IDs on rule group replacement

* fix comments and abbreviate test variable name

* Update pkg/services/ngalert/provisioning/alert_rules.go

Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com>

Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com>
(cherry picked from commit 174c61b949)

Co-authored-by: Alex Moreno <alexander.moreno@grafana.com>
2022-12-16 12:33:11 +01:00
Grot (@grafanabot) cdb21a3717 [v9.2.x] Graphite: bug fix, strip white space from queries before comparing them (#60348)
Graphite: bug fix, strip white space from queries before comparing them (#60133)

strip white space from queries before comparing them

(cherry picked from commit d5d07894b1)

Co-authored-by: Brendan O'Handley <brendan.ohandley@grafana.com>
2022-12-14 11:52:33 -05:00
Isabella Siu 796e2e020c Cloudwatch: Fix deeplink with default region (#60260) (#60273)
Cloudwatch: fix deeplink with default region
(cherry picked from commit d6bb2a7493)
v9.2.8
2022-12-13 16:54:08 -05:00
Alexa V d7dcea71ea [v9.2.x] Snapshots: Build snapshot originalUrl on the backend (#60232) (#60256)
Co-authored-by: kay delaney <kay@grafana.com>
2022-12-13 17:43:53 +01:00
Jack Baldry 3c68684dd2 [v9.2.x] Use relative aliases for all non-current Grafana aliases (#60113)
* Use relative aliases for all non-current Grafana aliases

Prevents non-latest documentation "stealing" the page away from latest
and through permanent redirects for latest pages that no longer exist.

The redirected pages are indexed by search engines but our robots.txt
forbids them crawling the non-latest page.

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* Remove all current page aliases

find docs/sources -type f -name '*.md' -exec sed -z -i 's#\n *- /docs/grafana/next/[^\n]*\n#\n#' {} \;
find docs/sources -type f -name '*.md' -exec sed -z -i 's#\n *- /docs/grafana/latest/[^\n]*\n#\n#' {} \;
find docs/sources -type f -name '*.md' -exec sed -Ez -i 's#\n((aliases:\n *-)|aliases:\n)#\n\2#' {} \;

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
2022-12-12 08:23:37 -04:00
Grot (@grafanabot) daad3c97b7 [v9.2.x] Fix branch filter for release workflows (#60123)
Fix branch filter for release workflows (#59963)

Ensures the workflow is run on every push to all version branches.

This was thought to be working because it was tested with a manual
dispatch, however, that trigger does not consider filters and was not
an accurate test.

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit 6f9ee7acf9)

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
2022-12-09 15:18:44 -04:00
Grot (@grafanabot) 27cb7982c3 [v9.2.x] Fix index out of range in regenerateLinksSupplier (#60069)
Fix index out of range in regenerateLinksSupplier (#60011)

(cherry picked from commit 896cb9ddce)

Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
2022-12-09 02:21:37 -05:00
Daniel Lee c0feee3801 [v9.2.x] UsageInsights: Record events for Explore queries (#59992)
* UsageInsights: Record events for Explore queries (#59931)

* usageinsights: record events for Explore queries

* usageinsights: make the source field optional

It is not logical to have it for an event like the dashboard-view

* usageinsights: add comment to Explore test

Explain why we are reversing a previous decision

(cherry picked from commit 74167b4d44)

* usageinsights: fix merge conflict

* Empty-Commit to trigger build

* usageinsights: fix broken tests after merge
2022-12-08 00:13:59 +01:00
Ieva 1b29543b64 Auth: Logger for user remote cache (#59961)
add logger
2022-12-07 09:58:57 -05:00
Carl Bergquist 95d2adf251 [9.2.x] Backport Contexthandler: Add uname as response header #59930 (#59950)
* Contexthandler: Add uname as response header (#59930)

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

* fixes tests broken due to moved featuremgt package

Signed-off-by: bergquist <carl.bergquist@gmail.com>

Signed-off-by: bergquist <carl.bergquist@gmail.com>
2022-12-07 15:27:34 +01:00
Grot (@grafanabot) 6c73fd2635 [v9.2.x] Plugins: Add username to datasource plugin logging (#59947)
Plugins: Add username to datasource plugin logging (#59893)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Signed-off-by: bergquist <carl.bergquist@gmail.com>
(cherry picked from commit a5ace56be8)

Co-authored-by: Carl Bergquist <carl.bergquist@gmail.com>
2022-12-07 13:43:35 +01:00
Jo 2919588a82 Auth: Session cache [v9.2.x] (#59907)
* add cache wrapper

only cache token if not to rotate

Co-authored-by: Kalle Persson <kalle.persson@grafana.com>

anticipate next rotation

Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>
Co-authored-by: Kalle Persson <kalle.persson@grafana.com>
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
(cherry picked from commit 07a4b2343d59cb593ad128355e1d9217ba493700)

* FeatureToggle: for storing sessions in a Remote Cache

Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>
(cherry picked from commit b8a8c15148)

* use feature flag for session cache

* ensure ttl is minimum 1 second

Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>
Co-authored-by: Kalle Persson <kalle.persson@grafana.com>
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>

* ensure 2 ttl window to prevent caching of tokens near rotation

Co-authored-by: Kalle Persson <kalle.persson@grafana.com>

* fix description of toggle

Co-authored-by: gamab <gabi.mabs@gmail.com>
Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>
Co-authored-by: Kalle Persson <kalle.persson@grafana.com>
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
2022-12-07 10:04:05 +01:00
Gabriel MABILLE 91b15eed1a FeatureToggle: for storing signed in user object in a Remote Cache (#59883)
* FeatureToggle: for storing sessions in a Remote Cache

Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>

* Fix conflicting modifications :D

Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>

* rename the flag to userRemoteCache

* undo unintended change

* Users: Add option to use remote cache for SignedInUsers (#59892)

* Add remote cache to GetSignedInUserWithCacheCtx

Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>

* Populate SignedInUser remote cache

Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>

* Line

* minor fixes to make this work

Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>

* Fix tests

* change flag to updated name

Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>

Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>
2022-12-07 08:58:15 +01:00
Serge Zaitsev 3c86bf550e [v9.2.x] Chore: Add encryption codec to the remote cache (#59871) (#59896)
* add encryption codec to the remote cache

* change config files too

* fix test constructor

* pass codec into the test cache

(cherry picked from commit f1fb202284)
2022-12-06 17:09:24 +01:00
Carl Bergquist 8c15be99f5 [9.2.x] Instrumentation: Log plugin and datasource info for each plugin request. (#59882)
Signed-off-by: bergquist <carl.bergquist@gmail.com>
2022-12-06 16:11:09 +01:00
Serge Zaitsev b221e8cac9 [v9.2.x] Chore: Remote cache key prefix (#59838) (#59877)
Chore: Remote cache key prefix (#59838)

* attempt to implement a remote cache key prefix

* add a test for the prefix store

* oh, linter

(cherry picked from commit 3978502d83)
2022-12-06 15:16:36 +01:00
Gabriel MABILLE efc69a08fa FIX: Remove service accounts from quota count (#59878) 2022-12-06 14:09:25 +01:00
Grot (@grafanabot) e7e20a300d [v9.2.x] AzureMonitor: Automate location retrieval (#59810)
* AzureMonitor: Automate location retrieval (#59602)

* Automate location retrieval

- Add function to retrieve provider information
- Add function to retrieve subscription locations
- Add parsers for each function
- Add types
- Update resourcePickerData with new functions
- Remove old location metadata file

* Improve types

- Add types for responses
- Use correct name parameter
- Update response parser (parseProvider unnecessary)

* Fix tests

- Add necessary mocks

* Fix logic and ensure maps are consistent

* Add tests

* Review

* Lint issue

(cherry picked from commit c52d4e2a64)

* Lint issues

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2022-12-05 08:01:31 -05:00
Grot (@grafanabot) 74ec072a96 [v9.2.x] Restrict workflow to grafana/grafana repository (#59755)
Restrict workflow to grafana/grafana repository (#59740)

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit e7bdcb4ba8)

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
2022-12-02 17:30:35 -04:00
matt abrams b6e12f2723 DataLinks: Backport 58934 to v9.2.x (#59457)
* manual backport

* manual backport
2022-12-02 07:00:23 -10:00
Karl Persson 3148a918ce [v9.2.x] DataSourcePermissions: Handle licensing properly for ds permissions (#59711)
DataSourcePermissions: Handle licensing properly for ds permissions (#59694)

* RBAC: add viewer grand if dspermissions enforcement is not enabled

* RBAC: Change permissions based on role prefix

* RBAC: Add option to for permission service to add a license middleware

* RBAC: Remove actions from query struct

(cherry picked from commit 6d1bcd9f40)
2022-12-02 14:07:20 +01:00
Grot (@grafanabot) c0e7cb2bc1 [v9.2.x] AzureMonitor: Fix panic from empty response in ARG (#59706)
AzureMonitor: Fix panic from empty response in ARG (#59691)

AzureMonitor: Avoid panic from empty response in ARG
(cherry picked from commit 231b5b587c)

Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
2022-12-02 13:55:51 +01:00
Grot (@grafanabot) 3a1b15c602 [v9.2.x] Automate docs publishing steps (#59565)
* Automate docs publishing steps (#59550)

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit 10a83714c8)

* Remove dependency on test job (#59575)

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* Fix release_branch_regexp (#59590)

Apparently the non-capturing group was incorrect.

I verified the logic in a branch in grafana-github-actions:
https://github.com/grafana/grafana-github-actions/compare/jdb/2022-11-prove-grafana-regexp-behaves-correctly?expand=1

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
2022-11-30 13:13:22 -04:00
Jo 516407dad2 [v9.2.x] Sessions: Remove invalid session cookie if it's invalid/expired/missing (#59588)
only remove invalid session cookie if it's invalid/expired/missing

(cherry picked from commit 270a893e12)
2022-11-30 16:50:49 +01:00
Grot (@grafanabot) 903ff4ef5e [v9.2.x] Datasources: Use context logger in cache service (#59557)
Datasources: Use context logger in cache service (#59547)

(cherry picked from commit 0fca3cf9dd)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
2022-11-30 08:42:21 -05:00
Grot (@grafanabot) 6e5880c432 [v9.2.x] Fix: Unlocking the UI for AuthProxy users (#59529)
Fix: Unlocking the UI for AuthProxy users (#59507)

Unlocking the UI for AuthProxy users

Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>

Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
(cherry picked from commit 5bb99775bb)

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
2022-11-30 12:49:21 +01:00
Dimitris Sotirakis 7c4bcef971 [v9.2.x] Docs: Remove publish.yml (#59536)
Remove publish.yml
2022-11-30 04:50:46 -05:00
George Robinson c4e4bfe257 Backport Fix XSS in runbook URL (#681) to v9.2.x (#683)
(cherry picked from commit db1548c1491c2f5b522e3c0ceb1832b914a4b2f0)
(cherry picked from commit 3135a81edf0ebeb575c95560dd548f9589c14d02)
(cherry picked from commit fe17b64445)
2022-11-30 11:06:39 +02:00
Dimitris Sotirakis 34f0068875 [v9.2.x] Changelog: Updated changelog for 9.2.7 (#59525) (#59528)
Changelog: Updated changelog for 9.2.7 (#59525)

(cherry picked from commit 312dbc979e)

Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
2022-11-30 10:50:57 +02:00
Grot (@grafanabot) 048e200a68 Release: Bump version to 9.2.8 (#59526)
"Release: Updated versions in package to 9.2.8"
2022-11-30 10:35:33 +02:00
Grot (@grafanabot) c98714f77f [v9.2.x] Docs: Add docs for labels with dots (#59486)
Docs: Add docs for labels with dots (#59352)

(cherry picked from commit c8c1499cd0)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2022-11-29 13:38:16 +00:00
Grot (@grafanabot) ac9819bfa5 [v9.2.x] Fix: Allow creating snapshot with no dashboard id (#59465)
Fix: Allow creating snapshot with no dashboard id (#58669)

(cherry picked from commit d279b6d7b0)

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
2022-11-29 10:09:08 +01:00
Grot (@grafanabot) 6b4394d8e6 [v9.2.x] SQL Datasources: Fix annotation migration (#59454)
SQL Datasources: Fix annotation migration (#59438)

(cherry picked from commit 71e4a8261d)

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
2022-11-29 01:25:25 -06:00
Marcus Efraimsson 9b7ad3d663 [v9.2.x] SSE: Make sure to forward headers, user and cookies/OAuth token (#58897) (#59430)
SSE: Make sure to forward headers, user and cookies/OAuth token (#58897)

Fixes #58793 and Fixes https://github.com/grafana/azure-data-explorer-datasource/issues/513

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

Co-authored-by: Kyle Brandt <kyle@grafana.com>
2022-11-28 19:06:59 +01:00
George Robinson 8bb5b17692 Docs: Improve docs for images in notifications (#59033) (#59404)
(cherry picked from commit 0af3515e95)
2022-11-28 19:06:41 +01:00
Grot (@grafanabot) 12fc64b389 [v9.2.x] BarChart: fix hover overlay for hz stacked (#59397)
BarChart: fix hover overlay for hz stacked (#59359)

(cherry picked from commit 13d5ad2ce2)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
2022-11-28 09:00:33 -05:00
Grot (@grafanabot) 052fd5713d [v9.2.x] Navigation: Fix crash when Help is disabled (#59375)
Navigation: Set navtree to  an empty array instead of null (#58919)

set navtree to  an empty array instead of null

(cherry picked from commit 4aa5dea96b)

Co-authored-by: Leo <108552997+lpskdl@users.noreply.github.com>
2022-11-28 06:54:07 -05:00