Merge pull request #10967 from bergquist/sample-yaml

provisioning: dont ignore sample yaml files

conf/provisioning/dashboards/sample.yaml

-# This file is only an example.
-# Grafana will never read sample.yaml files
-
 # # config file version
 # # config file version
-# apiVersion: 1
+apiVersion: 1
 
 
 #providers:
 #providers:
 # - name: 'default'
 # - name: 'default'

conf/provisioning/datasources/sample.yaml

-# This file is only an example.
-# Grafana will never read sample.yaml files
-
 # # config file version
 # # config file version
-# apiVersion: 1
+apiVersion: 1
 
 
 # # list of datasources that should be deleted from the database
 # # list of datasources that should be deleted from the database
 #deleteDatasources:
 #deleteDatasources:

pkg/services/provisioning/dashboards/config_reader.go

@@ -63,7 +63,7 @@ func (cr *configReader) readConfig() ([]*DashboardsAsConfig, error) {
 	}
 	}
 
 
 	for _, file := range files {
 	for _, file := range files {
-		if (!strings.HasSuffix(file.Name(), ".yaml") && !strings.HasSuffix(file.Name(), ".yml")) || file.Name() == "sample.yaml" {
+		if !strings.HasSuffix(file.Name(), ".yaml") && !strings.HasSuffix(file.Name(), ".yml") {
 			continue
 			continue
 		}
 		}
 
 

pkg/services/provisioning/dashboards/test-configs/dashboards-from-disk/sample.yaml

 apiVersion: 1
 apiVersion: 1
 
 
-providers:
-- name: 'gasdf'
-  orgId: 2
-  folder: 'developers'
-  editable: true
-  type: file
-  options:
-    path: /var/lib/grafana/dashboards
+#providers:
+#- name: 'gasdf'
+#  orgId: 2
+#  folder: 'developers'
+#  editable: true
+#  type: file
+#  options:
+#    path: /var/lib/grafana/dashboards

pkg/services/provisioning/datasources/config_reader.go

@@ -24,7 +24,7 @@ func (cr *configReader) readConfig(path string) ([]*DatasourcesAsConfig, error)
 	}
 	}
 
 
 	for _, file := range files {
 	for _, file := range files {
-		if (strings.HasSuffix(file.Name(), ".yaml") || strings.HasSuffix(file.Name(), ".yml")) && file.Name() != "sample.yaml" {
+		if strings.HasSuffix(file.Name(), ".yaml") || strings.HasSuffix(file.Name(), ".yml") {
 			datasource, err := cr.parseDatasourceConfig(path, file)
 			datasource, err := cr.parseDatasourceConfig(path, file)
 			if err != nil {
 			if err != nil {
 				return nil, err
 				return nil, err

pkg/services/provisioning/datasources/config_reader_test.go

@@ -138,7 +138,7 @@ func TestDatasourceAsConfig(t *testing.T) {
 				t.Fatalf("readConfig return an error %v", err)
 				t.Fatalf("readConfig return an error %v", err)
 			}
 			}
 
 
-			So(len(cfg), ShouldEqual, 2)
+			So(len(cfg), ShouldEqual, 3)
 
 
 			dsCfg := cfg[0]
 			dsCfg := cfg[0]
 
 
@@ -146,6 +146,17 @@ func TestDatasourceAsConfig(t *testing.T) {
 
 
 			validateDatasource(dsCfg)
 			validateDatasource(dsCfg)
 			validateDeleteDatasources(dsCfg)
 			validateDeleteDatasources(dsCfg)
+
+			dsCount := 0
+			delDsCount := 0
+
+			for _, c := range cfg {
+				dsCount += len(c.Datasources)
+				delDsCount += len(c.DeleteDatasources)
+			}
+
+			So(dsCount, ShouldEqual, 2)
+			So(delDsCount, ShouldEqual, 1)
 		})
 		})
 
 
 		Convey("can read all properties from version 0", func() {
 		Convey("can read all properties from version 0", func() {

pkg/services/provisioning/datasources/test-configs/all-properties/sample.yaml

@@ -3,30 +3,30 @@
 
 
 apiVersion: 1
 apiVersion: 1
 
 
-datasources:
-  - name: name
-    type: type
-    access: proxy
-    orgId: 2
-    url: url
-    password: password
-    user: user
-    database: database
-    basicAuth: true
-    basicAuthUser: basic_auth_user
-    basicAuthPassword: basic_auth_password
-    withCredentials: true
-    jsonData:
-      graphiteVersion: "1.1"
-      tlsAuth: true
-      tlsAuthWithCACert: true
-    secureJsonData:
-      tlsCACert: "MjNOcW9RdkbUDHZmpco2HCYzVq9dE+i6Yi+gmUJotq5CDA=="
-      tlsClientCert: "ckN0dGlyMXN503YNfjTcf9CV+GGQneN+xmAclQ=="
-      tlsClientKey: "ZkN4aG1aNkja/gKAB1wlnKFIsy2SRDq4slrM0A=="
-    editable: true
-    version: 10
-
-deleteDatasources:
-  - name: old-graphite3
-    orgId: 2
+#datasources:
+#  - name: name
+#    type: type
+#    access: proxy
+#    orgId: 2
+#    url: url
+#    password: password
+#    user: user
+#    database: database
+#    basicAuth: true
+#    basicAuthUser: basic_auth_user
+#    basicAuthPassword: basic_auth_password
+#    withCredentials: true
+#    jsonData:
+#      graphiteVersion: "1.1"
+#      tlsAuth: true
+#      tlsAuthWithCACert: true
+#    secureJsonData:
+#      tlsCACert: "MjNOcW9RdkbUDHZmpco2HCYzVq9dE+i6Yi+gmUJotq5CDA=="
+#      tlsClientCert: "ckN0dGlyMXN503YNfjTcf9CV+GGQneN+xmAclQ=="
+#      tlsClientKey: "ZkN4aG1aNkja/gKAB1wlnKFIsy2SRDq4slrM0A=="
+#    editable: true
+#    version: 10
+#
+#deleteDatasources:
+#  - name: old-graphite3
+#    orgId: 2