133 Commits (1bcd4c040b52d8355005e4ce0de54daae350c1ac)

Author	SHA1	Message	Date
bergquist	0a9bfc5529	delete provisioning meta data when deleting folder ... prior to this fix Grafana didnt delete meta data about the provisioned dashboard in `dashboard_provisioning` which means that the dashboard wasn't inserted into Grafana again if the folder was delete within Grafana. closes #13280	7 years ago
Mario Trangoni	f73236f8f4	pkg/services/sqlstore: Fix x.Sql is deprecated: use SQL instead. (megacheck) ... See, $ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./... | grep SQL alert.go:43:9⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) alert_notification.go:122:12⚠️ sess.Sql is deprecated: use SQL instead. (SA1019) (megacheck) annotation.go:226:12⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) dashboard.go:228:9⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) dashboard.go:302:10⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) dashboard.go:416:9⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) dashboard.go:635:12⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) migrations/user_mig.go:137:9⚠️ sess.Sql is deprecated: use SQL instead. (SA1019) (megacheck) plugin_setting.go:29:10⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) quota.go:41:12⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) quota.go:84:13⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) quota.go:143:12⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) quota.go:186:13⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) quota.go:234:12⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) team.go:172:12⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) team.go:199:17⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) team.go:223:9⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) temp_user.go:99:10⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) temp_user.go:124:10⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) user.go:375:3⚠️ sess.Sql is deprecated: use SQL instead. (SA1019) (megacheck) user.go:377:3⚠️ sess.Sql is deprecated: use SQL instead. (SA1019) (megacheck) user.go:379:3⚠️ sess.Sql is deprecated: use SQL instead. (SA1019) (megacheck)	7 years ago
Marcus Efraimsson	770acee56a	new property for current user indicating if edit permissions in folders	7 years ago
Mario Trangoni	6eb00000fe	pkg/services: fix ineffassign issues	7 years ago
Jonathan McCall	069012639a	Sort results from GetDashboardTags	7 years ago
Karsten Weiss	f61e69ce75	Simplify comparison to bool constant (gosimple) ... This fixes: build.go:553:6: should omit comparison to bool constant, can be simplified to !strings.Contains(path, ".sha256") (S1002) pkg/cmd/grafana-cli/commands/ls_command.go:27:5: should omit comparison to bool constant, can be simplified to !pluginDirInfo.IsDir() (S1002) pkg/components/dynmap/dynmap_test.go:24:5: should omit comparison to bool constant, can be simplified to !value (S1002) pkg/components/dynmap/dynmap_test.go:122:14: should omit comparison to bool constant, can be simplified to b (S1002) pkg/components/dynmap/dynmap_test.go:125:14: should omit comparison to bool constant, can be simplified to !b (S1002) pkg/components/dynmap/dynmap_test.go:128:14: should omit comparison to bool constant, can be simplified to !b (S1002) pkg/models/org_user.go:51:5: should omit comparison to bool constant, can be simplified to !(*r).IsValid() (S1002) pkg/plugins/datasource/wrapper/datasource_plugin_wrapper_test.go:77:12: should omit comparison to bool constant, can be simplified to !haveBool (S1002) pkg/services/alerting/conditions/evaluator.go:23:9: should omit comparison to bool constant, can be simplified to !reducedValue.Valid (S1002) pkg/services/alerting/conditions/evaluator.go:48:5: should omit comparison to bool constant, can be simplified to !reducedValue.Valid (S1002) pkg/services/alerting/conditions/evaluator.go:91:5: should omit comparison to bool constant, can be simplified to !reducedValue.Valid (S1002) pkg/services/alerting/conditions/query.go:56:6: should omit comparison to bool constant, can be simplified to !reducedValue.Valid (S1002) pkg/services/alerting/extractor.go:107:20: should omit comparison to bool constant, can be simplified to !enabled.MustBool() (S1002) pkg/services/alerting/notifiers/telegram.go:222:41: should omit comparison to bool constant, can be simplified to this.UploadImage (S1002) pkg/services/sqlstore/apikey.go:58:12: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/apikey.go:72:12: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/dashboard.go:66:33: should omit comparison to bool constant, can be simplified to !cmd.Overwrite (S1002) pkg/services/sqlstore/dashboard.go:175:12: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/dashboard.go:311:13: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/dashboard.go:444:12: should omit comparison to bool constant, can be simplified to !exists (S1002) pkg/services/sqlstore/dashboard.go:472:12: should omit comparison to bool constant, can be simplified to !exists (S1002) pkg/services/sqlstore/dashboard.go:554:32: should omit comparison to bool constant, can be simplified to !cmd.Overwrite (S1002) pkg/services/sqlstore/dashboard_snapshot.go:83:12: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/plugin_setting.go:39:12: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/quota.go:34:12: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/quota.go:111:6: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/quota.go:136:12: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/quota.go:213:6: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/temp_user.go:129:12: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/user.go:157:12: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/user.go:182:5: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/user.go:191:12: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/user.go:212:12: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/services/sqlstore/user.go:307:12: should omit comparison to bool constant, can be simplified to !has (S1002) pkg/social/generic_oauth.go:185:5: should omit comparison to bool constant, can be simplified to !s.extractToken(&data, token) (S1002) pkg/tsdb/mssql/mssql.go:148:39: should omit comparison to bool constant, can be simplified to ok (S1002) pkg/tsdb/mssql/mssql.go:212:6: should omit comparison to bool constant, can be simplified to !query.Model.Get("fillNull").MustBool(false) (S1002) pkg/tsdb/mssql/mssql.go:247:56: should omit comparison to bool constant, can be simplified to ok (S1002) pkg/tsdb/mssql/mssql.go:274:7: should omit comparison to bool constant, can be simplified to !exist (S1002) pkg/tsdb/mssql/mssql.go:282:8: should omit comparison to bool constant, can be simplified to !exist (S1002) pkg/tsdb/mysql/mysql.go:221:6: should omit comparison to bool constant, can be simplified to !query.Model.Get("fillNull").MustBool(false) (S1002) pkg/tsdb/mysql/mysql.go:256:56: should omit comparison to bool constant, can be simplified to ok (S1002) pkg/tsdb/mysql/mysql.go:283:7: should omit comparison to bool constant, can be simplified to !exist (S1002) pkg/tsdb/mysql/mysql.go:291:8: should omit comparison to bool constant, can be simplified to !exist (S1002) pkg/tsdb/postgres/postgres.go:134:39: should omit comparison to bool constant, can be simplified to ok (S1002) pkg/tsdb/postgres/postgres.go:201:6: should omit comparison to bool constant, can be simplified to !query.Model.Get("fillNull").MustBool(false) (S1002) pkg/tsdb/postgres/postgres.go:236:56: should omit comparison to bool constant, can be simplified to ok (S1002) pkg/tsdb/postgres/postgres.go:263:7: should omit comparison to bool constant, can be simplified to !exist (S1002) pkg/tsdb/postgres/postgres.go:271:8: should omit comparison to bool constant, can be simplified to !exist (S1002)	7 years ago
Karsten Weiss	be2d635078	Simplify error returns (gosimple) ... This fixes: pkg/api/avatar/avatar.go:261:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/log/file.go:102:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/metrics/graphitebridge/graphite.go:298:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/provisioning/provisioning.go:23:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/alert_notification.go:27:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/alert_notification.go:27:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/annotation.go:105:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/annotation.go:105:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/dashboard.go:351:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/dashboard.go:435:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/dashboard_acl.go:38:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/dashboard_acl.go:38:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/stats.go:22:2: 'if err != nil { return err }; return err' can be simplified to 'return err' (S1013) pkg/services/sqlstore/team.go:213:2: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/user.go:256:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/user.go:256:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/user.go:274:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/user.go:274:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/user.go:482:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) pkg/services/sqlstore/user.go:482:3: 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013)	7 years ago
Marcus Efraimsson	b4863002c9	permission: fix user with org viewer save/move permissions ... User with org viewer role should not be able to save/move dashboards in/to general folder.	7 years ago
bergquist	061a418f0f	style: dont expose func outside package	7 years ago
Marcus Efraimsson	3f588b4c48	dashboards: created/updated and createdby/updatedby should be set before save ... If creating a new folder/dashboard created/updated and createdby/updatedby should always be set. If updating an existing folder/dashboard updated and updatedby should always be set.	7 years ago
Marcus Efraimsson	39aba03483	dashboards: created date should be set when creating a folder/dashboard	7 years ago
Marcus Efraimsson	53cd39fde5	Shouldn't be able to overwrite a dashboard if you don't have permissions (#10900) ... * dashboards: new command for validating dashboard before update Removes validation logic from saveDashboard and later on use the new command for validating dashboard before saving a dashboard. This due to the fact that we need to validate permissions for overwriting other dashboards by uid and title. * dashboards: use the new command for validating dashboard before saving Had to refactor dashboard provisioning a bit to be able to sidetrack the permission validation in a somewhat reasonable way. Adds some initial tests of the dashboard repository, but needs to be extended later. At least now you can mock the dashboard guardian * dashboards: removes validation logic in the save dashboard api layer Use the dashboard repository solely for create/update dashboards and let it do all the validation. One exception regarding quota validation which still is in api layer since that logic is in a macaron middleware. Need to move out-commented api tests later. * dashboards: fix database tests for validate and saving dashboards * dashboards: rename dashboard repository to dashboard service Split the old dashboard repository interface in two new interfaces, IDashboardService and IDashboardProvisioningService. Makes it more explicit when using it from the provisioning package and there's no possibility of calling an incorrect method for saving a dashboard. * database: make the InitTestDB function available to use from other packages * dashboards: rename ValidateDashboardForUpdateCommand and some refactoring * dashboards: integration tests of dashboard service * dashboard: fix sqlstore test due to folder exist validation * dashboards: move dashboard service integration tests to sqlstore package Had to move it to the sqlstore package due to concurrency problems when running against mysql and postgres. Using InitTestDB from two packages added conflicts when clearing and running migrations on the test database * dashboards: refactor how to find id to be used for save permission check * dashboards: remove duplicated dashboard tests * dashboards: cleanup dashboard service integration tests * dashboards: handle save dashboard errors and return correct http status * fix: remove log statement * dashboards: import dashboard should use dashboard service Had to move alerting commands to models package due to problems with import cycles of packages. * dashboards: cleanup dashboard api tests and add some tests for post dashboard * dashboards: rename dashboard service interfaces * dashboards: rename dashboard guardian interface	7 years ago
Torkel Ödegaard	fcaa8227a6	Dashboard acl query fixes (#10909) ... * initial fixes for dashboard permission acl list query, fixes #10864 * permissions: refactoring of acl api and query	7 years ago
Torkel Ödegaard	ec6f0f94b8	permissions: refactoring of acl api and query	7 years ago
Torkel Ödegaard	162439a8d6	fix: removed logging	7 years ago
Torkel Ödegaard	8e8f3c4332	dashboard and folder search with permissions	7 years ago
Marcus Efraimsson	0e8377a9f4	Update logic for create/update dashboard, validation and plugin dashboard links (#10809) ... * enables overwrite if dashboard allready exist in folder * dashboard: Don't allow creating a folder named General * dashboards: update logic for save/update dashboard No id and uid creates a new dashboard/folder. No id and uid, with an existing title in folder allows overwrite of dashboard. Id without uid, allows update of existing dashboard/folder without overwrite. Uid without id allows update of existing dashboard/folder without overwrite. Id without uid, with an existing title in folder allows overwrite of dashboard/folder and updated will have the uid of overwritten. Uid without id, with an existing title in folder allows overwrite of dashboard/folder and new will have the same uid as provided. Trying to change an existing folder to a dashboard yields error. Trying to change an existing dashboard to a folder yields error. * dashboards: include folder id when confirmed to save with overwrite * dashboards: fixes due to new url structure Return importedUrl property in response to importing dashboards and getting plugin dashboards and use this for redirects/links in the frontend.	7 years ago
Torkel Ödegaard	b84fd3a7ae	fix: initial fix for #10822	7 years ago
Daniel Lee	db1423eebc	dashfolders: fixes #10820	7 years ago
Marcus Efraimsson	a879dd8c0c	dashboards: render correct link for folder when searching for dashboards (#10763) ... Fixes #10761	7 years ago
Carl Bergquist	cc0cc8dd73	changes to new urlformat for home dashboard (#10738)	7 years ago
Marcus Efraimsson	744f402a96	db: fix failing integration tests for mysql and postgresql	7 years ago
bergquist	90207bcb7d	register handler for get dashboards by slug	7 years ago
bergquist	992fd37010	alert: use new url format	7 years ago
Marcus Efraimsson	90933b0621	dashboard: refactor logic for retrieving url for folder/dashboard	7 years ago
Marcus Efraimsson	035b724725	dashboards: remove slug property in dashboard search responses ... Removes slug property in dashboard search responses since this property isn't needed anymore and it haven't been released to any stable release.	7 years ago
Marcus Efraimsson	92a0171a9b	folders: change the front end route for browsing folders ... Change the front end route for folders to /dashboards/f/<uid>/<slug of folder title>. Use new route for deleting dashboard/folder by uid. Retrieve dashboard/folder by uid when moving or deleting dashboards/folders.	7 years ago
Marcus Efraimsson	b23560ed5a	dashboards: add validation to delete dashboard by slug ... Validates that there are only one folder/dashboard having that slug, otherwise returns 412 Precondition Failed	7 years ago
bergquist	58cfb23625	retry uid generation	7 years ago
bergquist	16a1642831	gofmt...	7 years ago
bergquist	7e96052594	ensure dashboard title is unique in folder	7 years ago
bergquist	bb3183f6cd	removes uniqnes check on slug when saving dashboards	7 years ago
Daniel Lee	eb765d288c	alertlist: disable pause button when user does not have permission	7 years ago
Marcus Efraimsson	9fb7b887db	dashboards: add url property to dashboard meta and search api responses ... #7883	7 years ago
Marcus Efraimsson	13d5db7d19	dashboards: add support for retrieving a dashboard by uid ... Introduces new url in api /dashboards/<uid> for fetching dashboard by unique id Leave the old dashboard by slug url /dashboards/db/<slug> for backward compatibility and for supporting fallback WIP for #7883	7 years ago
Marcus Efraimsson	5b35c694dc	dashboard: generate and include uid in dashboard model. #7883	7 years ago
Marcus Efraimsson	f08932b78a	WIP: folder api. #10630	7 years ago
bergquist	d62d5c7418	provisioning: delete dashboards from db when file is missing	7 years ago
bergquist	57e7048b8f	provisioning: enables title changes for dashboards	7 years ago
bergquist	67a9e6a71d	provisioing: add lookup table provisioned dashboards	7 years ago
Daniel Lee	94a54248c1	dashfolders: show folders use can save to in picker ... Instead of returning all folders a user has some sort of access to, this change creates a new end point that returns folders the user has write access to. This new endpoint is used in the folder picker	7 years ago
Marcus Efraimsson	df3655dd4a	db: fix postgres regression when comparing boolean columns/values (#10303) ... Use the dialect specific BooleanStr when comparing boolean columns/values. Fixes #10300	8 years ago
Torkel Ödegaard	313735bd75	search: worked on search results	8 years ago
bergquist	d69b63cbc0	dashboards as cfg: read first cfg version	8 years ago
Daniel Lee	4356e980f0	dashfolders: create app folder on dashboard import	8 years ago
Torkel Ödegaard	fc1d8416a7	working on dashboard search	8 years ago
Daniel Lee	7c74111187	search: add expanded folders	8 years ago
Daniel Lee	f47673ab5c	search: refactor search sql into a builder class	8 years ago
Torkel Ödegaard	f4d0e2caee	ux: search progress	8 years ago
Daniel Lee	cd6a18ec62	search: fix search to limit dashboards better ... Change the query to first select the dashboards, apply the limit then join with tags. Means the limit will apply to the number of dashboards returned in the search. The disadvantage is that the query will return more rows than the limit, no. of dashboards x no. of tags. So hard limit set to 5000 for all rows.	8 years ago