SEBA-772 Use voltha_kpi_broker value for kafka host
Change-Id: Ia171de80ef9cb95c6694b2685b525607c40e04e8
diff --git a/nem-monitoring/Chart.yaml b/nem-monitoring/Chart.yaml
index d0ff49b..562f8d4 100644
--- a/nem-monitoring/Chart.yaml
+++ b/nem-monitoring/Chart.yaml
@@ -15,4 +15,4 @@
name: nem-monitoring
description: Time Series Storage and Dashboard for SEBA
-version: 1.0.4
+version: 1.0.5
diff --git a/nem-monitoring/exporter-config/conf.yaml b/nem-monitoring/exporter-config/conf.yaml
deleted file mode 100644
index 29d5fb1..0000000
--- a/nem-monitoring/exporter-config/conf.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-broker:
- name: broker-name
- host: cord-kafka.default.svc.cluster.local:9092
- description: The kafka broker
- topics:
- - onos.aaa.stats.kpis
- - onos.kpis
- - voltha.kpis
-logger:
- loglevel: info
- host: cord-kafka.default.svc.cluster.local:9092
-target:
- type: prometheus-target
- name: http-server
- port: 8080
- description: http target for prometheus
diff --git a/nem-monitoring/templates/_helpers.tpl b/nem-monitoring/templates/_helpers.tpl
new file mode 100644
index 0000000..c1565c1
--- /dev/null
+++ b/nem-monitoring/templates/_helpers.tpl
@@ -0,0 +1,36 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Copyright 2018-present Open Networking Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/}}
+
+{{- define "exporter.config" -}}
+---
+broker:
+ name: broker-name
+ host: {{ .Values.args.voltha_kpi_broker }}
+ description: The kafka broker
+ topics:
+ - onos.aaa.stats.kpis
+ - onos.kpis
+ - voltha.kpis
+logger:
+ loglevel: info
+ host: {{ .Values.args.voltha_kpi_broker }}
+target:
+ type: prometheus-target
+ name: http-server
+ port: 8080
+ description: http target for prometheus
+{{- end -}}
diff --git a/nem-monitoring/templates/exporter-configmap.yaml b/nem-monitoring/templates/exporter-configmap.yaml
index 4707e31..69d2ae3 100644
--- a/nem-monitoring/templates/exporter-configmap.yaml
+++ b/nem-monitoring/templates/exporter-configmap.yaml
@@ -4,4 +4,4 @@
name: exporter-configmap
data:
conf.yaml: |
-{{ .Files.Get "exporter-config/conf.yaml" | indent 4 }}
+{{ include "exporter.config" . | indent 4 }}