diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2019-03-19 19:34:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-03-19 19:34:45 +0000 |
| commit | 3c861dd4e53b43c94e60d28ec3699119966c6ceb (patch) | |
| tree | baeb0d516a89a89308ecdc99f1c839fbfc65529c | |
| parent | a1f055200ba8061417b820a4edf462a6084c1b68 (diff) | |
| parent | 72ac32bf57b6f077a21fc040f0eef12df6d0ec11 (diff) | |
Merge "Remove hardcoded values from values.yaml"
| -rw-r--r-- | vnfs/DAaaS/collection/charts/prometheus/templates/servicemonitor.yaml | 7 | ||||
| -rw-r--r-- | vnfs/DAaaS/collection/charts/prometheus/values.yaml | 4 |
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 |