Commit Graph
6566 Commits
Author SHA1 Message Date
Grot (@grafanabot)andGeorge Robinson 4e6eb817ec Fix alerts with evaluation interval more than 30 seconds resolving in Alertmanager (#39513) (#39522)
(cherry picked from commit 27609dc2c5)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2021-09-28 09:41:43 +01:00
Marcus Efraimsson c857fb0d49 Elasticsearch/Prometheus: Set correct service namespace for SigV4 (#39439) (#39664)
Makes sure to set the SigV4 service namespace for Elasticsearch and Prometheus.

Fixes #38440

(cherry picked from commit 45a844e77e)
2021-09-27 16:25:55 +02:00
Todd Treece d6764b59b0 Chore: Add go-redis v8 dependency (#39442) (#39451)
* adds redis v8 client dependency

* remove go-redis v5 dependency

(cherry picked from commit 1781c8ec7d)
2021-09-20 18:01:21 -05:00
Dimitris Sotirakis abca3c81b0 Fix regex to identify / as separator (#39220) 2021-09-15 11:51:45 +02:00
Grot (@grafanabot)andEmil Tullstedt f427f11bda LDAP: Search all DNs for users (#38891) (#39167)
(cherry picked from commit ad971cc9be)

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
2021-09-14 11:30:38 +02:00
Sofia Papagiannaki feb4fbaae9 Alerting: Fix notification channel migration (#38983) (#39053)
(cherry picked from commit b56bf83c19)
2021-09-09 20:50:12 +03:00
5a1c145aee [v8.1.x] LibraryPanels: Fixes update issues related to library panels in rows (#38969)
* LibraryPanels: Fixes update issues related to library panels in rows (#38963)

(cherry picked from commit 17f9bc138e)

* Tests: fixes broken test because of feature not yet backported

Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>
Co-authored-by: Hugo Häggmark <hugo.haggmark@gmail.com>
2021-09-09 06:21:44 +02:00
Grot (@grafanabot)andWill Browne 9240425952 track signature files + add warn log (#38938) (#38958)
(cherry picked from commit 40643ee023)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
2021-09-08 09:22:37 +02:00
Marcus Efraimsson 4f215e06f1 Postgres/MySQL/MSSQL: Fix region annotations not displayed correctly (#38936) (#38953)
Fix region annotations not displayed correctly when returning timeend column
as epoch timestamp and by that making sure that the returned data frame field
named timeend is treated as time type.

Fixes #38533

(cherry picked from commit fbdaf56a84)
2021-09-08 09:51:27 +03:00
Grot (@grafanabot)andgotjosh 3760a3ab23 Alerting: Fix alert flapping in the internal alertmanager (#38648) (#38829)
* Alerting: Fix alert flapping in the alertmanager

fixes a bug that caused Alerts that are evaluated at low intervals (sub 1 minute), to flap in the Alertmanager.
Mostly due to a combination of `EndsAt` and resend delay.

The Alertmanager uses `EndsAt` as a heuristic to know whenever it should resolve a firing alert, in the case that it hasn't heard
back from the alert generation system.

Because grafana sent the alert with an `EndsAt` which is equal to the `For` of the alert itself,
and we had a hard-coded 1 minute re-send delay (only applicable to firing alerts) this meant that a firing alert would resolve in the Alertmanager before we re-notify that it still firing.

This commit, increases the `EndsAt` by 3x the the resend delay or alert interval (depending on which one is higher). The resendDelay has been decreased to 30 seconds.

(cherry picked from commit dd502f22eb)

Co-authored-by: gotjosh <josue@grafana.com>
2021-09-02 17:03:07 +01:00
Grot (@grafanabot)andRyan McKinley bfcf311f8f Live: prepend orgId when publishing from HTTP (#38775) (#38793)
(cherry picked from commit e461c722bf)

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
2021-09-01 18:25:32 +02:00
Grot (@grafanabot)andAlexander Emelin 592829cbed Live: allow connections with request host matching origin host (#38538) (#38628)
(cherry picked from commit a95a40d87d)

Co-authored-by: Alexander Emelin <frvzmb@gmail.com>
2021-08-27 12:54:16 +02:00
Grot (@grafanabot)andidafurjes 51d3926cde Bug: Return empty plugins.DataTimeSeriesSlice when the frame field vector is epmty (#38587) (#38602)
* Add check if the vector is empty

* Use Rows() instead of Len() on field

* Remove redundant condition

(cherry picked from commit 568549e810)

Co-authored-by: idafurjes <36131195+idafurjes@users.noreply.github.com>
2021-08-26 17:20:03 +02:00
Grot (@grafanabot)andDimitris Sotirakis e928c334c2 Elasticsearch: Fix metric names for alert queries (#38546) (#38574)
* Export fieldName to var

* Add empty string as frame name

(cherry picked from commit 12320dda3c)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
2021-08-26 09:46:30 +02:00
Grot (@grafanabot)andidafurjes f195dcc37a API: Add short url validation (#38436) (#38572)
* Add short url validation
Path should not contain string ../

* Update pkg/api/short_url.go

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

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
(cherry picked from commit 7faea40674)

Co-authored-by: idafurjes <36131195+idafurjes@users.noreply.github.com>
2021-08-26 09:44:07 +02:00
Grot (@grafanabot)andWitek Bedyk bcb405e40c Licensing: Provide correct URL for AGPL license (#36917) (#38531)
* Provide correct link for AGPL license

* Change LicenseURL to point go Grafana OSS page

* Keep utm_source query parameter

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

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
(cherry picked from commit 65501cbad3)

Co-authored-by: Witek Bedyk <wbedyk@suse.com>
2021-08-25 15:57:13 +02:00
Grot (@grafanabot)andidafurjes 70a0dc57ac API: Add theme validation (#38432) (#38480)
* Add theme validation

* Fix lint for const

(cherry picked from commit ccab9611cb)

Co-authored-by: idafurjes <36131195+idafurjes@users.noreply.github.com>
2021-08-24 10:30:49 +02:00
Grot (@grafanabot)andidafurjes 1a711659f5 Bug: Register OpenTSDB with correct service name (#37581) (#38450)
* Bug: Register OpenTSDB with correct service name

* USe Register instead of RegisterAndStart

(cherry picked from commit 769b7a5865)

Co-authored-by: idafurjes <36131195+idafurjes@users.noreply.github.com>
2021-08-23 15:23:28 +02:00
Grot (@grafanabot)andPiotr Jamróz 8dd9ecf7cb Graphite: Convert tag values returned as numbers to strings (#37882) (#38083)
* Convert tag values returned as numbers to string

This is a bug in Graphite <= 1.1.7. Since 1.1.8 all values are converted to strings.

* Simplify type conversions

* Fix linting errors

(cherry picked from commit f7501ff77f)

Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com>
2021-08-19 19:28:28 +02:00
Grot (@grafanabot)andbillabongrob a7db2a20dc Admin: Obfuscate azure_blob Account Key (#38061)
Obfuscate azure_blob Account Key #37970

(cherry picked from commit 2fe62af685)

Co-authored-by: billabongrob <billabongrob@gmail.com>
2021-08-19 12:10:47 +02:00
Grot (@grafanabot)andStephanie Hingtgen 17219bf052 Update http error code when datasource health check fails (#37895) (#37914)
Since the datasource settings are configured by the user, the health check error could be a client error. A 506 error may be sufficient as well.

(cherry picked from commit db2e0d46b7)

Co-authored-by: Stephanie Hingtgen <stephanie.hingtgen@grafana.com>
2021-08-18 21:35:06 +02:00
Grot (@grafanabot)andDimitris Sotirakis cfeb21b12c Cloudwatch: Unwrap errors - throw error from upstream (#36334) (#37993)
* Unwrap errors - throw error from upstream

* Fixes according to reviewer's comments

* Fix linting

* Remove unused code

(cherry picked from commit 050dc7bc8f)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
2021-08-18 21:34:02 +02:00
Grot (@grafanabot)andVictor Cinaglia c4ffd13612 profiling: Support binding pprof server to custom network interfaces (#36580) (#38009)
Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
(cherry picked from commit 0819d15942)

Co-authored-by: Victor Cinaglia <victor@grafana.com>
2021-08-18 19:48:46 +02:00
Grot (@grafanabot)andSergey Kostrukov 1fe8b3a7b0 Fix scopes mutation by cloning original array (#37981) (#37996)
(cherry picked from commit c6356c5bba)

Co-authored-by: Sergey Kostrukov <sekost@microsoft.com>
2021-08-18 10:36:41 +02:00
Grot (@grafanabot)andWill Browne 5619aa7a5b fix with global config state (#37293) (#37954)
(cherry picked from commit 697ac937c6)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
2021-08-17 12:42:17 +02:00
Grot (@grafanabot)andAndrej Ocenas d6a13c45d2 CloudWatch/Logs: Fix crash when time column has nil values (#37708) (#37825)
(cherry picked from commit b5f7df3e62)

Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>
2021-08-17 12:07:28 +02:00
Grot (@grafanabot)andDimitris Sotirakis 7b8440ad46 Elasticsearch: Fix metric names for alert queries (#37871) (#37925)
* Use props names as metrics names

* Make aliases work

(cherry picked from commit 1aeafa34d1)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
2021-08-16 14:27:20 +02:00
Grot (@grafanabot)andSergey Kostrukov e12111ee6e Fix alternative Azure cloud names (#37133) (#37886)
(cherry picked from commit dd0a906fb7)

Co-authored-by: Sergey Kostrukov <sekost@microsoft.com>
2021-08-13 16:26:16 +02:00
Grot (@grafanabot)andDimitris Sotirakis d4497432a0 Remove duplicated title from slack notification (#37834) (#37881)
(cherry picked from commit db91a55d49)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
2021-08-13 14:48:08 +02:00
Grot (@grafanabot)andKyle Brandt a4154b376f Annotations: Fix alerting annotation coloring (#37412) (#37851)
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
(cherry picked from commit aef67994a1)

Co-authored-by: Kyle Brandt <kyle@grafana.com>
2021-08-12 19:02:36 +02:00
Grot (@grafanabot)andSLAMA 709c5e8db4 Alerting frontend : fix line notifier (#37744) (#37753)
- Fixes #37425
- change `line` type string to uppercase

(cherry picked from commit 5986d99f51)

Co-authored-by: SLAMA <36870081+xy-man@users.noreply.github.com>
2021-08-10 19:40:00 +01:00
Grot (@grafanabot)andWill Browne 1dcecdb89a Plugins: Use file extension allowlist when serving plugin assets instead of checking for UNIX executable (#37688) (#37695)
* explicitly check for plugin binary

* remove check completely

* resolve conflicts

* allow module + logos

* add tests

* simplify

* rework to allowlist

* add case

* remove old stuff

* simplify

* add case insensitive test

(cherry picked from commit e0315dabe8)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
2021-08-10 16:42:46 +02:00
Grot (@grafanabot)andying-jeanne dd15b33f74 Dependency: update collector to v.31.0 (#37546) (#37558)
* update collector to v.31.0

* Change protobuf unmarshal function after upgrade

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
(cherry picked from commit fcd0dac814)

Co-authored-by: ying-jeanne <74549700+ying-jeanne@users.noreply.github.com>
2021-08-04 18:28:58 +02:00
Grot (@grafanabot)andgotjosh bbee1b26c5 Alerting: Refactor Run of the scheduler (#37157) (#37337)
* Alerting: Refactor `Run` of the scheduler

A bit of a refactor to make the diff easier to read for supporting
external Alertmanagers.

We'll introduce another routine that checks the database for
configuration and spawns other routines accordingly.

* Block the wait.

* Fix test

(cherry picked from commit 442a6677fc)

Co-authored-by: gotjosh <josue@grafana.com>
2021-08-04 17:28:18 +01:00
Grot (@grafanabot)andJack Westbrook 0e5a6a62be Plugins: Fix catalog permissions for org and server admins (#37504) (#37529)
* simplify toggle + add link to server admin

* feat(catalog): org admins can configure plugin apps, cannot install/uninstall plugins

* fix(catalog): dont show buttons if user doesn't have install permissions

* feat(catalog): cater for accessing catalog via /plugins and /admin/plugins

* feat(catalog): use location for list links and match.url to define breadcrumb links

* test(catalog): mock isGrafanaAdmin for PluginDetails tests

* test(catalog): preserve default bootdata in PluginDetails mock

* refactor(catalog): move orgAdmin check out of state and make easier to reason with

Co-authored-by: Will Browne <will.browne@grafana.com>
(cherry picked from commit cdcccfcc53)

Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
2021-08-04 12:58:46 +02:00
Joan López de la Franca Beltran b05581cc23 Encryption: Convert functions into global variables (#37240) (#37492) 2021-08-03 17:25:57 +02:00
Grot (@grafanabot)andDomas fc5e1dbd15 put alerting admin page under ngalert flag (#37437) (#37439)
(cherry picked from commit 73d36d5521)

Co-authored-by: Domas <domas.lapinskas@grafana.com>
2021-08-02 10:39:31 +02:00
Grot (@grafanabot) 22a357cc7d Live: display stream rate, fix duplicate channels in list response (#37365) (#37421) 2021-07-30 21:42:29 +03:00
Grot (@grafanabot)andAgnès Toulet 7a823fe895 Renderer: delete debug.log file when Grafana is stopped (#37367) (#37413)
(cherry picked from commit 0757ba1c64)

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>
2021-07-30 18:45:41 +02:00
Grot (@grafanabot)andKyle Brandt 0075a3c014 NGAlert: Send resolve signal to alertmanager on alerting -> Normal (#37363) (#37371)
(cherry picked from commit aa904a5a04)

Co-authored-by: Kyle Brandt <kyle@grafana.com>
2021-07-29 20:58:45 +02:00
Grot (@grafanabot)andGanesh Vernekar 411e19ed4b Alerting: Deduplicate receivers during migration (#36812) (#37353)
* Alerting: Deduplicate receivers during migration

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

* Fix review comments

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

* Better naming of contact points

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

* Handle some edge cases

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

* Don't add routes which point to default contact point

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

Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com>
2021-07-29 16:52:19 +02:00
Grot (@grafanabot)andWill Browne a952824e35 Plugins: Perform plugin update check prior to uninstall (#36909) (#37346)
* only uninstall if update is possible

* add .

* update lingo for clarity

(cherry picked from commit 08a73a5291)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
2021-07-29 12:20:29 +02:00
Grot (@grafanabot)andIlya Stoliar f778fdbbe8 CloudWatch: Add AWS LookoutMetrics (#37329) (#37332)
(cherry picked from commit b62fe58cac)

Co-authored-by: Ilya Stoliar <52413756+ilyastoli@users.noreply.github.com>
2021-07-29 10:07:56 +02:00
Grot (@grafanabot)andidafurjes 0f5446d768 SQL: Fix SQL dataframe resampling (fill mode + time intervals) (#36937) (#37330)
* Refactor resample logic

* Adjust test to have one more timestamp out of range

* adjust test + ensure filling

* revert flag flip

* Undo logic - should be timeseries only

* change data calculation based on previous interval

* fix the logics

* fix typo

* fix resample start time, to reuse what sql api returned

* calculate the start point with from truncate by interval

Co-authored-by: Will Browne <will.browne@grafana.com>
Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
Co-authored-by: Ying WANG <ying.wang@grafana.com>
(cherry picked from commit 180b1973e0)

Co-authored-by: idafurjes <36131195+idafurjes@users.noreply.github.com>
2021-07-29 09:05:59 +02:00
Grot (@grafanabot)andDavid Parrott 2b97f6a507 Alerting: automatically remove stale alerting states (#36767) (#37214)
* initial attempt at automatic removal of stale states

* test case, need espected states

* finish unit test

* PR feedback

* still multiply by time.second

* pr feedback

(cherry picked from commit b5f464412d)

Co-authored-by: David Parrott <stomp.box.yo@gmail.com>
2021-07-26 18:37:34 +02:00
Grot (@grafanabot)andGanesh Vernekar 4478259f70 Alerting: Remove the fixed wait for notification delivery (#37203) (#37207)
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
(cherry picked from commit a65975cca0)

Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com>
2021-07-26 15:42:31 +02:00
Grot (@grafanabot)andIlya Stoliar 38cb26bd5b CloudWatch: Add AWS IVS metrics and dimensions (#37178) (#37206)
(cherry picked from commit 59c691a777)

Co-authored-by: Ilya Stoliar <52413756+ilyastoli@users.noreply.github.com>
2021-07-26 15:22:36 +02:00
Grot (@grafanabot)andGeorge Robinson 04cb471599 Expand the value string in annotations and labels of alerts (#37051) (#37105)
This commit makes it possible to use the value string in
annotations and labels for alerts with "{{ $value }}"

(cherry picked from commit 2f4c893cf3)

Co-authored-by: George Robinson <85952834+gerobinson@users.noreply.github.com>
2021-07-23 09:28:49 +02:00
Grot (@grafanabot)andSergey Kostrukov fda235a862 Infra: Azure authentication in HttpClientProvider (#36932) (#37124)
* Azure middleware in HttpClientProxy

* Azure authentication under feature flag

* Minor fixes

* Add prefixes to not clash with JsonData

* Return error if JsonData cannot be parsed

* Return original string if URL invalid

* Tests for datasource_cache

(cherry picked from commit c1963024ec)

Co-authored-by: Sergey Kostrukov <sergey@kostrukov.com>
2021-07-22 23:12:31 +02:00
Grot (@grafanabot)andAlexander Emelin bc9ac1199b fix sample.ini (#37106) (#37107)
(cherry picked from commit 6b2d33dc14)

Co-authored-by: Alexander Emelin <frvzmb@gmail.com>
2021-07-22 17:25:47 +02:00