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) and Sofia 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) and Ganesh 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) and idafurjes
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) and Ganesh 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) and Will 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) and Sofia 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) and Chip 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) and Ryan 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) and ying-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) and Owen 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) and Owen 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) and Kyle 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) and Ganesh 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) and Alexander 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) and Ganesh 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) and Danilo 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) and Ganesh 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) and Alexander 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) and Sofia 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) and Owen 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) and Kyle 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) and Will 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) and Ryan 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) and ying-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) and Will 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) and Torkel Ö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) and Alexander 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) and David 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) and Serge 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) and Kevin 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) and Ganesh 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) and Ganesh 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) and Torkel Ö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) and Emil 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) and Ben 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) and Torkel Ö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) and Arve 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) and Marcus 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) and Evan 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) and Evan 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) and Alexander 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) and Gá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) and Joan 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) and Erik 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) and Sergey 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) and Sofia 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) and wangjian
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