Commit Graph

39351 Commits

Author SHA1 Message Date
Timur Olzhabayev 7df263ff2e Fixing plugin signing docs for the current latest version (#62755)
* Fixing plugin signing docs for the current latest version

* Deleting a file that should not have been there?
2023-02-02 11:10:29 +01:00
Grot (@grafanabot) fa1b189beb [v9.3.x] Fix/60084/save and test (#62749)
Fix: Save and test error message does not persist across datasource instance settings anymore

(cherry picked from commit ce50168b70)

Co-authored-by: Timur Olzhabayev <timur.olzhabayev@grafana.com>
2023-02-02 09:02:40 +00:00
Grot (@grafanabot) e7c8704090 [v9.3.x] Server: Switch from separate server & cli to a unified grafana binary (#62443)
* Server: Switch from separate server & cli to a unified grafana binary (#58286)

* avoid the need for a second bulky binary for grafana-cli

* look for grafana-server in $PATH as well as same directory

* implement unified "grafana" command

* update dockerfiles, fix grafana-cli -v

* update packaging to work with single binary

- add wrapper scripts for grafana and grafana-server
- update and sync package files
- implement --sign flag of build package command
- stop packaging scripts folder, they are not useful for end users
- add support for --configOverrides in server command
- remove unused nfpm.yaml config file

* windows support

(cherry picked from commit de99ce139c)

* Build: don't remove grafana-server and grafana-cli binaries from deb and rpm packages (#59890)

* don't remove grafana-server and grafana-cli binaries from /usr/share/grafana/bin in deb and rpm packages

* don't add config overrides in /usr/sbin/grafana-server

---------

Co-authored-by: Dan Cech <dcech@grafana.com>
2023-02-02 10:41:18 +02:00
Isabella Siu d3a33de503 Cloudwatch: Fix log group variable interpolation (#62640) (#62722)
(cherry picked from commit 1f09508d8c)
2023-02-01 14:53:13 -05:00
Grot (@grafanabot) e08bfdfcf6 [v9.3.x] docs: fix broken elasticsearch metrics play link (#62718)
docs: fix broken elasticsearch metrics play link (#62715)

fix broken elastic search play link

(cherry picked from commit 1225e8d6d8)

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
2023-02-01 12:04:19 -06:00
Gilles De Mey a31430a3dd Alerting: hide "silence" button for external AM setups (#62133) (#62693) 2023-02-01 15:25:37 +00:00
Grot (@grafanabot) e1999d51cd [v9.3.x] Docs: Fix OSS typo (#62631)
Docs: Fix OSS typo (#60131)

fix OSS typo

(cherry picked from commit ca3c4bb50f)

Co-authored-by: matt abrams <37156449+zuchka@users.noreply.github.com>
2023-01-31 19:40:43 +00:00
ismail simsek ead3a002df [v9.3.x] Expressions: Fixes the issue showing expressions editor (#62627)
Expressions: Fixes the issue showing expressions editor (#62510)

* Use suggested value for uid

* update the snapshot

* use __expr__

* replace all -100 with __expr__

* update snapshot

* more changes

* revert redundant change

* Use expr.DatasourceUID where it's possible

* generate files

(cherry picked from commit 91221bc436)
2023-01-31 14:31:33 -05:00
Grot (@grafanabot) 4d450ab910 [v9.3.x] GrafanaUI: Add disabled option for menu items (#62612) 2023-01-31 18:10:50 +01:00
George Robinson 1c6fcb8ed4 Alerting: Validate that tags are 100 characters or less (#62335) (#62594)
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
(cherry picked from commit 0dacb11a12)
2023-01-31 14:39:56 +00:00
Grot (@grafanabot) a63895ff24 [v9.3.x] Tempo: Fix span name being dropped from the query (#62592)
Tempo: Fix span name being dropped from the query (#62257)
(cherry picked from commit c3b476e1dc)
Co-authored-by: Hamas Shafiq <hamas.shafiq@grafana.com>
2023-01-31 14:31:08 +00:00
Grot (@grafanabot) df86048b6d [v9.3.x] AzureMonitor: Fix dimension migration (#62578)
AzureMonitor: Fix dimension migration (#62485)

Remove unneeded properties post migration

(cherry picked from commit f77853f91e)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2023-01-31 12:48:45 +00:00
Grot (@grafanabot) aaa2a821ae [v9.3.x] Plugins: Fix circular reference in customOptions leading to MarshalJSON errors (#62564)
Plugins: Fix circular reference in customOptions leading to MarshalJSON errors (#62328)

* Plugins: test ds.JsonData.MarshalJSON()

* CustomOptions: copy to avoid cyclic marshal

(cherry picked from commit c41f97029e)

Co-authored-by: Yasir Ekinci <ekinci.yasir@gmail.com>
2023-01-31 13:28:59 +01:00
Emil Tullstedt 267d53a56a [v9.3.x] Login: Fix panic when UpsertUser is called without ReqContext (#62571)
* Login: Fix panic when UpsertUser is called without ReqContext (#62539)

(cherry picked from commit b1151dd118)

* login->models
2023-01-31 13:22:09 +01:00
Shirley 575f3bd49c [v9.3.x] CloudWatch: Use grafana-aws-sdk v0.12.0 (#62085)
CloudWatch: Use grafana-aws-sdk v0.12.0 (#62007)

(cherry picked from commit cd86758a35)
2023-01-30 14:17:25 +00:00
Grot (@grafanabot) 31971fab4f [v9.3.x] Replace ambiguous relrefs with partial URIs to prevent 404s (#62472)
Replace ambiguous relrefs with partial URIs to prevent 404s (#62468)

* Replace ambiguous relrefs with partial URIs to prevent 404s

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

* Fix local builds that depend on latest content

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

* Fix broken relref

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

---------

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

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
2023-01-30 12:53:32 +00:00
Grot (@grafanabot) 57ad341af1 [v9.3.x] Time Series Panel: Fix legend text selection in Firefox (#62451)
Time Series Panel: Fix legend text selection in Firefox (#60809)

Add user-select property to legend items.

(cherry picked from commit 38d7168921)

Co-authored-by: Kyle Cunningham <codeincarnate@users.noreply.github.com>
2023-01-30 10:32:30 +00:00
Sven Grossmann bac45b3aee [9.3.x] Logs: Fix stats not being updated when log results change #62317 (#62449)
Logs: Fix stats not being updated when log results change (#62317)

update stats in logdetails

(cherry picked from commit ae8c61c0b2)
2023-01-30 05:11:18 -05:00
Grot (@grafanabot) 7ee08a5c50 [v9.3.x] Auth: Fix catch both both ErrInvalidAPIKey for context with APIKey (#62206)
Auth: Fix catch both both ErrInvalidAPIKey for context with APIKey (#62193)

* fix: capture both ErrInvalidAPIKey

* rename of variable

(cherry picked from commit c5cb5be3cc)

Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
2023-01-30 08:59:16 +00:00
Grot (@grafanabot) 4da046bde5 [v9.3.x] CloudWatch: Add missing AWS/DX metric (#62442)
CloudWatch: Add missing AWS/DX metric (#62405)

(cherry picked from commit 2ff715cb7a)

Co-authored-by: Jan Garaj <jan.garaj@gmail.com>
2023-01-30 08:40:57 +00:00
Grot (@grafanabot) f966a06342 [v9.3.x] docs: clarify note re export dashboard as PDF (#62399)
docs: clarify note re export dashboard as PDF (#62398)

clarify note re export dashboard as PDF

Update note under Export dashboard as PDF to indicate that it's only available on Enterprise and Cloud, as well as which version of Enterprise it's available on.

(cherry picked from commit 290f23a50b)

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
2023-01-27 13:53:41 -06:00
Grot (@grafanabot) ca772d2fbe [v9.3.x] Move Grafana tutorials from grafana/tutorials repository (#62360)
Move Grafana tutorials from grafana/tutorials repository (#62309)

* Add Grafana tutorials originally from tutorials repository

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

* Replace tutorials/step shortcode with ordinary headings

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

* Fix typos reported by codespell

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

* Fix doc-validator linting and run prettier

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

* Specify version in tutorials lookup as non-rendered pages do not have a relative permalink used to infer the version

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

* Use latest version

Ensures CI passes and only breaks one website build as the backport to
v9.3.x will solve the missing "latest" pages on publishing.

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

---------

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

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
2023-01-27 17:58:07 +00:00
Grot (@grafanabot) 6e8be826ba [v9.3.x] StateTimeline: Show correct legend label when value mappings set (#62312)
StateTimeline: Show correct legend label when value mappings set (#62282)

* StateTimeline: Show correct legend label when value mappings set

* Add test dashboard for thresholds and value mappings

* run stripnulls.sh

(cherry picked from commit 846acd28ff)

Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
2023-01-27 14:53:45 +00:00
dsotirakis 12ddd7294a go mod tidy 2023-01-27 16:25:05 +02:00
Dimitris Sotirakis 58ea79a30b [v9.3.x] Docs: Update whats new link (#62240)
* Update what's new link

* yarn install

* Fix link to whatsnew

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>
2023-01-27 15:25:09 +02:00
Grot (@grafanabot) 61ff98096d [v9.3.x] Changelog: Updated changelog for 9.3.6 (#62234)
Changelog: Updated changelog for 9.3.6 (#62231)

(cherry picked from commit 0cd14091c4)
2023-01-26 17:29:46 +02:00
Grot (@grafanabot) ee1556e4fa [v9.3.x] QueryEditorRow: Fixes issue loading query editor when data source variable selected (#62180)
QueryEditorRow: Fixes issue loading query editor when data source variable selected (#61927)

* QueryEditorRow: Fixes issue loading query editor when data source variable selected

* Fix func name

* Removed wait

* restore waiting for with better check

* restore waiting for with better check

(cherry picked from commit 9f7ddf1f0b)

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
2023-01-26 13:16:20 +01:00
Horst Gutmann 8e3111aa47 Merge 'v9.3.x' into v9.3.x 2023-01-26 12:42:21 +01:00
Grot (@grafanabot) 6991330eda [v9.3.x] Encryption: Cache new DEKs (only) after a caution period (#62177)
Encryption: Cache new DEKs (only) after a caution period (#60664)

* Encryption: Cache new DEKs (only) after commit

* Fix typo

* Update secrets manager tests with new failing case

* Update secrets manager tests with new clarifications (comments)

* Correct broken method calls

* Unify methods

* Cache data keys only after a caution period

* Caution period for data keys caching only for encrypt ops

(cherry picked from commit c4e067d49d)

Co-authored-by: Joan López de la Franca Beltran <5459617+joanlopez@users.noreply.github.com>
2023-01-26 11:31:42 +01:00
Victor Marin 7ea31b5173 [v9.3.x] Fix Barchart legend calcs when stacking is percent (#62176)
Fix Barchart legend calcs when stacking is percent (#61449)

* Fix Barchart legend calcs when stacking is percent

* doc change

* Refactor + tests

(cherry picked from commit ab7a4e5f28)
2023-01-26 10:02:22 +00:00
Dimitris Sotirakis 613940a0c8 [v9.3.x] Remove github automations when publishing (#62099)
Remove github automations
2023-01-26 09:28:46 +02:00
Nathan Marrs 1c8a50b369 [v9.3.x] SVG: Add dompurify preprocessor step (#62157)
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
(cherry picked from commit 8b574e22b5)
2023-01-25 13:30:53 -08:00
Grot (@grafanabot) c69fb85c7e [v9.3.x] add export customHeadersSettings component (#62141)
add export customHeadersSettings component (#62131)

(cherry picked from commit 069dc2d357)

Co-authored-by: Taewoo K <taewoo.kim@grafana.com>
2023-01-25 14:03:43 -05:00
Grot (@grafanabot) e7e110c140 [v9.3.x] Oauth: Remove extra decoding of redirect url (#60878)
Oauth: Remove extra decoding of redirect url (#60875)

Oauth: remove extra decoding of redirect cookie url
(cherry picked from commit 5b4e1ee6fc)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
2023-01-25 15:16:28 +00:00
Grot (@grafanabot) f938fc9d0d [v9.3.x] Add reference to Google OAuth docs (#61067)
Add reference to Google OAuth docs (#61048)

(cherry picked from commit 7582e77d25)

Co-authored-by: linoman <2051016+linoman@users.noreply.github.com>
2023-01-25 11:12:13 +01:00
Grot (@grafanabot) 0d00936ba7 Release: Bump version to 9.3.5 (#62074)
"Release: Updated versions in package to 9.3.5"
2023-01-25 11:49:04 +02:00
Grot (@grafanabot) 5736569768 [v9.3.x] Changelog: Updated changelog for 9.3.4 (#62068)
Changelog: Updated changelog for 9.3.4 (#62067)

(cherry picked from commit 8c3e4487ba)
2023-01-25 11:38:33 +02:00
Esteban Beltran 594b5cdd95 Docs: Update publish a plugin FAQ to cover more common questions (#62… (#62063) 2023-01-25 10:04:22 +01:00
Grot (@grafanabot) 9be71e5175 [v9.3.x] Docs: corrects broken link to v9.0 docs (#62036)
Docs: corrects broken link to v9.0 docs (#62035)

corrects broken link to v9.0 docs

(cherry picked from commit 0f93548ac4)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
2023-01-24 14:37:09 -06:00
Grot (@grafanabot) 9d5b13b565 [v9.3.x] Explore: Be sure time range key bindings are mounted after clear (#62020)
Explore: Be sure time range key bindings are mounted after clear (#61892)

* Add list of bindings for updating on change

* Revert "Add list of bindings for updating on change"

This reverts commit 092707371d.

* Clear keybindings before component render

(cherry picked from commit 6ab79c4fba)

Co-authored-by: Kristina <kristina.durivage@grafana.com>
2023-01-24 11:33:45 -06:00
Grot (@grafanabot) 47f924d915 [v9.3.x] Datasources: Fix Proxy by UID Failing for UIDs with a Hyphen (#62011)
Datasources: Fix Proxy by UID Failing for UIDs with a Hyphen (#61723)

Fix Proxy by UID Failing for UIDs with a Hyphen

Hyphens are allowed in short IDs but not picked up by the
proxyPathRegexp. This caused the end of the uid to be proxied as part of
the path to the backing datasource which would usually cause a 404.

(cherry picked from commit f85d072c17)

Co-authored-by: Chris Marchbanks <csmarchbanks@gmail.com>
2023-01-24 16:32:36 +00:00
Grot (@grafanabot) 73a881c954 [v9.3.x] Docs: prose and format updates (#61996)
Docs: prose and format updates (#61720)

* wording and format updates

* corrects typo

(cherry picked from commit 12a4a83c77)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
2023-01-24 10:05:19 -06:00
Grot (@grafanabot) 77b7420f54 Release: Bump version to 9.3.5 (#729)
"Release: Updated versions in package to 9.3.5"
2023-01-24 16:06:00 +01:00
Jo ecf4e45659 Auth: Update saml go.mod (missing query sig verification) [9.3.x] (#712)
* update saml go.mod (missing query sig verification)

(cherry picked from commit 1e1dbd1a06455a451d722856dc619b2a7c78e2c0)

* fix sync
v9.3.4
2023-01-24 15:03:52 +01:00
Nathan Marrs c9c7f0d653 [v9.3.x] SVG: Add dompurify preprocessor step (#698) (#703)
* SVG: Add dompurify preprocessor step (#698)

* add sanitized SVG component

(cherry picked from commit dbbe819368f507b9493b7a3cf6e080a5dd752b3e)

* Remove added file

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
2023-01-24 15:03:51 +01:00
Misi 56cb8a6ee8 [v9.3.x] Update grafana/saml library (#690)
SAML: update grafana/saml

Co-authored-by: linoman <2051016+linoman@users.noreply.github.com>
2023-01-24 15:03:50 +01:00
Dominik Prokop 384eaed327 Snapshots: Fix originalUrl spoof security issue (#675)
(cherry picked from commit 91dc90ba633a4c96236ab1761c408d8f1b7a8e06)
2023-01-24 15:03:49 +01:00
Kevin Minehart ad08393729 [v9.3.x] Packaging: Use base64 key (#61823)
backport

Co-authored-by: Julien Duchesne <julien.duchesne@grafana.com>
2023-01-24 14:01:16 +00:00
Grot (@grafanabot) 14eb47f749 [v9.3.x] Docs: Update index.md to not escape dollar sign (#61960)
Docs: Update index.md to not escape dollar sign (#61694)

Update index.md to not escape dollar sign

the backslash is useful in json files, but not where most users will see it

(cherry picked from commit 3146740d82)

Co-authored-by: jeremybanzhaf <88380596+jeremybanzhaf@users.noreply.github.com>
2023-01-23 16:01:44 -06:00
Ryan McKinley 816923e94d TextPanel: Refactor to functional component (#60885) (#61937)
(cherry picked from commit 8b50c60342)
2023-01-23 14:45:13 -06:00