6389 Commits
Author SHA1 Message Date
Grot (@grafanabot)andRyan McKinley 80db97f134 SQL: Fixes issues with showing value column name prefix in legends (#35839) (#35922)
* rename strategy

* Update pkg/tsdb/sqleng/sql_engine.go

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>

* more strict constraints

* Fixed so that it works on multi series results

* only apply the logic when original query returns 3 fields

* removed part of comment

* Update mysql test

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

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
2021-06-18 08:28:23 +02:00
Grot (@grafanabot)andDavid Parrott 2b0291f997 Alerting: recalculate EndsAt (#35830) (#35898)
* setEndsAt

* one more test case

* add should clause to tests

(cherry picked from commit 4732f832f7)

Co-authored-by: David Parrott <stomp.box.yo@gmail.com>
2021-06-17 19:26:32 +02:00
Grot (@grafanabot)andSofia Papagiannaki a4d72f0e5d Alerting: Fix alert permissions migration (#35869) (#35881)
* Alerting: Fix alert permissions migration

for MySQL >= 5.7 and PostgreSQL

* Do not use import struct

(cherry picked from commit 5e534d212c)

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
2021-06-17 16:34:20 +03:00
Grot (@grafanabot)andMarcus Efraimsson 1569452425 Chore: Improve save dashboard error messages (#35780) (#35819)
Includes panel and dashboard id in alert
extractor errors.
Logs all non-400 dashboard errors.

Fixes #35751

(cherry picked from commit 477d4197fb)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
2021-06-16 15:19:27 +02:00
Grot (@grafanabot)andAndrej Ocenas c5cff65563 CloudWatch/Logs: Fix missing response data for log queries (#35724) (#35746)
(cherry picked from commit 9a3e3014dd)

Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>
2021-06-16 13:58:48 +02:00
Grot (@grafanabot)andGanesh Vernekar 9252d6b05f Alerting: Fill the empty GeneratorURL (#35740) (#35803)
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
(cherry picked from commit dcd4bf1615)

Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com>
2021-06-16 12:27:49 +02:00
Grot (@grafanabot)andSofia Papagiannaki 242577ad33 Alerting: Fix updating alert rule properties with missing/zero values (#35512) (#35776)
* Fix deleting labels and annotations

* Add test

* Keep no data and error start if not provided

* Allow setting interval and for to zero during rule updates

(cherry picked from commit e5a5b8e3fe)

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
2021-06-15 21:42:25 +03:00
Grot (@grafanabot)andSofia Papagiannaki 6a9f5b260d Alerting: Add error recovery during rule evaluations (#35450) (#35773)
* Alerting: Eval recovery after query failure

* Apply suggestions from code review

(cherry picked from commit abe35c8c01)

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
2021-06-15 19:54:33 +03:00
Grot (@grafanabot)andAndres Martinez Gotor 15c9d4e3e2 Avoid log entry if not set for debug (#35741) (#35748)
(cherry picked from commit 6b786e7f68)

Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
2021-06-15 18:01:38 +02:00
Grot (@grafanabot)andWill Browne 86be18a668 Plugins: fix test with bad symlink target (#35737) (#35755)
(cherry picked from commit adbb15a3a7)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
2021-06-15 16:16:49 +02:00
Grot (@grafanabot)andDomas dd24946f0f Fix: fix loading symbolically linked plugins (#35635) (#35693)
(cherry picked from commit 5b5cb94809)

Co-authored-by: Domas <domas.lapinskas@grafana.com>
2021-06-15 13:24:53 +03:00
Grot (@grafanabot)andWill Browne c9b8c851fa Plugins: Ignore symlinked folders when verifying plugin signature (#34434) (#35719)
* add check + test

* fix test

* add manifest

* fix linter

* add nolint

* separate err cond checks

* only collect relevant plugin files

* skip symlinks

* refactor

* add missing test files + enable scanning Chromium.app/

* remove test since case already covered

* remove unnecessary changes from before

* refactor

* remove comment

(cherry picked from commit 303352a89b)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
2021-06-15 12:19:24 +02:00
Grot (@grafanabot)andSofia Papagiannaki eb018c417d Alerting: Fix alert migration RefID generation (#35667) (#35679)
* Alerting: Fix alert migration RefID generation

if the alert has more than 26 conditions

* Remove TODO comment

* Make similar change under pkg/expr

(cherry picked from commit c997f646cc)

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
2021-06-15 11:49:40 +03:00
Grot (@grafanabot)andTobias Skarhed 4c274d1615 Login: Require user to not be signed in to get request password email (#35421) (#35672)
(cherry picked from commit 7f882eea05)

Co-authored-by: Tobias Skarhed <1438972+tskarhed@users.noreply.github.com>
2021-06-14 18:25:24 +02:00
Grot (@grafanabot) 7a3163da1f Alerting: Increase alertmanager_conf column size if mysql (#35657) (#35668)
fixes #35583

(cherry picked from commit 8a3d7b6446)
2021-06-14 17:30:17 +02:00
Grot (@grafanabot)andSofia Papagiannaki 732f794e16 Alerting: fix postgres migration on conflict (#35556) (#35653)
(cherry picked from commit 423474325a)

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
2021-06-14 18:09:27 +03:00
Marcus EfraimssonandJavier Palomo 906af3bf4b [v8.0.x] Datasource: Add support for max_conns_per_host in dataproxy settings (#35520) (#35573)
Allow configuring dataproxy.max_conns_per_host for HTTP data sources.

Ref #35519
Ref #35257

(cherry picked from commit 6531424c72)

Co-authored-by: Javier Palomo <javier.palomo@grafana.com>
2021-06-11 17:18:44 +02:00
Grot (@grafanabot)andMarcus Efraimsson 601b9e3e8a Postgres/MySQL/MSSQL: Fix concurrent map writes panic (#35510) (#35562)
Fixes panic/fatal error concurrent map writes in SQL data sources when multiple
queries are executed concurrently and you interpolate SQL query before executing it.

Fixes #35469

(cherry picked from commit 0611207f3b)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
2021-06-11 15:24:06 +02:00
Grot (@grafanabot)andStephanie Closson 8a2e2aa063 Fix: only recurse a symbolic link if it is a directory (#35455) (#35521)
* only recurse a symbolic link if it is a directory

* added test for detecting valid plugins using lib dirs with symbolic links in them (like oracle)

* fix linting errors

* added extra checks as per code-review

(cherry picked from commit 83f26e9ce2)

Co-authored-by: Stephanie Closson <srclosson@gmail.com>
2021-06-10 17:54:50 +02:00
Grot (@grafanabot)andshuotli ded96ea901 Upgrade ARG API version (#35464) (#35492)
(cherry picked from commit 05f3985108)

Co-authored-by: shuotli <63325084+shuotli@users.noreply.github.com>
2021-06-10 12:56:38 +02:00
Grot (@grafanabot)andMarcus Efraimsson 422e388fa2 Datasource: Fix storing timeout option as numeric (#35441) (#35481)
#31871 introduced support for configuring timeout in seconds
for HTTP data sources. That had a bug where backend expected
a numeric timeout value where it was actually stored as a
string. This should resolve this by requiring input to be
numbers, storing input as numeric and falling back to string
value if there's no numeric value.

Ref #31871

(cherry picked from commit d15d87db8a)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
2021-06-10 10:51:47 +02:00
Grot (@grafanabot)andErik Sundell ad6f9a0c32 Cloudwatch: Fix duplicated time series (#35433) (#35480)
* make sure queries are only ran once

* test aliases

* use correct dates

(cherry picked from commit eff2410bae)

Co-authored-by: Erik Sundell <erik.sundell@grafana.com>
2021-06-10 10:48:16 +02:00
Grot (@grafanabot)andDimitris Sotirakis 1bdd2c54d9 HTTP Client: Introduce go-conntrack into http client provider (#35314) (#35477)
* Introduce go-conntrack into http client provider

* Fixes according to reviewer's comments

* Fixes according to reviewer's comments

(cherry picked from commit 7cdf8b3705)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
2021-06-10 10:21:30 +02:00
Grot (@grafanabot) c4075fe2e3 Alerting/SSE: Fix "count_non_null" reducer validation (#35451) (#35457)
fixes error "reducer 'count_non_null' in condition 2 is not a valid reducer"

(cherry picked from commit f4e9dcd40b)
2021-06-09 21:06:07 +02:00
Grot (@grafanabot)andAndres Martinez Gotor f4750c7a6b Fix missing defaultRegion (#35436) (#35440)
(cherry picked from commit 086309700e)

Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
2021-06-09 17:44:32 +02:00
Grot (@grafanabot)andMarc Bachmann 4fca76a631 [v8.0.x] Postgres/MySQL/MSSQL: Fix annotation parsing for empty responses (#35367) (#35430)
* fix sql annotation parsing for empty responses

* fix backend when no data returned

* add back frontend changes

Co-authored-by: Ying WANG <ying.wang@grafana.com>
(cherry picked from commit 9a5e10e6fb)

Co-authored-by: Marc Bachmann <marc.brookman@gmail.com>
2021-06-09 17:39:33 +02:00
Grot (@grafanabot)andWill Browne ed605c97f9 Plugins: Ignore trailing slash in root URL check (#35338) (#35402)
* ignore trailing slash in root URL check

* apply pr feedback

(cherry picked from commit 873e20b7ae)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
2021-06-09 10:22:24 +02:00
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