public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,569 Commits 655 Branches 650 Tags
883977bc3a0cdc960877d656fa8adee43ce251ca
Commit Graph
32569 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dimitris Sotirakis 883977bc3a [v8.3.x] Update changelog for 8.3.5 and 7.5.15 (#45078) (#45086) 
* Update changelog for 8.3.5 and 7.5.15 (#45078)

(cherry picked from commit b2a8487684)

* Remove 8.4.0-beta1 additions
 2022-02-08 16:29:54 +01:00
Dimitris SotirakisMarcus EfraimssonKevin MinehartSerge Zaitsev
 		f42d0b9beb [v8.3.x] Sync security changes (#45067) 
* "Release: Updated versions in package to 8.3.5"

* [v8.3.x] Fix for CVE-2022-21702 (#225)

Fix for CVE-2022-21702

* Update yarn.lock for 8.3.5

* resolve conflicts

(cherry picked from commit bb38cfcba4b4f824060ff385d858c63f50b72d74)

* csrf checks for v8.3.5 (#234)

* Fix lint

* Cherry pick e2e test server changes

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
Co-authored-by: Serge Zaitsev <serge.zaitsev@grafana.com>
 2022-02-08 15:35:38 +01:00
Grot (@grafanabot)andHugo Häggmark 667f884db1 LibraryPanels: Removes save errors for panels changed to library panels (#45033) (#45034) 
(cherry picked from commit 9e1cb8c12a)

Co-authored-by: Hugo Häggmark <hugo.haggmark@gmail.com>
 2022-02-08 07:13:02 +01:00
achatterjee-grafana 0ac23b0446 Fix link to user API (#44930) 2022-02-05 18:46:05 +01:00
Grot (@grafanabot)andGilles De Mey acdf2ec806 Alerting: validate namespace and groupname for Grafana manages and Lotex alerts (#44872) (#44909) 
(cherry picked from commit 1680e284e5)

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
 2022-02-04 15:17:22 +01:00
Dimitris Sotirakis 2c033a6540 CI: Make e2e tests depend on binary builds (#44647) (#44833) 
* Make e2e test depend on binary builds

* Search for binary in the correct folders

* Remove package file var

* Add ARCH var

(cherry picked from commit 7bb5a5b318)
 2022-02-04 10:08:19 +02:00
Grot (@grafanabot)andKonrad Lalik 9cddb216d3 Alerting: Fix alert notification template (#44761) (#44838) 
(cherry picked from commit bb88cf683c)

Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
 2022-02-03 14:34:41 +01:00
Grot (@grafanabot)andGilles De Mey c051c5d423 Alerting: load correct unified alerting tab (#44794) (#44831) 
(cherry picked from commit 29b97361f7)

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
 2022-02-03 14:09:12 +01:00
Grot (@grafanabot)andJM e38d8cd8af Library Elements API GET by name returns array (#44743) (#44751) 
* Library Elements API GET by name returns array

Making a GET request to the Library Elements HTTP API `api/library-elements/name/:name` will return an **array** of Library Element objects, but the documentation says it will return a Library Element object.

Example cURL POST request:
`curl -X POST -H "Content-Type: application/json" -H "Authorization: Bearer XXXXXXXXXXX" -d @request.json "https://my.grafana.net/api/library-elements/"`

request.json
```json
{
  "model": {},
  "kind": 1,
  "name": "testing description3",
  "uid": "basic3",
  "id": 12345,
  "version": 2
}
```

Example cURL GET request:
`curl -X GET -H "Content-Type: application/json" -H "Authorization: Bearer XXXXXXXX" -d @request "https://my/api/library-elements/name/testing description3"`

Example response:
```json
{
    "result": [
        {
            . . .
        }
    ]
}
```

* Library Elements API fix bracket spacing

(cherry picked from commit 925333bfa4)

Co-authored-by: JM <justintmai@gmail.com>
 2022-02-02 18:46:03 +01:00
Grot (@grafanabot) 9464ffa86b Fix Discord Webhook URL for invalid template (#44763) (#44772) 
This commit fixes an issue where an invalid template for Discord would change the Webhook URL to "" and cause "unsupported protocol scheme" errors.
 2022-02-02 14:48:27 +01:00
Konrad Lalik 60a25b4022 Alerting: Split legacy and unified routing configuration (#44641) (#44757) 
* Disable add alert menu entry for legacy alerting

* Split legacy and unified routing configuration

* Fix fallback routes configuration

(cherry picked from commit 69e4796504)
 2022-02-02 11:37:06 +01:00
Grot (@grafanabot)andGiordano Ricci 6beca4317e [v8.3.x] Logs Panel: fix timestamp parsing for string dates without timezone (#44754) 
Co-authored-by: Giordano Ricci <me@giordanoricci.com>
 2022-02-02 11:09:07 +01:00
Grot (@grafanabot)andCat Perry c9a619e364 Tempo: Show error if transformTrace() is passed bad data to parse to JSON (#44684) (#44741) 
* Surface errors if transformTrace() is passed bad data to parse

(cherry picked from commit a86d7a5a90)

Co-authored-by: Cat Perry <000.perry@gmail.com>
 2022-02-01 23:59:10 +01:00
Connor Lindsey 9b628f4742 [v8.3.x] Tempo: Add request histogram to service graph datalink 2022-02-01 20:07:44 +01:00
Tania BandMitch Seaman 2bd51b506e add links between encryption docs (#42549) (#44705) 
(cherry picked from commit b7e1f5f9ce)

Co-authored-by: Mitch Seaman <mjseaman@users.noreply.github.com>
 2022-02-01 15:12:21 +02:00
Grot (@grafanabot)andUrsula Kallio b88f3a909e Add concept about envelope encryption (#41860) (#44703) 
* Add concept about envelope-encryption.

* remove comma

* separate warning note into steps

* remove steps from warning note

* Fix lint

Co-authored-by: Mitch Seaman <mjseaman@users.noreply.github.com>
Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
(cherry picked from commit ed0f3100b3)

Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com>
 2022-02-01 14:49:27 +02:00
Grot (@grafanabot)andKonrad Lalik 4f2ffc434f Alerting: Fix moving alert rules to a different folder (#44533) (#44644) 
* Prevent rule deletion when creation in a new folder fails

* Fix handling duplication of rules when moving between folders

* Add unit test for unique name generator

* Fix typo

(cherry picked from commit 88f3dff6d2)

Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
 2022-02-01 10:33:22 +01:00
Grot (@grafanabot)andachatterjee-grafana 8f7c031d1d Docs: Add section about limitations alerting in "Time range controls" (#44680) (#44682) 
* Added section about syntaxes not supported by Grafana. Also updated missing image name.

* Fixed image name again.

(cherry picked from commit 133e34d52a)

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
 2022-01-31 18:46:33 -05:00
Andrej Ocenas 30d5482a48 Prometheus: Fix some of the alerting queries that use reduce/math operation (#44380) (#44672) 
* Prometheus: Dont fill response with nulls for alerting queries

* Refactor based on reviews

(cherry picked from commit 780591cc12)
 2022-01-31 13:51:30 -05:00
Grot (@grafanabot)andConnor Lindsey 5af06db660 NodeGraph: Update no data message to show if no nodes (#44483) (#44674) 
* Display error if no service graph data is returned

* Remove error message and update node graph no data logic

* Check processed nodes instead of rendered nodes for no data message

* Remove console.log

(cherry picked from commit 4f44ff7ce8)

Co-authored-by: Connor Lindsey <cblindsey3@gmail.com>
 2022-01-31 19:45:40 +01:00
Grot (@grafanabot)andGeorge Robinson 8343e79f3e Add metrics to ngalert scheduler (#44602) (#44670) 
This pull request adds metrics to the ngalert scheduler so we can see how long it takes to evaluate a tick.

(cherry picked from commit 5e2280ceee)

Co-authored-by: George Robinson <george.robinson@grafana.com>
 2022-01-31 17:40:19 +00:00
Will Browne ac8f1b5b6b [v8.3.x] Plugins: Refactor Grafana and Plugin version update checkers (#44662) 
* 44529

* fix test
 2022-01-31 16:49:29 +01:00
Grot (@grafanabot)andTharun Rajendran 5b37d14b7f Tempo: Display start time in search results as relative time (#44568) (#44661) 
* Explore: modify tempo trace start time to human readable format in table output

Signed-off-by: tharun <rajendrantharun@live.com>

* add unit tests

Signed-off-by: tharun <rajendrantharun@live.com>
(cherry picked from commit de1661e877)

Co-authored-by: Tharun Rajendran <rajendrantharun@live.com>
 2022-01-31 16:22:46 +01:00
Grot (@grafanabot)andHugo Häggmark 3ce1ca5ac1 Variables: Fix for constant variables in self referencing links (#44631) (#44651) 
* Variables: Fix for constant variables in self referencing links

* Chore: adds bettercomment

(cherry picked from commit 5a5f5cacc8)

Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>
 2022-01-31 14:20:40 +01:00
Karl Persson cdcbf64b67 quote reserved keyword (#43652) (#44649) 
(cherry picked from commit 2425828a0b)
 2022-01-31 13:24:29 +01:00
Grot (@grafanabot)andJosh Hunt f35f826525 TablePanel: Fix ad-hoc variabes not working on default datasources (#44314) (#44626) 
* Dashboards: Fix ad-hoc variabes not working on default datasources

* not async

* Update comment

(cherry picked from commit b1b6205651)

Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
 2022-01-31 01:36:39 +01:00
Grot (@grafanabot)andachatterjee-grafana 30c7df22ee Docs: Added information about Prometheus write permission requirement. (#44616) (#44618) 
* Added note.

* Fixed typo.

(cherry picked from commit d584a27055)

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
 2022-01-28 20:22:32 -05:00
Grot (@grafanabot)andConnor Lindsey 0d469694c6 Tempo: Auto-clear results when changing query type (#44390) (#44596) 
* Auto-clear results when changing query type

* Move clear results to function

(cherry picked from commit 45a435ad78)

Co-authored-by: Connor Lindsey <cblindsey3@gmail.com>
 2022-01-28 08:57:32 -07:00
Grot (@grafanabot)andGilles De Mey 9ddcb16298 fix: multiple queries in alerting regression (#44585) (#44599) 
(cherry picked from commit 26ddeaf3d7)

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
 2022-01-28 16:37:55 +01:00
Grot (@grafanabot)andachatterjee-grafana 2c1a590752 fix typo (#44564) (#44567) 
(cherry picked from commit 7b476c19c2)

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
 2022-01-28 08:42:43 -05:00
Connor LindseyandTharun Rajendran a61b1e4285 NodeGraph: fix rendering of node graph in dashboard panel (#44552) (#44558) 
Signed-off-by: tharun <rajendrantharun@live.com>
(cherry picked from commit 5721933e4b)

Co-authored-by: Tharun Rajendran <rajendrantharun@live.com>
 2022-01-27 19:48:53 +01:00
Grot (@grafanabot)andIsabella Siu 7c2b1cc9d0 CloudMonitoring: Fix resource labels in query editor (#44550) (#44555) 
(cherry picked from commit d3b8fc53aa)

Co-authored-by: Isabella Siu <Isabella.siu@grafana.com>
 2022-01-27 11:57:29 -05:00
Grot (@grafanabot)andTania B 872727e745 Chore: Remove unused AWS KMS provider's token setting (#44531) (#44548) 
(cherry picked from commit 1a9c293984)

Co-authored-by: Tania B <yalyna.ts@gmail.com>
 2022-01-27 16:30:57 +01:00
Grot (@grafanabot)andLeon Sorokin 2585ad1ddc TimeSeries: disable fill when fillBelowTo field is missing (#44498) (#44500) 
(cherry picked from commit 6533eb9244)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
 2022-01-27 00:22:37 +01:00
Grot (@grafanabot)andMitsuhiro Tanda 7c9c60b853 Cloud Monitoring: Reduce request size when listing labels (#44365) (#44473) 
(cherry picked from commit d1083b9597)

Co-authored-by: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
 2022-01-26 12:18:30 +01:00
Grot (@grafanabot)andLeon Sorokin e016d4eb1b Formatters: speed up toDuration() (#44345) (#44461) 
(cherry picked from commit a20894c261)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
 2022-01-26 02:09:15 -06:00
Grot (@grafanabot)andConnor Lindsey 9727ba084c Tempo: Add time range to tempo search query behind a feature flag (#43811) (#44445) 
(cherry picked from commit ef12028a68)

Co-authored-by: Connor Lindsey <cblindsey3@gmail.com>
 2022-01-25 18:16:32 +01:00
Dimitris Sotirakis e80194610c Update grabpl version (#44410) (#44412) 
(cherry picked from commit ef35cb5318)
 2022-01-25 10:00:06 +01:00
Grot (@grafanabot)andTorkel Ödegaard a2f97a68c6 QueryEditors: Restore query editor margin to what old value (#44384) (#44409) 
(cherry picked from commit 566556fea2)

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
 2022-01-25 09:39:09 +01:00
Carl BergquistandDave Henderson 8aa31fd2d6 Update dependency github.com/influxdata/influxdb-client-go/v2 to v2.6.0 (#44225) (#44295) 
Signed-off-by: Dave Henderson <dave.henderson@grafana.com>
(cherry picked from commit 3d865a3687)

Co-authored-by: Dave Henderson <dhenderson@gmail.com>
 2022-01-24 18:29:20 +01:00
Grot (@grafanabot)andTharun Rajendran eccd87a564 Explore: show scalar data result in a table instead of graph (#44362) (#44366) 
Signed-off-by: tharun <rajendrantharun@live.com>
(cherry picked from commit 732c2ebb37)

Co-authored-by: Tharun Rajendran <rajendrantharun@live.com>
 2022-01-24 10:37:24 +01:00
Grot (@grafanabot)andLeon Sorokin f5abd72785 TimeSeries: prevent threshold line color from affecting grid lines (#44337) (#44346) 
(cherry picked from commit 79ec3ec54c)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
 2022-01-22 00:39:14 +01:00
Grot (@grafanabot)andJason Walton db1b31d542 docs: Fix URL for Github callback in OAuth. (#41122) (#44332) 
(cherry picked from commit 5d0bc9e933)

Co-authored-by: Jason Walton <github@lucid.thedreaming.org>
 2022-01-21 12:03:36 -05:00
Grot (@grafanabot)andAndres Martinez Gotor 7fd39889fa AzureMonitor: Allow template variables in the subscription field (#44312) (#44331) 
(cherry picked from commit addeba7f05)

Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
 2022-01-21 17:02:49 +01:00
Grot (@grafanabot)andJM 64fc2ecb0e Docs: add API pages to HTTP API list (#42997) (#44328) 
* add API pages to HTTP API list

* fix capitalization of page names

(cherry picked from commit 8a21385481)

Co-authored-by: JM <justintmai@gmail.com>
 2022-01-21 10:31:55 -05:00
Grot (@grafanabot)andJean-Philippe Quéméner 42668a5e89 Alerting: recognize Cortex datasources correctly in the frontend (#44316) (#44325) 
* Alerting: always use msg field for user facing errors

* fix: revert front-end Cortex detection

Co-authored-by: gillesdemey <gilles.de.mey@gmail.com>
(cherry picked from commit 8ee3f59cd4)

Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com>
 2022-01-21 16:03:55 +01:00
Armand GrilletandYuriy Tseretyan c335538765 Create only one folder per dashboard with ACL (#44317) 
Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com>
 2022-01-21 14:59:18 +01:00
Grot (@grafanabot)andAshley Harrison 3d453a6104 Only modify table spacing (#44313) (#44320) 
(cherry picked from commit e1af78954f)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
 2022-01-21 14:52:47 +01:00
Dimitris Sotirakis 918cb580e8 E2E: Rename end-to-end-tests-server to grafana-server (#44249) (#44282) 
* Rename to grafana-server / move scripts into new directory

* Change grafana-server step command

* Change scripts paths

* Use test grabpl version

* Update run-suite script

* Further name updates

* Update grabpl version

* Update contribute/style-guides/e2e-core.md

Co-authored-by: Maria Alexandra <239999+axelavargas@users.noreply.github.com>

Co-authored-by: Maria Alexandra <239999+axelavargas@users.noreply.github.com>
(cherry picked from commit 22eb2df602)
 2022-01-21 11:09:31 +02:00
Dominik Prokop 6863f49bd0 [v8.3.x] Cursor sync: Apply the settings without saving the dashboard (#44270) (#44279) 
* Cursor sync: Apply the settings without saving the dashboard

* Remove unnecessary code

* Lint god damn

(cherry picked from commit 7bf25f62e1)
 2022-01-21 09:27:15 +01:00