public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,669 Commits 655 Branches 650 Tags
f9724ef34cbcb805205cc0852a7a5cfb3a9d09c7
Commit Graph
35669 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Grot (@grafanabot)andNathan Marrs f9724ef34c Annotations: Fix custom tag functionality (#51537) (#51588) 
(cherry picked from commit 35240f6d5a)

Co-authored-by: Nathan Marrs <nathanielmarrs@gmail.com>
 2022-06-29 10:52:44 -07:00
Ashley Harrisonanddsotirakis 09be340848 Chore: Backport 51543 to v9.0.x (#51562) 
* Chore: split betterer into it's own CI step and allow failures for now (#51543)

* split betterer into it's own CI step and allow failures for now

* Run make drone

Co-authored-by: dsotirakis <dimitrios.sotirakis@grafana.com>
(cherry picked from commit f654152dc8)

* Run make drone

Co-authored-by: dsotirakis <dimitrios.sotirakis@grafana.com>
 2022-06-29 16:35:35 +01:00
Grot (@grafanabot)andkay delaney 53a3dca76c LibraryElements: Delete invalid connections before deleting element (#50519) (#51550) 
(cherry picked from commit 189b7f9c0b)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
 2022-06-29 16:19:01 +01:00
Grot (@grafanabot)andChristopher Moyer fb24f7de8c Docs: combines use dashboard content into single topic (#51527) (#51554) 
* combines use dashboard content into single topic

* Some minor updates

* corrects spelling

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
(cherry picked from commit 40e72c6de3)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
 2022-06-29 08:49:11 -05:00
Grot (@grafanabot)andPolina Boneva 121d398022 Variables: variables in Markdown links are not interpolated (#51392) (#51546) 
* on a text panel first interpolate, then markdown, then sanitize;

* update devenv dashboard + e2e tests

* fix typo and undo changes in grafana/data

* handling of config option disableSanitizeHtml more readable when preparing markdown in text panel

* betterer

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
(cherry picked from commit f83f05d6b3)

Co-authored-by: Polina Boneva <13227501+polibb@users.noreply.github.com>
 2022-06-29 15:46:45 +03:00
Grot (@grafanabot)andAshley Harrison f8d19746f6 Chore: add a betterer test for undocumented stories (#51444) (#51545) 
* add a betterer test for undocumented stories

* update results

* Update .betterer.ts

Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com>

* update results

* prettier

* slightly nicer regexp

Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com>
(cherry picked from commit 688164bbd6)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
 2022-06-29 07:53:55 -04:00
Grot (@grafanabot)andGeorge Robinson 169646b780 Alerting: Remove duplicate error message (#51515) (#51540) 
(cherry picked from commit ed56755dd7)

Co-authored-by: George Robinson <george.robinson@grafana.com>
 2022-06-29 10:21:24 +01:00
Grot (@grafanabot)andAshley Harrison 37a58f8af5 Templating: Changing between variables with the same name now correctly triggers a dashboard refresh (#51490) (#51539) 
* user essentials mob! 🔱

* user essentials mob! 🔱

lastFile:public/app/features/variables/pickers/OptionsPicker/actions.ts

* user essentials mob! 🔱

lastFile:public/app/features/variables/pickers/OptionsPicker/actions.test.ts

* linting

* update betterer

Co-authored-by: kay delaney <kay@grafana.com>
(cherry picked from commit 683bbc7373)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
 2022-06-29 05:02:27 -04:00
Grot (@grafanabot)andChristopher Moyer 5a626418d7 moves custom branding to configuration (#51522) (#51523) 
(cherry picked from commit f59a4d51cd)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
 2022-06-28 14:45:29 -05:00
Grot (@grafanabot)andChristopher Moyer cb9411d64a Docs: renames tracing topics, moves to configure docs (#51519) (#51521) 
* renames tracing topics, moves to configure docs

* changes enable diagnostics file name

(cherry picked from commit 5eb35e1b78)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
 2022-06-28 12:37:55 -05:00
Grot (@grafanabot) d4e57ea5ef ReleaseNotes: Updated changelog and release notes for 9.0.2 (#51507) (#51509) 
(cherry picked from commit 744fc4c802)
 2022-06-28 16:14:14 +01:00
Grot (@grafanabot) 2cc1c3196d "Release: Updated versions in package to 9.0.2" (#51505) 2022-06-28 16:02:09 +01:00
Grot (@grafanabot)andSriram afc0318ac8 E2E: default download to grafana enterprise (#51473) (#51485) 
In plugin E2E, changing the default download to enterprise version of grafana.

(cherry picked from commit 5aab8b710b)

Co-authored-by: Sriram <yesoreyeram@gmail.com>
 2022-06-28 06:33:16 -04:00
Gilles De Mey 1e9b32778e Alerting: Skip the default data source if incompatible (#51452) (#51486) 2022-06-28 05:11:59 -04:00
Grot (@grafanabot)andGeorge Robinson bc294261f9 Alerting: Add support for images in Telegram (#51433) (#51482) 
(cherry picked from commit 5053468c65)

Co-authored-by: George Robinson <george.robinson@grafana.com>
 2022-06-28 10:06:52 +01:00
Grot (@grafanabot)andGeorge Robinson c9cd00c1be Alerting: Add support for images in Pushover alerts (#51372) (#51483) 
(cherry picked from commit f04dfc589c)

Co-authored-by: George Robinson <george.robinson@grafana.com>
 2022-06-28 10:06:44 +01:00
Eric Leijonmarck 5735f6c88b [v9.0.x] Auth: Case insensitive ids duplicate usagestats (#51240) 
* merged and backport to 9.0

* implement the missing method GetDialect for sqlStore

* Add back mockstore missing methods
 2022-06-28 11:03:53 +02:00
Grot (@grafanabot)andAndrej Ocenas 6dcb1b07c0 Prometheus: Add test for resource call header handling (#51036) (#51046) 
* Add test

* Remove unused test

(cherry picked from commit 677b2a43b5)

Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>
 2022-06-28 10:57:17 +02:00
Grot (@grafanabot)Peter HolmbergPeter Holmberg
 		5b390de1b6 Alerting: Add legacy indicator to navbar (#49511) (#49614) 
* update id and add translation key

* remove logs

(cherry picked from commit e3a51a4aa8)

Co-authored-by: Peter Holmberg <peterholmberg@users.noreply.github.com>
Co-authored-by: Peter Holmberg <peter.hlmbrg@gmail.com>
 2022-06-28 10:38:58 +02:00
Grot (@grafanabot)Dimitris Sotirakisdsotirakis
 		c343547467 [v9.0.x] Docs CI: Fix CHANGELOG.md - add *.md in checkDocs (#50721) 
* Fix docs - add *.md checks (#50720)

(cherry picked from commit 2dfa3270ef)

* Fix changelog

Co-authored-by: Dimitris Sotirakis <sotirakis.dim@gmail.com>
Co-authored-by: dsotirakis <dimitrios.sotirakis@grafana.com>
 2022-06-28 03:34:25 -04:00
Grot (@grafanabot)andJean-Philippe Quéméner 5e8c61b979 Alerting: change optimistic lock to use proper insert select (#51461) (#51466) 
* Alerting: change optimistic lock to proper insert select

* remove debug logging

* fix postgres

* fix mysql

* remove empty line for go-lint

* add some docs

* use constants

(cherry picked from commit cd0fefec5b)

Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com>
 2022-06-27 18:34:50 -04:00
Grot (@grafanabot)andSantiago 1cb7a6fcb0 Optional custom title and description for OpsGenie (#50131) (#51427) 
* optional custom description for OpsGenie

* custom title and message, tests

* update changelog

* check for empty / whitespace only strings

* truncate the title to 130 characters if needed

* unnecessary validation removed

* truncate title to 127 characters and add three dots

(cherry picked from commit 9dc7e752b7)

Co-authored-by: Santiago <santiagohernandez.1997@gmail.com>
 2022-06-27 22:48:40 +03:00
Grot (@grafanabot)andJean-Philippe Quéméner 3cd7eac137 Alerting: prevent the use of the same uid across all contact points (#51440) (#51458) 
* Alerting: prevent the use of the same uid across all contact points

* Update pkg/services/ngalert/provisioning/contactpoints.go

Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com>

Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com>
(cherry picked from commit bf255965a2)

Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com>
 2022-06-27 13:11:41 -04:00
Joao Silva c23fc1c84e Dashboards: Fixes issue with the initial panel layout counting as an unsaved change (#51439) 2022-06-27 14:19:37 +01:00
Grot (@grafanabot)andMarcus Efraimsson 504ecbd4f9 Plugins: Improved handling of symlinks (#51324) (#51431) 
Improves how we handle symlinks in plugin management.

(cherry picked from commit 04df634ef5)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
 2022-06-27 06:41:51 -04:00
Marcus Efraimsson e037f7ace7 [v9.0.x] Plugins: Use a Grafana specific SDK logger implementation for core plugins (#51229) (#51325) 
* Plugins: Use a Grafana specific SDK logger implementation for core plugins (#51229)

Upgrade grafana-aws-sdk to v0.10.6

(cherry picked from commit a8eb29f1d7)

* fix go.mod go.sum
 2022-06-27 12:22:28 +02:00
Grot (@grafanabot)Kristina DurivageGilles De Mey
 		813b3873f5 [v9.0.x] Alerting: adds additional command palette actions (#51429) 
Co-authored-by: Kristina Durivage <kristina.durivage@grafana.com>
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
 2022-06-27 06:10:22 -04:00
Grot (@grafanabot)andPatrick Baus 896396e04b [v9.0.x] Alerting: Use relative path for flow chart image (#51426) 
Co-authored-by: Patrick Baus <github@maat-family.de>
 2022-06-27 12:01:28 +02:00
Ashley Harrison 5d9905cc82 Chore: reintroduce type assertion test + change emitted metric names … (#51421) 
* Chore: reintroduce type assertion test + change emitted metric names (#51375)

* reintroduce type assertion test + change emitted metric names

* rename test to better eslint to be more generic

(cherry picked from commit 0124dc8e6b)

* don't use --cache

* update betterer results
 2022-06-27 10:32:14 +01:00
Timur Olzhabayev a86f63e69f Updating migration docs and adding hint about polystat panel (#51367) (#51420) 
(cherry picked from commit cb17f91ab5)
 2022-06-27 10:22:55 +02:00
Jack Westbrook 73d9a4f08c Build: Bump grafana/eslint-config to 4.0.0 (#51329) (#51391) 
(cherry picked from commit ead01e6e5d)
 2022-06-25 13:48:01 +01:00
Todd Treece e236df03c0 Variables: Selectively reload panels on URL update (#51003) (#51397) 
(cherry picked from commit 342344bb03)
 2022-06-24 18:39:55 +00:00
Artur Wierzbicki 899b421166 Search: Fix pagination in the new search page (#51366) (#51394) 
* Fix pagination in the new search

* update betterer betterer betterer betterer betterer betterer

* revert packagejson

(cherry picked from commit c496b3e712)
 2022-06-24 22:17:10 +04:00
Grot (@grafanabot)andGeorge Robinson c54f381570 [v9.0.x] Alerting: Remove fmt.Println from Threema (#51382) 
Co-authored-by: George Robinson <george.robinson@grafana.com>
 2022-06-24 16:05:31 +02:00
Grot (@grafanabot)andIvana Huckova c69b092f20 FeedbackLink: Add tracking (#51251) (#51377) 
(cherry picked from commit 0d899e2635)

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
 2022-06-24 15:26:40 +02:00
Grot (@grafanabot)andIvana Huckova fe8bc8702e Logs: Fix report interaction name (#51335) (#51364) 
(cherry picked from commit f7db3d2ae6)

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
 2022-06-24 10:49:53 +02:00
Grot (@grafanabot)andJoey Tawadrous 7c8cfc0fe5 Traces: Feature tracking (#49767) (#51312) 
* Feature tracking for traces

* Mock runtime in test

* Update reportInteraction key

(cherry picked from commit dcccac6657)

Co-authored-by: Joey Tawadrous <90795735+joey-grafana@users.noreply.github.com>
 2022-06-24 08:15:12 +01:00
Grot (@grafanabot)andAndres Martinez Gotor b429aa11fe AzureMonitor: Parse non-fatal errors for Logs (#51320) (#51362) 
(cherry picked from commit b10ddfdf8c)

Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
 2022-06-24 09:13:15 +02:00
Alexander Weaver 40ff163fde Alerting: Code-gen parsing of URL parameters and fix related bugs (#50731) (#51353) 
* Extend template and generate

* Generate and fix up alertmanager endpoints

* Prometheus routes

* fix up Testing endpoints

* touch up ruler API

* Update provisioning and fix 500

* Drop dead code

* Remove more dead code

* Resolve merge conflicts

(cherry picked from commit 0d9389e1f4)
 2022-06-23 16:51:01 -04:00
Isabella Siu cfc67c0bbd CloudWatch: fix variable query migration with json template variables (#51207) (#51346) 
(cherry picked from commit 8ba8e1df83)
 2022-06-23 16:48:10 -04:00
gotjosh d1c45321f7 Alerting: Don't stop the migration when alert rule tags are invalid (#51253) (#51341) 
* 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 19:51:22 +02:00
Erik Sundell 90ef654130 resolve merge conflict (#51333) 2022-06-23 17:14:21 +02:00
Grot (@grafanabot)andTania bacb7893d6 Encryption: Stop decrypting EE encrypted secrets with legacy encryption (#50090) (#51309) 
(cherry picked from commit 7a614fd8a1)

Co-authored-by: Tania <yalyna.ts@gmail.com>
 2022-06-23 14:09:06 +02:00
Grot (@grafanabot)andpolibb f015a44eb1 Template Variable: Datasource variable can be used when MIXED option is selected in panel query (#51170) (#51181) 
* user essentials mob! 🔱

* user essentials mob! 🔱

lastFile:public/app/features/query/components/QueryEditorRowHeader.test.tsx

* user essentials mob! 🔱

* test variables showing in data source picker dropdown on MIXED

* clean up unused imports

* remove comment

* remove unused mock

Co-authored-by: Alexandra Vargas <alexa1866@gmail.com>
Co-authored-by: Joao Silva <joao.silva@grafana.com>
Co-authored-by: joshhunt <josh@trtr.co>
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
(cherry picked from commit 665da5d063)

Co-authored-by: polibb <13227501+polibb@users.noreply.github.com>
 2022-06-23 12:23:02 +02:00
Grot (@grafanabot)andIvana Huckova 00165544bd Query history: Fix default value when no config (#51129) (#51167) 
* Query history: Fix default value in setting.go

* Update for frontend

* Remove frontend update

(cherry picked from commit 62e55d530d)

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
 2022-06-22 17:08:23 +02:00
Grot (@grafanabot)andAshley Harrison 99cea9f98b Annotations: Fixes a problem where annotation autocomplete would crash the panel (#51164) (#51250) 
* use custom formatCreateLabel in AnnotationEditorForm

* give `TagFilter` it's own formatCreateLabel

* only show TagBadge if the label is a string

(cherry picked from commit be6a878fd6)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
 2022-06-22 16:10:25 +02:00
Grot (@grafanabot)andJguer a8401fc8e8 OAuth: Restore debug log behavior (#51244) (#51247) 
(cherry picked from commit d2ab3556fa)

Co-authored-by: Jguer <joao.guerreiro@grafana.com>
 2022-06-22 15:44:55 +02:00
Daniel LeeandAlexandre de Verteuil 1dcd9939a5 Minor edits in whats-new-in-v9-0 (#51159) (#51243) 
Grammar, punctuation, syntax edits.

(cherry picked from commit 746f664a75)

Co-authored-by: Alexandre de Verteuil <alexandre@grafana.com>
 2022-06-22 15:04:19 +02:00
Grot (@grafanabot)andGeorge Robinson 7d537849b3 Alerting: Add support for images in Kafka alerts (#50758) (#51231) 
(cherry picked from commit 6e44b36a30)

Co-authored-by: George Robinson <george.robinson@grafana.com>
 2022-06-22 11:16:08 +01:00
Grot (@grafanabot)andChristopher Moyer 128c940cda Docs: fixes setup relrefs (#51178) (#51195) 
* fixes setup relrefs

* Update docs/sources/setup-grafana/configure-security/configure-authentication/enhanced_ldap.md

Co-authored-by: Garrett Guillotte <100453168+gguillotte-grafana@users.noreply.github.com>

* Update docs/sources/setup-grafana/configure-security/_index.md

Co-authored-by: Garrett Guillotte <100453168+gguillotte-grafana@users.noreply.github.com>

Co-authored-by: Garrett Guillotte <100453168+gguillotte-grafana@users.noreply.github.com>
(cherry picked from commit 2df04582ce)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
 2022-06-22 10:28:11 +01:00