provisioing: always skip 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
 
 

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
 
 

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") {
+		if (!strings.HasSuffix(file.Name(), ".yaml") && !strings.HasSuffix(file.Name(), ".yml")) || file.Name() == "sample.yaml" {
 			continue
 			continue
 		}
 		}
 
 

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

+apiVersion: 1
+
+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") {
+		if (strings.HasSuffix(file.Name(), ".yaml") || strings.HasSuffix(file.Name(), ".yml")) && file.Name() != "sample.yaml" {
 			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/test-configs/all-properties/sample.yaml

+# Should not be included
+
+
+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