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>

23 files changed, 12 insertions, 40 deletions

diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/Chart.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/Chart.yaml
index a0721868..a0721868 100755..100644
--- a/vnfs/DAaaS/deploy/visualization/charts/grafana/Chart.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/Chart.yaml
diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/README.md b/vnfs/DAaaS/deploy/visualization/charts/grafana/README.md
index 44a30601..44a30601 100755..100644
--- a/vnfs/DAaaS/deploy/visualization/charts/grafana/README.md
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/README.md
diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/dashboards/custom-dashboard.json b/vnfs/DAaaS/deploy/visualization/charts/grafana/dashboards/custom-dashboard.json
index 9e26dfee..9e26dfee 100755..100644
--- a/vnfs/DAaaS/deploy/visualization/charts/grafana/dashboards/custom-dashboard.json
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/dashboards/custom-dashboard.json
diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/dashboards/dashboard1.json b/vnfs/DAaaS/deploy/visualization/charts/grafana/dashboards/dashboard1.json
index 3726721c..3726721c 100755..100644
--- a/vnfs/DAaaS/deploy/visualization/charts/grafana/dashboards/dashboard1.json
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/dashboards/dashboard1.json
diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/grafana-values.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/grafana-values.yaml
deleted file mode 100755
index cf04bc8c..00000000
--- a/vnfs/DAaaS/deploy/visualization/charts/grafana/grafana-values.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-grafana:
-#  nodeSelector:
-#    vcmtspktgen: "true"
-
-  datasources:
-    datasources.yaml:
-      apiVersion: 1
-      datasources:
-      - name: Prometheus
-        type: prometheus
-        url: http://cp-prometheus-prometheus.edge1:9090
-        isDefault: true
-        access: proxy
-
-  adminPassword: admin
-
-  image:
-    tag: 5.1.4
-
-  service:
-    type: NodePort
-  #  nodePort: 17765
-
-  # Customer DashBoards configurations
-  dashboardProviders:
-    dashboardproviders.yaml:
-      apiVersion: 1
-      providers:
-      - name: 'dashboard1'
-        orgId: 1
-        folder: ''
-        type: file
-        disableDeletion: false
-        editable: true
-        options:
-          path: /var/lib/grafana/dashboards/dashboard1
-    
-  dashboardsConfigMaps:
-    dashboard1: "custom-dashboard1"
diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/NOTES.txt b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/NOTES.txt
index 80c6d148..80c6d148 100755..100644
--- a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/NOTES.txt
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/NOTES.txt
diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/_helpers.tpl b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/_helpers.tpl
index 3a3ebd3e..3a3ebd3e 100755..100644
--- a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/_helpers.tpl
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/_helpers.tpl
diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/clusterrole.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/clusterrole.yaml
index ccfc7237..ccfc7237 100755..100644
--- a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/clusterrole.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/clusterrole.yaml
diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/clusterrolebinding.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/clusterrolebinding.yaml
index 0ffe9ff2..0ffe9ff2 100755..100644
--- a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/clusterrolebinding.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/clusterrolebinding.yaml
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
index d125f875..d125f875 100755..100644
--- a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap-add-dashboard.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap-add-dashboard.yaml
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
index 07717319..07717319 100755..100644
--- a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap-dashboard-provider.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap-dashboard-provider.yaml
diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap.yaml
index a2d05075..a2d05075 100755..100644
--- a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap.yaml
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
index 5af0f692..5af0f692 100755..100644
--- a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/dashboards-json-configmap.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/dashboards-json-configmap.yaml
diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/deployment.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/deployment.yaml
index 05225e40..05225e40 100755..100644
--- a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/deployment.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/deployment.yaml
diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/ingress.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/ingress.yaml
index 48973454..48973454 100755..100644
--- a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/ingress.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/ingress.yaml
diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/podsecuritypolicy.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/podsecuritypolicy.yaml
index d3ef3644..d3ef3644 100755..100644
--- a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/podsecuritypolicy.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/podsecuritypolicy.yaml
diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/pvc.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/pvc.yaml
index e1cc0329..e1cc0329 100755..100644
--- a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/pvc.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/pvc.yaml
diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/role.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/role.yaml
index f6165694..f6165694 100755..100644
--- a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/role.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/role.yaml
diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/rolebinding.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/rolebinding.yaml
index 8b6671b8..8b6671b8 100755..100644
--- a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/rolebinding.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/rolebinding.yaml
diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/secret.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/secret.yaml
index a1ea5798..a1ea5798 100755..100644
--- a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/secret.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/secret.yaml
diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/service.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/service.yaml
index 87fac70c..87fac70c 100755..100644
--- a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/service.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/service.yaml
diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/serviceaccount.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/serviceaccount.yaml
index 04601d05..04601d05 100755..100644
--- a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/serviceaccount.yaml
+++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/serviceaccount.yaml
diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/values.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/values.yaml
index d78af1f5..dea2bd95 100755..100644
--- 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