80 Commits (306f0785e122a94de00895ada7866ebedb30277f)

Author	SHA1	Message	Date
Tania B	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>	5 years ago
Tania B	ff086df3b5	Fix decrypting secrets in alerting migration (#41061)	5 years ago
Joan López de la Franca Beltran	722c414fef	Encryption: Refactor securejsondata.SecureJsonData to stop relying on global functions (#38865) ... * Encryption: Add support to encrypt/decrypt sjd * Add datasources.Service as a proxy to datasources db operations * Encrypt ds.SecureJsonData before calling SQLStore * Move ds cache code into ds service * Fix tlsmanager tests * Fix pluginproxy tests * Remove some securejsondata.GetEncryptedJsonData usages * Add pluginsettings.Service as a proxy for plugin settings db operations * Add AlertNotificationService as a proxy for alert notification db operations * Remove some securejsondata.GetEncryptedJsonData usages * Remove more securejsondata.GetEncryptedJsonData usages * Fix lint errors * Minor fixes * Remove encryption global functions usages from ngalert * Fix lint errors * Minor fixes * Minor fixes * Remove securejsondata.DecryptedValue usage * Refactor the refactor * Remove securejsondata.DecryptedValue usage * Move securejsondata to migrations package * Move securejsondata to migrations package * Minor fix * Fix integration test * Fix integration tests * Undo undesired changes * Fix tests * Add context.Context into encryption methods * Fix tests * Fix tests * Fix tests * Trigger CI * Fix test * Add names to params of encryption service interface * Remove bus from CacheServiceImpl * Add logging * Add keys to logger Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Add missing key to logger Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Undo changes in markdown files * Fix formatting * Add context to secrets service * Rename decryptSecureJsonData to decryptSecureJsonDataFn * Name args in GetDecryptedValueFn * Add template back to NewAlertmanagerNotifier * Copy GetDecryptedValueFn to ngalert * Add logging to pluginsettings * Fix pluginsettings test Co-authored-by: Tania B <yalyna.ts@gmail.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>	5 years ago
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	5 years ago
Hugo Häggmark	fc73bc1161	LibraryElements: Enables creating library elements with specific UID (#39019) ... * LibraryPanels: Enables create/update library panels with specific UID * Chore: added check for uid length after PR comments * Refactor: creates IsShortUIDTooLong function * Refactor: adds UID to PATCH endpoint * Refactor: clarifies the patch code * Refactor: changes after PR comments	5 years ago
Alex Khomenko	ea8d9d77f4	Admin: User list tweaks (#38750) ... * Setup filter * Enable filtering users by active in last 30 days * Add loading state * Update last active age strings * Tweak user list * Use theme spacing * Improve table's accessibility * Add more aria-labels	5 years ago
Joan López de la Franca Beltran	8433def04f	Encryption: Convert functions into global variables (#37240)	5 years ago
Will Browne	303352a89b	Plugins: Ignore symlinked folders when verifying plugin signature (#34434) ... * add check + test * fix test * add manifest * fix linter * add nolint * separate err cond checks * only collect relevant plugin files * skip symlinks * refactor * add missing test files + enable scanning Chromium.app/ * remove test since case already covered * remove unnecessary changes from before * refactor * remove comment	5 years ago
Domas	5b5cb94809	Fix: fix loading symbolically linked plugins (#35635)	5 years ago
Stephanie Closson	83f26e9ce2	Fix: only recurse a symbolic link if it is a directory (#35455) ... * only recurse a symbolic link if it is a directory * added test for detecting valid plugins using lib dirs with symbolic links in them (like oracle) * fix linting errors * added extra checks as per code-review	5 years ago
Sofia Papagiannaki	a5082ab112	Chore: additional check when decrypting values (#34637) ... * Chore: additional check when decrypting values * Apply suggestions from code review	5 years ago
Arve Knudsen	ac09baae7d	Chore: Use Header.Set method instead of Header.Add (#29804) ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
taciomcosta	10ff4eecef	Backend: fix IPv6 address parsing erroneous (#28585) ... * Backend: Fix parsing of client IP address Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>	6 years ago
Arve Knudsen	9593d57914	Chore: Enable errorlint linter (#29227) ... * Enable errorlint linter * Handle wrapped errors Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>	6 years ago
Arve Knudsen	574553ec7b	Chore: Fix issues found by staticcheck (#28802) ... * Fix linting issues Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	6 years ago
Arve Knudsen	dff84f6a31	Chore: Remove dead code (#28664) ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	6 years ago
kay delaney	c4c5b2dc61	CloudWatch Logs queue and websocket support (#28176) ... CloudWatch Logs queue and websocket support	6 years ago
Matheus Alcantara	b4b3f6a088	Test: Create unit test to SplitEmails (#27985)	6 years ago
Arve Knudsen	a5d9196a53	Chore/fix lint issues (#27704) ... * Chore: Fix linting issues Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	6 years ago
Emil Tullstedt	d664853179	Tests: Change util GoConvey tests to use testify (#26724)	6 years ago
Arve Knudsen	16c185c3b9	Chore: Drop xerrors dependency (#26718) ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	6 years ago
Arve Knudsen	41d432b5ae	Chore: Enable whitespace linter (#25903) ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	6 years ago
Arve Knudsen	5070f7a75b	Chore: Start harmonizing linting with plugin SDK (#25854) ... * Chore: Harmonize linting with plugin SDK Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Chore: Fix linting issues Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	6 years ago
Mario Trangoni	5116420e9a	Fix misspell issues (#23905) ... * Fix misspell issues See, $ golangci-lint run --timeout 10m --disable-all -E misspell ./... Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com> * Fix codespell issues See, $ codespell -S './.git*' -L 'uint,thru,pres,unknwon,serie,referer,uptodate,durationm' Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com> * ci please? * non-empty commit - ci? * Trigger build Co-authored-by: bergquist <carl.bergquist@gmail.com> Co-authored-by: Kyle Brandt <kyle@grafana.com>	6 years ago
Marcus Efraimsson	e6cec8dbdc	Backend plugins: Prepare and clean request headers before resource calls (#22321) ... Moves common request proxy utilities to proxyutil package with support for removing X-Forwarded-Host, X-Forwarded-Port, X-Forwarded-Proto headers, setting X-Forwarded-For header and cleaning Cookie header. Using the proxyutil package to prepare and clean request headers before resource calls. Closes #21512	6 years ago
Sofia Papagiannaki	886bad2fd5	Util: Modify SplitHostPortDefault not to return an error for empty input (#20351) ... * Util: Optionally allow empty input in SplitHostPortDefault Due to a recent change the SQL Server tests failed because passing an empty datasource url in `util.SplitHostPortDefault` was no more allowed. This fix contains the following modifications: - Modifies the util.SplitHostPortDefault not to return an error for empty input. - Modifies the util.SplitHostPort to return an error for empty input. - Introduces an additional test for empty input.	7 years ago
Stephan Eicher	8cf75b4e75	pkg/util: Replace custom pbkdf2 implementation by maintained version (#19941)	7 years ago
Arve Knudsen	35e0e078b7	pkg/util: Check errors (#19832) ... * pkg/util: Check errors * pkg/services: DRY up code	7 years ago
Arve Knudsen	b858a5f496	Don't truncate IPv6 addresses (#19573) ... * Bugfix: Fix parsing of IPv6 addresses Make sure that IPv6 addresses aren't truncated when parsing. Fixes #18924 * util: Change network address parsing funcs to return error * pkg/api: Return NetworkAddress instead of host/port	7 years ago
Chad Nedzlek	20faef8de5	AzureMonitor: Alerting for Azure Application Insights (#19381) ... * Convert Azure Application Insights datasource to Go Allows for alerting of Application Insights data source Closes: #15153 * Fix timeGrainReset * Default time interval for querys for alerts * Fix a few rename related bugs * Update readme to indicate App Insights alerting * Fix typo and add tests to ensure migration is happening * Address code review feedback (mostly typos and unintended changes)	7 years ago
Oleg Gaidarenko	35b74a99a8	Emails: resurrect template notification (#18686) ... * Emails: resurrect template notification * Phantomjs (oh yeah, there is another dev dep phantom :-) was failing for the generation of the html templates so I had to update the dependencies in order to fix it. While doing that I update the scripts field and docs for it as well. yarn.lock is included * Move splitting of the emails to separate helper function, since more services coming up that would need to use this functionality * Add support for enterprise specific email letters. Probably could be done in the better way, but it's not a priority right now	7 years ago
Andrej Ocenas	151b24b95f	CLI: Add command to migrate all datasources to use encrypted password fields (#17118) ... closes: #17107	7 years ago
Carl Bergquist	c55e6016bf	backend: replace /pkg/errors with errutil (#17065)	7 years ago
Andrej Ocenas	c429934a66	Chore: Use x/xerrors instead of pkg/errors (#16668) ... * Use xerrors instead of pkg/errors * Add Wrap util func * Move Wrap to errutil package	7 years ago
Andrej Ocenas	2d7fc55df7	Provisioning: Do not allow deletion of provisioned dashboards (#16211) ... * Unprovision dashboard in case of DisableDeletion = true * Rename command struct * Handle removed provision files * Allow html in confirm-modal * Do not show confirm button without onConfirm * Show dialog on deleting provisioned dashboard * Changed DeleteDashboard to DeleteProvisionedDashboard * Remove unreachable return * Add provisioned checks to API * Remove filter func * Fix and add tests for deleting dashboards * Change delete confirm text * Added and used pkg/errors for error wrapping	7 years ago
Marcus Efraimsson	d433ca7d40	fix util for splitting host and port ... Now you can provide both a default host and a default port	7 years ago
Mario Trangoni	b7628f2060	pkg/util/{filepath.go,shortid_generator.go}: Fix golint issues ... See, $ gometalinter --vendor --deadline 10m --disable-all --enable=golint ./... filepath.go:12:5⚠️ error var WalkSkipDir should have name of the form ErrFoo (golint) shortid_generator.go:11:5⚠️ var validUidPattern should be validUIDPattern (golint) shortid_generator.go:19:6⚠️ func IsValidShortUid should be IsValidShortUID (golint) shortid_generator.go:24:6⚠️ func GenerateShortUid should be GenerateShortUID (golint)	7 years ago
Mario Trangoni	8261613b51	pkg/util/{ip.go,url.go}: Fix some golint issues ... See, $ gometalinter --vendor --deadline 10m --disable-all --enable=golint ./... ip.go:8:6⚠️ func SplitIpPort should be SplitIPPort (golint) url.go:14:6⚠️ func NewUrlQueryReader should be NewURLQueryReader (golint) url.go:9:6⚠️ type UrlQueryReader should be URLQueryReader (golint) url.go:37:6⚠️ func JoinUrlFragments should be JoinURLFragments (golint)	7 years ago
Mario Trangoni	5f6383a750	pkg/util/*: Add missing function comments. ... See, $ gometalinter --vendor --deadline 10m --disable-all --enable=golint ./... encoding.go:15:1⚠️ comment on exported function GetRandomString should be of the form "GetRandomString ..." (golint) encoding.go:30:1⚠️ exported function EncodePassword should have comment or be unexported (golint) encoding.go:35:1⚠️ comment on exported function EncodeMd5 should be of the form "EncodeMd5 ..." (golint) encoding.go:42:1⚠️ comment on exported function PBKDF2 should be of the form "PBKDF2 ..." (golint) encoding.go:80:1⚠️ exported function GetBasicAuthHeader should have comment or be unexported (golint) encoding.go:85:1⚠️ exported function DecodeBasicAuthHeader should have comment or be unexported (golint) encoding.go:105:1⚠️ exported function RandomHex should have comment or be unexported (golint) encryption.go:14:1⚠️ exported function Decrypt should have comment or be unexported (golint) encryption.go:39:1⚠️ exported function Encrypt should have comment or be unexported (golint) ip.go:7:1⚠️ exported function SplitIpPort should have comment or be unexported (golint) json.go:3:6⚠️ exported type DynMap should have comment or be unexported (golint) md5.go:22:1⚠️ comment on exported function Md5SumString should be of the form "Md5SumString ..." (golint) strings.go:10:1⚠️ exported function StringsFallback2 should have comment or be unexported (golint) strings.go:14:1⚠️ exported function StringsFallback3 should have comment or be unexported (golint) strings.go:27:1⚠️ exported function SplitString should have comment or be unexported (golint) strings.go:35:1⚠️ exported function GetAgeString should have comment or be unexported (golint) url.go:8:6⚠️ exported type UrlQueryReader should have comment or be unexported (golint) url.go:12:1⚠️ exported function NewUrlQueryReader should have comment or be unexported (golint) url.go:23:1⚠️ exported method UrlQueryReader.Get should have comment or be unexported (golint) url.go:32:1⚠️ exported function JoinUrlFragments should have comment or be unexported (golint) validation.go:16:1⚠️ exported function IsEmail should have comment or be unexported (golint)	7 years ago
Vlad Ellis	c208186f26	Parse database host correctly when using IPv6	7 years ago
Marcus Efraimsson	0495499b4f	fix ip address parsing of loopback address	7 years ago
Marcus Efraimsson	e08f61059b	utils	7 years ago
Bob Shannon	16ff8a182b	Re-organize packages and add basic auth test	8 years ago
Bob Shannon	dcc48860b8	Fix formatting and remove enabled toggle	8 years ago
Bob Shannon	362b3740ed	Add basic authentication support to metrics endpoint	8 years ago
Mario Trangoni	da46cc2fca	Fix changed want md5 hash	8 years ago
Mario Trangoni	80fa66fcb0	Fix some typos found by codespell ... See, $ codespell -S "./.git*,./vendor*,./public*"	8 years ago
tariq1890	e8dfbe94b1	Fixing bug in url query reader and added test cases	8 years ago
bergquist	c817aecd66	provisioning: only update dashboard if hash of json changed	8 years ago
Karsten Weiss	de8696d5d3	Outdent code after if block that ends with return (golint) ... This commit fixes the following golint warnings: pkg/bus/bus.go:64:9: if block ends with a return statement, so drop this else and outdent its block pkg/bus/bus.go:84:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:137:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:177:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:183:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:199:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:208:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/components/dynmap/dynmap.go:236:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:242:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:257:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:263:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:278:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:284:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:299:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:331:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:350:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:356:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:366:12: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:390:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:396:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:405:12: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:427:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:433:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:442:12: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:459:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:465:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:474:12: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:491:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:497:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:506:12: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:523:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:529:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:538:12: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:555:9: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:561:10: if block ends with a return statement, so drop this else and outdent its block pkg/components/dynmap/dynmap.go:570:12: if block ends with a return statement, so drop this else and outdent its block pkg/login/ldap.go:55:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/login/ldap_test.go:372:10: if block ends with a return statement, so drop this else and outdent its block pkg/middleware/middleware_test.go:213:12: if block ends with a return statement, so drop this else and outdent its block pkg/plugins/dashboard_importer.go:153:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/plugins/dashboards_updater.go:39:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/plugins/dashboards_updater.go:121:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/plugins/plugins.go:210:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/plugins/plugins.go:235:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/eval_context.go:111:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/notifier.go:92:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/notifier.go:98:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/notifier.go:122:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/rule.go:108:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/rule.go:118:10: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/rule.go:121:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/alerting/notifiers/telegram.go:94:10: if block ends with a return statement, so drop this else and outdent its block pkg/services/sqlstore/annotation.go:34:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/sqlstore/annotation.go:99:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/sqlstore/dashboard_test.go:107:13: if block ends with a return statement, so drop this else and outdent its block pkg/services/sqlstore/plugin_setting.go:78:10: if block ends with a return statement, so drop this else and outdent its block pkg/services/sqlstore/preferences.go:91:10: if block ends with a return statement, so drop this else and outdent its block pkg/services/sqlstore/user.go:50:10: if block ends with a return statement, so drop this else and outdent its block pkg/services/sqlstore/migrator/migrator.go:106:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/services/sqlstore/migrator/postgres_dialect.go:48:10: if block ends with a return statement, so drop this else and outdent its block pkg/tsdb/time_range.go:59:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/tsdb/time_range.go:67:9: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) pkg/tsdb/cloudwatch/metric_find_query.go:225:9: if block ends with a return statement, so drop this else and outdent its block pkg/util/filepath.go:68:11: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)	8 years ago