public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,190 Commits 655 Branches 650 Tags
3d4a5ce8fa879e2fecd33ecf9afcf309a37df50f
Commit Graph
32190 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Grot (@grafanabot)andJean-Philippe Quéméner 3d4a5ce8fa Alerting: support mute timings configuration through the api for the embedded alertmanager (#41533) (#41990) 
* Alerting: accept mute_timing_intervals through the api for the embedded alertmanager

* add workaround for mutetimeinterval

* add mute timings to routes

* revert changes

* Update pkg/services/ngalert/api/api_alertmanager.go

* Update pkg/services/ngalert/api/api_alertmanager.go

* Update pkg/services/ngalert/api/api_alertmanager.go

* update prometheus/alertmanager dependency

* add some var docs

(cherry picked from commit b9cdad3814)

Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com>
 2021-11-19 17:17:08 +01:00
Grot (@grafanabot)andGábor Farkas 66a91bb55b docs: improved deprecation-info for elasticsearch and influxdb (#41981) (#41986) 
(cherry picked from commit 91f9284e9d)

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
 2021-11-19 16:16:59 +01:00
Grot (@grafanabot)andIeva 4ab201e4b5 show admin nav link it the user only has permissions to view licensing and not other pages under admin node (#41948) (#41956) 
(cherry picked from commit 03b7a55242)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
 2021-11-19 14:49:25 +00:00
Grot (@grafanabot)andGábor Farkas 984e477d00 Docs: add easier to find deprecation notices to certain data sources and to the changelog (#41938) (#41980) 
* docs: add easier to find deprecation-info

* better indentation in the docs

Co-authored-by: Giordano Ricci <me@giordanoricci.com>

* better indentation in the docs

Co-authored-by: Giordano Ricci <me@giordanoricci.com>

* prettier fixes

Co-authored-by: Giordano Ricci <me@giordanoricci.com>
(cherry picked from commit f5641c0293)

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
 2021-11-19 15:41:49 +01:00
Grot (@grafanabot)andEric Leijonmarck 782d661710 refactor: fix displayname and description for serviceaccount role (#41946) (#41962) 
* refactor: fix displayname and description for serviceaccount role

* add: ActionWrite, ActionCreate

* refactor: update description

(cherry picked from commit 253da4a936)

Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
 2021-11-19 14:09:16 +00:00
Dimitris Sotirakis 5e0900609b Refactor drone yaml (#41969) 2021-11-19 14:46:00 +01:00
Grot (@grafanabot)andDominik Prokop b6efbd6b28 ThresholdControls: Use correct scale key when calculating handle position (#41942) (#41971) 
(cherry picked from commit 67f43cd7ab)

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
 2021-11-19 14:26:14 +01:00
Grot (@grafanabot)andEmil Tullstedt 9027846b91 JWT: Split race-y test into two stable tests (#41950) (#41957) 
(cherry picked from commit 12e0a94316)

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
 2021-11-19 12:30:01 +01:00
Grot (@grafanabot)andNathan Rodman 3dd2abbda7 Alerting: increase timeout for silences tests (#41918) (#41958) 
(cherry picked from commit 81155e2d55)

Co-authored-by: Nathan Rodman <nathanrodman@gmail.com>
 2021-11-19 12:28:46 +01:00
Grot (@grafanabot)andAlexander Zobnin 81043a763e Fix loop when cannot fetch roles (#41901) (#41945) 
(cherry picked from commit d66158a042)

Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>
 2021-11-19 14:05:43 +03:00
Grot (@grafanabot)andAndres Martinez Gotor 0838146d16 AzureMonitor: Fix metric namespace clear (#41878) (#41944) 
(cherry picked from commit c5241731de)

Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
 2021-11-19 10:38:20 +01:00
Grot (@grafanabot)andIeva ed00b3cf50 Access Control: use role groups in role picker (#41912) (#41941) 
* 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>
(cherry picked from commit 11f133b406)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
 2021-11-19 10:15:07 +01:00
Grot (@grafanabot)andGabriel MABILLE 8cfc96fa61 AccessControl: RolePicker fetch roles in org (#41927) (#41940) 
(cherry picked from commit da5327ea14)

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
 2021-11-19 10:08:53 +01:00
Grot (@grafanabot) bc1aa104a2 add unsupported renderer message to catalog (#41898) (#41939) 2021-11-19 10:07:57 +01:00
Grot (@grafanabot)andAgnès Toulet f8ab11bd11 Docs: Add configuration option for the image renderer (#41798) (#41916) 
* Docs: add configuration option for the image renderer

* Apply review feedback

(cherry picked from commit e904f423e4)

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>
 2021-11-19 09:19:37 +01:00
Grot (@grafanabot)andGabriel MABILLE c708c92593 AccessControl: FGAC permissions for orgs endpoint on frontend (#41050) (#41928) 
* 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>
(cherry picked from commit 0ee0a0b7a0)

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
 2021-11-19 09:12:13 +01:00
Grot (@grafanabot)andRyan McKinley cdd89d2945 Transformers: extract fields from JSON and text (alpha) (#41791) (#41936) 
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
(cherry picked from commit a6e60c62f4)

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
 2021-11-19 07:19:21 +01:00
Grot (@grafanabot)andLeon Sorokin fd81b1a9e4 Candlestick: fix volume histogram height by using mapped field name (#41931) (#41934) 
(cherry picked from commit 17c2f52dcf)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
 2021-11-19 03:50:51 +01:00
Grot (@grafanabot)andDimitris Sotirakis 94023f10a3 Make initialize depend on clone, only on enterprise pipelines (#41909) (#41910) 
(cherry picked from commit 7dcc5ca199)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
 2021-11-18 18:11:43 +02:00
Grot (@grafanabot)andDimitris Sotirakis a6ce53136c Run integration tests after initialize (#41906) (#41908) 
(cherry picked from commit e8a2a82d5c)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
 2021-11-18 18:00:35 +02:00
Grot (@grafanabot)andDimitris Sotirakis b4b13f8113 Disable lint-drone from release pipelines (#41899) (#41900) 
(cherry picked from commit 53dc388dcf)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
 2021-11-18 17:34:13 +02:00
Grot (@grafanabot)andAndres Martinez Gotor 591d789f38 Azure Monitor: Clean up fields when editing Metrics (#41762) (#41891) 
(cherry picked from commit f8192bf428)

Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
 2021-11-18 16:05:29 +01:00
Grot (@grafanabot)andDimitris Sotirakis fe082e2210 Update grabpl version to 2.6.1 (#41892) (#41896) 
(cherry picked from commit c82a15eafb)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
 2021-11-18 16:01:05 +01:00
Grot (@grafanabot) 3140f630c1 ReleaseNotes: Updated changelog and release notes for 8.2.5 (#41886) (#41887) 
(cherry picked from commit daa3cb831d)
 2021-11-18 15:02:10 +01:00
Zoltán Bedi b7b5a59437 Update yarn.lock after version bump (#41884) 2021-11-18 14:57:58 +01:00
Grot (@grafanabot) 64c575c115 "Release: Updated versions in package to 8.3.0-beta.1" (#41877) 2021-11-18 13:59:05 +01:00
Levente Balogh 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
Grot (@grafanabot) 6aeecd48a7 ReleaseNotes: Updated changelog and release notes for 8.2.5 (#41861) 2021-11-18 13:25:28 +01:00
Ashley HarrisonandHugo Häggmark 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
George Robinson ac59b7615d Alerting: README.md for ngalert 2021-11-18 10:26:42 +00:00
André R. de Miranda c644ad31b6 Chore: Removed duplicate filter statement (#41847) 2021-11-18 10:54:18 +01:00
Andrej Ocenas 5cd4cde12a Tempo: Add error details when json upload fails (#41803) 2021-11-18 10:35:09 +01:00
Andrej Ocenas 9a7e411f55 Tempo: Fix basic auth password reset on adding tag (#41808) 2021-11-18 10:34:13 +01:00
Ieva 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
achatterjee-grafana e59c3a34fe Updated content based on Ivana's note. (#41848) 2021-11-18 09:53:38 +01:00
idafurjes f40c1d0808 Chore: Add context apikey (#41698) 
* Add context apikey

* Rename DeleteApiKeyCtx to DeleteApiKey
 2021-11-18 09:50:03 +01:00
nikki-kigaandRyan McKinley 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
Joan López de la Franca BeltranAgnès TouletTania B
 		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
Dominik Prokop 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
Mitch SeamanandUrsula Kallio 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
Todd TreeceandStephanie Hingtgen 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
Ryan McKinley 837e268395 Geomap: use same style config for makers and geojson (#41846) 2021-11-17 22:13:27 -08:00
Hugo Häggmark 18cc552edb Variables: Fix so panels in expanded rows have correct variable values (#41721) 2021-11-18 06:22:16 +01:00
achatterjee-grafana 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
Ryan McKinley 7ef05588ea Provisioning: set stable datasource UID with provisioning (#41769) 2021-11-18 01:18:08 +01:00
Ryan McKinley bf85ae44a2 Geomap: simplify styles (#41842) 2021-11-18 01:05:10 +01:00
Nathan Marrs 40d3072df2 Geomap: Refactor marker style options into reusable component (#41716) 2021-11-17 13:59:41 -08:00
Todd Treece 335e0cac11 Recorded Queries: Add frontend settings (#41841) 2021-11-17 22:45:05 +01:00
Leon Sorokin 6844cf57a0 Transformers: ensure ISO 8601 date strings are not parsed in local TZ (#41835) 2021-11-17 14:56:04 -06:00
Andrej Ocenas 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