public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,758 Commits 655 Branches 650 Tags
f00f6e33759d6974bc202cff676ceee7ee8e9fe3
Commit Graph

35758 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grot (@grafanabot) f00f6e3375 Alerting: fix validation of alertmanager template. (#51538) (#52210) 
without setting function map from alertmanager we receive error:
method=PUT path=/api/v1/provisioning/templates/slack.message status=400
level=error msg="invalid object specification: invalid template: template: :1: function \"toUpper\" not defined"

So for validation we should use the same settings as alertmanager do
for templates internally.

(cherry picked from commit b54da68765)

Co-authored-by: Michał Zielonka <michal.zielonka.8001@gmail.com>
 2022-07-14 06:11:14 -04:00
Grot (@grafanabot) 314b932ab8 Alerting: Fix bug where state did not change between Alerting and Error (#52204) (#52209) 
This commit fixes a bug where the state did not change from Alerting to Error if the evaluation result returned an error, or from Error to Alerting if evaluations stopped returning errors.

(cherry picked from commit 34d45977ca)

Co-authored-by: George Robinson <george.robinson@grafana.com>
 2022-07-14 06:10:39 -04:00
Grot (@grafanabot) 5018784717 Chore: Remove any that was introduced in a test (#52203) (#52206) 
(cherry picked from commit cabdfb4811)

Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
 2022-07-14 05:52:41 -04:00
Grot (@grafanabot) 708753244a Documentation: Show that admin/pause-all-alerts is only for legacy. (#51862) (#52019) 
Fixes #51728

(cherry picked from commit b808cd4432)

Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>
 2022-07-14 17:10:57 +08:00
Polina Boneva 10f3ad8c13 remove event.stopPropagation(), so that when one menu opens, all others close; (#51557) (#51807) 
Put the ClickOutsideWrapper further out in the PanelHeader, so it doesn't catch itself when clicking on the panel header above the menu;

co-authored with @glintik

(cherry picked from commit 556f312b00)
 2022-07-14 12:05:25 +03:00
Alexander Weaver f4e7d0d261 Alerting: Provisioning API respects global rule quota (#52190) 
* Alerting: Provisioning API respects global rule quota (#52180)

* Inject interface for quota service and create mock

* Check quota and return 403 if limit exceeded

* Implement tests for quota being exceeded

(cherry picked from commit 2d7389c34d)

* backport error check

Co-authored-by: Jean-Philippe Quémémer <jeanphilippe.quemener@grafana.com>
 2022-07-14 10:59:04 +02:00
Grot (@grafanabot) 9457f67210 Alerting: Disable /api/admin/pause-all-alerts with Unified Alerting (#51895) (#52077) 
/api/admin/pause-all-alerts only takes effect for legacy alerts. This
change returns a 403 if it's called when legacy alerting is disabled.

Fixes #51729

(cherry picked from commit 0cbc14961a)

Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>
 2022-07-14 16:58:37 +08:00
Grot (@grafanabot) 9a7acc9fd2 Logs: Fixed LogContext being underneath the table (#52165) (#52202) 
(cherry picked from commit 63776d5a0e)

Co-authored-by: Sven Grossmann <Svennergr@gmail.com>
 2022-07-14 10:53:48 +02:00
Grot (@grafanabot) 63eb9a94a1 AzureMonitor: Improve handling of unsupported template variable cases in URIs (#52054) (#52201) 
* Set error message for certain template variable combinations

- Make use of setError method from query editor
- Update Azure Monitor error type
- Add test for case 2 from https://github.com/grafana/grafana/pull/51331

* Update template variable docs

* Fix lint issues

* Update docs/sources/datasources/azuremonitor/template-variables.md

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

* PR comment updates

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

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
 2022-07-14 04:42:08 -04:00
Grot (@grafanabot) 8664af1ad3 Docs: fixes data source links (#52196) (#52199) 
* Docs: fixes data source links

* fixes unified alerting redirect

(cherry picked from commit 07e03666ad)

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
 2022-07-14 10:20:22 +02:00
Grot (@grafanabot) 363fa7ca46 combines table viz docs (#52176) (#52187) 
(cherry picked from commit 2520d8f827)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
 2022-07-13 17:17:19 -05:00
Grot (@grafanabot) aabd98852a Fix the bug in navbar's active item when the root url include a subpath (#51767) (#52159) 
(cherry picked from commit 7c5ba889a4)

Co-authored-by: Kian Eliasi <kian.elbo@gmail.com>
 2022-07-13 10:50:44 -04:00
Konrad Lalik d609ebd78f Use non-blocking way of fetching ruler api availability (#52102) (#52138) 
Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>
 2022-07-13 12:34:58 +02:00
Grot (@grafanabot) 4652401964 SQLstore: Fix fetching an inexistent playlist response (#51962) (#52139) 
* SQLstore: Fix fetching and deleting an inexistent playlist

xorm's session.Get() does not return an error if the raw does not exist.
It returns a boolean instead.
The playlist `sqlstore.GetPlaylist()` used to check only the error and in case
of inexistent UID didn't return an error.

(cherry picked from commit 4ff0f006dd)

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
 2022-07-13 06:13:38 -04:00
Grot (@grafanabot) f3f66f6325 API: Do not validate/save legacy alerts when saving a dashboard if legacy alerting is disabled (#51883) (#52137) 
* API: Do not validate/save legacy alerts if legacy alerting is disabled

Co-authored-by: Ida Furjesova <ida.furjesova@grafana.com>
(cherry picked from commit b3992df988)

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
 2022-07-13 05:52:32 -04:00
Joey Tawadrous 7d8fbb83f4 [v9.0.x] Splunk: Use legacy annotation runner (#52079) 2022-07-13 09:27:58 +01:00
Grot (@grafanabot) d351b07795 Logs: Fixed wrapping log lines from detected fields (#52108) (#52131) 
* fixed wrap in detected fields

* removed cx

(cherry picked from commit 05ba08fd8b)

Co-authored-by: Sven Grossmann <Svennergr@gmail.com>
 2022-07-13 03:38:33 -04:00
Grot (@grafanabot) 8eda9c96d3 fix docs with correct instructions to create a silence URL (#52062) (#52112) 
(cherry picked from commit f4606faec2)

Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com>
 2022-07-12 11:51:26 -04:00
Brendan O'Handley be3db07bd4 Prometheus datasource: query builder freezes when metrics metadata is undefined (#51929) (#52058) 
* add error handling for prom query builder returning undefined metrics metadata

* remove reference to escalation

(cherry picked from commit e51187a474)
 2022-07-12 10:26:51 -04:00
Grot (@grafanabot) 4e8cd49e08 Fix relrefs in devloper docs (#51942) (#51995) 
(cherry picked from commit 1c6ee69c2d)

Co-authored-by: Garrett Guillotte <100453168+gguillotte-grafana@users.noreply.github.com>
 2022-07-11 16:38:33 -07:00
Grot (@grafanabot) 82f7490f7e Alerting: Allow filtering of contact points by name (#51933) (#52070) 
* Define query param and regenerate

* Add query struct for contact points

* Filter contact points by name in query

* Document that name filter is optional

(cherry picked from commit 0e066dd5f8)

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
 2022-07-11 18:26:35 -04:00
Grot (@grafanabot) b016c0aec4 BarChart: fix crash when checking bar value text overlap (#52061) (#52064) 
(cherry picked from commit 254159ad69)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
 2022-07-11 14:01:53 -04:00
Leon Sorokin 5789a04e35 GraphNG: uPlot 1.6.22 (#51945) (#51992) 
(cherry picked from commit fda7f064ad)

# Conflicts:
#	yarn.lock
 2022-07-11 10:55:06 -05:00
Grot (@grafanabot) ef5372d317 AzureMonitor: Update resource and namespace metadata. (#52030) (#52053) 
Fixes #52028

(cherry picked from commit 1f3ff08482)

Co-authored-by: despian <mfamphlett@gmail.com>
 2022-07-11 11:31:33 -04:00
Joey Tawadrous f6147c8ece Fixed cherry-pick conflicts (#52037) 2022-07-11 15:56:02 +01:00
Grot (@grafanabot) 1d6b044c48 refactors all dashboard and linking content (#52005) (#52042) 
(cherry picked from commit 94175a801a)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
 2022-07-11 07:52:25 -05:00
Grot (@grafanabot) 23ff480957 Loki: Fix suggesting operations from different category (#52034) (#52041) 
(cherry picked from commit 0a2a370b77)

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
 2022-07-11 08:42:53 -04:00
Grot (@grafanabot) d67c1004f7 Docs: new data sources topic (#51863) (#51898) 
* Docs: new datasources topic

* Update docs/sources/alerting/fundamentals/data-source-alerting.md

Co-authored-by: George Robinson <george.robinson@grafana.com>

* Update docs/sources/alerting/fundamentals/data-source-alerting.md

Co-authored-by: George Robinson <george.robinson@grafana.com>

* corrects relrefs

Co-authored-by: George Robinson <george.robinson@grafana.com>
(cherry picked from commit f6f017edc2)

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
 2022-07-11 13:28:21 +01:00
Grot (@grafanabot) 36b06b90ff Table: Fix scrollbar is hidden by pagination (#51501) (#51960) 
* Table: Pagination fix centering

* Table: Fix scrollbar is hidden by pagination

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
(cherry picked from commit 506e63f4e1)

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
 2022-07-11 09:22:55 +02:00
Grot (@grafanabot) 7e5a7fc7fc Alerting: Add method to reset notification policy tree back to the default (#51934) (#52004) 
* Define route and run codegen

* Wire up HTTP layer

* Update API layer and test fakes

* Implement reset of policy tree

* Implement service layer test and authorization bindings

* API layer testing

* Be more specific when injecting settings

(cherry picked from commit fce283d73e)

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
 2022-07-08 16:39:49 -05:00
Adam Simpson 08f72f214e CloudWatch: Remove simplejson in favor of 'encoding/json' (#51062) (#51999) 
(cherry picked from commit 05cdef5004)
 2022-07-08 20:03:11 +00:00
Grot (@grafanabot) 48f1752e43 FeatureFlags: omit metric when grafana cant run the feature (#51856) (#51981) 
(cherry picked from commit 704a602d8c)

Co-authored-by: Stephanie Hingtgen <stephanie.hingtgen@grafana.com>
 2022-07-08 10:52:07 -06:00
Christopher Moyer 07cc627e10 adds shared content (#51982) (#51986) 
(cherry picked from commit 7f70be0580)
 2022-07-08 11:08:37 -05:00
Alexander Weaver 2b23445b42 Fix consistency errors and regenerate (#51935) (#51985) 
(cherry picked from commit d77731646c)
 2022-07-08 11:00:33 -05:00
Grot (@grafanabot) 25ca7c3ed8 Loki: Add missing operators in label filter expression (#51880) (#51972) 
(cherry picked from commit 99fb29850e)

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
 2022-07-08 17:47:47 +02:00
Grot (@grafanabot) c50ac22022 Plugins: InfluxDB update time range query (#51833) (#51927) 
(cherry picked from commit 8deb17fdc4)

Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
 2022-07-08 16:21:40 +02:00
Grot (@grafanabot) c086ae990d Azure Monitor: Add support to migrate some queries with template variables (#51881) (#51899) 
(cherry picked from commit 438c76252a)

Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
 2022-07-08 04:37:17 -04:00
Grot (@grafanabot) 6c9ed9a759 Alerting: Fix RegExp matchers in frontend for Silences and other previews. (#51726) (#51873) 
(cherry picked from commit d99a7334d5)

Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>
 2022-07-08 10:42:43 +08:00
Grot (@grafanabot) 91585c7719 Plugins: InfluxDB datasource - set epoch query param value as "ms" (#51651) (#51926) 
(cherry picked from commit 3d68023606)

Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
 2022-07-07 19:25:08 +02:00
Grot (@grafanabot) 2a25dc7ab8 Rendering: Fix user information when using render key (#50879) (#51920) 
* Rendering: Fix user information when using render key

* fix when render user ID is 0

* update fix

* improve fix

* add comment

(cherry picked from commit ca80865bf1)

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>
 2022-07-07 19:02:09 +02:00
ismail simsek f3ddc42358 [v9.0.x] Plugins: InfluxDB variable interpolation fix (#51917) (#51922) 
* Plugins: InfluxDB variable interpolation fix (#51917)

* Don't use regex on flux mode while applying template variables

(cherry picked from commit 885c517983)
 2022-07-07 11:51:58 -04:00
Grot (@grafanabot) a35e7f0bf5 Plugins: InfluxDB variable interpolation fix for influxdbBackendMigration feature flag (#51624) (#51834) 
(cherry picked from commit 9941e06e22)

Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
 2022-07-07 17:22:00 +02:00
Grot (@grafanabot) 62e0a2c561 Time series panel: Fix an issue with stacks being not complete due to the incorrect data frame length (#51910) (#51915) 
* Test failure

* Fix

(cherry picked from commit 5a65a12278)

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
 2022-07-07 07:45:02 -07:00
Grot (@grafanabot) 6e86f5dcf7 Docs: Improve docs for differences and limitations (#51905) (#51909) 
(cherry picked from commit 2b2c09b8d5)

Co-authored-by: George Robinson <george.robinson@grafana.com>
 2022-07-07 15:16:33 +01:00
Grot (@grafanabot) 35a4b56e33 Docs: Improve docs for images in notifications (#51900) (#51906) 
(cherry picked from commit ef1fb9d3a3)

Co-authored-by: George Robinson <george.robinson@grafana.com>
 2022-07-07 14:49:06 +01:00
idafurjes 59dbbb41f8 Do not check permissions while deleting external snapshot (#51897) (#51904) 
(cherry picked from commit ee88b44458)
 2022-07-07 15:45:32 +02:00
Grot (@grafanabot) e4abc7b9f1 Chore: Fix CVE-2021-3807 (#51753) (#51803) 
(cherry picked from commit 0c04fe16aa)

Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
 2022-07-07 15:33:45 +02:00
Grot (@grafanabot) 02220a6c51 Chore: Fix CVE-2022-0155 (#51755) (#51793) 
(cherry picked from commit c1ef68535b)

Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
 2022-07-07 15:32:28 +02:00
Grot (@grafanabot) d085ae7df3 Chore: Fix CVE-2020-7753 (#51752) (#51792) 
(cherry picked from commit f14cdc712c)

Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
 2022-07-07 15:30:38 +02:00
Grot (@grafanabot) 5f8a71e8c6 Chore: Fix CVE-2021-3918 (#51745) (#51791) 
(cherry picked from commit 73e7a1cc92)

Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
 2022-07-07 15:28:46 +02:00