public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,594 Commits 655 Branches 650 Tags
03e8428caa482884d8317502c7987bc2bbc1b24f
Commit Graph
32594 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Grot (@grafanabot)andLeon Sorokin 03e8428caa BarChart: fix single group rendering (#45953) (#45991) 
(cherry picked from commit 1c4b20b268)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
 2022-02-28 15:34:53 -06:00
Grot (@grafanabot)andying-jeanne 274cd740a5 Middleware: Fix IPv6 host parsing in CSRF check (#45911) (#45983) 
- Also create tests for this middleware

Co-authored-by: Kyle Brandt <kyle@grafana.com>
(cherry picked from commit 06ed5efdf0)

Co-authored-by: ying-jeanne <74549700+ying-jeanne@users.noreply.github.com>
 2022-02-28 20:34:26 +01:00
Dimitris Sotirakis 6e75734bd5 DockerHub: Use grafana(-oss)-image-tags to push to grafana(-oss)-dev DockerHub repo (#45708) (#45711) 
* Revert back changes - changes are done on grabpl

* Sync drone

(cherry picked from commit 3db331402d)
 2022-02-28 12:25:46 +02:00
Grot (@grafanabot)andying-jeanne 1db431b5cf bump go version to 1.17.7 (#45772) (#45782) 
(cherry picked from commit b512a3d75f)

Co-authored-by: ying-jeanne <74549700+ying-jeanne@users.noreply.github.com>
 2022-02-23 14:47:09 +01:00
Dimitris Sotirakis b688a9dede CI: Introduce docs pipeline (#45454) (#45670) 2022-02-21 16:50:16 +02:00
Dimitris Sotirakis b48b55dc14 Update grabpl (#45520) (#45526) 
(cherry picked from commit af1691dbfb)
 2022-02-18 11:51:40 +02:00
Andrej Ocenas d748a2d1e0 Docs: Remove docs publish GitHub action (#45539) 2022-02-17 16:40:23 +01:00
Dimitris Sotirakis 3bcf3f50b7 CI: Remove manual gcloud authentication (#44986) (#45445) 
* Remove manual gcloud auth from store-packages

* Update grabpl

(cherry picked from commit 163b570f5d)
 2022-02-16 09:54:30 +01:00
Grot (@grafanabot)andGilles De Mey c9411b4d57 Alerting: do not unescape external AM label values (#45334) (#45393) 
(cherry picked from commit 651bb773db)

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
 2022-02-15 14:08:09 +01:00
Dimitris Sotirakis 2adf2a1584 [v8.3.x] Bug: Update upload-cdn command args (#44979) 
* CI: Update `GCP_GRAFANA_UPLOAD_KEY` var name (#44303)

* Update GCP_KEY var name

* Rename GCP_GRAFANA_UPLOAD_KEY for upload-packages

* Update grabpl

(cherry picked from commit f96a6c10c5)

* Update upload-cdn command args (#44966)

(cherry picked from commit 67225d9cfc)
 2022-02-15 12:07:07 +00:00
Dimitris Sotirakis 027e345231 CI: Remove grafana/drone-grafana-docker image (#44983) (#45091) 
* CI: Remove `grafana/drone-grafana-docker` image (#44983)

* Remove grafana/drone-grafana-docker image

* Rename step

* Remove manual gcloud authentication

(cherry picked from commit 329b1a1ef3903c7e2c3ec1f286f9b0f00fcd023e)

* Add publish command for main

* Fix TAG variable parsing

* Remove shouldSave from main builds

* Reorder dependencies

* Update grabpl version

(cherry picked from commit 5543ad883d)

* Sign drone
 2022-02-15 12:04:12 +02:00
Grot (@grafanabot)andgotjosh 26289304f2 Alerting: Fix updating notification channels in legacy (#45302) (#45330) 
The problem here is that without the orgID we ignore the lookup of the existing notification channel just before updating and end up failing the update because there is no channel available.

(cherry picked from commit 8bf2e642aa)

Co-authored-by: gotjosh <josue.abreu@gmail.com>
 2022-02-11 17:52:01 +01:00
malcolmholmes 85edf78a46 Build: only specify github-token when needed (#45326) (#45329) 
(cherry picked from commit 9a7438c720)
 2022-02-11 16:25:31 +00:00
Carl Bergquistandmalcolmholmes 588dc422ab make drone (#45318) 
Signed-off-by: bergquist <carl.bergquist@gmail.com>

Co-authored-by: malcolmholmes <42545407+malcolmholmes@users.noreply.github.com>
 2022-02-11 15:59:08 +01:00
Grot (@grafanabot)andJJgitGit 3a95cdd78e Update geomap.md (#43527) (#45268) 
(cherry picked from commit d97e74d80f)

Co-authored-by: JJgitGit <JJgitGit@users.noreply.github.com>
 2022-02-10 17:50:51 -05:00
Grot (@grafanabot)andYuriy Tseretyan 76460e790d Alerting: support ok state in alert migration (#45264) (#45266) 
(cherry picked from commit c59567a236)

Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com>
 2022-02-10 22:12:47 +01:00
Grot (@grafanabot)andShirley c6e6309bc5 Update latest.json (#45171) (#45172) 
(cherry picked from commit 67423f42a5)

Co-authored-by: Shirley <4163034+fridgepoet@users.noreply.github.com>
 2022-02-09 18:26:22 +01:00
Grot (@grafanabot)andShirley Leu 30d3523138 Release: Bump version to 8.3.6 (#45168) 
* "Release: Updated versions in package to 8.3.6"

* Update yarn.lock

Co-authored-by: Shirley Leu <4163034+fridgepoet@users.noreply.github.com>
 2022-02-09 17:55:11 +01:00
Grot (@grafanabot)andConnor Lindsey c79cdf97d9 Tempo: Fix visual service graph bug by setting upper bound for failed arc (#45009) (#45155) 
* Fix visual service graph bug by setting upper bound for failed arc calculation

(cherry picked from commit e94b7f45a1)

Co-authored-by: Connor Lindsey <cblindsey3@gmail.com>
 2022-02-09 15:41:57 +01:00
Grot (@grafanabot)andmaicon db4f50171f Provisioning: Ensure that the default value for orgID is set when provisioning datasources to be deleted (#44244) (#45129) 
Fixes #44243

Signed-off-by: Maicon Costa <maiconscosta@gmail.com>
(cherry picked from commit 8e03541228)

Co-authored-by: maicon <maiconscosta@gmail.com>
 2022-02-09 12:49:15 +01:00
Grot (@grafanabot)andDavid Parrott 2f9f74b221 Rework template docs and add examples (#43178) (#43179) 
(cherry picked from commit 8206802f19)

Co-authored-by: David Parrott <stomp.box.yo@gmail.com>
 2022-02-09 09:57:56 +01:00
Grot (@grafanabot)andRoy C 62ff483d13 Alerting: remove error banner when Prometheus ruler is not supported (#44571) 
(cherry picked from commit 3d0cff5410)

Co-authored-by: Roy C <crosscent@gmail.com>
 2022-02-08 22:27:31 +01:00
Grot (@grafanabot)andsam boyer 4806851ae3 pkg/web: X-Forwarded-For multi-IP handling (#45098) (#45103) 
It is conventionally common for the X-Forwarded-For header to contain a
comma-separated list of IP addresses, with each intermediate proxy
adding an additional item as a request passes through it. This change
makes the web framework handle this case appropriately, always selecting
the first item in the list.

(cherry picked from commit 6a2255abe7)

Co-authored-by: sam boyer <sdboyer@grafana.com>
 2022-02-08 14:57:43 -05:00
Konrad Lalik c44af3ca20 Alerting: Improve Contact Points error handling (#44888) (#45093) 
* Add 400 and 408 errors handling to display useful error message

* Add generic error handling

* Improve type guard

(cherry picked from commit 1cf48618de)
 2022-02-08 17:40:11 +01:00
Grot (@grafanabot)andDan Cech 4a29cf13f0 update snapshots server url (#44563) (#44566) 
* update snapshots server url
* update all old references to snapshot.raintank.io

(cherry picked from commit 1e89fc157d)

Co-authored-by: Dan Cech <dcech@grafana.com>
 2022-02-08 17:05:20 +01:00
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