From: Gary Wu <gary.i.wu@huawei.com>
Date: Tue, 19 Mar 2019 19:34:45 +0000 (+0000)
Subject: Merge "Remove hardcoded values from values.yaml"
X-Git-Tag: 1.4.0~50
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3c861dd4e53b43c94e60d28ec3699119966c6ceb;hp=a1f055200ba8061417b820a4edf462a6084c1b68;p=demo.git

Merge "Remove hardcoded values from values.yaml"
---

diff --git a/vnfs/DAaaS/collection/charts/prometheus/templates/servicemonitor.yaml b/vnfs/DAaaS/collection/charts/prometheus/templates/servicemonitor.yaml
index f360d0df..ea2b81b6 100644
--- a/vnfs/DAaaS/collection/charts/prometheus/templates/servicemonitor.yaml
+++ b/vnfs/DAaaS/collection/charts/prometheus/templates/servicemonitor.yaml
@@ -21,11 +21,10 @@ items:
     {{- if .jobLabel }}
       jobLabel: {{ .jobLabel }}
     {{- end }}
-    {{- if .namespaceSelector }}
       namespaceSelector:
-{{ toYaml .namespaceSelector | indent 8 }}
-    {{- end }}
+        matchNames:
+          - {{ $.Release.Namespace | quote }}
       selector:
-{{ toYaml .selector | indent 8 }}
+{{ toYaml .selector  | indent 8  }}  release: {{ $.Release.Name | quote }}
 {{- end }}
 {{- end }}
diff --git a/vnfs/DAaaS/collection/charts/prometheus/values.yaml b/vnfs/DAaaS/collection/charts/prometheus/values.yaml
index 47af00c2..1a5fc94c 100644
--- a/vnfs/DAaaS/collection/charts/prometheus/values.yaml
+++ b/vnfs/DAaaS/collection/charts/prometheus/values.yaml
@@ -9,10 +9,6 @@ prometheus:
       selector:
         matchLabels:
           app: collectd
-          release: "cp"
-      namespaceSelector:
-        matchNames:
-          - "edge1"
       endpoints:
         - port: collectd-prometheus
           interval: 10s