52 Commits (ab6cf9e94de7e1a0811bf2eb48cdbde6136448d9)

Author	SHA1	Message	Date
Kristin Laemmert	945f015770	backend/datasources: move datasources models into the datasources service package (#51267) ... * backend/datasources: move datasources models into the datasources service pkg	4 years ago
Marcus Efraimsson	36c3398c6d	Datasource: Remove support for unencrypted passwords (#49987) ... * Datasource: Remove support for unencrypted passwords * regenerate swagger * [WIP] Remove references to datasource password and basic auth password fields (#50015) * try delete moar tings * delete provisioning stuff * remove from yaml * update snapshots * remove lingering snapshot fields * fix ds http settings * Re-generate swagger and fix swagger-api-spec make target Co-authored-by: Will Browne <will.browne@grafana.com> Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>	4 years ago
Serge Zaitsev	a231c6861c	Chore: Remove bus.Dispatch from provisioning services (#44989) ... * make getordbyname a method * remove one dispatch from plugins provisioner * remove bus from the plugins provisioner, skip test for now * remove bus from datasource provisioning * resolve tests in notifier provisioning * remove bus from the dashboards provisioning service * fix missing struct field * fix getorgbyid method calls * pass org store into dashboard provisioner * fix test function prototype * fix tests * attempt to fix tests after the rebase * fix integration test * avoid using transaction * remove comments	4 years ago
maicon	8e03541228	Provisioning: Ensure that the default value for orgID is set when provisioning datasources to be deleted (#44244) ... Fixes #44243 Signed-off-by: Maicon Costa <maiconscosta@gmail.com>	4 years ago
idafurjes	8e6d6af744	Rename DispatchCtx to Dispatch (#43563)	4 years ago
idafurjes	7936c4c522	Rename AddHandlerCtx to AddHandler (#43557)	4 years ago
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	4 years ago
idafurjes	e6123bc3ef	Replace AddHandler with AddHandlerCtx in tests (#42585)	4 years ago
Ryan McKinley	7ef05588ea	Provisioning: set stable datasource UID with provisioning (#41769)	4 years ago
idafurjes	47f6bb3583	Chore: Add context to org (#40685) ... * Add context to org * Rebase * Fix rebase	4 years ago
Serge Zaitsev	7b15cd0ed2	Chore: Refactor GoConvey in provisioning package (#40892) ... * refactor goconvey in some provisioning subpackages * fix goconvey in provisioning/datasources * remove goconvey from notifiers subpackage * finally resolve goconvey in dashboards subpackage	4 years ago
Will Browne	e4297006f6	Chore: Propagate context for data source provisioning (#40235) ... * context all the things * apply feedback * rollback some alerting changes * rollback some alerting changes #2 * more rollbacks * more rollbacks #2 * more rollbacks #3 * more rollbacks #4 * fix integration test * add missing context * add missing and remove incorrect dispatch	4 years ago
Kyle Brandt	1c1a800bc0	API: Add by UID routes for data sources (#29884) ... - also add Get by UID+OrgID to datasource cache - Refactor backend commands for Delete and Get to be unified	5 years ago
Arve Knudsen	f326b79cc1	Security: Add gosec G304 auditing annotations (#29578) ... * Security: Add gosec G304 auditing annotations Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * add G304 auditing comment Signed-off-by: bergquist <carl.bergquist@gmail.com> * add G304 auditing comment Signed-off-by: bergquist <carl.bergquist@gmail.com> * add G304 auditing comment Signed-off-by: bergquist <carl.bergquist@gmail.com> * add G304 auditing comment Signed-off-by: bergquist <carl.bergquist@gmail.com> * add G304 auditing comment Signed-off-by: bergquist <carl.bergquist@gmail.com> * add G304 auditing comment Signed-off-by: bergquist <carl.bergquist@gmail.com> * add G304 auditing comment Signed-off-by: bergquist <carl.bergquist@gmail.com> * add G304 auditing comment Signed-off-by: bergquist <carl.bergquist@gmail.com> * Add gosec annotations Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * add G304 auditing comment Signed-off-by: bergquist <carl.bergquist@gmail.com> * add G304 auditing comment Signed-off-by: bergquist <carl.bergquist@gmail.com> * Add gosec annotations Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * add G304 auditing comment Signed-off-by: bergquist <carl.bergquist@gmail.com> * add G304 auditing comment Signed-off-by: bergquist <carl.bergquist@gmail.com> * add G304 auditing comment Signed-off-by: bergquist <carl.bergquist@gmail.com> * Add gosec annotations Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * space Signed-off-by: bergquist <carl.bergquist@gmail.com> * Add gosec annotations Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: bergquist <carl.bergquist@gmail.com>	5 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>	5 years ago
Arve Knudsen	ab078133bf	Backend: Remove unused code (#28933) ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Maksim Nabokikh	ba2524cd88	Provisioning: Add validation for missing organisations in datasource, dashboard, and notifier configurations (#26601) ... * Provisioning: Check that org. from config exists Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com> * Apply suggestions from code review Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix some code after applying suggestions Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com> * Add negative test case Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com> Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>	6 years ago
Maksim Nabokikh	a1f40195be	Provisioning: Validate that datasource access field equals to direct or proxy (#26440) ... * Validate that datasource access field equals to allowed value (direct or proxy)	6 years ago
Arve Knudsen	d4e4cb4c71	Chore: Enable Go linter gocritic (#26224) ... * Chore: Enable gocritic linter Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	6 years ago
Arve Knudsen	07582a8e85	Chore: Fix various spelling errors in back-end code (#25241) ... * Chore: Fix various spelling errors in back-end code Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com> Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>>	6 years ago
Carl Bergquist	7610d5717a	Provisioning: Use proxy as default access mode in provisioning (#24669) ... fixes #24591 fixes #19501	6 years ago
Andrej Ocenas	e5dd7efdee	Provisioning: Allows specifying uid for datasource and use that in derived fields (#23585) ... * Add uid to datasource * Fix uid passing when provisioning * Better error handling and Uid column type change * Fix test and strict null error counts * Add backend tests * Add tests * Fix strict null checks * Update test * Improve tests * Update pkg/services/sqlstore/datasource.go Co-Authored-By: Arve Knudsen <arve.knudsen@gmail.com> * Variable rename Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>	6 years ago
Carl Bergquist	0fd5945542	Fixes linting errors in datasource provisioning. (#23515)	6 years ago
Erik Sundell	4dbedb8405	Azure Monitor: Revert support for cross resource queries (#19115)" (#19346) ... This reverts commit 88051258e9.	6 years ago
Erik Sundell	88051258e9	Azure Monitor: Add support for cross resource queries (#19115) ... * Add new query mode picker with different states for each query. Also really simple migration script * Populate cross resource dropdowns * Cleanup. Handle change events * Add multi select picker for subscriptions * Fix markup issue * Prepare for new query mode * More cleanup * Handle multiple queries both in ds and backend * Refactoring * Improve migration * Add support for multiselect display name * Use multiselect also for locations and resources * Add more typings * Fix migrations * Custom multiselect built for array of options instead of variables * Add url builder test * fix datasource tests * UI fixes * Improve query editor init * Fix brokens tests * Cleanup * Fix tslint issue * Change query mode display name * Make sure alerting works for single queries * Friendly error for multi resources * Add temporary typings	6 years ago
zhulongcheng	2fff8f77dc	move log package to /infra (#17023) ... ref #14679 Signed-off-by: zhulongcheng <zhulongcheng.me@gmail.com>	7 years ago
Andrej Ocenas	fcebd713a5	Provisioning: Interpolate env vars in provisioning files (#16499) ... * Add value types with custom unmarshalling logic * Add env support for notifications config * Use env vars in json data tests for values * Add some more complexities to value tests * Update comment with example usage * Set env directly in the tests, removing patching * Update documentation * Add env var to the file reader tests * Add raw value * Post merge fixes * Add comment	7 years ago
Andrej Ocenas	66f6e16916	Security: Store datasource passwords encrypted in secureJsonData (#16175) ... * Store passwords in secureJsonData * Revert unnecessary refactors * Fix for nil jsonSecureData value * Remove copied encryption code from migration * Fix wrong field reference * Remove migration and provisioning changes * Use password getters in datasource proxy * Refactor password handling in datasource configs * Add provisioning warnings * Update documentation * Remove migration command, moved to separate PR * Remove unused code * Set the upgrade version * Remove unused code * Remove double reference	7 years ago
Marcus Efraimsson	b4267eafb8	log root cause error when reading from provisioning directories	7 years ago
Mario Trangoni	60dfff11a0	Fix datbase > database	7 years ago
Mario Trangoni	80fa66fcb0	Fix some typos found by codespell ... See, $ codespell -S "./.git*,./vendor*,./public*"	7 years ago
Marcus Efraimsson	0a7be2618e	cleaning up test data	8 years ago
Marcus Efraimsson	aed89b49c0	should allow one default datasource per organisation using provisioning	8 years ago
bergquist	1411709db1	provisioning: place testfiles within testdata folder	8 years ago
Karsten Weiss	b7adf28501	Remove redundancy in variable declarations (golint) ... This commit fixes the following golint warnings: pkg/api/avatar/avatar.go:229:12: should omit type *http.Client from declaration of var client; it will be inferred from the right-hand side pkg/login/brute_force_login_protection.go:13:26: should omit type time.Duration from declaration of var loginAttemptsWindow; it will be inferred from the right-hand side pkg/metrics/graphitebridge/graphite.go:58:26: should omit type []string from declaration of var metricCategoryPrefix; it will be inferred from the right-hand side pkg/metrics/graphitebridge/graphite.go:69:22: should omit type []string from declaration of var trimMetricPrefix; it will be inferred from the right-hand side pkg/models/alert.go:37:36: should omit type error from declaration of var ErrCannotChangeStateOnPausedAlert; it will be inferred from the right-hand side pkg/models/alert.go:38:36: should omit type error from declaration of var ErrRequiresNewState; it will be inferred from the right-hand side pkg/models/datasource.go:61:28: should omit type map[string]bool from declaration of var knownDatasourcePlugins; it will be inferred from the right-hand side pkg/plugins/update_checker.go:16:13: should omit type http.Client from declaration of var httpClient; it will be inferred from the right-hand side pkg/services/alerting/engine.go:103:24: should omit type time.Duration from declaration of var unfinishedWorkTimeout; it will be inferred from the right-hand side pkg/services/alerting/engine.go:105:19: should omit type time.Duration from declaration of var alertTimeout; it will be inferred from the right-hand side pkg/services/alerting/engine.go:106:19: should omit type int from declaration of var alertMaxAttempts; it will be inferred from the right-hand side pkg/services/alerting/notifier.go:143:23: should omit type map[string]*NotifierPlugin from declaration of var notifierFactories; it will be inferred from the right-hand side pkg/services/alerting/rule.go:136:24: should omit type map[string]ConditionFactory from declaration of var conditionFactories; it will be inferred from the right-hand side pkg/services/alerting/conditions/evaluator.go:12:15: should omit type []string from declaration of var defaultTypes; it will be inferred from the right-hand side pkg/services/alerting/conditions/evaluator.go:13:15: should omit type []string from declaration of var rangedTypes; it will be inferred from the right-hand side pkg/services/alerting/notifiers/opsgenie.go:44:19: should omit type string from declaration of var opsgenieAlertURL; it will be inferred from the right-hand side pkg/services/alerting/notifiers/pagerduty.go:43:23: should omit type string from declaration of var pagerdutyEventApiUrl; it will be inferred from the right-hand side pkg/services/alerting/notifiers/telegram.go:21:17: should omit type string from declaration of var telegramApiUrl; it will be inferred from the right-hand side pkg/services/provisioning/dashboards/config_reader_test.go:11:24: should omit type string from declaration of var simpleDashboardConfig; it will be inferred from the right-hand side pkg/services/provisioning/dashboards/config_reader_test.go:12:24: should omit type string from declaration of var oldVersion; it will be inferred from the right-hand side pkg/services/provisioning/dashboards/config_reader_test.go:13:24: should omit type string from declaration of var brokenConfigs; it will be inferred from the right-hand side pkg/services/provisioning/dashboards/file_reader.go:22:30: should omit type time.Duration from declaration of var checkDiskForChangesInterval; it will be inferred from the right-hand side pkg/services/provisioning/dashboards/file_reader.go:24:23: should omit type error from declaration of var ErrFolderNameMissing; it will be inferred from the right-hand side pkg/services/provisioning/datasources/config_reader_test.go:15:34: should omit type string from declaration of var twoDatasourcesConfig; it will be inferred from the right-hand side pkg/services/provisioning/datasources/config_reader_test.go:16:34: should omit type string from declaration of var twoDatasourcesConfigPurgeOthers; it will be inferred from the right-hand side pkg/services/provisioning/datasources/config_reader_test.go:17:34: should omit type string from declaration of var doubleDatasourcesConfig; it will be inferred from the right-hand side pkg/services/provisioning/datasources/config_reader_test.go:18:34: should omit type string from declaration of var allProperties; it will be inferred from the right-hand side pkg/services/provisioning/datasources/config_reader_test.go:19:34: should omit type string from declaration of var versionZero; it will be inferred from the right-hand side pkg/services/provisioning/datasources/config_reader_test.go:20:34: should omit type string from declaration of var brokenYaml; it will be inferred from the right-hand side pkg/services/sqlstore/stats.go:16:25: should omit type time.Duration from declaration of var activeUserTimeLimit; it will be inferred from the right-hand side pkg/services/sqlstore/migrator/mysql_dialect.go:69:14: should omit type bool from declaration of var hasLen1; it will be inferred from the right-hand side pkg/services/sqlstore/migrator/mysql_dialect.go:70:14: should omit type bool from declaration of var hasLen2; it will be inferred from the right-hand side pkg/services/sqlstore/migrator/postgres_dialect.go:95:14: should omit type bool from declaration of var hasLen1; it will be inferred from the right-hand side pkg/services/sqlstore/migrator/postgres_dialect.go:96:14: should omit type bool from declaration of var hasLen2; it will be inferred from the right-hand side pkg/setting/setting.go:42:15: should omit type string from declaration of var Env; it will be inferred from the right-hand side pkg/setting/setting.go:161:18: should omit type bool from declaration of var LdapAllowSignup; it will be inferred from the right-hand side pkg/setting/setting.go:473:30: should omit type bool from declaration of var skipStaticRootValidation; it will be inferred from the right-hand side pkg/tsdb/interval.go:14:21: should omit type time.Duration from declaration of var defaultMinInterval; it will be inferred from the right-hand side pkg/tsdb/interval.go:15:21: should omit type time.Duration from declaration of var year; it will be inferred from the right-hand side pkg/tsdb/interval.go:16:21: should omit type time.Duration from declaration of var day; it will be inferred from the right-hand side pkg/tsdb/cloudwatch/credentials.go:26:24: should omit type map[string]cache from declaration of var awsCredentialCache; it will be inferred from the right-hand side pkg/tsdb/influxdb/query.go:15:27: should omit type *regexp.Regexp from declaration of var regexpOperatorPattern; it will be inferred from the right-hand side pkg/tsdb/influxdb/query.go:16:27: should omit type *regexp.Regexp from declaration of var regexpMeasurementPattern; it will be inferred from the right-hand side pkg/tsdb/mssql/mssql_test.go:25:14: should omit type string from declaration of var serverIP; it will be inferred from the right-hand side	8 years ago
Mario Trangoni	c1742df9ac	remove unused variables detected by varcheck	8 years ago
Mario Trangoni	91fb2e07ce	pkg: fix codespell issues	8 years ago
bergquist	4dc6074e79	provisioning: dont ignore sample yaml files ... closes #10963	8 years ago
bergquist	dba087463a	provisioing: always skip sample.yaml files	8 years ago
bergquist	165304a342	provisioning: handle nil configs	8 years ago
bergquist	84de76ff0a	provisioning: code formating	8 years ago
bergquist	44baaeed8f	provisioning: adds logs about deprecated config format	8 years ago
bergquist	4a35244cb9	provisioning: support camcelCase provisioning files	8 years ago
bergquist	c3a768b3ed	provsioning: dont stop grafana due to missing	8 years ago
bergquist	5f5cdad97a	improve error handling for datasources as cfg	8 years ago
bergquist	9cebb23e01	dashboards as cfg: revert minor changes	8 years ago
bergquist	dc0fb8be06	dashboards as cfg: code cleanup	8 years ago
bergquist	87983021e2	datasources as cfg: convert yaml map into json for jsonData	8 years ago
bergquist	ebbfc529e0	datasource as cfg: support globbing	8 years ago
bergquist	0f136a940c	datasource as cfg: enable editable ds's	8 years ago