Commit Graph
6373 Commits
Author SHA1 Message Date
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
Grot (@grafanabot)andTorkel Ödegaard 15c09dcd68 Histogram: Fix crash when state was undefined (when combine was enabled) (#34514) (#34520)
(cherry picked from commit d0769397b2)

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
2021-05-27 10:59:57 +02:00
Grot (@grafanabot)andAlexander Emelin f45f160ab8 Live: grafana_live namespace for centrifuge prom metrics (#34712) (#34767)
(cherry picked from commit 4221f2d147)

Co-authored-by: Alexander Emelin <frvzmb@gmail.com>
2021-05-26 15:31:48 -07:00
Grot (@grafanabot)andDavid Parrott d99847423b set state correctly and test (#34680) (#34770)
(cherry picked from commit 20d356947c)

Co-authored-by: David Parrott <stomp.box.yo@gmail.com>
2021-05-26 15:04:40 -07:00
Grot (@grafanabot)andSerge Zaitsev 653a3bdfbf Expose folder UID in dashboards API response (#33991) (#34772)
* expose folder UID in dashboards API response, import dashboards into folders by folder UID

* handle bad folder UID as 400 error

* 12591:Add tests for request with folderUid

* Use more descriptive error status for missing folders

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

* return 400 when folder id is missing

* put error checking in the right place this time

* mention folderUid in the docs

* Clarify usage of folderUid and folderId when both present

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

* Capitalise UID

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

* mention folder UID in the metadata for a GET response

Co-authored-by: Ida Furjesova <ida.furjesova@grafana.com>
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 ef0fab9aa5)

Co-authored-by: Serge Zaitsev <serge.zaitsev@grafana.com>
2021-05-26 22:10:59 +02:00
Grot (@grafanabot)andKevin Minehart fca62d20d6 hide caching settings when its disabled (#34756) (#34769)
(cherry picked from commit 3aba08f708)

Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
2021-05-26 15:06:29 -05:00
Grot (@grafanabot)andGanesh Vernekar 72b3478935 NGAlert: Update the default template to include more URLs (#34715) (#34750)
* NGAlert: Update the default template to include more URLs

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

* Fix tests

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

Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com>
2021-05-26 17:14:15 +02:00
Grot (@grafanabot)andGanesh Vernekar 81f2f68535 NGAlert: Add integration tests for remaining notification channels (#34662) (#34728)
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
(cherry picked from commit b168223029)

Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com>
2021-05-26 19:59:34 +05:30
Grot (@grafanabot)andTorkel Ödegaard ebe20d1998 TestData: Some simple small test data and first draft of what's new in v8 demo dashboard (#34731) (#34736)
* TestData: More test data

* Added v8 demo dashboard

(cherry picked from commit 6fb0560a84)

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
2021-05-26 14:36:01 +02:00
Grot (@grafanabot)andEmil Tullstedt ba85b954e1 Access control: Rename predefined roles to fixed roles (code) (#34469) (#34663)
* s/grafana:roles:/fixed:/

* Update free text references to predefined roles

(cherry picked from commit 0f4806db8a)

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
2021-05-26 13:22:44 +02:00
Grot (@grafanabot)andBen Sully ea84eb499a Datasource: Use intervalMs field of query model in GetIntervalFrom if interval field is not set (#34270) (#34720)
The /api/ds/query and /api/tsdb/query endpoints extract the intervalMs field from
each query in the request, but it currently seems to be ignored, at
least for queries to a Prometheus datasource. This changes
GetIntervalFrom function to check for the presence of intervalMs in the
query model if interval is missing.

(cherry picked from commit b7ea66b00d)

Co-authored-by: Ben Sully <ben.sully@grafana.com>
2021-05-26 12:09:04 +02:00
Grot (@grafanabot)andTorkel Ödegaard d149b2aae3 TestData: Support for csv files & csv content (#34674) (#34709)
* initial implementation of csv support for test data source

* CSV file & content scenarios working

* Removing categorical data

* fixing handler names

* Update pkg/tsdb/testdatasource/csv_data.go

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

* Update pkg/tsdb/testdatasource/csv_data.go

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

* Update pkg/tsdb/testdatasource/csv_data.go

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

* Update pkg/tsdb/testdatasource/csv_data.go

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

* Update pkg/tsdb/testdatasource/csv_data.go

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

* Update pkg/tsdb/testdatasource/csv_data.go

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

* Update pkg/tsdb/testdatasource/csv_data.go

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

* Fixed lint issues

* updated so it uses the same parsing

* more CSV tests

* lint fixes

* more lint

* lint

* support time field

* migrate manual entry to csv

* more test output

* more test output

* missing file

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
(cherry picked from commit 987bffe482)

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
2021-05-26 11:15:41 +02:00
Grot (@grafanabot)andArve Knudsen 1de3c88c0e Chore: Upgrade opentelemetry.io/collector dependency (#34700) (#34706)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 796590a1aa)

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
2021-05-26 10:43:14 +02:00
Grot (@grafanabot)andMarcus Andersson 17f3a5a4a3 Alerting: added possibility to preview grafana managed alert rules. (#34600) (#34704)
* starting to add eval logic.

* wip

* first version of test rule.

* reverted file.

* add info colum to result to show error or (with CC evalmatches)

* fix labels in evalmatch

* fix be test

* refactored using observables.

* moved widht/height div to outside panel rendere.

* adding docs api level.

* adding container styles to error div.

* increasing size of preview.

Co-authored-by: kyle <kyle@grafana.com>
(cherry picked from commit e19b3df1a9)

Co-authored-by: Marcus Andersson <marcus.andersson@grafana.com>
2021-05-26 10:31:56 +02:00
Grot (@grafanabot)andEvan Sosenko f7c144f957 Add missing AWS/AppSync metrics (#34691) (#34695)
(cherry picked from commit 80c05becc5)

Co-authored-by: Evan Sosenko <razorx@evansosenko.com>
2021-05-26 09:02:15 +02:00
Grot (@grafanabot)andEvan Sosenko 0d6135dccb CloudWatch: Add Lambda@Edge Amazon CloudFront metrics (#34561) (#34694)
* Add LambdaExecutionError to AWS/CloudFront

* Add LambdaValidationError to AWS/CloudFront

* Add LambdaLimitExceededErrors to AWS/CloudFront

(cherry picked from commit f9b8f3777a)

Co-authored-by: Evan Sosenko <razorx@evansosenko.com>
2021-05-26 09:01:47 +02:00
Grot (@grafanabot)andAlexander Emelin e2b6820d42 Live: use latest changes in Go SDK to deal with streaming frames (#34668) (#34678)
(cherry picked from commit 063e1b5ff5)

Co-authored-by: Alexander Emelin <frvzmb@gmail.com>
2021-05-25 20:16:54 +02:00
Grot (@grafanabot)andGábor Farkas ef05f687ca InfluxDB: Flux: handle boolean data-columns (#34479) (#34670)
* InfluxDB: Flux: handle boolean data-columns

* normalize data-type strings based on documentation

* reference missing data type

(cherry picked from commit ab26c4dfa4)

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
2021-05-25 17:54:26 +02:00
Grot (@grafanabot)andJoan López de la Franca Beltran 7319caaa63 API: Use SettingsProvider on GET settings handler (#34632) (#34661)
(cherry picked from commit b74a502dc4)

Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com>
2021-05-25 16:50:11 +02:00
Grot (@grafanabot)andErik Sundell b1177e2f8f expose azure settings as env variables (#34484) (#34647)
(cherry picked from commit 92ac2c40d3)

Co-authored-by: Erik Sundell <erik.sundell@grafana.com>
2021-05-25 14:11:16 +02:00
3956e2b422 [v8.0.x] HTTP Client: Make ResponseHeaderTimeout default timeout in http client (#34629)
* HTTP Client: Make `ResponseHeaderTimeout` default timeout in http client (#34597)

* HTTP Client: Add `ResponseHeaderTimeout` - split from `DialContext` timeout

* Fixes according to reviewer's comments

* Use grafana-plugin-sdk-go v0.100.0

(cherry picked from commit 91657dad18)

* Small change

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
Co-authored-by: dsotirakis <sotirakis.dim@gmail.com>
2021-05-25 10:59:24 +02:00
Grot (@grafanabot)andSergey Kostrukov d678865934 AzureMonitor: Fix Azure token provider national clouds (#34615) (#34617)
* Fix AAD authority for sovereign clouds

* Update Azure SDK with scopes fix

* Credential initialization in cache

(cherry picked from commit a337f70469)

Co-authored-by: Sergey Kostrukov <sekost@microsoft.com>
2021-05-25 08:46:03 +02:00
Grot (@grafanabot)andSofia Papagiannaki ec09a5995d [Alerting]: alertmanager notifier fixes (#34575) (#34589)
(cherry picked from commit b48832c0f7)

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
2021-05-24 17:32:52 +03:00
Grot (@grafanabot)andwangjian ea1dae55e8 Elasticsearch: fix NewClient not passing httpClientProvider to client impl (#34539) (#34594)
* Update client.go

fix missing "httpClientProvider" in NewClient

* Update client.go

(cherry picked from commit 530072fce7)

Co-authored-by: wangjian <wj0360@foxmail.com>
2021-05-24 15:22:27 +01:00
Grot (@grafanabot)andHugo Häggmark 603cff9491 LibraryPanels: Fixes error when importing plugin dashboard (#34557) (#34559)
(cherry picked from commit 7b17801047)

Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>
2021-05-24 09:56:15 +02:00
Grot (@grafanabot)andSofia Papagiannaki 52d6afbae7 [Alerting]: namespace fixes (#34470) (#34489)
* [Alerting]: forbid viewers for updating rules if viewers can edit

check for CanSave instead of CanEdit

* Clear ngalert tables when deleting the folder

* Apply suggestions from code review

* Log failure to check save permission

Co-authored-by: gotjosh <josue@grafana.com>
(cherry picked from commit 23939eab10)

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
2021-05-24 10:42:56 +03:00
Grot (@grafanabot)andHugo Häggmark 7f919c0e55 LibraryElements: Creates usage stats for panels and variables (#34476) (#34555)
* LibraryPanels: Adds usage collection

* Refactor: renames Panel and Variable consts

* Chore: initialize stats

* Refactor: moves library element migrations to migration namespace

(cherry picked from commit 7204a64717)

Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>
2021-05-24 06:35:35 +02:00
Grot (@grafanabot)andGiordano Ricci 50041c8138 Elasticsearch: fix flaky test (#34517) (#34518)
(cherry picked from commit e2e78f14d2)

Co-authored-by: Giordano Ricci <me@giordanoricci.com>
2021-05-20 16:50:19 +01:00
Grot (@grafanabot)andWill Browne d86e725369 Plugins: Improve plugin installer error messages (#34437) (#34495)
* fix and improve error messages

* enrich error message

* ignore previous changes

* revert manual version bump

* remove condition

* fix version param

(cherry picked from commit c4dcfdef56)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
2021-05-20 15:34:31 +02:00
Marcus Efraimsson 60d0c8d0ec HTTP Client: Outgoing tracing middleware (#34466)
Following #33439 this adds support for outgoing tracing middleware 
in HTTP client provider.

Fixes #24004
2021-05-20 11:16:55 +02:00
a91edd7267 Plugin Admin App: make the catalog look like internal component (#34341)
* Allow Route component usage in app plugins

* i tried

* fix catalog app

* fix catalog app

* fix catalog app

* cleanup imports

* plugin catalog enabled to plugin admin

* rename plugin catalog to plugin admin

* expose catalog url

* update text

* import from react-router-dom

* fix imports -- add logging

* merge changes

* avoid onNavUpdate

* Fixed onNavChange issues

* fix library imports

* more links

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
2021-05-20 10:42:26 +02:00
Ganesh Vernekar 95ee5f01b5 NGAlert: Do not pick a random default channel if no default exists (#34465)
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
2021-05-20 10:30:09 +02:00
Josh Hunt cf94410e59 AzureMonitor: Update Logs workspace() template variable query to return resource URIs (#34445)
* Migrate template variables straight into resource field,

Display error if unable to migrate

* Update workspace() template variable query function to return a resource URI

* update backend to support resource uris in workspace field

* don't load resource names for variables

* throw error when workspace migration returns no results

* update testDatasource to work with either resource URI or workspace GUID

* fix tests

* cleanup types just a little bit, as a treat
2021-05-20 10:16:29 +02:00
gotjoshandGanesh Vernekar 7b04278834 Alerting: Opsgenie notification channel (#34418)
* Alerting: Opsgenie notification channel

This translate the opsgenie notification channel from the old alerting
system to the new alerting system with a few changes:

- The tag system has been replaced in favour of annotation.
- TBD
- TBD

Signed-off-by: Josue Abreu <josue@grafana.com>

* Fix template URL

* Bugfig: dont send resolved when autoClose is false

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

* Fix integration tests

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

* Fix URLs in all other channels

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

Co-authored-by: Ganesh Vernekar <ganeshvern@gmail.com>
2021-05-20 10:12:08 +02:00
Hugo Häggmark 740f1ab3e2 LibraryPanels: Fixes connections after dashboard import (#34461) 2021-05-20 09:40:23 +02:00
Hugo Häggmark 21d6f02dd3 LibraryElements: replaces is_folder=1 usages with correct dialect string (#34453) 2021-05-20 07:22:34 +02:00
Ryan McKinley b02403e3fc TestData: use new format for random walk example (#34441) 2021-05-19 21:59:43 -07:00
Marcus EfraimssonandArve Knudsen 348e76fc8e Datasource: Shared HTTP client provider for core backend data sources and any data source using the data source proxy (#33439)
Uses new httpclient package from grafana-plugin-sdk-go introduced 
via grafana/grafana-plugin-sdk-go#328. 
Replaces the GetHTTPClient, GetTransport, GetTLSConfig methods defined 
on DataSource model.
Longer-term the goal is to migrate core HTTP backend data sources to use the 
SDK contracts and using httpclient.Provider for creating HTTP clients and such.

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
2021-05-19 23:53:41 +02:00
David Parrott 7a83d1f9ff Alerting resend delay for sending to notifiers (#34312)
* adds resend delay to avoid saturating notifier

* correct method signatures

* pr feedback
2021-05-19 22:15:09 +02:00
Owen Diehl 8f350bc353 actually register metrics this time (#34444) 2021-05-19 22:09:12 +02:00