public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,724 Commits 655 Branches 650 Tags
83bc445d3ea6bd49e13eee67fd4ed0ed39b566bb
Commit Graph
7116 Commits
Author SHA1 Message Date
Joan López de la Franca Beltran 83bc445d3e Encryption: Fix DEKs cache (#43129) 
* Encryption: Fix DEKs cache

* Clarify tests
 2021-12-27 18:04:47 +01:00
Alex KhomenkoJoan López de la Franca BeltranJoan López de la Franca Beltran
 		3b4a4be3c6 Feature highlights: add setting toggle (#43394) 
* Feature highlights: add toggle setting

* Settings: Use provider for 'feature_highlights' section

* Fix frontendsettings API tests

* Document the toggle

Co-authored-by: Joan López de la Franca Beltran <5459617+joanlopez@users.noreply.github.com>
Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com>
 2021-12-24 10:49:52 +02:00
Ryan McKinleyAshley HarrisonArtur Wierzbicki
 		4233a62aeb DashboardPreviews: add dashboard previews behind feature flag (#43226) 
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
Co-authored-by: Artur Wierzbicki <artur@arturwierzbicki.com>
 2021-12-23 09:43:53 -08:00
Karl Persson 0ace9695a6 Access control: Add optional hooks (#43372) 
* Add optional OnSet hooks
 2021-12-23 10:10:06 +01:00
J Guerreiro 3d4fafcf70 AccessControl: Add access control metadata to org user DTOs (#43362) 
* AccessControl: Add access control metadata to OrgUserDTO

* AccessControl: get User AC metadata

* AccessControl: return User Access Control metadata when requested
 2021-12-22 18:46:33 +01:00
Marcus Efraimsson 7d3bdb6d1b Plugins: Set backend metadata property for core plugins (#43349) 
Ref #42648
Ref #42781
 2021-12-22 17:59:26 +01:00
J Guerreiro a1b8b5d123 Usage stats: Count API keys (#42883) 
* Stats: add api key count to usage stats

* Chore: correctly capitalize struct member
 2021-12-22 17:37:45 +01:00
David Henderson 575eb68828 CloudWatch: Add Missing Elasticache Host-level metrics (#43455) 
Add missing host-level Elasticache metrics from https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/CacheMetrics.HostLevel.html

Follows from https://github.com/grafana/grafana/pull/43336#issuecomment-999367311
 2021-12-22 14:02:52 +01:00
idafurjes b8852ef6a3 Chore: Remove context.TODO() (#43409) 
* Remove context.TODO() from services

* Fix live test

* Remove context.TODO
 2021-12-22 11:02:42 +01:00
Karl Persson 2409d8dc1f check the value of the feature toggle (#43433) 2021-12-22 10:05:53 +01:00
Jean-Philippe Quéméner ffc72aa255 Alerting: fix gosec warning that is not valid (#43425) 2021-12-21 19:47:47 +01:00
Daniel Lee 93de61f690 fix for CWE-89 (#43407) 
The sqlOrArgs unpacking seems to confuse CodeQL. Trying something simpler
 2021-12-21 19:04:56 +01:00
Karl Persson b3d5a607d4 Access Control: Add option to filter only managed permissions (#43371) 
* Add option to filter only managed permissions
 2021-12-21 14:22:54 +01:00
Tania B c1be17bec7 Chore: Add Google Cloud KMS dependency (#43211) 
* Encryption: Add Google Cloud KMS dependency

* Change version
 2021-12-21 14:15:27 +02:00
Siavash Safi 4c4322f717 CloudWatch: Add all ElastiCache Redis Metrics (#43336) 
Add all missing Redis ElastiCache metrics.
https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/CacheMetrics.Redis.html

Signed-off-by: Siavash Safi <siavash.safi@gmail.com>
 2021-12-21 09:13:41 +01:00
idafurjes ff3cf94b56 Chore: Remove context.TODO() from services (#42555) 
* Remove context.TODO() from services

* Fix live test
 2021-12-20 17:05:33 +01:00
Carl Bergquist f373588810 setting: configure toggles as true/false instead of array (#43326) 
Signed-off-by: bergquist <carl.bergquist@gmail.com>
 2021-12-20 15:33:11 +01:00
Tania B 0dc86bf7f4 Chore: Move default encryption provider to kmsproviders package (#43331) 2021-12-20 12:47:49 +02:00
Gábor Farkas 1879a6855e prometheus: respect the http-method data source setting (#42753) 
* prometheus: respect the http-method data source setting

* removed forgotten if-true section

* refactored json-check
 2021-12-20 11:27:18 +01:00
Karl Perssonkay delaneyAlex KhomenkoGabriel MABILLEIeva
 		c3ca2d214d Access control: Refactor managed permission system to create api and frontend components (#42540) 
* Refactor resource permissions
* Add frondend components for resource permissions

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
 2021-12-20 09:52:24 +01:00
Ilya Stoliar 9cf5623918 CloudWatch: Add Data Lifecycle Manager metrics and dimension (#43310) 2021-12-20 09:48:07 +01:00
Artur Wierzbicki 197f4f81f2 #41993: make it possible to create N random60hz channels (#43295) 2021-12-17 23:42:37 +04:00
Sofia Papagiannaki c4aaf5f9d1 API: prevent provisioned dashboard from being updated (#41894) 2021-12-17 10:31:52 -05:00
Alexander Zobnin 2c0f961c59 OAuth: Fix forwarding id token to the data source (#43204) 2021-12-17 03:34:16 -05:00
Yuriy Tseretyan 1a762083d7 Alerting: make alert rule routine evaluation control be thread-safe (#41220) 
* change registry.delete to return deleted struct
* use pointer to alertRuleInfo instead copying.
* do not access evaluation channel when routine is stopped
* remove stopCh and use context cancellation
* do not return ctx.Err when channel is cancelled because it cancels all other routines
* make alertRuleInfo fields and functions package private
 2021-12-16 14:52:47 -05:00
Ryan McKinleyMarcus EfraimssonKyle BrandtSantiago
 		2754e4fdf0 Expressions: use datasource model from the query (#41376) 
* refactor datasource loading

* refactor datasource loading

* pass uid

* use dscache in alerting to get DS

* remove expr/translate pacakge

* remove dup injection entry

* fix DS type on metrics endpoint, remove SQL DS lookup inside SSE

* update test and adapter

* comment fix

* Make eval run as admin when getting datasource info

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

* fmt and comment

* remove unncessary/redundant code

Co-authored-by: Kyle Brandt <kyle@grafana.com>
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Co-authored-by: Santiago <santiagohernandez.1997@gmail.com>
 2021-12-16 13:51:46 -03:00
Jeremy PriceEric LeijonmarckEmil Tullstedt
 		13fdc5231d AccessControl: upgrade apikeys by adding service accounts (#42425) 
Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>

* Change default options for cloned service account

* Run in background

* Add endpoint to upgrade api keys to service accounts
 2021-12-16 14:28:16 +01:00
Jean-Philippe Quéméner b605340668 Alerting: log errors happening in the API on server side (#43192) 
* Alerting: log errors happening in the API on server side

* adapt tests to reflect changed payload
 2021-12-16 13:33:10 +01:00
Gilles De Mey bb3b5c10e7 Alerting: fix WeCom channel notifier test assertion (#43173) 2021-12-15 19:45:12 +01:00
Gilles De Mey cbbbb505b4 Alerting: use HTML-safe characters for the default template (#43148) 2021-12-15 17:57:08 +01:00
smallpathandgotjosh aec14cba42 Alerting: Support WeCom as a contact point type (#40975) 
* add wecom notifier

* fix backend lint

* fix alerting channel test

* update wecom doc

* update notifiers

* update wecom notifier test

* Apply suggestions from code review

Co-authored-by: gotjosh <josue.abreu@gmail.com>

* unify wecom alerting

* fix backend lint

* fix front lint

* fix wecom test

* update docs

* Update pkg/services/ngalert/notifier/channels/wecom.go

Co-authored-by: gotjosh <josue.abreu@gmail.com>

* Update docs/sources/alerting/old-alerting/notifications.md

Co-authored-by: gotjosh <josue.abreu@gmail.com>

* Update docs/sources/alerting/old-alerting/notifications.md

Co-authored-by: gotjosh <josue.abreu@gmail.com>

* Update docs/sources/alerting/old-alerting/notifications.md

Co-authored-by: gotjosh <josue.abreu@gmail.com>

* remove old wecom notifier

* remove old notifier doc

* fix backend test

* Update docs/sources/alerting/unified-alerting/contact-points.md

Co-authored-by: gotjosh <josue.abreu@gmail.com>

* fix doc style

Co-authored-by: gotjosh <josue.abreu@gmail.com>
 2021-12-15 16:42:03 +00:00
Gabriel MABILLEandKarl Persson c7cabdfd6f AccessControl: Add accesscontrol metadata to datasources DTOs (#42675) 
* AccessControl: Provide scope to frontend

* Covering datasources with accesscontrol metadata

* Write benchmark tests for GetResourcesMetadata

* Add accesscontrol util and interface

* Add the hasPermissionInMetadata function in the frontend access control code

* Use IsDisabled rather that performing a feature toggle check

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
 2021-12-15 12:08:15 +01:00
Ryan McKinleyandAlexander Emelin c0ff685d3b Live: support query execution with live RPC (#43118) 
Co-authored-by: Alexander Emelin <frvzmb@gmail.com>
 2021-12-14 18:38:20 +01:00
Alexander EmelinandRyan McKinley f4cc353225 Live: proxy subscribe data for subscribe and runstream plugin calls (#42824) 
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
 2021-12-14 20:12:00 +03:00
Karl PerssonandEmil Tullstedt 9558c09a7c Access Control: Store permissions on SignedInUser (#43040) 
* add permission structure to signedinuser

* add middleware to load user permissions into signedinuser struct

* apply LoadPermissionsMiddleware to http server

* check for permissions in signedinuser struct

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
 2021-12-14 16:05:59 +01:00
Will Browne e4ba5f17dd add core plugins thru store (#43085) 2021-12-14 15:22:40 +01:00
Leonard Gram 5d18834deb OAuth: persisting the id token (#42938) 
* OAuth: persisting the id token

* OAuth: verifies that the idtoken gets persistet in the database
 2021-12-14 15:22:10 +01:00
Eric Leijonmarck 4a3961400a Serviceaccounts: create serviceaccount api (#42150) 
* WIP

* wip

* wip

* wip

* refactor: new return of the create service accoutn

* refactor: change to have correct role

* refactor: ability to create service accounts

* make public

* refactor: make ints instead

* refactor: remove location sprintf

* refactor: added back named constants
 2021-12-14 14:39:25 +01:00
Shirley 21656a0491 Remove reference to legacydata package (#43075) 
* Remove reference to legacydata package

* Change from and to times
 2021-12-14 12:58:31 +01:00
Will Browne 155487bfb0 Plugins: Add typed models for frontend settings data sources and panels (#42062) 
* add model for data source

* add model for panels

* add omitempty

* make consistent with main

* dont emit bools

* resolve conflicts

* remove file

* remove file

* update field name

* always pass jsonData

* minify the changes

* remove dupe line
 2021-12-14 11:16:13 +01:00
Will Browne 6c4555265a Plugins: Update client to use SDK resource contract (#42888) 
* client uses sdk resource handler

* apply pr feedback
 2021-12-14 11:15:49 +01:00
Erik Sundell 043680371f add all new es metrics (#43034) 2021-12-14 10:12:39 +01:00
Yuriy Tseretyan 35b0067650 Populate missing UID of provisioned data source only for new records (#42999) 
* defer updating empty UID to insert command
* change logging to use the command
 2021-12-13 14:14:39 -05:00
Yuriy Tseretyan b63595b47f Alerting: fix sqlstore.GetFolderByTitle to search for folder (#42898) 
* a test to reproduce the bug
 2021-12-13 13:59:20 -05:00
Ieva 2ef071e728 log provisioning errors (#43041) 2021-12-13 16:50:02 +01:00
Serge Zaitsev f5802878f1 Chore: Move remaining web framework code to pkg/web, remove macaron binding module (#43018) 
* remove macaron binding dependency

* completely purge macaron binding

* move everything to pkg/web

* remove non-go files from pkg/web

* clean up leftovers of macaron imports

* make linter happy
 2021-12-13 15:56:14 +01:00
Yuriy Tseretyan 1db9b1e6a9 Improve bridge for Alertmanager logger (#42958) 
* Implement go-kit/log.Logger for internal logger.
 2021-12-13 09:41:53 -05:00
Torkel Ödegaard 0e88f5db85 AppPlugins: Support app plugins with only default nav (#43016) 2021-12-13 14:06:15 +01:00
Sofia Papagiannaki c6483cd8ed Alerting: Refactor API handlers to use web.Bind (#42600) 
* Alerting: Refactor API handlers to use web.Bind

* lint
 2021-12-13 09:22:57 +01:00
Marcus EfraimssonWill Brownemalcolmholmes
 		d6ec6f8ad2 Backport fix to main (#42979) 
* fixes

(cherry picked from commit a2c386915ce11b9422f4af8ae181eaa1a22bc5c3)
(cherry picked from commit 06706efbbe)

* fix regex

(cherry picked from commit a259213a3badc9618e969f2c8db0a0143f00faee)
(cherry picked from commit 1d7105c095)

* lint (#42970)

(cherry picked from commit afb9e8e5f3)

Co-authored-by: Will Browne <will.browne@grafana.com>
Co-authored-by: malcolmholmes <42545407+malcolmholmes@users.noreply.github.com>
 2021-12-10 16:10:04 +01:00