diff options
| author |   Srivahni <srivahni.chivukula@intel.com> | 2019-03-07 17:40:40 -0800 |
|---|---|---|
| committer | Srivahni <srivahni.chivukula@intel.com> | 2019-03-07 18:29:00 -0800 |
| commit | afddb9a1dd8cc82a02c09ac790bf19afbe01ebba (patch) | |
| tree | 5be647992fbce75f177f0a45c0a180b1f8818b87 /vnfs/DAaaS/collection/charts/prometheus | |
| parent | 155be668f75d9f8e3b1050ba6338dfdf49ac5964 (diff) | |
Fix Collection Service Helm charts package
Change-Id: I01f5a9377827666bdeaff4a3adc1c44844eb716c
Issue-ID: ONAPARC-366
Signed-off-by: Srivahni Chivukula <srivahni.chivukula@intel.com>
Diffstat (limited to 'vnfs/DAaaS/collection/charts/prometheus')
3 files changed, 8 insertions, 4 deletions
diff --git a/vnfs/DAaaS/collection/charts/prometheus/templates/prometheus.yaml b/vnfs/DAaaS/collection/charts/prometheus/templates/prometheus.yaml index 86e14789..9c3d84c2 100644 --- a/vnfs/DAaaS/collection/charts/prometheus/templates/prometheus.yaml +++ b/vnfs/DAaaS/collection/charts/prometheus/templates/prometheus.yaml @@ -4,10 +4,12 @@ metadata: name: {{ template "prometheus.fullname" . }}-prometheus labels: app: {{ template "prometheus.name" . }}-prometheus + "helm.sh/hook": post-install + "helm.sh/hook-weight": "2" spec: serviceMonitorSelector: matchLabels: - app: collectd + app: {{ template "prometheus.name" . }}-prometheus release: {{ .Release.Name }} serviceMonitorNamespaceSelector: matchNames: diff --git a/vnfs/DAaaS/collection/charts/prometheus/templates/servicemonitor.yaml b/vnfs/DAaaS/collection/charts/prometheus/templates/servicemonitor.yaml index 47a911c6..f360d0df 100644 --- a/vnfs/DAaaS/collection/charts/prometheus/templates/servicemonitor.yaml +++ b/vnfs/DAaaS/collection/charts/prometheus/templates/servicemonitor.yaml @@ -7,6 +7,8 @@ items: kind: ServiceMonitor metadata: name: {{ .name }} + "helm.sh/hook": post-install + "helm.sh/hook-weight": "1" labels: app: {{ template "prometheus.name" $ }}-prometheus {{ include "prometheus.labels" $ | indent 8 }} diff --git a/vnfs/DAaaS/collection/charts/prometheus/values.yaml b/vnfs/DAaaS/collection/charts/prometheus/values.yaml index 8a886455..47af00c2 100644 --- a/vnfs/DAaaS/collection/charts/prometheus/values.yaml +++ b/vnfs/DAaaS/collection/charts/prometheus/values.yaml @@ -9,10 +9,10 @@ prometheus: selector: matchLabels: app: collectd - release: "${RELEASE_NAME}" + release: "cp" namespaceSelector: matchNames: - - "${RELEASE_NAMESPACE}" + - "edge1" endpoints: - port: collectd-prometheus interval: 10s @@ -51,7 +51,7 @@ m3db: kafkaAdapter: image: repository: telefonica/prometheus-kafka-adapter - tag: 1.2.0 + tag: 1.2.0 pullPolicy: IfNotPresent url: http://localhost:8080 port: 8080 |