Compare commits

..

117 Commits

Author SHA1 Message Date
Grot (@grafanabot)
e927a6459f Release: Bump version to 8.5.20 (#721)
"Release: Updated versions in package to 8.5.20"
2023-01-11 14:45:55 +02:00
Horst Gutmann
6c249ec607 [v8.5.x] Remove duplicate code change (#719) 2023-01-09 18:12:28 +01:00
Nathan Marrs
5f3ca5be07 [v8.5.x] SVG: Add dompurify preprocessor step (#707)
* SVG: Add dompurify preprocessor step (#698)

* add sanitized SVG component

(cherry picked from commit dbbe819368f507b9493b7a3cf6e080a5dd752b3e)

* Remove unused import to fix build

* Fix lint issues

* Remove additional class handling as not needed

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
2023-01-09 17:02:38 +01:00
kay delaney
62dd2999f0 Snapshots: Fix originalUrl spoof security issue (#671) 2023-01-09 17:02:34 +01:00
Misi
cd9a734f64 [v8.5.x] Update grafana/saml library (#687)
SAML: update grafana/saml

Co-authored: Jo <joao.guerreiro@grafana.com>

Co-authored-by: linoman <2051016+linoman@users.noreply.github.com>
2023-01-09 16:59:24 +01:00
Esteban Beltran
f5301859e0 Docs: Add source code url field description in publish a plugin documentation (#61080) (#61138) 2023-01-09 10:50:41 +01:00
Jack Baldry
4cacab01f4 [v8.5.x] Use relative aliases for all non-current Grafana aliases and remove current page latest aliases (#60062) (#61032)
* Use relative aliases for all non-current Grafana aliases

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/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>
2023-01-05 14:29:40 +00:00
Grot (@grafanabot)
246b9cc82c [v8.5.x] Remove packages path from branch filter (#60944)
Remove packages path from branch filter (#60128)

That directory is no longer used in published docs and causes this
workflow to fail when changes only affect the packages directory.

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

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

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
2023-01-04 10:40:59 +00:00
Emil Tullstedt
df7504737a [v8.5.x] Chore: Upgrade Go to 1.19.4 (#60794) (#60824) 2022-12-30 11:50:37 +01:00
Grot (@grafanabot)
aaa4698064 [v8.5.x] Add copyright notice (#60659)
* 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:01:31 +00:00
Dominik Prokop
7880990c5f [v8.5.x] Snapshots: Build snapshot originalUrl on the backend (#60232) (#60245)
Co-authored-by: kay delaney <kay@grafana.com>
Co-authored-by: Alexandra Vargas <alexa1866@gmail.com>
2022-12-13 17:43:42 +01:00
Grot (@grafanabot)
b8f9d46328 [v8.5.x] Fix branch filter for release workflows (#60120)
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:39:48 -04:00
Grot (@grafanabot)
669ff8909a [v8.5.x] Restrict workflow to grafana/grafana repository (#59753)
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:29:38 -04:00
Grot (@grafanabot)
f954b4c03d [v8.5.x] Automate docs publishing steps (#59563)
* 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 15:04:33 -04:00
Emil Tullstedt
14273c598c [v8.5.x] Chore: Upgrade go-sqlite3 to v1.14.16 (#58696)
Chore: Upgrade go-sqlite3 to v1.14.16
2022-11-22 10:50:12 +00:00
Jo
4e4f4218d1 Fix: Email and username trimming and invitation validation (#58449)
* Trim leading and trailing whitespaces from email and username on signup

* Check whether the provided email address is the same as where the invitation sent

Co-authored-by: Mihaly Gyongyosi <mgyongyosi@users.noreply.github.com>
2022-11-14 13:13:06 +01:00
Garrett Guillotte
5facdc6510 [v8.5.x] Docs: Add document for jsondata field alertmanagerUid (#57118)
* Add document for jsondata field `alertmanagerUid` (#52895)

alertmanagerUid can be used to specify Alert Manager for a particular Prometheus/Loki data source.

Co-authored-by: Garrett Guillotte <garrett.guillotte@grafana.com>

* Docs: Fix provisioning table formatting (#57042)

Co-authored-by: Vũ Quốc Phong <phong.vq.198@gmail.com>
2022-11-14 10:55:43 +01:00
Karl Persson
4cfb76b4bc [v8.5.x] Omit error from http response (#58453) 2022-11-14 09:42:58 +01:00
Will Browne
d25246ca15 resolve conflicts (#58466)
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
2022-11-08 12:42:56 -05:00
Grot (@grafanabot)
f31ba9a34f "Release: Updated versions in package to 8.5.16" (#58457) 2022-11-08 10:53:13 -05:00
Emil Tullstedt
62c41e99b8 Chore: Upgrade Go to 1.19.3 (#58070) 2022-11-07 15:07:24 +01:00
Karl Persson
360994050c [v8.5.x] Login email before username (#57408)
* Add test for username/login field conflict

* Swap order of login fields

Co-authored-by: linoman <2051016+linoman@users.noreply.github.com>
2022-10-21 14:14:00 +02:00
Emil Tullstedt
656e270bd9 Chore: Upgrade Go to 1.19.2 (#56857)
We also need to upgrade the linter together with the Go version, all the changes should relate to either fixing linting problems or upgrading the Go version used to build Grafana.
2022-10-13 14:53:51 +02:00
Grot (@grafanabot)
9e70696f09 "Release: Updated versions in package to 8.5.15" (#56707) 2022-10-11 09:07:29 -04:00
Sofia Papagiannaki
58b7ae14ce [v8.5.x] Chore: Release 8.5.14 (#56698)
* remove support for v1

(cherry picked from commit 8630a7a991af74edc4030f57d37a4bc263202fde)

* Security: Make proxy endpoints not leak sensitive HTTP headers

Fixes CVE-2022-31130

(cherry picked from commit 2974574a53ab6d26be7b706e76271173a91fea3a)

* Security: Fix do not forward login cookie in outgoing requests

(cherry picked from commit 54a32fc83b233f5910495b5fcca0b4f881221538)

* Add test for username/login field conflict

(cherry picked from commit 7aabcf2694)

* Swap order of login fields

(cherry picked from commit 5ec176cada)

* "Release: Updated versions in package to 8.5.14" (#547)

Co-authored-by: Will Browne <will.browne@grafana.com>
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Co-authored-by: linoman <2051016+linoman@users.noreply.github.com>
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
2022-10-11 15:25:10 +03:00
Grot (@grafanabot)
811b6c06b0 Docs: Fix caching.memcached setting name (#56606) (#56672)
(cherry picked from commit ef17f12c23)

Co-authored-by: Joan López de la Franca Beltran <5459617+joanlopez@users.noreply.github.com>
2022-10-11 05:07:45 -04:00
Grot (@grafanabot)
de78d1880b Dashboard: Single right-aligned y axis loses gridlines (#54206) (#55536)
Co-authored-by: gitstart <gitstart@gitstart.com>
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: Nitesh Singh <nitesh.singh@gitstart.dev>
Co-authored-by: Murilo Amaral <87545137+MuriloAmarals@users.noreply.github.com>
Co-authored-by: Matheus Benini Ferreira <88898100+MatheusBeniniF@users.noreply.github.com>
Co-authored-by: Rafael Toledo <87545086+Toledodev@users.noreply.github.com>
Co-authored-by: Rubens Rafael <70234898+RubensRafael@users.noreply.github.com>
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev>
Co-authored-by: Thiago Nascimbeni <tnascimbeni@gmail.com>

Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: gitstart <gitstart@gitstart.com>
Co-authored-by: Nitesh Singh <nitesh.singh@gitstart.dev>
Co-authored-by: Murilo Amaral <87545137+MuriloAmarals@users.noreply.github.com>
Co-authored-by: Matheus Benini Ferreira <88898100+MatheusBeniniF@users.noreply.github.com>
Co-authored-by: Rafael Toledo <87545086+Toledodev@users.noreply.github.com>
Co-authored-by: Rubens Rafael <70234898+RubensRafael@users.noreply.github.com>
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev>
Co-authored-by: Thiago Nascimbeni <tnascimbeni@gmail.com>
(cherry picked from commit 667993eae7)

Co-authored-by: GitStart <1501599+gitstart@users.noreply.github.com>
2022-09-23 17:10:36 -05:00
Ieva
992ea8b765 Access Control: Allow org admins to invite new users (#55585)
* backport change to allow org admins to invite new users to org

* remove docs from backport
2022-09-21 11:19:06 -04:00
Ieva
0e5b1a7c5d resolve merge conflicts (#55508)
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
2022-09-20 12:26:45 -04:00
Grot (@grafanabot)
8df7f5b1d4 "Release: Updated versions in package to 8.5.13" (#55501) 2022-09-20 12:01:34 -04:00
Ieva
3282afc648 V8.5.12 security patch (#486) (#55495)
* Data source: prevent from using auth proxy header as custom data source header (#477)

* apply security changes for auth proxy permission escalation

* add links to CVE

* remove duplicate check

* apply security fix for admin only folder migration (#484)

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

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
2022-09-20 16:40:52 +01:00
Grot (@grafanabot)
8806b8fc1b Plugins: Expose emotion/react to plugins to prevent load failures (#55297) (#55398)
(cherry picked from commit db17a88193)

Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
2022-09-19 17:36:36 +02:00
kay delaney
9e7d9fd123 [v8.5.x] Chore: Update slate and related packages (#54566) (#54800)
* Chore: Update slate and related packages (#54566)
2022-09-14 15:21:53 +01:00
Gilles De Mey
157cc68501 Manual back-port of #52399 (#55035) 2022-09-12 10:36:09 -04:00
Grot (@grafanabot)
b3f4a71c77 API: Do not expose user input in datasource error responses (#53483) (#54707)
(cherry picked from commit 950715b255)

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
2022-09-05 09:24:08 -04:00
Grot (@grafanabot)
46bbc0d3ab AppRootPage: Fixes issue navigating between two app plugin pages (#54519) (#54527)
* AppRootPage: Fixes issue where it was not possible to navigate to another plugin

* Externalize react-router

* fixing test

(cherry picked from commit e5fba788d6)

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
2022-08-31 09:48:14 -04:00
Grot (@grafanabot)
3d42e06e35 "Release: Updated versions in package to 8.5.11" (#54457) 2022-08-30 20:11:29 +02:00
Joan López de la Franca Beltran
51fa81c419 Rendering: Add support for renderer token (#54425) (#54438)
(cherry picked from commit a4f75cc0438712c90b02d24740416f8615e3a0cb)
(cherry picked from commit 6ec06f66b9)
2022-08-30 14:05:05 +02:00
Grot (@grafanabot)
d043d12427 Geomap: Local color range for dimensions (#54348) (#54350)
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
(cherry picked from commit 0707d682e0)
2022-08-26 16:58:53 -04:00
Grot (@grafanabot)
390c53a81e [v8.5.x] Build: Use specific nodejs version for levitate pipeline (#54211)
Co-authored-by: Esteban Beltran <academo@users.noreply.github.com>
2022-08-25 05:32:39 -04:00
Grot (@grafanabot)
5260d264fb alerting: redact alertmanagers in scheduler logs (#54183) (#54186)
(cherry picked from commit 438c95892f)

Co-authored-by: Santiago <santiagohernandez.1997@gmail.com>
2022-08-24 17:07:26 -04:00
Grot (@grafanabot)
f997ac8532 Geomap: Fix geohash editor settings #54058 (#54063)
(cherry picked from commit 13aacf3590)

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
2022-08-22 17:26:58 -04:00
Grot (@grafanabot)
25033280fd TimeSeries: Fix memory leak on viz re-init caused by KeyboardPlugin (#53892)
(cherry picked from commit 329aab7395)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
2022-08-18 08:29:45 -04:00
Grot (@grafanabot)
99d7e7b4f2 Fix small typo in panel doc (#52568) (#52726)
(cherry picked from commit bdcef92e35)

Co-authored-by: Chris Hodges <chris.hodges@gmail.com>
2022-08-16 10:40:22 +02:00
Yuriy Tseretyan
ac565335ff [v8.5.x] Alerting: AlertingProxy to elevate permissions for request forwarded to data proxy when RBAC enabled (#53681)
* use constants from prior to the refactoring
2022-08-12 13:28:19 -04:00
Grot (@grafanabot)
4b2f8a8420 Chore: Panic! in the Logs (#53664) (#53667)
(cherry picked from commit cc777e175e)

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
2022-08-12 10:00:36 -04:00
Grot (@grafanabot)
d8583237ea [v8.5.x] Geomap: Revert temporary fix for markers coloring (#53611) (#53630)
(cherry picked from commit 1f93216f1d)

Co-authored-by: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
2022-08-11 17:57:01 -04:00
Grot (@grafanabot)
b48e5fcc53 Geomap: Set markers color based on selected color field #53493 (#53496)
(cherry picked from commit 45750da667)

Co-authored-by: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
2022-08-09 19:00:12 -04:00
Jean-Philippe Quéméner
c93f0439db Backport release notes of 8.5.10
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
2022-08-08 09:40:44 -04:00
Grot (@grafanabot)
030d52282f "Release: Updated versions in package to 8.5.10" (#53394) 2022-08-08 15:27:51 +02:00
Sofia Papagiannaki
dc52320fc9 [v8.5.x] API: Fix snapshot responses (#53301)
* API: Fix snapshot responses (#52998)

* API: Fix response status when snapshots are not found

* API: Fix response status when snapshot key is empty

* Apply suggestions from code review

(cherry picked from commit 5fec6cc4f5)
2022-08-04 19:21:39 +03:00
Grot (@grafanabot)
6c8768020e add missing check for root URLs length (#53239) (#53249)
(cherry picked from commit 46b7ca12e1)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
2022-08-03 17:27:16 +02:00
Grot (@grafanabot)
557b044c15 check not empty root urls before setting field (#53135) (#53234)
(cherry picked from commit 5523c00b01)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
2022-08-03 10:20:31 -04:00
Grot (@grafanabot)
ada287544f Plugins: Validate root URLs when signing private plugins via grafana-toolkit (#51968) (#53227)
* validate URLs

* apply PR review feedback

* fix err msg

(cherry picked from commit b32ad993c5)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
2022-08-03 15:48:39 +02:00
Yuriy Tseretyan
af8853d0bf [8.5.x] Alerting: Remove user input from error response (#53147) 2022-08-02 16:51:55 -04:00
Grot (@grafanabot)
2f2e0752ec TimeSeriesPanel: Tooltip works properly when changing modes (#52876) (#53054)
* TimeSeriesPanel: Tooltip works properly when changing modes

* TooltipPlugin respects display mode

* Pass options to TimeSeriesPanel props

(cherry picked from commit 2948bf01dc)

Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
2022-08-01 11:27:28 -04:00
Grot (@grafanabot)
9c779fd805 BarchartPanel: Fix color from thresholds show incorrectly (#52038) (#52968)
Signed-off-by:  Kyle Cunningham <kyle.cunningham@grafana.com>
(cherry picked from commit 11c79cd6da)

Co-authored-by: mingozh <77652617+mingozh@users.noreply.github.com>
2022-08-01 05:00:13 -04:00
MicroOps-cn
1b1076ea2e Variables: Add 'jsonwithoutquote' formatting options for variables, and format of variable supports pipeline. (#51859) 2022-07-29 17:32:48 +01:00
Grot (@grafanabot)
617cf776bd [v8.5.x] API: Do not expose user input in datasource error responses (#52995)
* API: Do not expose user input in datasource error responses (#52992)

(cherry picked from commit 87004cc22d)

* Remove unused import

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
2022-07-29 16:18:16 +03:00
Will Browne
efe6c1d1b8 [v8.5.x] Plugins: Add validation for plugin manifest (#52865)
* resolve conflicts

* add plugin data for test
2022-07-27 14:23:00 +02:00
Selene
8ce81019db Add GetDialect function (#52818) 2022-07-27 12:58:41 +02:00
Grot (@grafanabot)
5c51d32098 [v8.5.x] UI/Card: Fix card items always having pointer cursor (#52816)
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
2022-07-26 16:44:33 +02:00
Konrad Lalik
804a52b059 [v8.5.x] Alerting: Fix alert panel instance-based rules filtering (#52583) (#52653) 2022-07-26 10:02:18 +02:00
Gabriel MABILLE
393c63e479 RBAC: Fix Anonymous Editors missing dashboard controls (#52649) 2022-07-26 09:19:35 +02:00
Grot (@grafanabot)
3ace91016e Fix anonymous access (#52615) (#52635)
(cherry picked from commit 8d938175f5)

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
2022-07-22 11:08:50 +02:00
gotjosh
79c998c760 Alerting: Allow the webhook notifier to support a custom Authorization header (#52515) (#52621)
* Allow the webhook notifier to support a custom Authorization header

Instead of doing something clever of re-using the existing username/password fields of Basic Authentication - I opted for two diffent fields to match the upstream Alertmanager configuration (that in turn is based of the HTTP Basic authentication).

 It'll fail if you have values for both HTTP Basic Authentication and Authorization.

(cherry picked from commit b026f2bc5d)
2022-07-22 09:41:49 +01:00
Grot (@grafanabot)
c04cce903f Docs: Update query caching support (#50706) (#52461)
* Docs: Update query caching support

* Update query-caching.md

(cherry picked from commit 2b7fe7251c)

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>
2022-07-19 10:34:15 -04:00
Andreas Christou
75be60cd0a Bump grafana-azure-sdk-go version (#52328) 2022-07-15 14:18:48 +01:00
Matthew Jacobson
6162f12369 Alerting: Fix Teams notifier not failing on 200 response with error (#52254) (#52269)
Team's webhook API does not always use the status code to communicate errors.
There are cases where it returns 200 and an error message in the body.
For example, 429 - Too Many Requests or when the message is too large.
Instead, what we should be looking for is a response body = "1".

https://docs.microsoft.com/en-us/microsoftteams/platform/webhooks-and-connectors/how-to/connectors-using?tabs=cURL#send-messages-using-curl-and-powershell
(cherry picked from commit efa0d90093)
2022-07-14 15:04:17 -04:00
Ieva
47fe0c40be backport changelog (#52258)
* backport changelog

* add 8.5.9 back in

* add date

Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
2022-07-14 19:15:21 +01:00
Grot (@grafanabot)
a1a1c00c0f "Release: Updated versions in package to 8.5.9" (#408) 2022-07-14 15:04:41 +01:00
Dimitris Sotirakis
586f9d18d4 [v8.5.x] Merge release-8.5.8 branch (#406)
* "Release: Updated versions in package to 8.5.6" (#370)

* Fix XSS in runbook URL (#379)

(cherry picked from commit ac3f79956d)

* "Release: Updated versions in package to 8.5.7" (#380)

* Fix: Choose Lookup params per auth module

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

Fix: Prefer pointer to struct in lookup

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

Fix: user email for ldap

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

Fix: Use only login for lookup in LDAP

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

Fix: use user email for ldap

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

fix remaining test

fix nit picks

(cherry picked from commit 51c83909ebc99017fa0029c1e3f75724f25c5660)

* "Release: Updated versions in package to 8.5.8" (#398)

Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
Co-authored-by: George Robinson <george.robinson@grafana.com>
Co-authored-by: jguer <joao.guerreiro@grafana.com>
2022-07-14 15:04:41 +01:00
Jguer
b3e1d5cb5d Fix: Choose Lookup params per auth module (#397)
Co-authored-by: Karl Persson <kalle.persson@grafana.com>

Fix: Prefer pointer to struct in lookup

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

Fix: user email for ldap

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

Fix: Use only login for lookup in LDAP

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

Fix: use user email for ldap

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

fix remaining test

fix nit picks
2022-07-14 15:04:41 +01:00
George Robinson
d647fa61b7 Fix XSS in runbook URL (#379) 2022-07-14 15:04:41 +01:00
Grot (@grafanabot)
6c70574ff1 Alerting: Fix bug where state did not change between Alerting and Error (#52204) (#52208)
This commit fixes a bug where the state did not change from Alerting to Error if the evaluation result returned an error, or from Error to Alerting if evaluations stopped returning errors.

(cherry picked from commit 34d45977ca)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2022-07-14 06:08:27 -04:00
George Robinson
2160b0e9ab Alerting: Backport fix database unavailable removes rules from scheduler (#52140) 2022-07-14 09:45:04 +01:00
Leon Sorokin
702f6860f7 [v8.5.x] GraphNG: uPlot 1.6.22 (#51945) (#51991)
* GraphNG: uPlot 1.6.22 (#51945)

(cherry picked from commit fda7f064ad)

# Conflicts:
#	.betterer.results
#	package.json
#	packages/grafana-data/package.json
#	packages/grafana-data/src/transformations/transformers/joinDataFrames.ts
#	packages/grafana-ui/package.json
#	yarn.lock

* revert changes to isLikelyAscendingVector()

* types
2022-07-13 15:17:30 -07:00
Grot (@grafanabot)
aafcd83761 Plugins: Improved handling of symlinks (#51324) (#52089)
Improves how we handle symlinks in plugin management.

(cherry picked from commit 04df634ef5)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
2022-07-12 14:16:38 +02:00
Grot (@grafanabot)
e24416e678 BarChart: fix crash when checking bar value text overlap (#52061) (#52063)
(cherry picked from commit 254159ad69)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
2022-07-11 14:03:03 -04:00
Will Browne
022d7c14d9 [v8.5.x] CLI: Allow relative symlinks in zip archives when installing plugins (#52049)
* resolve conflicts

* fix build issue

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
2022-07-11 16:28:56 +02:00
Grot (@grafanabot)
e62f2a7b74 Prometheus datasource: query builder freezes when metrics metadata is undefined (#51929) (#51988)
* add error handling for prom query builder returning undefined metrics metadata

* remove reference to escalation

(cherry picked from commit e51187a474)

Co-authored-by: Brendan O'Handley <brendan.ohandley@grafana.com>
2022-07-08 12:22:35 -04:00
Ieva
0ad8a8fc4f backport (#51964) 2022-07-08 16:28:41 +02:00
Grot (@grafanabot)
f1f6feee8b Alerting: Fix RegExp matchers in frontend for Silences and other previews. (#51726) (#51872)
(cherry picked from commit d99a7334d5)

Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>
2022-07-08 10:42:19 +08:00
Grot (@grafanabot)
aa247f5833 Time series panel: Fix an issue with stacks being not complete due to the incorrect data frame length (#51910) (#51914)
* Test failure

* Fix

(cherry picked from commit 5a65a12278)

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
2022-07-07 07:45:09 -07:00
Grot (@grafanabot)
11b8cefe09 [v8.5.x] Bar chart: Fix stacking bug when data produces 0 accumulators (#51809)
* Bar chart: Fix stacking bug when data produces 0 accumulators (#51450)

* Don't divide by 0 ...

* Add test panel to gdev dashboard

(cherry picked from commit daf0e3cb4e)

* betterer

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
2022-07-07 02:07:47 -07:00
Grot (@grafanabot)
14e622414b Plugins: Register management endpoints only when external managed is also false (#51802) (#51816)
* Only define plugin install endpoints when catalog enabled

* add external check

(cherry picked from commit 40dff288cd)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
2022-07-07 04:58:51 -04:00
Yuriy Tseretyan
e347be769f Chore: Update ConcreteLogger to implement gokit Logger interface (#51599) (#51647)
# Conflicts:
#	pkg/infra/log/log.go
2022-07-06 11:49:27 -04:00
Grot (@grafanabot)
17b083f861 Histogram: filter nulls, bucket-adaptive xAxis decimals (#51773) (#51822)
(cherry picked from commit 173636aa61)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
2022-07-06 11:29:41 -04:00
Grot (@grafanabot)
a0aba4319f Only define plugin install endpoints when catalog enabled (#51788) (#51789)
(cherry picked from commit ba9fc10a74)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
2022-07-06 11:27:55 +02:00
Grot (@grafanabot)
f2dc6c9330 Graphite: Use TimeRange with applied fiscalYearStartMonth (#51623) (#51774)
* Parse date with fiscalYearStartMonth in graphite ds

* Use precalculated timeranges

* Always use precalculated values

* Modify test

(cherry picked from commit 5b058d617d)

Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
2022-07-06 10:11:09 +03:00
Ieva
8a7fe0f49f Access Control: Allow dashboard admins to query org users (#51695)
* "Release: Updated versions in package to 8.5.6" (#370)

* allow dashboard admins to query org users

Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
2022-07-04 14:22:37 +01:00
Grot (@grafanabot)
f7d9c401c2 Access control: role checks before updates (#51449) (#51457)
* add role checks

* linting

(cherry picked from commit 0c0cf36ab8)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
2022-06-28 06:23:17 -04:00
Victor Marin
ddfdc9ee7a Variables: improve performance of transformMetricFindResponse (#49360) (#51435)
* improve performance of transformMetricFindResponse

* use lodash uniqBy for postgres

* use lodash uniqBy for mysql

* use lodash uniqBy for mssql

* hopefully conform to import linting rules

* Added .betterer.results

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
Co-authored-by: Victor Marin <victor.marin@grafana.com>
(cherry picked from commit 683f31f2c6)

Co-authored-by: Nathaniel Saxe <NathanielSaxophone@gmail.com>
2022-06-27 05:02:30 -07:00
Emil Tullstedt
db5dee09d2 Chore: update golang.org/x dependencies (#51430) 2022-06-27 12:35:42 +02:00
Todd Treece
2200c3ca50 Variables: Selectively reload panels on URL update (#51003) (#51396)
(cherry picked from commit 342344bb03)
2022-06-24 21:23:01 +02:00
gotjosh
8356365b0a Alerting: Don't stop the migration when alert rule tags are invalid (#51253) (#51339)
* Alerting: Don't stop the migration when alert rule tags are invalid

As we migrate we expect the `alertRuleTags` on a dashboard alert to be a JSON object. However, it seems this is not really validated by Grafana and an user can change the format to something else that the JSON parser is not able to marshal into a `map[string]string`.

Let's do a bit better by "attempting" to parse the tags and if we can't we'll simple return an empty map. The data is still there so if the user wishes they can go back, fix the data and attemp the migration again.

(cherry picked from commit 90646e7f41)
2022-06-23 12:37:21 -05:00
Grot (@grafanabot)
f60aeb4b5d Fix query parameter template variable (#50023) (#51173)
As documented under [Advanced variable format options – Query parameters](https://grafana.com/docs/grafana/latest/variables/advanced-variable-format-options/#query-parameters), the option is `queryparam`, not `queryparams`.

I have verified in Grafana 8.5.3 that the former works while the latter doesn't.

(cherry picked from commit 1b091454ec)

Co-authored-by: kiwi-oss <71145773+kiwi-oss@users.noreply.github.com>
2022-06-21 15:49:59 +02:00
Grot (@grafanabot)
4b378485cf [v8.5.x] Alerting: Fix alert rule page crashing when datasource contained URL unsafe characters (#51122)
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
2022-06-20 15:59:23 +02:00
Victor Marin
87420e15b8 TablePanel: Show filter icon on correct field when other fields are hidden (#50940) (#51090) 2022-06-20 10:27:39 +03:00
Dimitris Sotirakis
f73fa13e58 Update gopkg.in/yaml.v3 dep (#51042) 2022-06-20 10:04:19 +03:00
Grot (@grafanabot)
08c182bf2b Time Series Panel: Add Null Filling and "No Value" Support (#50907) (#51066)
* Use nullInsertThreshold and nullToValue in time series

* Allow for undefined timeRange to support certain candlestick uses of prepareGraphableFields

* Make sure null to value doesn't modify initial data

* Do a shallow values copy and avoid Array.push()

* Clean up null to value transformation.

* Add basic tests

* Remove redunant null threshold application flagging

* set nullThresholdApplied flag even when no null inserts were done

* Include nullThresholdApplied in test snapshot

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
(cherry picked from commit 86b785d039)

Co-authored-by: Kyle Cunningham <codeincarnate@users.noreply.github.com>
2022-06-17 16:32:15 -05:00
Matthew Jacobson
ca436db452 Alerting: Fix AM config overwrite when SQLite db is locked during sync (#50951) (#51001)
If SQLite is used and the database is locked temporarily (ex. heavy write-load) during periodic
AM config sync, it was possible for your AM config to be overwritten with the default one.

This fixes that by patching a bug in xorm v0.8.2 which was causing SQLITE_BUSY errors to be ignored
in certain cases.

(cherry picked from commit 8f5912b94c)
2022-06-17 12:19:05 -04:00
Grot (@grafanabot)
bdd1b2a6af StateTimeline: make sure we use result of applyNullInsertThreshold() (#50988) (#50993)
Co-authored-by: Kyle Cunningham <kyle@codeincarnate.com>
(cherry picked from commit 406509cdd3)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
2022-06-16 17:46:30 -05:00
Adam Simpson
b03353537d ReleaseNotes: Updated changelog and release notes for 8.5.6 (#50807) (#50830)
(cherry picked from commit 2dd784852c)

Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
2022-06-16 13:10:00 +00:00
Dimitris Sotirakis
09fe518981 Remove publish.yml for v8.5.x (#50811) 2022-06-14 18:39:33 +02:00
Grot (@grafanabot)
15130a30fb "Release: Updated versions in package to 8.5.6" (#50806) 2022-06-14 16:03:29 +00:00
Agnès Toulet
89466ef3fc Docs: update query caching InfluxDB support (#50662) 2022-06-13 16:03:44 +02:00
Jack Baldry
88f730f062 Add current alias to all files (#48635) (#49102)
* Add aliases to all files

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

* Prettify front matter

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit 51dfcd7)
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
2022-06-13 14:09:38 +02:00
Zoltán Bedi
c114e3ff5c [v8.5.x] TimeSeries: Add an option to set legend width (#50549)
* TimeSeries: Add an option to set legend width (#49126)

* Add an option to set legend width

* Add width to the cue file

* Use legendStyle

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

* Add missing migration

Co-authored-by: Ivan Babrou <github@ivan.computer>
2022-06-10 09:55:15 +02:00
Gabriel MABILLE
e9ec97b34c RBAC: Include alert.rules action when setting folder permissions (#49946) (#50510)
* Generate additional actions when setting folder permissions in acl list

* Add migration for managed folder permissions to include alert rule
actions

(cherry picked from commit bdff63d4a8)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
2022-06-09 14:25:04 +02:00
Grot (@grafanabot)
9500c94c98 [v8.5.x] RBAC: drop permissions with folder:create action added by migration (#50493)
* add migrator to drop folder create actions that was set fromt he folder (#49878)

(cherry picked from commit f4f25d911b)

* Add missing const

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Co-authored-by: gamab <gabi.mabs@gmail.com>
2022-06-09 13:45:29 +02:00
Grot (@grafanabot)
18d37f81d8 Alerting: Improve Unified Alerting Rollback Warning (#50470) (#50471)
After migrating to unified alerting, users must explicitly allow rolling
back to legacy alerting by setting force_migration = true in config.
This updates the panic message to clarify why that's required and what
the consequences of rolling back will be.

Fixes #50469

(cherry picked from commit 30f035ca34)

Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>
2022-06-09 07:48:34 +02:00
lean.dev
7ebae85355 Bumping protobufjs version (#50435) (#50445)
Backport (cherry picked from commit b9cce18f72)
2022-06-08 18:11:46 +02:00
Grot (@grafanabot)
8328d823b8 Security: Fixes javascript security warnings in old vendored libs (#50382) (#50412)
(cherry picked from commit 74608d6480)

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
2022-06-08 14:12:16 +02:00
Grot (@grafanabot)
fc324d07cd Dashboard: Fixes random scrolling on time range change (#50379) (#50383)
* Dashboard: Fixes random scrolling on time range change

* fix ts issue

* removed logging

(cherry picked from commit fd408652dc)

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
2022-06-08 13:17:00 +02:00
Ezequiel Victorero
b09980dc4f Backport 50340 to v8.5.x (#50355)
* ReleaseNotes: Updated changelog and release notes for 8.5.5 (#50340)

(cherry picked from commit 5f65edff28)

Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
2022-06-07 14:10:14 -03:00
Grot (@grafanabot)
9fd27abb44 "Release: Updated versions in package to 8.5.5" (#50339) 2022-06-07 12:42:15 -03:00
678 changed files with 9103 additions and 6015 deletions

View File

@@ -41,8 +41,8 @@ exports[`no enzyme tests`] = {
"packages/grafana-ui/src/components/Logs/LogRows.test.tsx:3121815234": [
[0, 17, 13, "RegExp match", "2409514259"]
],
"packages/grafana-ui/src/components/QueryField/QueryField.test.tsx:375894800": [
[0, 19, 13, "RegExp match", "2409514259"]
"packages/grafana-ui/src/components/QueryField/QueryField.test.tsx:2976628669": [
[0, 26, 13, "RegExp match", "2409514259"]
],
"packages/grafana-ui/src/components/Slider/Slider.test.tsx:751112695": [
[0, 17, 13, "RegExp match", "2409514259"]
@@ -56,16 +56,16 @@ exports[`no enzyme tests`] = {
"packages/grafana-ui/src/components/Typeahead/TypeaheadInfo.test.tsx:3512289373": [
[0, 17, 13, "RegExp match", "2409514259"]
],
"packages/grafana-ui/src/slate-plugins/braces.test.tsx:1440546721": [
"packages/grafana-ui/src/slate-plugins/braces.test.tsx:1691463920": [
[0, 19, 13, "RegExp match", "2409514259"]
],
"packages/grafana-ui/src/slate-plugins/clear.test.tsx:1085648664": [
"packages/grafana-ui/src/slate-plugins/clear.test.tsx:3927593033": [
[0, 19, 13, "RegExp match", "2409514259"]
],
"packages/grafana-ui/src/slate-plugins/runner.test.tsx:446043290": [
"packages/grafana-ui/src/slate-plugins/runner.test.tsx:1123710822": [
[0, 19, 13, "RegExp match", "2409514259"]
],
"packages/grafana-ui/src/slate-plugins/suggestions.test.tsx:3654981205": [
"packages/grafana-ui/src/slate-plugins/suggestions.test.tsx:2682912140": [
[0, 18, 13, "RegExp match", "2409514259"]
],
"packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/CanvasSpanGraph.test.js:1974748555": [

View File

@@ -1,7 +1,8 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
go 1.17
go 1.19
replace github.com/docker/docker => github.com/docker/engine v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible
require github.com/drone/drone-cli v1.4.0 // drone
require golang.org/x/sys v0.0.0-20221010170243-090e33056c14

View File

@@ -1 +1,3 @@
module _ // Fake go.mod auto-created by 'bingo' for go -moddir compatibility with non-Go projects. Commit this file, together with other .mod files.
module _ // Fake go.mod auto-created by 'bingo' for go -moddir compatibility with non-Go projects. Commit this file, together with other .mod files.
go 1.19

File diff suppressed because it is too large Load Diff

View File

@@ -4,12 +4,10 @@
],
"enabledManagers": ["npm"],
"ignoreDeps": [
"@grafana/slate-react", // should be updated when the `slate` package is updated
"@types/systemjs",
"@types/d3-force", // we should bump this once we move to esm modules
"@types/d3-interpolate", // we should bump this once we move to esm modules
"@types/d3-scale-chromatic", // we should bump this once we move to esm modules
"@types/grafana__slate-react", // should be updated when the `slate` package is updated
"@types/react-icons", // jaeger-ui-components is being refactored to use @grafana/ui icons instead
"commander", // we are planning to remove this, so no need to update it
"d3",
@@ -23,8 +21,6 @@
"react-hook-form", // due to us exposing these hooks via @grafana/ui form components bumping can break plugins
"react-icons", // jaeger-ui-components is being refactored to use @grafana/ui icons instead
"react-router-dom", // we should bump this together with history
"slate",
"slate-plain-serializer",
"systemjs",
"copy-webpack-plugin", // try to upgrade with newer yarn release. Not working with 3.1.1
"ts-loader", // we should remove ts-loader and use babel-loader instead

View File

@@ -15,6 +15,10 @@ jobs:
with:
path: './pr'
- uses: actions/setup-node@v3
with:
node-version: 16.16.0
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
@@ -56,6 +60,10 @@ jobs:
path: './base'
ref: ${{ github.event.pull_request.base.ref }}
- uses: actions/setup-node@v3
with:
node-version: 16.16.0
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"

View File

@@ -0,0 +1,30 @@
name: "publish-technical-documentation-next"
on:
push:
branches:
- "main"
paths:
- "docs/sources/**"
workflow_dispatch:
jobs:
sync:
if: "github.repository == 'grafana/grafana'"
runs-on: "ubuntu-latest"
steps:
- name: "Checkout Grafana repo"
uses: "actions/checkout@v3"
- name: "Clone website-sync Action"
run: "git clone --single-branch --no-tags --depth 1 -b master https://grafanabot:${{ secrets.GH_BOT_ACCESS_TOKEN }}@github.com/grafana/website-sync ./.github/actions/website-sync"
- name: "Publish to website repository (next)"
uses: "./.github/actions/website-sync"
id: "publish-next"
with:
repository: "grafana/website"
branch: "master"
host: "github.com"
github_pat: "${{ secrets.GH_BOT_ACCESS_TOKEN }}"
source_folder: "docs/sources"
target_folder: "content/docs/grafana/next"

View File

@@ -0,0 +1,60 @@
name: "publish-technical-documentation-release"
on:
push:
branches:
- v[0-9]+.[0-9]+.x
tags:
- v[0-9]+.[0-9]+.[0-9]+
paths:
- "docs/sources/**"
workflow_dispatch:
jobs:
sync:
if: "github.repository == 'grafana/grafana'"
runs-on: "ubuntu-latest"
steps:
- name: "Checkout Grafana repo"
uses: "actions/checkout@v3"
with:
fetch-depth: 0
- name: "Checkout Actions library"
uses: "actions/checkout@v3"
with:
repository: "grafana/grafana-github-actions"
path: "./actions"
- name: "Install Actions from library"
run: "npm install --production --prefix ./actions"
- name: "Determine if there is a matching release tag"
id: "has-matching-release-tag"
uses: "./actions/has-matching-release-tag"
with:
ref_name: "${{ github.ref_name }}"
release_tag_regexp: "^v(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)$"
release_branch_regexp: "^v(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.x$"
- name: "Determine technical documentation version"
if: "steps.has-matching-release-tag.outputs.bool == 'true'"
uses: "./actions/docs-target"
id: "target"
with:
ref_name: "${{ github.ref_name }}"
- name: "Clone website-sync Action"
if: "steps.has-matching-release-tag.outputs.bool == 'true'"
run: "git clone --single-branch --no-tags --depth 1 -b master https://grafanabot:${{ secrets.GH_BOT_ACCESS_TOKEN }}@github.com/grafana/website-sync ./.github/actions/website-sync"
- name: "Publish to website repository (release)"
if: "steps.has-matching-release-tag.outputs.bool == 'true'"
uses: "./.github/actions/website-sync"
id: "publish-release"
with:
repository: "grafana/website"
branch: "master"
host: "github.com"
github_pat: "${{ secrets.GH_BOT_ACCESS_TOKEN }}"
source_folder: "docs/sources"
target_folder: "content/docs/grafana/${{ steps.target.outputs.target }}"

View File

@@ -1,49 +0,0 @@
name: publish_docs
on:
push:
branches:
- v8.5.x
paths:
- 'docs/sources/**'
- 'packages/grafana-*/**'
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- run: git clone --single-branch --no-tags --depth 1 -b master https://grafanabot:${{ secrets.GH_BOT_ACCESS_TOKEN }}@github.com/grafana/website-sync ./.github/actions/website-sync
- name: generate-packages-docs
uses: actions/setup-node@v2.5.1
id: generate-docs
with:
node-version: '16'
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
- uses: actions/cache@v2.1.7
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
yarn-
- run: yarn install --immutable
- run: ./scripts/ci-reference-docs-build.sh
- name: publish-to-git
uses: ./.github/actions/website-sync
id: publish
with:
repository: grafana/website
branch: master
host: github.com
github_pat: '${{ secrets.GH_BOT_ACCESS_TOKEN }}'
source_folder: docs/sources
target_folder: content/docs/grafana/latest
allow_no_changes: 'true'
- shell: bash
run: |
test -n "${{ steps.publish.outputs.commit_hash }}"
test -n "${{ steps.publish.outputs.working_directory }}"

2
.gitignore vendored
View File

@@ -59,6 +59,7 @@ public/css/*.min.css
*.sublime-workspace
*.swp
.idea/
.fleet/
*.iml
*.tmp
.DS_Store
@@ -117,6 +118,7 @@ debug.test
/scripts/build/release_publisher/release_publisher
*.patch
!.yarn/patches/*.patch
# Ignoring frontend packages specifics
/packages/**/dist

File diff suppressed because one or more lines are too long

View File

@@ -3,40 +3,37 @@ enableTelemetry: false
nodeLinker: pnp
packageExtensions:
"@grafana/slate-react@0.22.10-grafana":
peerDependencies:
slate-react: ">=0.22.0"
"@mdx-js/loader@1.6.22":
'@mdx-js/loader@1.6.22':
peerDependencies:
react: 17.0.1
"@storybook/addon-docs@6.4.15":
'@storybook/addon-docs@6.4.15':
peerDependencies:
"@storybook/manager-webpack5": 6.4.15
"@storybook/addon-essentials@6.4.15":
'@storybook/manager-webpack5': 6.4.15
'@storybook/addon-essentials@6.4.15':
peerDependencies:
"@storybook/components": 6.4.15
"@storybook/core-events": 6.4.15
"@storybook/manager-webpack5": 6.4.15
"@storybook/theming": 6.4.15
"@storybook/core-server@6.4.15":
'@storybook/components': 6.4.15
'@storybook/core-events': 6.4.15
'@storybook/manager-webpack5': 6.4.15
'@storybook/theming': 6.4.15
'@storybook/core-server@6.4.15':
peerDependencies:
"@babel/core": ^7.0.0
"@storybook/core@6.4.15":
'@babel/core': ^7.0.0
'@storybook/core@6.4.15':
peerDependencies:
"@babel/core": ^7.0.0
"@storybook/manager-webpack5": 6.4.15
"@storybook/csf-tools@6.4.15":
'@babel/core': ^7.0.0
'@storybook/manager-webpack5': 6.4.15
'@storybook/csf-tools@6.4.15':
peerDependencies:
"@babel/core": ^7.0.0
"@storybook/react@6.4.15":
'@babel/core': ^7.0.0
'@storybook/react@6.4.15':
peerDependencies:
"@storybook/manager-webpack5": 6.4.15
'@storybook/manager-webpack5': 6.4.15
doctrine@3.0.0:
dependencies:
assert: 2.0.0
moveable@0.28.0:
dependencies:
"@daybrush/utils": 1.6.0
'@daybrush/utils': 1.6.0
framework-utils: ^1.1.0
rc-time-picker@3.7.3:
peerDependencies:
@@ -51,9 +48,9 @@ packageExtensions:
react-simple-compat: 1.2.1
react-compat-moveable@0.16.0:
dependencies:
"@egjs/agent": ^2.2.1
"@egjs/children-differ": ^1.0.1
"@scena/matrix": 1.1.1
'@egjs/agent': ^2.2.1
'@egjs/children-differ': ^1.0.1
'@scena/matrix': 1.1.1
css-to-mat: ^1.0.3
gesto: ^1.7.0
overlap-area: ^1.0.0
@@ -65,17 +62,17 @@ packageExtensions:
webpack: 4.41.5
react-icons@2.2.7:
peerDependencies:
prop-types: "*"
prop-types: '*'
react-resizable@3.0.4:
peerDependencies:
react-dom: 17.0.1
plugins:
- path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
spec: "@yarnpkg/plugin-typescript"
spec: '@yarnpkg/plugin-typescript'
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"
spec: '@yarnpkg/plugin-interactive-tools'
- path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
spec: "https://mskelton.dev/yarn-outdated/v2"
spec: 'https://mskelton.dev/yarn-outdated/v2'
yarnPath: .yarn/releases/yarn-3.2.0.cjs

View File

@@ -1,3 +1,96 @@
<!-- 8.5.15 START -->
# 8.5.15 (2022-11-08)
### Features and enhancements
- **Chore:** Upgrade Go to 1.19.2. [#56857](https://github.com/grafana/grafana/pull/56857), [@sakjur](https://github.com/sakjur)
<!-- 8.5.15 END -->
<!-- 8.5.14 START -->
# 8.5.14 (2022-10-11)
### Features and enhancements
- **Access Control:** Allow org admins to invite new users. [#55585](https://github.com/grafana/grafana/pull/55585), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
<!-- 8.5.14 END -->
<!-- 8.5.13 START -->
# 8.5.13 (2022-09-20)
### Features and enhancements
- **Plugins:** Expose @emotion/react to plugins to prevent load failures. [#55297](https://github.com/grafana/grafana/pull/55297), [@jackw](https://github.com/jackw)
### Bug fixes
- **AuthNZ:** Security fixes for CVE-2022-35957 and CVE-2022-36062. [#55495](https://github.com/grafana/grafana/pull/55495), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
<!-- 8.5.13 END -->
<!-- 8.5.11 START -->
# 8.5.11 (2022-08-30)
### Features and enhancements
- **Rendering:** Add support for renderer token (#54425). [#54438](https://github.com/grafana/grafana/pull/54438), [@joanlopez](https://github.com/joanlopez)
- **Alerting:** AlertingProxy to elevate permissions for request forwarded to data proxy when RBAC enabled. [#53681](https://github.com/grafana/grafana/pull/53681), [@yuri-tceretian](https://github.com/yuri-tceretian)
<!-- 8.5.11 END -->
<!-- 8.5.10 START -->
# 8.5.10 (2022-08-08)
### Bug fixes
- **RBAC:** Fix Anonymous Editors missing dashboard controls. [#52649](https://github.com/grafana/grafana/pull/52649), [@gamab](https://github.com/gamab)
<!-- 8.5.10 END -->
<!-- 8.5.9 START -->
# 8.5.9 (2022-07-14)
### Bug fixes
- **Security:** Fixes for CVE-2022-31107 and CVE-2022-31097. [#52238](https://github.com/grafana/grafana/pull/52238), [@xlson](https://github.com/xlson)
<!-- 8.5.9 END -->
<!-- 8.5.6 START -->
# 8.5.6 (2022-06-14)
### Bug fixes
- **Dashboard:** Fixes random scrolling on time range change. [#50379](https://github.com/grafana/grafana/pull/50379), [@torkelo](https://github.com/torkelo)
- **Security:** Fixes minor code scanning security warnings in old vendored javascript libs. [#50382](https://github.com/grafana/grafana/pull/50382), [@torkelo](https://github.com/torkelo)
<!-- 8.5.6 END -->
<!-- 8.5.5 START -->
# 8.5.5 (2022-06-06)
### Features and enhancements
- **Azure Monitor:** Include datasource ref when interpolating variables. [#49543](https://github.com/grafana/grafana/pull/49543), [@kevinwcyu](https://github.com/kevinwcyu)
- **CloudWatch:** Add multi-value template variable support for log group names in logs query builder. [#49737](https://github.com/grafana/grafana/pull/49737), [@kevinwcyu](https://github.com/kevinwcyu)
- **Cloudwatch:** Add template variable query function for listing log groups. [#50100](https://github.com/grafana/grafana/pull/50100), [@yaelleC](https://github.com/yaelleC)
### Bug fixes
- **Alerting:** Do not overwrite existing alert rule condition. [#49920](https://github.com/grafana/grafana/pull/49920), [@gillesdemey](https://github.com/gillesdemey)
- **Alerting:** Remove double quotes from matchers. [#50044](https://github.com/grafana/grafana/pull/50044), [@alexweav](https://github.com/alexweav)
<!-- 8.5.5 END -->
<!-- 8.5.4 START -->
# 8.5.4 (2022-05-30)
@@ -209,6 +302,26 @@ When user is using Github OAuth, GitHub login is showed as both Grafana login an
The meaning of the default data source has now changed from being a persisted property in a panel. Before when you selected the default data source for a panel and later changed the default data source to another data source it would change all panels who were configured to use the default data source. From now on the default data source is just the default for new panels and changing the default will not impact any currently saved dashboards. Issue [#45132](https://github.com/grafana/grafana/issues/45132)
<!-- 8.4.11 START -->
# 8.4.11 (2022-08-30)
### Features and enhancements
- **Rendering:** Add support for renderer token (#54425). [#54437](https://github.com/grafana/grafana/pull/54437), [@joanlopez](https://github.com/joanlopez)
<!-- 8.4.11 END -->
<!-- 8.4.10 START -->
# 8.4.10 (2022-07-14)
### Bug fixes
- **Security:** Fixes for CVE-2022-31107 and CVE-2022-31097. [#52218](https://github.com/grafana/grafana/pull/52218), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
<!-- 8.4.10 END -->
<!-- 8.4.7 START -->
# 8.4.7 (2022-04-19)
@@ -396,6 +509,16 @@ AngularJS plugin support is now in a deprecated state, meaning it will be remove
- **News:** Reload feed when changing the time range or refreshing. [#42217](https://github.com/grafana/grafana/pull/42217), [@ashharrison90](https://github.com/ashharrison90)
- **UI/Plot:** Implement keyboard controls for plot cursor. [#42244](https://github.com/grafana/grafana/pull/42244), [@kaydelaney](https://github.com/kaydelaney)
<!-- 8.3.11 START -->
# 8.3.11 (2022-08-30)
### Features and enhancements
- **Rendering:** Add support for renderer token (#54425). [#54436](https://github.com/grafana/grafana/pull/54436), [@joanlopez](https://github.com/joanlopez)
<!-- 8.3.11 END -->
<!-- 8.3.7 START -->
# 8.3.7 (2022-03-01)
@@ -630,7 +753,7 @@ The access mode "browser" is deprecated in the following data sources and will b
### Features and enhancements
- **AccessControl:** Apply fine-grained access control to licensing. (Enterprise)
- **AccessControl:** Apply role-based access control to licensing. (Enterprise)
- **Alerting:** Add UI for contact point testing with custom annotations and labels. [#40491](https://github.com/grafana/grafana/pull/40491), [@nathanrodman](https://github.com/nathanrodman)
- **Alerting:** Make alert state indicator in panel header work with Grafana 8 alerts. [#38713](https://github.com/grafana/grafana/pull/38713), [@domasx2](https://github.com/domasx2)
- **Alerting:** Option for Discord notifier to use webhook name. [#40463](https://github.com/grafana/grafana/pull/40463), [@Skyebold](https://github.com/Skyebold)

View File

@@ -20,7 +20,7 @@ COPY emails emails
ENV NODE_ENV production
RUN yarn build
FROM golang:1.17.11-alpine3.15 as go-builder
FROM golang:1.19.4-alpine3.15 as go-builder
RUN apk add --no-cache gcc g++ make

View File

@@ -21,7 +21,7 @@ COPY emails emails
ENV NODE_ENV production
RUN yarn build
FROM golang:1.17.11 AS go-builder
FROM golang:1.19.4 AS go-builder
WORKDIR /src/grafana

View File

@@ -1020,6 +1020,8 @@ container_name =
server_url =
# If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
callback_url =
# An auth token that will be sent to and verified by the renderer. The renderer will deny any request without an auth token matching the one configured on the renderer side.
renderer_token = -
# Concurrent render request limit affects when the /render HTTP endpoint is used. Rendering many images at the same time can overload the server,
# which this setting can help protect against by only allowing a certain amount of concurrent requests.
concurrent_render_request_limit = 30

View File

@@ -999,6 +999,8 @@
;server_url =
# If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
;callback_url =
# An auth token that will be sent to and verified by the renderer. The renderer will deny any request without an auth token matching the one configured on the renderer side.
;renderer_token = -
# Concurrent render request limit affects when the /render HTTP endpoint is used. Rendering many images at the same time can overload the server,
# which this setting can help protect against by only allowing a certain amount of concurrent requests.
;concurrent_render_request_limit = 30

View File

@@ -3409,6 +3409,90 @@
],
"title": "'undefined' join artifacts (lines)",
"type": "timeseries"
},
{
"datasource": {
"type": "testdata",
"uid": "PD8C576611E62080A"
},
"fieldConfig": {
"defaults": {
"color": {
"mode": "thresholds"
},
"custom": {
"axisLabel": "",
"axisPlacement": "auto",
"axisSoftMin": 0,
"fillOpacity": 80,
"gradientMode": "none",
"hideFrom": {
"legend": false,
"tooltip": false,
"viz": false
},
"lineWidth": 1,
"scaleDistribution": {
"type": "linear"
}
},
"mappings": [],
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
},
{
"color": "red",
"value": 80
}
]
}
},
"overrides": []
},
"gridPos": {
"h": 9,
"w": 12,
"x": 0,
"y": 65
},
"id": 39,
"options": {
"barRadius": 0,
"barWidth": 0.97,
"groupWidth": 0.7,
"legend": {
"calcs": [],
"displayMode": "list",
"placement": "bottom"
},
"orientation": "auto",
"showValue": "auto",
"stacking": "percent",
"tooltip": {
"mode": "single",
"sort": "none"
},
"xTickLabelRotation": 0,
"xTickLabelSpacing": 0
},
"pluginVersion": "9.1.0-pre",
"targets": [
{
"csvContent": "name, number, number2, number3, number4\nName1, 40, 5, 20, 10\nName2, 0,0,0,0\nName3, 6, 3, 5, 1\nName4, 1, 1, 1, 2",
"datasource": {
"type": "testdata",
"uid": "PD8C576611E62080A"
},
"refId": "A",
"scenarioId": "csv_content"
}
],
"title": "Bar chart stack with 0 only series",
"type": "barchart"
}
],
"refresh": false,

View File

@@ -3,7 +3,7 @@ package main
import (
"fmt"
"io"
"io/ioutil"
"io/ioutil" //nolint:staticcheck // No need to change in v8.
"log"
"net/http"
"strings"
@@ -25,5 +25,6 @@ func hello(w http.ResponseWriter, r *http.Request) {
func main() {
http.HandleFunc("/", hello)
//nolint:gosec
log.Fatal(http.ListenAndServe(":3010", nil))
}

View File

@@ -47,5 +47,6 @@ func main() {
proxy.ServeHTTP(w, r)
})
//nolint:gosec
log.Fatal(http.ListenAndServe(":3011", nil))
}

View File

@@ -1,8 +1,8 @@
---
aliases:
- /docs/grafana/v1.1
- /docs/grafana/latest/guides/reference/admin
- /docs/grafana/v3.1
- /docs/grafana/v1.1/
- /docs/grafana/v3.1/
- guides/reference/admin/
description: Guides, Installation and Feature Documentation
keywords:
- grafana

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/installation/configuration/
- ../installation/configuration/
description: Configuration documentation
keywords:
- grafana

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/installation/configure-docker/
- ../installation/configure-docker/
description: Guide for configuring the Grafana Docker image
keywords:
- grafana

View File

@@ -1,6 +1,4 @@
---
aliases:
- ''
description: Grafana database encryption
keywords:
- grafana

View File

@@ -1,7 +1,7 @@
---
aliases:
- /docs/grafana/latest/manage-users/server-admin/
- /docs/grafana/latest/manage-users/server-admin/server-admin-manage-orgs/
- ../manage-users/server-admin/
- ../manage-users/server-admin/server-admin-manage-orgs/
description: Describes how to use organizations to isolate dashboard to users and
teams.
keywords:

View File

@@ -1,7 +1,6 @@
---
aliases:
- /docs/grafana/latest/administration/change-your-password/
- /docs/grafana/latest/administration/manage-user-preferences/
- change-your-password/
description: Learn how to update your user preferences and switch organizations
keywords:
- password

View File

@@ -1,6 +1,4 @@
---
aliases:
- /docs/grafana/latest/administration/manage-users-and-permissions/
title: Manage users and permissions
weight: 200
---

View File

@@ -1,10 +1,9 @@
---
aliases:
- /docs/grafana/latest/manage-users/
- /docs/grafana/latest/administration/manage-users-and-permissions/about-users-and-permissions/
- /docs/grafana/latest/permissions/overview/
- /docs/grafana/latest/permissions/
- /docs/grafana/latest/permissions/organization_roles/
- ../../manage-users/
- ../../permissions/
- ../../permissions/organization_roles/
- ../../permissions/overview/
title: About users and permissions
weight: 100
---

View File

@@ -1,7 +1,6 @@
---
aliases:
- /docs/grafana/latest/permissions/dashboard_folder_permissions/
- /docs/grafana/latest/administration/manage-users-and-permissions/manage-dashboard-permissions/
- ../../permissions/dashboard_folder_permissions/
title: Manage dashboard permissions
weight: 500
---

View File

@@ -1,7 +1,6 @@
---
aliases:
- /docs/grafana/latest/manage-users/org-admin/
- /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/
- ../../manage-users/org-admin/
title: Manage users in an organization
weight: 400
---

View File

@@ -1,6 +1,4 @@
---
aliases:
- /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/change-user-org-permissions/
title: Change a user's organization permissions
weight: 30
---

View File

@@ -1,6 +1,4 @@
---
aliases:
- /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/invite-user-join-org/
title: Invite a user to join an organization
weight: 10
---

View File

@@ -1,6 +1,4 @@
---
aliases:
- /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites/
title: Manage a pending invitation
weight: 20
---

View File

@@ -1,6 +1,4 @@
---
aliases:
- /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/remove-user-from-org/
title: Remove a user from an organization
weight: 40
---

View File

@@ -1,6 +1,4 @@
---
aliases:
- /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/view-list-org-users/
title: View a list of organization users
weight: 50
---

View File

@@ -1,8 +1,7 @@
---
aliases:
- /docs/grafana/latest/manage-users/server-admin/
- /docs/grafana/latest/manage-users/server-admin/server-admin-manage-users/
- /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/
- ../../manage-users/server-admin/
- ../../manage-users/server-admin/server-admin-manage-users/
title: Manage users globally
weight: 300
---

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-user-to-org/
- add-user-to-org/
title: Add or remove a user from an organization
weight: 30
---

View File

@@ -1,6 +1,4 @@
---
aliases:
- /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-user/
title: Add a user
weight: 10
---

View File

@@ -1,6 +1,4 @@
---
aliases:
- /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges/
title: Assign or remove Grafana server administrator privileges
weight: 20
---

View File

@@ -1,6 +1,4 @@
---
aliases:
- /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/change-user-org-permissions/
title: Change a user's organization permissions
weight: 50
---

View File

@@ -1,6 +1,4 @@
---
aliases:
- /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/force-user-logout/
title: Force a user to logout from Grafana
weight: 90
---

View File

@@ -1,6 +1,4 @@
---
aliases:
- /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions/
title: Grant editors administrator permissions
weight: 60
---

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-user-account-details/
- view-user-account-details/
title: View and edit a user account
weight: 110
---

View File

@@ -1,6 +1,4 @@
---
aliases:
- /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-list-users/
title: View a list of users
weight: 100
---

View File

@@ -1,9 +1,8 @@
---
aliases:
- /docs/grafana/latest/manage-users/add-or-remove-user-from-team/
- /docs/grafana/latest/manage-users/create-or-remove-team/
- /docs/grafana/latest/manage-users/manage-teams/
- /docs/grafana/latest/administration/manage-users-and-permissions/manage-teams/
- ../../manage-users/add-or-remove-user-from-team/
- ../../manage-users/create-or-remove-team/
- ../../manage-users/manage-teams/
title: Manage teams
weight: 600
---

View File

@@ -1,6 +1,4 @@
---
aliases:
- /docs/grafana/latest/administration/preferences/
title: Preferences
weight: 50
---

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/administration/change-home-dashboard/
- ../change-home-dashboard/
description: How to replace the default home dashboard
keywords:
- grafana

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/installation/provisioning
- ../installation/provisioning/
description: ''
keywords:
- grafana
@@ -160,6 +160,7 @@ Since not all datasources have the same configuration settings we only have the
| httpMethod | string | Prometheus | HTTP Method. 'GET', 'POST', defaults to POST |
| customQueryParameters | string | Prometheus | Query parameters to add, as a URL-encoded string. |
| manageAlerts | boolean | Prometheus and Loki | Manage alerts via Alerting UI |
| alertmanagerUid | string | Prometheus and Loki | UID of Alert Manager that manages Alert for this data source. |
| esVersion | string | Elasticsearch | Elasticsearch version (E.g. `7.0.0`, `7.6.1`) |
| timeField | string | Elasticsearch | Which field that should be used as timestamp |
| interval | string | Elasticsearch | Index date time format. nil(No Pattern), 'Hourly', 'Daily', 'Weekly', 'Monthly' or 'Yearly' |

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/installation/security/
- ../installation/security/
description: Security Docs
keywords:
- grafana

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/tutorials/ha_setup/
- ../tutorials/ha_setup/
keywords:
- grafana
- tutorials

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/admin/metrics/
- ../../admin/metrics/
description: Internal metrics exposed by Grafana
keywords:
- grafana

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/admin/view-server-settings/
- ../../admin/view-server-settings/
description: How to view server settings in the Grafana UI
keywords:
- grafana

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/admin/view-server-stats/
- ../../admin/view-server-stats/
keywords:
- grafana
- server

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/alerting/add-notification-template/
- ../add-notification-template/
keywords:
- grafana
- documentation

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/alerting/create-alerts/
- ../create-alerts/
description: Configure alert rules
keywords:
- grafana

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/alerting/notifications/
- ../notifications/
description: Alerting notifications guide
keywords:
- Grafana

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/alerting/pause-an-alert-rule/
- ../pause-an-alert-rule/
description: Pause an existing alert rule
keywords:
- grafana

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/alerting/troubleshoot-alerts/
- ../troubleshoot-alerts/
description: Troubleshoot alert rules
keywords:
- grafana

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/alerting/view-alerts/
- ../view-alerts/
description: View existing alert rules
keywords:
- grafana

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/alerting/metrics/
- metrics/
title: Grafana alerts
weight: 113
---

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/alerting/rules/
- ../rules/
title: Create and manage rules
weight: 130
---

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/
- create-cortex-loki-managed-recording-rule/
description: Create Grafana Mimir or Loki managed alerting rule
keywords:
- grafana

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/alerting/metrics/
- ../metrics/
title: Alerting fundamentals
weight: 120
---

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/alerting/metrics/
- ../../metrics/
title: Alertmanager
weight: 116
---

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/alerting/metrics/
- ../../metrics/
title: Alerting on numeric data
weight: 116
---

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/alerting/message-templating/
- ../message-templating/
description: Message templating
keywords:
- grafana

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/tutorials/authproxy/
- ../tutorials/authproxy/
description: 'Grafana Auth Proxy Guide '
keywords:
- grafana

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/installation/ldap/
- ../installation/ldap/
description: 'Grafana LDAP Authentication Guide '
keywords:
- grafana

View File

@@ -1,6 +1,4 @@
---
aliases:
- /docs/grafana/latest/auth/saml/
description: Grafana SAML Authentication
keywords:
- grafana

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/auth/saml/
- saml/
description: Grafana Team Sync
keywords:
- grafana

View File

@@ -1,7 +1,7 @@
---
aliases:
- /docs/grafana/latest/guides/glossary
- /docs/grafana/latest/getting-started/glossary
- ../getting-started/glossary/
- ../guides/glossary/
description: Grafana glossary
keywords:
- grafana

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/getting-started/intro-histograms
- ../getting-started/intro-histograms/
description: An introduction to histograms and heatmaps
keywords:
- grafana

View File

@@ -1,7 +1,7 @@
---
aliases:
- /docs/grafana/latest/guides/timeseries-dimensions
- /docs/grafana/latest/getting-started/timeseries-dimensions
- ../getting-started/timeseries-dimensions/
- ../guides/timeseries-dimensions/
description: time series dimensions
keywords:
- grafana

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/getting-started/strategies/
- ../getting-started/strategies/
description: Common observability strategies
keywords:
- grafana

View File

@@ -0,0 +1,7 @@
---
title: Copyright notice
---
# Copyright notice
Copyright &#169; 2021 Raintank, Inc. dba Grafana Labs. All Rights Reserved.

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/features/dashboard/dashboards/
- features/dashboard/dashboards/
title: Dashboards
weight: 80
---

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/reference/annotations/
- ../reference/annotations/
keywords:
- grafana
- annotations

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/features/dashboard/dashboards/
- ../features/dashboard/dashboards/
title: Create dashboards
weight: 7
---

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/features/dashboard/dashboards/
- ../features/dashboard/dashboards/
title: Manage dashboards
weight: 8
---

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/features/dashboard/dashboards/
- ../features/dashboard/dashboards/
title: ' Dashboard UI'
weight: 2
---

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/features/dashboard/dashboards/
- ../../features/dashboard/dashboards/
title: Dashboard header
weight: 80
---

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/features/dashboard/dashboards/
- ../../features/dashboard/dashboards/
title: Dashboard rows
weight: 80
---

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/reference/dashboard_folders/
- ../reference/dashboard_folders/
keywords:
- grafana
- dashboard

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/reference/dashboard_history/
- ../reference/dashboard_history/
keywords:
- grafana
- dashboard

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/reference/export_import/
- ../reference/export_import/
keywords:
- grafana
- dashboard

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/reference/dashboard/
- ../reference/dashboard/
keywords:
- grafana
- dashboard

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/reference/playlist/
- ../reference/playlist/
keywords:
- grafana
- dashboard

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/administration/reports
- ../administration/reports/
description: ''
keywords:
- grafana

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/reference/scripting/
- ../reference/scripting/
keywords:
- grafana
- dashboard

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/reference/search/
- ../reference/search/
keywords:
- grafana
- dashboard

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/reference/timerange/
- ../reference/timerange/
keywords:
- grafana
- dashboard

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/datasources/overview/
- overview/
title: Data sources
weight: 60
---

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/features/datasources/add-a-data-source/
- ../features/datasources/add-a-data-source/
title: Add data source
weight: 100
---

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/features/datasources/alertmanager
- ../features/datasources/alertmanager/
description: Guide for using Alertmanager in Grafana
keywords:
- grafana

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/datasources/cloudwatch
- cloudwatch/
description: Guide for using CloudWatch in Grafana
keywords:
- grafana

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/datasources/cloudwatch
- ../cloudwatch/
description: AWS authentication
keywords:
- grafana

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/datasources/cloudwatch
- ../cloudwatch/
description: Guide for using AWS CloudWatch in Grafana
keywords:
- grafana

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/datasources/cloudwatch
- ../cloudwatch/
description: Guide for provisioning CloudWatch
title: Provision CloudWatch
weight: 400

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/datasources/cloudwatch
- ../cloudwatch/
description: Template variables in CloudWatch queryh
title: Template variables in CloudWatch query
weight: 10

View File

@@ -1,6 +1,6 @@
---
aliases:
- /docs/grafana/latest/features/datasources/azuremonitor
- ../features/datasources/azuremonitor/
description: Guide for using Azure Monitor in Grafana
keywords:
- grafana

Some files were not shown because too many files have changed in this diff Show More