Browse Source

datasource as cfg: fixes typos

bergquist 8 years ago
parent
commit
6267ef1391
2 changed files with 2 additions and 3 deletions
  1. 2 2
      conf/datasources/datasources.yaml
  2. 0 1
      pkg/cmd/grafana-server/server.go

+ 2 - 2
conf/datasources/datasources.yaml

@@ -36,9 +36,9 @@ datasources:
 #   json_data: '{"graphiteVersion":"0.9"}'
 #   # <string> json object of data that will be encrypted in UI.
 #   secure_json_fields: ''
-#   # <int> including this value garantees that instance with old configs cannot
+#   # <int> including this value guarantees that instance with old configs cannot
 #   #       overwrite your last change.
 #   version: 1
 #   # <bool> allow users to edit datasources from the UI.
-#   editable: true
+#   editable: false
 

+ 0 - 1
pkg/cmd/grafana-server/server.go

@@ -66,7 +66,6 @@ func (g *GrafanaServerImpl) Start() {
 	social.NewOAuthService()
 	plugins.Init()
 
-	//if err := provisioning.StartUp(setting.HomePath); err != nil {
 	if err := provisioning.StartUp(setting.DatasourcesPath); err != nil {
 		logger.Error("Failed to provision Grafana from config", "error", err)
 		g.Shutdown(1, "Startup failed")