public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,855 Commits 655 Branches 650 Tags
6ee6dbc8dffc3b82a2b9461fe2faad14de3ea65b
Commit Graph
6362 Commits
Author SHA1 Message Date
Grot (@grafanabot)andSofia Papagiannaki 4c2822e5b7 Alerting: Allow rules with same title across folders (#35270) (#35281) 
* Alerting: Allow rules with same title across folders

* Add test

(cherry picked from commit 8cda1f5153)

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
 2021-06-05 19:49:34 +03:00
Grot (@grafanabot)andSofia Papagiannaki 557c310c8c Alerting: Recact html responses (#35277) (#35282) 
(cherry picked from commit fba90b8f9b)

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
 2021-06-04 21:29:23 +03:00
Grot (@grafanabot)andGiordano Ricci 7f410cceee Elasticsearch: Fix min_doc_count value when alerting (#35254) (#35264) 
* Elasticsearch: Fix min_doc_count value when alerting

* Add tests

(cherry picked from commit 7a304223e6)

Co-authored-by: Giordano Ricci <me@giordanoricci.com>
 2021-06-04 17:10:02 +02:00
Grot (@grafanabot)andSofia Papagiannaki 7eda7945d3 Alerting: Fix notification channel migration and handle case when Alertmanager default configuration is absent (#35086) (#35246) 
* Fix dashboard alert and nootifier migration for MySQL

* Fix POSTing Alertmanager configuration if no current configuration exists

in case the default configuration has not be stored yet
or has failed to get stored

* Change CreatedAt field type

(cherry picked from commit 15c55b0115)

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
 2021-06-04 16:41:28 +03:00
Grot (@grafanabot)andAgnès Toulet da8d9e6854 Renderer: add version information (#34964) (#35245) 
* Renderer: add version information

* fix alerting test

(cherry picked from commit 5f6c172b5a)

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>
 2021-06-04 14:27:58 +02:00
Grot (@grafanabot)andSergey Kostrukov e3ffea3f1b AzureMonitor: fix Azure Resource Graph queries in Azure China (#35235) (#35244) 
* Optimize Azure Monitor routes

* Update API version compatible with Azure China

(cherry picked from commit 412bcf1fb0)

Co-authored-by: Sergey Kostrukov <sekost@microsoft.com>
 2021-06-04 13:57:14 +02:00
Grot (@grafanabot)andWill Browne bc49ceddb7 remove incorrect use of grafana-cli logger (#35228) (#35236) 
(cherry picked from commit 2e9ad871b3)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
 2021-06-04 11:32:06 +02:00
Grot (@grafanabot)andSofia Papagiannaki 956f728f61 SSE: Change math expression to accept any value convertible to float (#34996) (#35202) 
* SSE: Change math expression to accept any scalar value

* Apply suggestions from code review

* Update test

* Remove TODO

(cherry picked from commit eeb84d09c2)

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
 2021-06-04 11:49:33 +03:00
Grot (@grafanabot)andDimitris Sotirakis 7b67612f7d Scuemata: Checking json validity by enabling skipped tests (#34385) (#35226) 
* Make sure we don't skip any tests - refactoring

* Remove commented lines

* Move test folder

(cherry picked from commit 4c8ce8a450)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
 2021-06-04 10:03:58 +02:00
Grot (@grafanabot)andGanesh Vernekar 6c512e1414 Alerting: Expand {{$labels.xyz}} template in labels and annotations (#35159) (#35208) 
* Alerting: Expand `{{$labels.xyz}}` template in labels and annotations

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Fix annotation not updating for same alert

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
(cherry picked from commit 8417088969)

Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com>
 2021-06-04 11:05:19 +05:30
Grot (@grafanabot)andGanesh Vernekar 4fe55be39e Alerting: Do not hard fail on templating errors in channels (#35165) (#35193) 
* Alerting: Do not hard fail on templating errors in channels

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Fix review

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
(cherry picked from commit a30e60a0b8)

Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com>
 2021-06-03 16:48:37 +02:00
Grot (@grafanabot)andDimitris Sotirakis 681c2b3338 Chore: Remove endpoints that contain the slug field (#35104) (#35182) 
* Chore: Remove endpoints that contain the slug field

* More cleanups

* Lint fixes

* Remove unnecessary funcs

* Cleanup frontend code

* Remove deprecated endpoints from docs

* Revert change according to reviewer's comments

(cherry picked from commit 1c49986b2f)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
 2021-06-03 15:57:25 +02:00
Grot (@grafanabot)andGanesh Vernekar 5d772ffbe0 Alerting: Don't save Alertmanager config on migration when 0 channels (#35119) (#35180) 
* Alerting: Don't save Alertmanager config on migration when 0 channels

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Fix review

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
(cherry picked from commit aa4c5bbfe4)

Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com>
 2021-06-03 19:14:30 +05:30
Grot (@grafanabot)andSerge Zaitsev b04a21b002 Add verbose version flag to list dependencies as well as the version (#34741) (#35176) 
* add verbose version flag to list dependencies as well as the version

* Fix typo in the println message

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 9d33a06b4e)

Co-authored-by: Serge Zaitsev <serge.zaitsev@grafana.com>
 2021-06-03 15:21:13 +02:00
Grot (@grafanabot)andMarcus Efraimsson 5fe040d26b Chore: Refactor backend plugin manager/tsdb query data (#34944) (#35172) 
Move QueryData method into backend plugin manager which HandleRequest uses to
query data from plugin SDK supported data sources. This allowed us to remove a lot
of code no longer needed.

Ref #21510

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
(cherry picked from commit b3e9087557)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
 2021-06-03 14:41:42 +02:00
Grot (@grafanabot) 1e533f37ed Security: Update default CSP template and fix firefox CSP issues (#34836) (#35162) 
* Security: Update default content_security_policy_template
- Add 'strict-dynamic' back to script-src
- Add ws(s)://$ROOT_PATH to connect-src
- Change onEvent to on-event in angular templates to fix CSP issues in firefox.
- Add blob: to style-src

(cherry picked from commit 8143991b94)
 2021-06-03 12:11:14 +01:00
Grot (@grafanabot)andWill Browne ada0a52a0f fix bad log format (#35150) (#35153) 
(cherry picked from commit 057ba4a6e7)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
 2021-06-03 10:55:43 +02:00
Grot (@grafanabot)andCarl Bergquist 0546486f31 plugin: add signature status plugin build info (#35128) (#35132) 
Signed-off-by: bergquist <carl.bergquist@gmail.com>
(cherry picked from commit ba7aca69f6)

Co-authored-by: Carl Bergquist <carl.bergquist@gmail.com>
 2021-06-03 08:24:20 +02:00
Grot (@grafanabot)andKyle Brandt d97bc8c0a9 SSE: Refactor to simplify Series type (#35063) (#35123) 
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 4093fae99a)

Co-authored-by: Kyle Brandt <kyle@grafana.com>
 2021-06-02 19:24:54 +02:00
Grot (@grafanabot)andAlexander Emelin 0924f4e268 live: log error on dashboard subscribe (#35095) (#35117) 
(cherry picked from commit 7aee0deb38)

Co-authored-by: Alexander Emelin <frvzmb@gmail.com>
 2021-06-02 18:54:26 +03:00
Grot (@grafanabot) 5bb876f414 Chore: Refactor short url api test (#35051) (#35066) 2021-06-01 20:58:45 +02:00
Grot (@grafanabot)andGábor Farkas adfb3d4e21 InfluxDB: Flux: timestamp-column has to be first in dataframes (#35036) (#35053) 
(cherry picked from commit 38b030e2a4)

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
 2021-06-01 18:09:30 +02:00
Grot (@grafanabot)andJan Jansen abc13765b9 Short URL: Fix so that orgId is included in generated short URL (#34696) (#35042) 
Fixes #33813

Signed-off-by: Jan Jansen <jan.jansen@gdata.de>
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
(cherry picked from commit 0d1b35f99e)

Co-authored-by: Jan Jansen <farodin91@users.noreply.github.com>
 2021-06-01 15:00:11 +02:00
Domas a108647836 Alerting: check upstream response content type in lotex proxy (#34760) (#34842) 
(cherry picked from commit 347273cdea)
 2021-06-01 11:25:16 +03:00
Grot (@grafanabot)andSofia Papagiannaki 0b02a7e918 Test datasource: Returns always float values (#34986) (#35001) 
(cherry picked from commit 51afde34bd)

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
 2021-05-31 20:19:09 +03:00
Grot (@grafanabot)andGanesh Vernekar eae88f8ce8 Alerting: Migrate tags as labels and not annotations (#34990) (#34992) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
(cherry picked from commit a23674ef99)

Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com>
 2021-05-31 16:43:10 +02:00
Grot (@grafanabot)andidafurjes ddb6922773 Oauth: Assign role from GF_USERS_AUTO_ASSIGN_ORG_ROLE for Azure AD Oauth (#34838) (#34938) 
* 30555:Assign correct role with environment variable GF_USERS_AUTO_ASSIGN_ORG_ROLE

* 30555:Remove unused condition

(cherry picked from commit 48f6d6f7e6)

Co-authored-by: idafurjes <36131195+idafurjes@users.noreply.github.com>
 2021-05-31 15:18:24 +02:00
Grot (@grafanabot)andGanesh Vernekar 765655fefd Alerting: Migrate paused alerts to silences (#34898) (#34987) 
* Alerting: Migrate paused alerts to silences

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Fix lint

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
(cherry picked from commit 7c25465b3a)

Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com>
 2021-05-31 14:32:41 +02:00
Grot (@grafanabot)andWill Browne ba313788d5 fix permissions + add link for admins (#34906) (#34981) 
(cherry picked from commit 98c849d4cc)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
 2021-05-31 12:54:59 +02:00
Grot (@grafanabot)andSofia Papagiannaki 0df47643fd [Alerting]: fix/cleanup API examples (#34588) (#34970) 
(cherry picked from commit 355be158b7)

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
 2021-05-31 11:56:00 +03:00
Grot (@grafanabot)andChip Wolf ‮ 2335c3d0d5 Alerting: Add support for configuring avatar URL for the Discord notifier (#33355) (#34940) 
Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
(cherry picked from commit badec6c6ad)

Co-authored-by: Chip Wolf ‮ <hello@chipwolf.uk>
 2021-05-31 09:02:32 +02:00
Grot (@grafanabot)andRyan McKinley 216f018377 Rename: Status grid to history (#34864) (#34953) 
(cherry picked from commit 4972e0f6a1)

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
 2021-05-29 21:03:37 +02:00
Grot (@grafanabot)andying-jeanne 5e46bbe823 [Dashboard] Revert feature toggle trimdefaults (#34888) (#34937) 
* Revert "solve comments and retrigger the test"

This reverts commit f08d2d9eca.

* Revert "update api doc"

This reverts commit cc09ceb853.

* Revert "remove post trim"

This reverts commit 46fe8ed596.

* Revert "fix typo"

This reverts commit 3b3ceee16e.

* Revert "Apply suggestions from code review"

This reverts commit 3b7f3b8e15.

* Revert "update comments"

This reverts commit b9c6260876.

* Revert "update doc"

This reverts commit 8e4c4d7c93.

* Revert "remove feature toggle + add libraryPaneldefinition"

This reverts commit d01cfcc2ed.

* fix some typos

* Update public/app/features/dashboard/components/ShareModal/ShareExport.tsx

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

* Update docs/sources/dashboards/export-import.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* fix comments

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
(cherry picked from commit b391e43472)

Co-authored-by: ying-jeanne <74549700+ying-jeanne@users.noreply.github.com>
 2021-05-29 16:59:06 +02:00
Grot (@grafanabot)andOwen Diehl 8fef4d7a8a alerting: fixes per-receiver metric cardinality (#34915) (#34924) 
(cherry picked from commit cc38613ba4)

Co-authored-by: Owen Diehl <ow.diehl@gmail.com>
 2021-05-28 18:54:30 +02:00
Grot (@grafanabot)andOwen Diehl 4a67bfc102 Alerting/consistent api errors (#34858) (#34920) 
* consolidates alertmanager api errors

* util & testing consistent errors

* consistent errors for rest of ngalert apis

* updates expected errors in testware

* bump ci

* linting

* unrelated: dashboard.go lint

(cherry picked from commit 9aca032d10)

Co-authored-by: Owen Diehl <ow.diehl@gmail.com>
 2021-05-28 12:20:46 -04:00
Joan López de la Franca Beltran 6dc4e4d563 Usage Stats: Make the UsageStatsService extension point more flexible (#34778) (#34895) 
* Usage Stats: Rename service to use a more idiomatic name

* Usage Stats: Update MetricsFunc definition and implementations

* Revert "Usage Stats: Rename service to use a more idiomatic name"

This reverts commit 910ecce3e8.

* Usage Stats: Update MetricsFunc definition and implementations

(cherry picked from commit f601921670)
 2021-05-28 17:47:47 +02:00
Grot (@grafanabot)andKyle Brandt 4c967fe718 Alerting: Extract values from MD expr alerts (#34757) (#34908) 
When using mulit-dimensional Grafana managed alerts (e.g. SSE math) extract refIds values and labels so they can be shown in the notification and dashboards.

(cherry picked from commit b47e7d12e6)

Co-authored-by: Kyle Brandt <kyle@grafana.com>
 2021-05-28 11:34:59 -04:00
Grot (@grafanabot)andGanesh Vernekar e1eebdcf75 Alerting: Do no hard fail on finding discontinued channels on migration (#34894) (#34902) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
(cherry picked from commit ad6648b649)

Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com>
 2021-05-28 16:39:45 +02:00
Grot (@grafanabot)andAlexander Emelin c767dedffd live: fix log message (#34879) (#34883) 
(cherry picked from commit b73d168753)

Co-authored-by: Alexander Emelin <frvzmb@gmail.com>
 2021-05-28 17:25:23 +03:00
Grot (@grafanabot)andGanesh Vernekar a0e0414720 Alerting: Fix flaky TestNotificationChannels take 2 (#34880) (#34885) 
* Alerting: Fix flaky TestNotificationChannels take 2

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Fix nits

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Fix lint

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
(cherry picked from commit 8278c7bf77)

Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com>
 2021-05-28 12:19:39 +02:00
Grot (@grafanabot)andDanilo Bargen 638735a37c Clarify that Threema Gateway Alerts support only Basic IDs (#34828) (#34871) 
Threema Gateway supports two types of IDs: Basic IDs (where the
encryption is managed by the API server) and End-to-End IDs (where the
keys are managed by the user).

This plugin currently does not support End-to-End IDs (since it's much
more complex to implement, because the encryption needs to happen
locally). Add a few clarifications to the UI.

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 83a83de10a)

Co-authored-by: Danilo Bargen <mail@dbrgn.ch>
 2021-05-28 09:29:12 +02:00
Grot (@grafanabot)andGanesh Vernekar d76104fedf Fix flaky TestNotificationChannels (#34831) (#34866) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
(cherry picked from commit 89262ac64d)

Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com>
 2021-05-28 07:56:57 +02:00
Grot (@grafanabot)andAlexander Emelin 04741642c5 Live: max_connections option with strict default (#34634) (#34853) 
this should help Live to be enabled by default but still
do not affect setups with lots of simultenious users. To
properly handle many WS connections Grafana administrators
should tune infrastructure a bit - for example increase a
number of open files for a process. Will be in more details
in documentation.

(cherry picked from commit 6d750c000e)

Co-authored-by: Alexander Emelin <frvzmb@gmail.com>
 2021-05-27 21:47:40 +02:00
Grot (@grafanabot)andSofia Papagiannaki 922b34817c Chore: additional check when decrypting values (#34637) (#34671) 
* Chore: additional check when decrypting values

* Apply suggestions from code review

(cherry picked from commit a5082ab112)

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
 2021-05-27 15:42:54 +03:00
Grot (@grafanabot)andOwen Diehl 337bce75a5 Alerting/testing promql extraction (#34665) (#34819) 
* promql compat for marshaling

* extracts upstream instant queries into data frame for alerting

* eval string parity

(cherry picked from commit 0e0ed43153)

Co-authored-by: Owen Diehl <ow.diehl@gmail.com>
 2021-05-27 08:36:37 -04:00
Grot (@grafanabot)andKyle Brandt 986e54c127 SSE/Chore: cleanup some error messages (#34738) (#34743) 
removes "rpc error: code = InvalidArgument desc =" like strings from error messages.

This came from old grpc stuff left from when SSE was a plugin (that probably should
not have been used even when it was a plugin)

(cherry picked from commit 9016d20c4c)

Co-authored-by: Kyle Brandt <kyle@grafana.com>
 2021-05-27 07:47:05 -04:00
Grot (@grafanabot)andWill Browne 8633344706 Plugins: Enable catalog management link to gcom (#34673) (#34811) 
* click out to gcom when config enabled

* set to false

* fix styling for uninstall

* remove advertising config + simplify callout URL

* add entry to configuration.md

* update config name

* update lingo

(cherry picked from commit c7b58fe186)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
 2021-05-27 13:12:38 +02:00
Grot (@grafanabot)andRyan McKinley dc27360a89 Live: check schema equality between push messages (#34548) (#34801) 
(cherry picked from commit 67028af99e)

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
 2021-05-27 12:20:39 +02:00
Grot (@grafanabot)andying-jeanne 48b74313b5 remove feature toggle + add libraryPaneldefinition (#34488) (#34798) 
* remove feature toggle + add libraryPaneldefinition

* update doc

* update comments

* Apply suggestions from code review

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* fix typo

* remove post trim

* update api doc

* solve comments and retrigger the test

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
(cherry picked from commit c59a2e1bcf)

Co-authored-by: ying-jeanne <74549700+ying-jeanne@users.noreply.github.com>
 2021-05-27 18:03:54 +08:00
Grot (@grafanabot)andWill Browne 0d0a795d02 check is grafana admin (#34773) (#34797) 
(cherry picked from commit dbef103fb9)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
 2021-05-27 11:32:39 +02:00