32190 Commits

Author SHA1 Message Date
8ccd7599bd Releasing: start splitting out publish phase (#41959) 2021-11-19 11:39:10 +00:00
81155e2d55 Alerting: increase timeout for silences tests (#41918) 2021-11-19 13:07:28 +02:00
12e0a94316 JWT: Split race-y test into two stable tests (#41950) 2021-11-19 12:05:04 +01:00
03b7a55242 show admin nav link it the user only has permissions to view licensing and not other pages under admin node (#41948) 2021-11-19 11:02:13 +00:00
42c51747ed Refactor drone yaml (#41937) 2021-11-19 11:35:57 +01:00
92639d1475 Update latest.json (#41873) 2021-11-19 10:37:00 +01:00
d66158a042 Fix loop when cannot fetch roles (#41901) 2021-11-19 12:23:03 +03:00
c5241731de AzureMonitor: Fix metric namespace clear (#41878) 2021-11-19 10:16:56 +01:00
11f133b406 Access Control: use role groups in role picker (#41912)
* use role groups in role picker UI

* Update public/app/core/components/RolePicker/RolePickerMenu.tsx

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
2021-11-19 08:52:16 +00:00
da5327ea14 AccessControl: RolePicker fetch roles in org (#41927) 2021-11-19 09:50:01 +01:00
4fa7fd2c75 add unsupported renderer message to catalog (#41898) 2021-11-19 08:47:28 +00:00
0462577f3d Install netcat to build-container and update the version (#41825) 2021-11-19 09:17:29 +01:00
a6e60c62f4 Transformers: extract fields from JSON and text (alpha) (#41791)
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
2021-11-18 21:52:49 -08:00
17c2f52dcf Candlestick: fix volume histogram height by using mapped field name (#41931) 2021-11-18 20:31:18 -06:00
541d1543db Geomap: Improve geojson style editor (#41926) 2021-11-18 17:39:13 -08:00
e904f423e4 Docs: Add configuration option for the image renderer (#41798)
* Docs: add configuration option for the image renderer

* Apply review feedback
2021-11-18 18:09:08 +01:00
3b497f3e8d Chore: Move babel config to a root babel.config.json (#41615)
* Chore: Move babel config to a root babel.config.json

* Re-add babel cache settings to webpack

* Re-add production browserlist in babel config

* re-add babel hot refresh config

* fix storybook
2021-11-18 16:38:58 +00:00
7dcc5ca199 Make initialize depend on clone, only on enterprise pipelines (#41909) 2021-11-18 18:10:25 +02:00
e8a2a82d5c Run integration tests after initialize (#41906) 2021-11-18 17:59:22 +02:00
ea4e711fe3 Datasource: Fix stable sort order of query responses (#41868)
Fixes #41773
Fixes #41303
Ref grafana/grafana-plugin-sdk-go#366
Ref #39614
2021-11-18 16:57:20 +01:00
53dc388dcf Disable lint-drone from release pipelines (#41899) 2021-11-18 17:32:45 +02:00
fc3ed34b22 Add basic resource trimming command (#41780)
* Add basic trim command

* Indent properly

* Actually apply defaults if the user asks for it
2021-11-18 10:02:11 -05:00
c82a15eafb Update grabpl version to 2.6.1 (#41892) 2021-11-18 15:56:49 +01:00
f8192bf428 Azure Monitor: Clean up fields when editing Metrics (#41762) 2021-11-18 15:13:56 +01:00
daa3cb831d ReleaseNotes: Updated changelog and release notes for 8.2.5 (#41886) 2021-11-18 14:58:09 +01:00
0ee0a0b7a0 AccessControl: FGAC permissions for orgs endpoint on frontend (#41050)
* AccessControl: FGAC permissions for orgs endpoint on frontend

Protect org update endpoints

add or refactor missing right messages

cover org page

* removing scopes from orgs

* Perform permission control with global org

* Perform the error handling in case of 403

* Simplify frontend code by requiring read access for sure

* Remove roles I added to decrease the number of changes

* Remove the check for server admin to reduce the number of changes

* change error message

* Cleaning todos

* Remove unecessary changes

* Fix tests

* Update test snapshot

* Update pkg/api/roles.go

Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com>

* Update public/app/features/admin/AdminEditOrgPage.tsx

Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com>

* Format AdminEditOrgPage for linting

* Update public/app/features/admin/AdminEditOrgPage.tsx

Co-authored-by: Vardan Torosyan <vardants@gmail.com>

* Update public/app/features/admin/AdminEditOrgPage.tsx

Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>

* Update public/app/features/admin/AdminListOrgsPage.tsx

Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>

* Commit suggestions

* Commit suggestion canRead canWrite

* fix typo

Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com>
Co-authored-by: Vardan Torosyan <vardants@gmail.com>
Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>
2021-11-18 14:10:38 +01:00
9c2a947605 Plugins Catalog: add support for enable/disable app plugins (#41801)
* refactor(plugins): add empty line between methods

* feat(api): add an API function for updating plugin settings

* feat(plugins): add a "getting started" guide for enabling / disabling app plugins

* test(plugins/admin): add tests for enable/disable functionality

* refactor(plugins/admin): update the name of the test cases

Now that we have multiple type of post-installation steps it probably makes sense.
2021-11-18 13:34:44 +01:00
6aeecd48a7 ReleaseNotes: Updated changelog and release notes for 8.2.5 (#41861) 2021-11-18 13:25:28 +01:00
97a423aedc Dashboard: Remove the current panel from the list of options in the Dashboard datasource (#41826)
* Dashboard: Update check for current panel

* Get datasource name as before

* Update public/app/plugins/datasource/dashboard/DashboardQueryEditor.tsx

Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>

* import SHARED_DASHBOARD_QUERY

* Add some unit tests

Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>
2021-11-18 11:43:47 +00:00
ac59b7615d Alerting: README.md for ngalert 2021-11-18 10:26:42 +00:00
c644ad31b6 Chore: Removed duplicate filter statement (#41847) 2021-11-18 10:54:18 +01:00
5cd4cde12a Tempo: Add error details when json upload fails (#41803) 2021-11-18 10:35:09 +01:00
9a7e411f55 Tempo: Fix basic auth password reset on adding tag (#41808) 2021-11-18 10:34:13 +01:00
b7f47561b6 Access control: add roles to fixed groups (#41673)
* add roles to fixed groups

* add global to group name
2021-11-18 09:16:18 +00:00
e59c3a34fe Updated content based on Ivana's note. (#41848) 2021-11-18 09:53:38 +01:00
f40c1d0808 Chore: Add context apikey (#41698)
* Add context apikey

* Rename DeleteApiKeyCtx to DeleteApiKey
2021-11-18 09:50:03 +01:00
7a3b52783c Geomap: Add Property and values to GeoJSON style rule (#41845)
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
2021-11-18 09:29:40 +01:00
0c280319af Envelope encryption CLI migration command (#41454)
* Working version of migrate secrets CLI command

* Move user oauth info encryption away from db transaction

* Enable a mechanism for re-use db session on encryption

* De-duplicate shared code between db and runner commands

* Set up Wire build graph

* Remove enterprise Wire set

* Fix cylic dependency: sqlstore.DBSession <-> xorm.Session

* Minor fix (add missing base64 encoding)

* Extract CLI 'secrets-migration' commands from 'data-migration' ones

* Move runner package outside commands

* Update Makefile (gen-go path)

* Minor prettier fix

* Some minor XORM related refactors

* Include new Wire enterprise file into .gitignore

* Update Wire deps

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>

Co-authored-by: Tania B <yalyna.ts@gmail.com>
Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>
2021-11-18 09:19:04 +01:00
1be9a61f43 TimeSeries: Allow multiple axes for the same unit (#41635)
* TimeSeries: Allow multiple axis for the same unit

* Update snapshot

* Add axis label and soft min/max to the scale key

* Removed console.log
2021-11-18 08:55:26 +01:00
0798fbb5d4 Add encryption algorithm to Enterprise config (#41412)
* Add encryption algorithm to Enterprise config

* Update docs/sources/enterprise/enterprise-configuration.md

Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com>

Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com>
2021-11-18 08:48:16 +01:00
c3f1cc6c75 Docs: Add docs for caching timeouts (#39672)
Co-authored-by: Stephanie Hingtgen <stephanie.hingtgen@grafana.com>
2021-11-18 08:36:10 +01:00
837e268395 Geomap: use same style config for makers and geojson (#41846) 2021-11-17 22:13:27 -08:00
18cc552edb Variables: Fix so panels in expanded rows have correct variable values (#41721) 2021-11-18 06:22:16 +01:00
d3b513ab59 Doc: Removed reference to Hosted Grafana (#41843)
* Removed extra word

* Removed another ref of hosted grafana.
2021-11-17 19:41:17 -05:00
7ef05588ea Provisioning: set stable datasource UID with provisioning (#41769) 2021-11-18 01:18:08 +01:00
bf85ae44a2 Geomap: simplify styles (#41842) 2021-11-18 01:05:10 +01:00
40d3072df2 Geomap: Refactor marker style options into reusable component (#41716) 2021-11-17 13:59:41 -08:00
335e0cac11 Recorded Queries: Add frontend settings (#41841) 2021-11-17 22:45:05 +01:00
6844cf57a0 Transformers: ensure ISO 8601 date strings are not parsed in local TZ (#41835) 2021-11-17 14:56:04 -06:00
e237ff20a9 CloudWatch Logs: Add retry strategy for hitting max concurrent queries (#39290)
* Add error passing and retry strategy

* Change generic error to specific one

* Make the error more generic

* Refactor retry strategy

* Add retry that handles multiple queries

* Rollback some backend changes

* Remove simple retry strategy

* Add comments

* Add tests

* Small test fixes

* Add log timeout config

* Fix tests

* Fix tests

* Add validation

* Remove commented code and add comment

* Fix snapshots

* Remove unnecessary cast
2021-11-17 21:46:13 +01:00