[SEBA-293] Onos KPIs
Change-Id: If46d57075392e83c686b3c4a934c91ac40cca187
diff --git a/nem-monitoring/templates/voltha-exporter-deployment.yaml b/nem-monitoring/templates/exporter-deployment.yaml
similarity index 82%
rename from nem-monitoring/templates/voltha-exporter-deployment.yaml
rename to nem-monitoring/templates/exporter-deployment.yaml
index f69f163..5147c64 100644
--- a/nem-monitoring/templates/voltha-exporter-deployment.yaml
+++ b/nem-monitoring/templates/exporter-deployment.yaml
@@ -16,22 +16,22 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
- name: voltha-kpi-exporter
+ name: kpi-exporter
labels:
release: {{ .Release.Name }}
spec:
- replicas: 2
+ replicas: {{ .Values.nem_voltha_kpi_exporter_replicas }}
template:
metadata:
labels:
- app: voltha-kpi-exporter
+ app: kpi-exporter
release: {{ .Release.Name }}
spec:
containers:
- - name: voltha-kpi-exporter
+ - name: kpi-exporter
image: {{ tpl .Values.nem_voltha_kpi_exporter_image . | quote }}
imagePullPolicy: {{ .Values.imagePullPolicy }}
- args: ["-broker={{ .Values.args.voltha_kpi_broker }}", "-topic={{ .Values.args.voltha_kpi_topic }}"]
+ args: ["-broker={{ .Values.args.voltha_kpi_broker }}"]
ports:
- containerPort: 8080
port: 8080
diff --git a/nem-monitoring/templates/voltha-exporter-service.yaml b/nem-monitoring/templates/exporter-service.yaml
similarity index 93%
rename from nem-monitoring/templates/voltha-exporter-service.yaml
rename to nem-monitoring/templates/exporter-service.yaml
index 60a67f4..f5fcee2 100644
--- a/nem-monitoring/templates/voltha-exporter-service.yaml
+++ b/nem-monitoring/templates/exporter-service.yaml
@@ -16,7 +16,7 @@
apiVersion: v1
kind: Service
metadata:
- name: voltha-kpi-exporter
+ name: kpi-exporter
labels:
release: {{ .Release.Name }}
spec:
@@ -27,4 +27,4 @@
nodePort: {{ .Values.nem_voltha_kpi_exporter_nodePort }}
protocol: TCP
selector:
- app: "voltha-kpi-exporter"
+ app: "kpi-exporter"
diff --git a/nem-monitoring/templates/voltha-exporter-service.yaml b/nem-monitoring/templates/grafana-dashboard-onos-configmap.yaml
similarity index 64%
copy from nem-monitoring/templates/voltha-exporter-service.yaml
copy to nem-monitoring/templates/grafana-dashboard-onos-configmap.yaml
index 60a67f4..25d270e 100644
--- a/nem-monitoring/templates/voltha-exporter-service.yaml
+++ b/nem-monitoring/templates/grafana-dashboard-onos-configmap.yaml
@@ -1,5 +1,5 @@
---
-# Copyright 2017-present Open Networking Foundation
+# 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.
@@ -14,17 +14,11 @@
# limitations under the License.
apiVersion: v1
-kind: Service
+kind: ConfigMap
metadata:
- name: voltha-kpi-exporter
+ name: grafana-dashboard-onos
labels:
- release: {{ .Release.Name }}
-spec:
- type: NodePort
- ports:
- - port: 8080
- targetPort: 8080
- nodePort: {{ .Values.nem_voltha_kpi_exporter_nodePort }}
- protocol: TCP
- selector:
- app: "voltha-kpi-exporter"
+ grafana_dashboard: "1"
+data:
+ onos.json: |
+{{ .Files.Get "grafana-dashboards/onos-kpi.json" | indent 4 }}
\ No newline at end of file