DAaaS: Fixed various minor issues in visulization

1. Adjust the directory layout for the example value file of grafana-values.yaml
introduced by commit d372a21.

2. Fix the file mode.

Issue-ID: ONAPARC-393
Change-Id: Iedaa54e1b89fbd8f2c62cbdc4a025c29bbd31482
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>

diff --git a/vnfs/DAaaS/deploy/visualization/README.txt b/vnfs/DAaaS/deploy/visualization/README.txt
old mode 100755 (executable)
new mode 100644 (file)
index a2005d2..9ebb1a0
--- a/vnfs/DAaaS/deploy/visualization/README.txt
+++ b/vnfs/DAaaS/deploy/visualization/README.txt
@@ -10,5 +10,5 @@ configmap found at ./charts/grafana/templates/configmap-add-dashboard.yaml
 
 #Install visualization helm package
 
-helm install -n graf-prometheus . -f ./charts/grafana/values.yaml -f ./charts/grafana/grafana-values.yaml
+helm install -n graf-prometheus . -f ./grafana-values.yaml
 

diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/Chart.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/Chart.yaml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/README.md b/vnfs/DAaaS/deploy/visualization/charts/grafana/README.md
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/dashboards/custom-dashboard.json b/vnfs/DAaaS/deploy/visualization/charts/grafana/dashboards/custom-dashboard.json
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/dashboards/dashboard1.json b/vnfs/DAaaS/deploy/visualization/charts/grafana/dashboards/dashboard1.json
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/NOTES.txt b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/NOTES.txt
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/_helpers.tpl b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/_helpers.tpl
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/clusterrole.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/clusterrole.yaml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/clusterrolebinding.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/clusterrolebinding.yaml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap-add-dashboard.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap-add-dashboard.yaml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap-dashboard-provider.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap-dashboard-provider.yaml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap.yaml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/dashboards-json-configmap.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/dashboards-json-configmap.yaml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/deployment.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/deployment.yaml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/ingress.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/ingress.yaml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/podsecuritypolicy.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/podsecuritypolicy.yaml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/pvc.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/pvc.yaml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/role.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/role.yaml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/rolebinding.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/rolebinding.yaml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/secret.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/secret.yaml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/service.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/service.yaml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/serviceaccount.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/serviceaccount.yaml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/values.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/values.yaml
old mode 100755 (executable)
new mode 100644 (file)
index d78af1f..dea2bd9
--- a/vnfs/DAaaS/deploy/visualization/charts/grafana/values.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/values.yaml
@@ -208,7 +208,18 @@ plugins: []
 ## Configure grafana datasources
 ## ref: http://docs.grafana.org/administration/provisioning/#datasources
 ##
-#datasources:
+datasources:
+  datasources.yaml:
+    apiVersion: 1
+    datasources:
+    - name: Prometheus
+      type: prometheus
+      url: http://localhost:9090
+      isDefault: true
+    - name: M3DB
+      type: prometheus
+      url: http://m3coordinator-m3db-cluster.edge1.svc.cluster.local:7201
+      access: proxy
 
 ## Configure notifiers
 ## ref: http://docs.grafana.org/administration/provisioning/#alert-notification-channels

diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/grafana-values.yaml b/vnfs/DAaaS/deploy/visualization/grafana-values.yaml
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from vnfs/DAaaS/deploy/visualization/charts/grafana/grafana-values.yaml
rename to vnfs/DAaaS/deploy/visualization/grafana-values.yaml