aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrivahni <srivahni.chivukula@intel.com>2019-03-18 10:27:18 -0700
committerSrivahni <srivahni.chivukula@intel.com>2019-03-18 22:46:51 -0700
commit72ac32bf57b6f077a21fc040f0eef12df6d0ec11 (patch)
treeb7606d5e95f932eae3d9e207acf3fa8399b03ffb
parentb94b8b3ff5f403d9460f97acb7c2a553a42498f7 (diff)
Remove hardcoded values from values.yaml
Change-Id: I21982d862e386dea3ec649f1f7186b1b29558233 Issue-ID: ONAPARC-442 Signed-off-by: Srivahni Chivukula <srivahni.chivukula@intel.com>
-rw-r--r--vnfs/DAaaS/collection/charts/prometheus/templates/servicemonitor.yaml7
-rw-r--r--vnfs/DAaaS/collection/charts/prometheus/values.yaml4
2 files changed, 3 insertions, 8 deletions
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