IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-29 15:59:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
33,281 Commits 1,119 Branches 715 Tags
8217d6d206692a411f5055780a3a6518711ca365
Commit Graph
36 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tania BandMitchel Seaman 84ea13bf6c Docs: Refactor encryption docs (#44718) 
* Docs: Refactor encryption docs

* Rename enterprise encr

* Remove envelope encr page

* combine database encryption sections

* fix reference

* Fix link

Co-authored-by: Mitchel Seaman <mitchel.seaman@gmail.com>
 2022-02-02 15:02:57 +02:00
Tania BandMitch Seaman 07d207a3f0 Docs: Add documentation for the new encryption providers (#44604) 
* Add docs for Google Cloud KMS provider

* Minor changes to Google KMS provider

* Add docs for Hashicorp Vault provider

* Review suggestion

Co-authored-by: Mitch Seaman <mjseaman@users.noreply.github.com>

* Commit suggested change

Co-authored-by: Mitch Seaman <mjseaman@users.noreply.github.com>

* Remove confusing instruction

* Add example of key file path

* Add links to new providers

* Add path description

Co-authored-by: Mitch Seaman <mjseaman@users.noreply.github.com>
 2022-02-02 14:24:56 +02:00
Tania B ca24b95b49 Encryption: Handle encryption key provider being a background service (#44007) 
* Encryption: Handle encryption key provider being a background service

* Sort imports

* Cleanup accidental changes

* Add proper error handling

* Apply review feedback
 2022-01-28 17:17:40 +02:00
Tania B 1a9c293984 Chore: Remove unused AWS KMS provider's token setting (#44531) 2022-01-27 17:15:49 +02: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
Tania B 0dc86bf7f4 Chore: Move default encryption provider to kmsproviders package (#43331) 2021-12-20 12:47:49 +02:00
Tania B 58978dcf96 Encryption: Add usage stats to secrets service (#42437) 
* Encryption: Add usage stats to secrets service

* Sort imports
 2021-11-29 16:35:15 +02:00
Tania B 4014891971 Encryption: Cleanup and add logging (#42084) 
* Encryption: Add more logs

* Add logging and checks

* Removed unused methods from secrets service

* Refactor and update tests

* Address review feedback
 2021-11-24 15:01:44 +02:00
Tania B 3af36b7e23 Encryption: Add settings to ini files (#42057) 
* Encryption: Add settings to ini files

* Rename a setting
 2021-11-23 20:29:35 +02:00
Tania BandJoan López de la Franca Beltran bc60ae3c66 Encryption: Refactor secrets service (#41771) 
* Refactor kmsproviders pkg

* Update tests

* Fix linting

Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com>
 2021-11-17 11:52:45 +02:00
Tania B b84496bc00 Fix decrypting in datasource update (#41704) 2021-11-16 16:47:59 +02:00
Tania B f6545ab8f4 Chore: Add current provider test for secrets service (#41387) 
* Chore: Add current provider test for secrets service

* Refactor the test

* Fix linting issue
 2021-11-09 16:40:37 +02:00
Tania Bandspinillos e81d434edf Encryption: Extend secrets service to support registering key providers (#40626) 
* Draft adding kms providers

* Rename defaultProvider to currentProvider

* Add getting current provider from config

* Remove comments

* Make current provider service struct field

* Add methods to secrets service

* Test getting current provider

* Implements missing methods for fake secrets service

* Remove accidental changes

* Fix linter issue

* Update configuration examples

* Rename CurrentProvider method

* Split service interface

* Update wire

Co-authored-by: spinillos <selenepinillos@gmail.com>
 2021-11-04 19:25:01 +02:00
Tania BEmil TullstedtJoan López de la Franca Beltran
 		5652bde447 Encryption: Use secrets service (#40251) 
* Use secrets service in pluginproxy

* Use secrets service in pluginxontext

* Use secrets service in pluginsettings

* Use secrets service in provisioning

* Use secrets service in authinfoservice

* Use secrets service in api

* Use secrets service in sqlstore

* Use secrets service in dashboardshapshots

* Use secrets service in tsdb

* Use secrets service in datasources

* Use secrets service in alerting

* Use secrets service in ngalert

* Break cyclic dependancy

* Refactor service

* Break cyclic dependancy

* Add FakeSecretsStore

* Setup Secrets Service in sqlstore

* Fix

* Continue secrets service refactoring

* Fix cyclic dependancy in sqlstore tests

* Fix secrets service references

* Fix linter errors

* Add fake secrets service for tests

* Refactor SetupTestSecretsService

* Update setting up secret service in tests

* Fix missing secrets service in multiorg_alertmanager_test

* Use fake db in tests and sort imports

* Use fake db in datasources tests

* Fix more tests

* Fix linter issues

* Attempt to fix plugin proxy tests

* Pass secrets service to getPluginProxiedRequest in pluginproxy tests

* Fix pluginproxy tests

* Revert using secrets service in alerting and provisioning

* Update decryptFn in alerting migration

* Rename defaultProvider to currentProvider

* Use fake secrets service in alert channels tests

* Refactor secrets service test helper

* Update setting up secrets service in tests

* Revert alerting changes in api

* Add comments

* Remove secrets service from background services

* Convert global encryption functions into vars

* Revert "Convert global encryption functions into vars"

This reverts commit 498eb19859.

* Add feature toggle for envelope encryption

* Rename toggle

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com>
 2021-11-04 18:47:21 +02:00
Tania B da39c6ce55 Settings: Add a method to Provider interface to check if a feature is enabled (#41250) 
* Settings: Add method to Provider interface to get feature toggles

* Apply review comment
 2021-11-03 16:37:16 +02:00
Tania B ff086df3b5 Fix decrypting secrets in alerting migration (#41061) 2021-10-29 14:20:07 +03:00
Tania B f59aabbd3b Chore: Refactor secrets service (#40331) 2021-10-12 17:08:07 +03:00
Tania B 62689ec804 Security: Add secrets service (#39418) 
* Add secrets service

* Revert accidental changes in util encryption

* Make minor changes

Move functional options to models

Revert renaming types to models

* Add context

* Minor change in GetDataKey

* Use CreateDataKeyWithDBSession in CreateDataKey

* Handle empty DEK name in DeleteDataKey

* Rename defaultProvider

* Remove secrets store service
 2021-10-01 15:39:57 +03:00
Tania B 990911a3b9 Chore: Cleanup usageStatsMock duplication (#39710) 
* Chore: Cleanup usageStatsMock duplication

* Remove making a new slice for UsageStatsMock
 2021-09-29 09:59:02 +03:00
Tania B b9acdce837 Chore: Fix grafana live stats reset when sending usage stats (#39558) 2021-09-23 12:55:00 +03:00
Tania BJoan López de la Franca BeltranJoan López de la Franca BeltranEmil Tullstedt
 		6b7b9f5158 Chore: Remove global encryption calls from sqlstore (#38588) 
* Add encryption service

* Add tests for encryption service

* Inject encryption service into http server

* Replace encryption global function usage in login tests

* Refactor UpdatePluginSetting

* Refactor EncryptSecureSettings

* Fix wire.go

* Refactor service initialization

Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com>
Co-authored-by: Joan López de la Franca Beltran <5459617+joanlopez@users.noreply.github.com>
Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
 2021-08-31 15:01:23 +02:00
Tania BJoan López de la Franca BeltranJoan López de la Franca BeltranEmil Tullstedt
 		bfde29d107 Chore: Remove global encryption calls from authinfoservice (#38591) 
* Add encryption service

* Add tests for encryption service

* Inject encryption service into http server

* Replace encryption global function usage in login tests

* Migrate to Wire

* Refactor authinfoservice to use encryption service

Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com>
Co-authored-by: Joan López de la Franca Beltran <5459617+joanlopez@users.noreply.github.com>
Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
 2021-08-31 14:00:13 +02:00
Tania BEmil TullstedtJoan López de la Franca BeltranJoan López de la Franca Beltran
 		a0108a1e5b Encryption: Extract encryption into service (#38442) 
* Add encryption service

* Add tests for encryption service

* Inject encryption service into http server

* Replace encryption global function usage in login tests

* Apply suggestions from code review

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

* Migrate to Wire

* Undo non-desired changes

* Move Encryption bindings to OSS Wire set

Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com>
Co-authored-by: Joan López de la Franca Beltran <5459617+joanlopez@users.noreply.github.com>
Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
 2021-08-30 19:39:55 +02:00
Tania BandUrsula Kallio bfc8a5cf49 Docs: Update docs for enterprise reporting (#37314) 
* Docs: Update docs for enterprise reporting

* Apply feedback

* Remove old scheduler section and add screenshots

* Update images links

* Update reporting scheduler intro

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

* Update Send now

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

* Update Send later

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

* Apply more feedback

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

* Apply review feedback

* Apply review feedback

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

* Apply review feedback

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

* Apply more feedback

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-08-03 18:09:26 +03:00
Tania BandUrsula Kallio 59e8ba6773 Docs: Update enterprise reporting section with link to the dashboard option (#32491) 
* Docs: Update enterprise reporting section to mention link to the dashboard

* Update the text

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

* Update new report screenshot

Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com>
 2021-05-13 10:41:08 +03:00
Tania BEmil Tullstedtachatterjee-grafana
 		711cf47b41 Docs: Add license check endpoint doc (#32987) 
* Docs: Add license check endpoint doc

* Change request example

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

* Change response example

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

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
Co-authored-by: achatterjee-grafana <aparajita.chatterjee@grafana.com>
 2021-04-21 15:31:38 -04:00
Tania B 3b6117a268 Docs: Update license exiration description (#32948) 2021-04-14 12:37:48 +03:00
Tania BandArve Knudsen ea484312a0 Fix loading timezone info on windows (#32029) 
* Fix loading timezone info on windows

* Move setting zoneinfo to config load

* Construct proper file path

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

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-03-19 11:14:49 +02:00
Tania B fb2402013b Remove UserSyncInfo.tsx (#31450) 2021-02-24 18:52:29 +02:00
Tania B f9a293afea Remove last synchronisation field from LDAP debug view (#30984) 
* Remove last synchronisation field from LDAP debug view

* Apply review comments
 2021-02-15 17:11:17 +02:00
Tania BandUrsula Kallio 8bf09161fb Docs: Add config settings for fonts in reporting (#30421) 
* Docs: Add config settings for fonts in reporting

* Update docs/sources/enterprise/reporting.md

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

* Update docs/sources/enterprise/reporting.md

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

* Move examples into values

* Update enterprise-configuration.md

* Update font style names to use lowercase

Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com>
 2021-01-29 18:01:32 +02:00
Tania B bb1f84dbc7 Chore: Upgrade grabpl version (#30486) 2021-01-21 19:24:12 +02:00
Tania B 2638a43337 Add enterprise reporting fonts to gitignore (#30385) 2021-01-19 14:51:16 +01:00
Tania BandEmil Tullstedt 551f96089b Remove the bus from teamgroupsync (#29810) 
* Add fake TeamSyncService

* Change SyncTeams dispatch to direct method call

* Remove SyncTeamsCommand struct

* Move TeamSyncService to a separate package

* Remove context from SyncTeams args

* Add comments to teamsyncgroup package

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

* Replace TeamSyncService with TeamSyncFunc

* Remove unnecessary error check

* Add a test

* Fix test input

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
 2020-12-23 14:42:20 +02:00
Tania B c869ae5791 Support svg embedded favicons in whitelabeling (#29436) 
* Fix favicon embedding in whitelabeling

* Fix formatting
 2020-12-07 12:23:53 +02:00
Tania B 2efcd11c12 Devenv: Add default db for influxdb (#29371) 2020-12-03 11:50:35 +02:00