fixes issue with datasource/dash as cfg and gitignore

.gitignore

@@ -39,8 +39,8 @@ conf/custom.ini
 fig.yml
 docker-compose.yml
 docker-compose.yaml
-/conf/dashboards/custom.yaml
+/conf/provisioning/dashboards/custom.yaml
-/conf/datasources/custom.yaml
+/conf/provisioning/datasources/custom.yaml
 profile.cov
 /grafana
 .notouch

conf/provisioning/dashboards/custom.yaml

@@ -1,6 +0,0 @@
-- name: 'default'
-  org_id: 1
-  folder: ''
-  type: file
-  options:
-    folder: /var/lib/grafana/dashboards

conf/provisioning/datasources/custom.yaml

@@ -1,48 +1,48 @@
-# list of datasources that should be deleted from the database
+# # list of datasources that should be deleted from the database
-delete_datasources:
+# delete_datasources:
-  - name: Graphite
+#   - name: Graphite
-    org_id: 1
+#     org_id: 1
 
-# list of datasources to insert/update depending 
+# # list of datasources to insert/update depending
-# whats available in the datbase
+# # whats available in the datbase
-datasources:
+# datasources:
-  # <string, required> name of the datasource. Required
+#   # <string, required> name of the datasource. Required
-- name: Graphite
+# - name: Graphite
-  # <string, required> datasource type. Required
+#   # <string, required> datasource type. Required
-  type: graphite
+#   type: graphite
-  # <string, required> access mode. direct or proxy. Required
+#   # <string, required> access mode. direct or proxy. Required
-  access: proxy
+#   access: proxy
-  # <int> org id. will default to org_id 1 if not specified
+#   # <int> org id. will default to org_id 1 if not specified
-  org_id: 1
+#   org_id: 1
-  # <string> url
+#   # <string> url
-  url: http://localhost:8080
+#   url: http://localhost:8080
-  # <string> database password, if used
+#   # <string> database password, if used
-  password:
+#   password:
-  # <string> database user, if used
+#   # <string> database user, if used
-  user:
+#   user:
-  # <string> database name, if used
+#   # <string> database name, if used
-  database:
+#   database:
-  # <bool> enable/disable basic auth
+#   # <bool> enable/disable basic auth
-  basic_auth:
+#   basic_auth:
-  # <string> basic auth username
+#   # <string> basic auth username
-  basic_auth_user:
+#   basic_auth_user:
-  # <string> basic auth password
+#   # <string> basic auth password
-  basic_auth_password:
+#   basic_auth_password:
-  # <bool> enable/disable with credentials headers
+#   # <bool> enable/disable with credentials headers
-  with_credentials:
+#   with_credentials:
-  # <bool> mark as default datasource. Max one per org
+#   # <bool> mark as default datasource. Max one per org
-  is_default:
+#   is_default:
-  # <map> fields that will be converted to json and stored in json_data
+#   # <map> fields that will be converted to json and stored in json_data
-  json_data: 
+#   json_data:
-     graphiteVersion: "1.1"
+#      graphiteVersion: "1.1"
-     tlsAuth: true
+#      tlsAuth: true
-     tlsAuthWithCACert: true
+#      tlsAuthWithCACert: true
-  # <string> json object of data that will be encrypted.
+#   # <string> json object of data that will be encrypted.
-  secure_json_data:
+#   secure_json_data:
-    tlsCACert: "..."
+#     tlsCACert: "..."
-    tlsClientCert: "..."
+#     tlsClientCert: "..."
-    tlsClientKey: "..."
+#     tlsClientKey: "..."
-  version: 1
+#   version: 1
-  # <bool> allow users to edit datasources from the UI.
+#   # <bool> allow users to edit datasources from the UI.
-  editable: false
+#   editable: false
 

conf/provisioning/datasources/sample.yaml

@@ -1,48 +0,0 @@
-# list of datasources that should be deleted from the database
-delete_datasources:
-  # - name: Graphite
-  #   org_id: 1
-
-# list of datasources to insert/update depending 
-# whats available in the datbase
-datasources:
-#   # <string, required> name of the datasource. Required
-# - name: Graphite
-#   # <string, required> datasource type. Required
-#   type: graphite
-#   # <string, required> access mode. direct or proxy. Required
-#   access: proxy
-#   # <int> org id. will default to org_id 1 if not specified
-#   org_id: 1
-#   # <string> url
-#   url: http://localhost:8080
-#   # <string> database password, if used
-#   password:
-#   # <string> database user, if used
-#   user:
-#   # <string> database name, if used
-#   database:
-#   # <bool> enable/disable basic auth
-#   basic_auth:
-#   # <string> basic auth username
-#   basic_auth_user:
-#   # <string> basic auth password
-#   basic_auth_password:
-#   # <bool> enable/disable with credentials headers
-#   with_credentials:
-#   # <bool> mark as default datasource. Max one per org
-#   is_default:
-#   # <map> fields that will be converted to json and stored in json_data
-#   json_data: 
-#      graphiteVersion: "1.1"
-#      tlsAuth: true
-#      tlsAuthWithCACert: true
-#   # <string> json object of data that will be encrypted.
-#   secure_json_data:
-#     tlsCACert: "..."
-#     tlsClientCert: "..."
-#     tlsClientKey: "..."
-#   version: 1
-#   # <bool> allow users to edit datasources from the UI.
-#   editable: false
-