public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,462 Commits 655 Branches 650 Tags
b7d2911caccbc79c63d2e585b95087824d945ede
Commit Graph
33462 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Giordano Ricci b7d2911cac Merge pull request #269 from grafana/bump-version-8.4.3 
Release: Bump version to 8.4.3
v8.4.3 		2022-03-02 13:01:27 +00:00
grafanabot f944a0fe16 "Release: Updated versions in package to 8.4.3" 2022-03-02 12:50:11 +00:00
Elfo404 e68b468420 Merge branch 'v8.4.x' of github.com:grafana/grafana into v8.4.x 2022-03-02 12:46:54 +00:00
Grot (@grafanabot)andKonrad Lalik 5ad4d91de3 Alerting: Fix silence url in notifications (#46031) (#46090) 
* Update silence url generation

* Update tests

* Update test to the new silence params format

* Fix tests

(cherry picked from commit aeec087065)

Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
 2022-03-02 13:22:56 +01:00
Grot (@grafanabot)andLeon Sorokin 659ce4bcad Graph (old): use timeField.config.interval to apply null insertion logic (#46069) (#46070) 
(cherry picked from commit fa99143eee)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
 2022-03-02 06:41:03 +01:00
Grot (@grafanabot)andMarcus Efraimsson 9d0e4efd9b Docs: Fix typo in Forward OAuth identity for the logged-in user section (#46043) (#46048) 
Fixes #45938

(cherry picked from commit 843e587a05)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
 2022-03-01 19:00:12 +01:00
Grot (@grafanabot)andGeorge Robinson 14acf3e39f Alerting: Fix use of > instead of >= when checking the For duration (#46011) (#46044) 
(cherry picked from commit 789cfc31e3)

Co-authored-by: George Robinson <george.robinson@grafana.com>
 2022-03-01 18:20:11 +01:00
Grot (@grafanabot)andachatterjee-grafana 45e484132c Docs update default.ini file description (#46036) (#46038) 
* remove confusing wording

* fixed broken alerting links

(cherry picked from commit 77dddf43bc)

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
 2022-03-01 10:53:06 -05:00
Erik Sundell f26e850297 fix conflict (#45957) 2022-03-01 14:17:25 +01:00
Grot (@grafanabot)andmatt abrams 6e03fe1f94 Transformations: Use asterisk for First non-null label (#45940) (#46014) 
(cherry picked from commit 07dda8a299)

Co-authored-by: matt abrams <37156449+zuchka@users.noreply.github.com>
 2022-03-01 14:03:34 +01:00
Grot (@grafanabot)andTimur Olzhabayev a31a0e898a Making yarn.lock bump work (#46016) (#46019) 
(cherry picked from commit 6f14490c6b)

Co-authored-by: Timur Olzhabayev <timur.olzhabayev@grafana.com>
 2022-03-01 13:40:33 +01:00
Grot (@grafanabot)andLeon Sorokin 1f39b05f33 Histogram: auto-skip x tick labels to avoid overlap (#45996) (#46001) 
(cherry picked from commit b491d6b4dc)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
 2022-03-01 09:12:36 +01:00
Grot (@grafanabot)andLeon Sorokin 865723d56e StateTimeline: fix duration in tooltip (#45955) (#45987) 
- Fixes duration in StateTimeline appearing incorrectly when "merge consecutive values" is enabled.

(cherry picked from commit 5aab0063c7)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
 2022-02-28 16:55:54 -06:00
Grot (@grafanabot)andLeon Sorokin 700fd45f54 BarChart: fix single group rendering (#45953) (#45992) 
(cherry picked from commit 1c4b20b268)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
 2022-02-28 15:33:38 -06:00
Grot (@grafanabot)andCat Perry be55f8800e Jaeger: Show loader when search options havent yet loaded (#45936) (#45985) 
* Swap out Select component for AsyncSelect to Jaeger search panel

(cherry picked from commit 83664121bc)

Co-authored-by: Cat Perry <000.perry@gmail.com>
 2022-02-28 11:37:38 -08:00
Grot (@grafanabot)andying-jeanne b0646b1be3 Middleware: Fix IPv6 host parsing in CSRF check (#45911) (#45984) 
- 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 14:15:10 -05:00
Grot (@grafanabot)andArmand Grillet e7f52218d1 Capitalize Webhook contact point type (#45942) (#45943) 
(cherry picked from commit 1b2c4dca61)

Co-authored-by: Armand Grillet <2117580+armandgrillet@users.noreply.github.com>
 2022-02-26 21:16:40 +01:00
Grot (@grafanabot)andGeorge Robinson 87edde2b38 Update comment for scheduler_behind_seconds metric (#45918) (#45919) 
(cherry picked from commit f87bfdf2ff)

Co-authored-by: George Robinson <george.robinson@grafana.com>
 2022-02-25 15:54:42 +01:00
Grot (@grafanabot)andGeorge Robinson 6ea6c611a9 Fix incorrect metric values for scheduler_behind_seconds (#45830) (#45904) 
(cherry picked from commit 6cccbb5a09)

Co-authored-by: George Robinson <george.robinson@grafana.com>
 2022-02-25 14:24:44 +00:00
Grot (@grafanabot)andShirley e555fd5455 CloudWatch: Add test to executeStartQuery (#45888) (#45912) 
* CloudWatch: Add test to executeStartQuery

* Add test for absence of limit

* Restrict assertions to limit in some tests

(cherry picked from commit a68a570e92)

Co-authored-by: Shirley <4163034+fridgepoet@users.noreply.github.com>
 2022-02-25 14:28:08 +01:00
Grot (@grafanabot)andGábor Farkas d17f59f052 loki: log-volume: improved documentation (#45823) (#45887) 
* loki: log-volume: improved documentation

* spelling fixes

(cherry picked from commit 7152deb92f)

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
 2022-02-25 06:45:29 -05:00
Grot (@grafanabot)andShirley 1d1e81b309 CloudWatch: Fix running go test with count (#45892) (#45903) 
(cherry picked from commit 304185f682)

Co-authored-by: Shirley <4163034+fridgepoet@users.noreply.github.com>
 2022-02-25 12:36:34 +01:00
Grot (@grafanabot)andPer Osbäck d27bc6e788 Escape windows newline. (#45771) (#45857) 
Fixes #45746

(cherry picked from commit dcd98f7819)

Co-authored-by: Per Osbäck <perosb@users.noreply.github.com>
 2022-02-25 12:17:48 +01:00
Grot (@grafanabot)andTimur Olzhabayev 47c777930d fix: update bump-version-action node runtime to 16 (#45856) (#45896) 
(cherry picked from commit ab0bbf6715)

Co-authored-by: Timur Olzhabayev <timur.olzhabayev@grafana.com>
 2022-02-25 11:39:48 +01:00
Grot (@grafanabot)andGeorge Robinson 787940f32e Rename evalCtx to avoid confusion with context.Context (#45144) (#45893) 
(cherry picked from commit 2ca79ca0c7)

Co-authored-by: George Robinson <george.robinson@grafana.com>
 2022-02-25 11:20:35 +01:00
George Robinson cdf8bab022 Alerting: Create annotation if Firing alert is removed (#45703) (#45865) 
This commit changes staleResultsHandler to create an annotation if the current state is Alerting and the result is being removed from the state cache as it has not been updated since 2x the evaluation interval.

(cherry picked from commit feae959c9d)
 2022-02-25 07:38:31 +01:00
Grot (@grafanabot)andKyle Brandt c29c1691fd SSE: Fix NoData when some series were no data but others not (#45867) (#45875) 
Co-authored-by: Santiago <santiagohernandez.1997@gmail.com>
(cherry picked from commit a578cf0f7c)

Co-authored-by: Kyle Brandt <kyle@grafana.com>
 2022-02-24 21:48:56 -03:00
Grot (@grafanabot)andMelori Arellano 585b39ac0f Update dashboard_versions.md (#45871) (#45872) 
Fixes https://github.com/grafana/grafana/issues/45866, change dashboard version example to use `version` instead of `id`

`api/dashboards/id/24/versions/1`

(cherry picked from commit 8a98354844)

Co-authored-by: Melori Arellano <melori.arellano@grafana.com>
 2022-02-24 16:28:48 -05:00
George Robinson 37b6fc7067 Alerting: Use expanded labels in dashboard annotations (#45726) (#45858) 2022-02-24 17:55:37 +00:00
Grot (@grafanabot) 2255628a5a ReleaseNotes: Updated changelog and release notes for 8.4.2 (#45850) (#45859) 
(cherry picked from commit 91af956eb7)
 2022-02-24 13:28:00 -04:00
Grot (@grafanabot)andStephanie Closson bfb9c7f249 Release: Bump version to 8.4.2 (#45849) 
* "Release: Updated versions in package to 8.4.2"

* Update yarn lock

Co-authored-by: Stephanie Closson <srclosson@gmail.com>
 2022-02-24 16:00:20 +00:00
Grot (@grafanabot)andErik Sundell 01628c4045 Azure Monitor: Fixes broken log queries that use workspace (#45820) (#45843) 
* allow log queries to be executed also without a resource

* add unit tests

(cherry picked from commit b7a2fda2ae)

Co-authored-by: Erik Sundell <erik.sundell87@gmail.com>
 2022-02-24 15:42:01 +01:00
Grot (@grafanabot)andAshley Harrison 01411b5f45 Add a fallback for the clipboard API (#45831) (#45841) 
(cherry picked from commit 64ad33f31a)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
 2022-02-24 15:14:54 +01:00
Grot (@grafanabot)andYaelle Chaudy 4363f9af1f Adding ap-southeast-3 to cloudwatch regions (#45821) (#45836) 
(cherry picked from commit 0e7b0f16b8)

Co-authored-by: Yaelle Chaudy <42030685+yaelleC@users.noreply.github.com>
 2022-02-24 15:05:26 +01:00
Dimitris Sotirakisandsam boyer 3734b455d7 grafana-cli: Diff generated ts directly instead of relying on git (#45815) (#45828) 
* Add diffing support to grafana-cli cue gen-ts

* Rely on diff comparison in cuetsify pipeline step

* Ignore *.gen.ts files with eslint

* Chore: Fix lint `sdboyer/cuetsify-compare` (#45818)

* Sync drone

(cherry picked from commit 40645ab19e39ff9b0a12b7ebb13a4dc4c5e1d472)

* Fix lint

(cherry picked from commit c95ece983984432fea029335b2b729b09d76c7eb)

* Sign drone

Co-authored-by: Dimitris Sotirakis <sotirakis.dim@gmail.com>
(cherry picked from commit 60db643983)

Co-authored-by: sam boyer <sdboyer@grafana.com>
 2022-02-24 12:25:59 +01:00
sam boyer dea7d4996a grafana-cli: Diff generated ts directly instead of relying on git (#45815) 
* Add diffing support to grafana-cli cue gen-ts

* Rely on diff comparison in cuetsify pipeline step

* Ignore *.gen.ts files with eslint

* Chore: Fix lint `sdboyer/cuetsify-compare` (#45818)

* Sync drone

(cherry picked from commit 40645ab19e39ff9b0a12b7ebb13a4dc4c5e1d472)

* Fix lint

(cherry picked from commit c95ece983984432fea029335b2b729b09d76c7eb)

* Sign drone

Co-authored-by: Dimitris Sotirakis <sotirakis.dim@gmail.com>
(cherry picked from commit 60db643983)
(cherry picked from commit 0a3fcc07d8)
 2022-02-24 13:19:31 +02:00
Grot (@grafanabot)andNathan Rodman f443777309 Alerting: add field for custom slack endpoint (#45751) (#45812) 
* add field for custom slack endpoint

* add test for using custom endpoint

* Update pkg/services/ngalert/notifier/channels/slack.go

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>

* specify description for endpoint

* remove brittle string constants

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
(cherry picked from commit f9701d78b1)

Co-authored-by: Nathan Rodman <nathanrodman@gmail.com>
 2022-02-24 11:05:44 +01:00
Kevin Minehart 69d1d4b124 remove flaky cloudwatch test (#45800) (#45807) 
* remove flaky cloudwatch tests

* Skip flaking templating-dashboard-links-and-variables test

(cherry picked from commit cbf96e6a8b)
 2022-02-23 15:27:50 -05:00
Grot (@grafanabot)andStephanie Closson 9fc02d717f Release: Bump version to 8.4.2 (#261) 
* "Release: Updated versions in package to 8.4.2"

* updated yarn.lock - 8.4.2 release process

Co-authored-by: Stephanie Closson <srclosson@gmail.com>
v8.4.2 		2022-02-23 14:22:54 -04:00
Stephanie Closson d98982bf02 Merge branch 'v8.4.x' of github.com:grafana/grafana into v8.4.x 2022-02-23 13:53:00 -04:00
Grot (@grafanabot)andSofia Papagiannaki 1c10ae4106 Skip flaky test (#45785) (#45799) 
(cherry picked from commit 3cfbbbdbf2)

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
 2022-02-23 17:09:58 +01:00
Grot (@grafanabot)andJoan López de la Franca Beltran 884b573c0b Encryption: Refine secrets-related commands (#45201) (#45790) 
* CLI: Adjust 're-encrypt-data-keys' command

* CLI: Adjust 're-encrypt' command

* Multiple improvements on re-encrypt secrets migration

* Another bunch of code improvements

* Lint fixes

(cherry picked from commit e6a85826e9)

Co-authored-by: Joan López de la Franca Beltran <5459617+joanlopez@users.noreply.github.com>
 2022-02-23 16:21:52 +01:00
Dimitris Sotirakis 6fd53a9b88 Update grabpl and build-container version (#45784) (#45788) 
(cherry picked from commit 2f0dcbbd9d)
 2022-02-23 15:30:40 +01:00
Grot (@grafanabot)andying-jeanne e6b5a6b227 bump go version to 1.17.7 (#45772) (#45783) 
(cherry picked from commit b512a3d75f)

Co-authored-by: ying-jeanne <74549700+ying-jeanne@users.noreply.github.com>
 2022-02-23 14:47:57 +01:00
Grot (@grafanabot)andSofia Papagiannaki 17354bfbe6 Search: fix PostgreSQL query (#45305) (#45780) 
* Search: fix PostgreSQL query

* Apply suggestion from code review

(cherry picked from commit 5a1d8cbea7)

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
 2022-02-23 13:49:33 +01:00
Grot (@grafanabot)andTorkel Ödegaard f86e30f492 Annotations: Fixes issue with tags filter not showing in annotation query (#45724) (#45778) 
(cherry picked from commit ef3f254208)

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
 2022-02-23 04:47:32 -08:00
Grot (@grafanabot)andmatt abrams e85b839bc4 add default number of returned dashboards (#45755) (#45777) 
(cherry picked from commit ade8c18557)

Co-authored-by: matt abrams <37156449+zuchka@users.noreply.github.com>
 2022-02-23 04:38:16 -08:00
Dimitris Sotirakis ec21ded065 Docs: Remove dependency between build-frontend and build-frontend-docs (#45736) (#45768) 
* Remove dependency

* Add yarn commands

(cherry picked from commit 02640c7436)
 2022-02-23 12:43:45 +01:00
Dimitris Sotirakis 7fb85157c9 CI: Add docs pipeline for main pipelines (#45740) (#45767) 
* Add docs pipeline for main

* Extract trigger docs

* Change trigger for main

(cherry picked from commit ea3e41ea62)
 2022-02-23 12:26:30 +01:00
Dimitris Sotirakis 90ec0128c1 DockerHub: Use grafana(-oss)-image-tags to push to grafana(-oss)-dev DockerHub repo (#45708) (#45712) 
* Revert back changes - changes are done on grabpl

* Sync drone

(cherry picked from commit 3db331402d)
 2022-02-23 13:12:52 +02:00