From fb00a06a25dda69958891705c7c18ddddfea25f9 Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Wed, 4 Sep 2019 09:27:31 +0800 Subject: 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 --- vnfs/DAaaS/deploy/visualization/README.txt | 2 +- .../deploy/visualization/charts/grafana/Chart.yaml | 0 .../deploy/visualization/charts/grafana/README.md | 0 .../grafana/dashboards/custom-dashboard.json | 0 .../charts/grafana/dashboards/dashboard1.json | 0 .../charts/grafana/grafana-values.yaml | 39 ---------------------- .../charts/grafana/templates/NOTES.txt | 0 .../charts/grafana/templates/_helpers.tpl | 0 .../charts/grafana/templates/clusterrole.yaml | 0 .../grafana/templates/clusterrolebinding.yaml | 0 .../grafana/templates/configmap-add-dashboard.yaml | 0 .../templates/configmap-dashboard-provider.yaml | 0 .../charts/grafana/templates/configmap.yaml | 0 .../templates/dashboards-json-configmap.yaml | 0 .../charts/grafana/templates/deployment.yaml | 0 .../charts/grafana/templates/ingress.yaml | 0 .../grafana/templates/podsecuritypolicy.yaml | 0 .../charts/grafana/templates/pvc.yaml | 0 .../charts/grafana/templates/role.yaml | 0 .../charts/grafana/templates/rolebinding.yaml | 0 .../charts/grafana/templates/secret.yaml | 0 .../charts/grafana/templates/service.yaml | 0 .../charts/grafana/templates/serviceaccount.yaml | 0 .../visualization/charts/grafana/values.yaml | 13 +++++++- .../DAaaS/deploy/visualization/grafana-values.yaml | 39 ++++++++++++++++++++++ 25 files changed, 52 insertions(+), 41 deletions(-) mode change 100755 => 100644 vnfs/DAaaS/deploy/visualization/README.txt mode change 100755 => 100644 vnfs/DAaaS/deploy/visualization/charts/grafana/Chart.yaml mode change 100755 => 100644 vnfs/DAaaS/deploy/visualization/charts/grafana/README.md mode change 100755 => 100644 vnfs/DAaaS/deploy/visualization/charts/grafana/dashboards/custom-dashboard.json mode change 100755 => 100644 vnfs/DAaaS/deploy/visualization/charts/grafana/dashboards/dashboard1.json delete mode 100755 vnfs/DAaaS/deploy/visualization/charts/grafana/grafana-values.yaml mode change 100755 => 100644 vnfs/DAaaS/deploy/visualization/charts/grafana/templates/NOTES.txt mode change 100755 => 100644 vnfs/DAaaS/deploy/visualization/charts/grafana/templates/_helpers.tpl mode change 100755 => 100644 vnfs/DAaaS/deploy/visualization/charts/grafana/templates/clusterrole.yaml mode change 100755 => 100644 vnfs/DAaaS/deploy/visualization/charts/grafana/templates/clusterrolebinding.yaml mode change 100755 => 100644 vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap-add-dashboard.yaml mode change 100755 => 100644 vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap-dashboard-provider.yaml mode change 100755 => 100644 vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap.yaml mode change 100755 => 100644 vnfs/DAaaS/deploy/visualization/charts/grafana/templates/dashboards-json-configmap.yaml mode change 100755 => 100644 vnfs/DAaaS/deploy/visualization/charts/grafana/templates/deployment.yaml mode change 100755 => 100644 vnfs/DAaaS/deploy/visualization/charts/grafana/templates/ingress.yaml mode change 100755 => 100644 vnfs/DAaaS/deploy/visualization/charts/grafana/templates/podsecuritypolicy.yaml mode change 100755 => 100644 vnfs/DAaaS/deploy/visualization/charts/grafana/templates/pvc.yaml mode change 100755 => 100644 vnfs/DAaaS/deploy/visualization/charts/grafana/templates/role.yaml mode change 100755 => 100644 vnfs/DAaaS/deploy/visualization/charts/grafana/templates/rolebinding.yaml mode change 100755 => 100644 vnfs/DAaaS/deploy/visualization/charts/grafana/templates/secret.yaml mode change 100755 => 100644 vnfs/DAaaS/deploy/visualization/charts/grafana/templates/service.yaml mode change 100755 => 100644 vnfs/DAaaS/deploy/visualization/charts/grafana/templates/serviceaccount.yaml mode change 100755 => 100644 vnfs/DAaaS/deploy/visualization/charts/grafana/values.yaml create mode 100644 vnfs/DAaaS/deploy/visualization/grafana-values.yaml (limited to 'vnfs/DAaaS/deploy/visualization') diff --git a/vnfs/DAaaS/deploy/visualization/README.txt b/vnfs/DAaaS/deploy/visualization/README.txt old mode 100755 new mode 100644 index a2005d29..9ebb1a0f --- 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 new mode 100644 diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/README.md b/vnfs/DAaaS/deploy/visualization/charts/grafana/README.md old mode 100755 new mode 100644 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 new mode 100644 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 new mode 100644 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 old mode 100755 new mode 100644 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 new mode 100644 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 new mode 100644 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 new mode 100644 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 new mode 100644 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 new mode 100644 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 new mode 100644 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 new mode 100644 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 new mode 100644 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 new mode 100644 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 new mode 100644 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 new mode 100644 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 new mode 100644 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 new mode 100644 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 new mode 100644 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 new mode 100644 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 new mode 100644 diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/values.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/values.yaml old mode 100755 new mode 100644 index d78af1f5..dea2bd95 --- 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/grafana-values.yaml b/vnfs/DAaaS/deploy/visualization/grafana-values.yaml new file mode 100644 index 00000000..cf04bc8c --- /dev/null +++ b/vnfs/DAaaS/deploy/visualization/grafana-values.yaml @@ -0,0 +1,39 @@ +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" -- cgit 1.2.3-korg