Remove graphing infrastructure from the VOLTHA chart.
Change-Id: I71c58d5925111f06d9f5240b6aa7702e3ba9b252
diff --git a/voltha/templates/_helpers.tpl b/voltha/templates/_helpers.tpl
index a8c2f05..bbe8aef 100644
--- a/voltha/templates/_helpers.tpl
+++ b/voltha/templates/_helpers.tpl
@@ -14,20 +14,6 @@
limitations under the License.
*/ -}}
-{{- define "voltha-shovel.cmd" }}
-- "/shovel/shovel/main.py"
-- "--kafka={{ .Values.kafkaReleaseName }}.default.svc.cluster.local"
-- "--host=grafana.voltha.svc.cluster.local"
-- "--topic=voltha.kpis"
-{{- end }}
-
-{{- define "voltha-dashd.cmd" }}
-- "/dashd/dashd/main.py"
-- "--kafka={{ .Values.kafkaReleaseName }}.default.svc.cluster.local"
-- "--grafana_url=http://admin:admin@grafana.$(NAMESPACE).svc.cluster.local:80/api"
-- "--topic=voltha.kpis"
-{{- end }}
-
{{- define "voltha-vcore.cmd" }}
- "voltha/voltha/main.py"
- "-v"
@@ -41,5 +27,3 @@
- "--ponsim-comm=grpc"
- "--core-number-extractor=^.*-([0-9]+)_.*$"
{{- end }}
-
-
diff --git a/voltha/templates/grafana.yaml b/voltha/templates/grafana.yaml
deleted file mode 100644
index f4716bb..0000000
--- a/voltha/templates/grafana.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2017-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.
-
-#
-# The grafana service
-#
-apiVersion: v1
-kind: Service
-metadata:
- name: grafana
- namespace: {{ .Values.global.namespace }}
- serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
-spec:
- clusterIP: None
- selector:
- app: grafana
- ports:
- - name: ui-port
- protocol: TCP
- port: 8883
- targetPort: 80
- - name: port-2003
- protocol: TCP
- port: 2003
- targetPort: 2003
- - name: port-2004
- protocol: TCP
- port: 2004
- targetPort: 2004
- - name: port-8126
- protocol: TCP
- port: 8126
- targetPort: 8126
- - name: port-8125
- protocol: TCP
- port: 8125
- targetPort: 8125
----
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
- name: grafana
- namespace: {{ .Values.global.namespace }}
- serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
-spec:
- replicas: 1
- template:
- metadata:
- labels:
- app: grafana
- spec:
- serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
- containers:
- - name: grafana
- image: {{ .Values.grafanaImage }}
- imagePullPolicy: {{ .Values.imagePullPolicy }}
- ports:
- - containerPort: 80
- - containerPort: 2003
- - containerPort: 2004
- - containerPort: 8126
- - containerPort: 8125
- env:
- - name: GR_SERVER_ROOT_URL
- value: "http://localhost:80/grafana/"
diff --git a/voltha/templates/stats.yaml b/voltha/templates/stats.yaml
deleted file mode 100644
index 6e187b4..0000000
--- a/voltha/templates/stats.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2017-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.
-
-#
-# The dashd deployment
-#
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
- name: dashd
- namespace: {{ .Values.global.namespace }}
- serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
-spec:
- replicas: 1
- template:
- metadata:
- labels:
- app: dashd
- spec:
- serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
- containers:
- - name: dashd
- image: {{ .Values.dashdImage }}
- imagePullPolicy: {{ .Values.imagePullPolicy }}
- env:
- - name: NAMESPACE
- valueFrom:
- fieldRef:
- fieldPath: metadata.namespace
- args:
-{{ include "voltha-dashd.cmd" . | indent 8 }}
-
----
-#
-# The shovel deployment
-#
-apiVersion: apps/v1beta1
-kind: Deployment
-metadata:
- name: shovel
- namespace: {{ .Values.global.namespace }}
- serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
-spec:
- replicas: 1
- template:
- metadata:
- labels:
- app: shovel
- spec:
- serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
- containers:
- - name: shovel
- image: {{ .Values.shovelImage }}
- imagePullPolicy: {{ .Values.imagePullPolicy }}
- env:
- - name: NAMESPACE
- valueFrom:
- fieldRef:
- fieldPath: metadata.namespace
- args:
-{{ include "voltha-shovel.cmd" . | indent 8 }}
\ No newline at end of file
diff --git a/voltha/values.yaml b/voltha/values.yaml
index 5785376..700149f 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -72,11 +72,8 @@
envoyForEtcdImage: 'voltha/voltha-envoy:1.4.0'
freeradiusImage: 'tpdock/freeradius:latest'
-grafanaImage: 'kamon/grafana_graphite:3.0'
netconfImage: 'voltha/voltha-netconf:1.4.0'
ofagentImage: 'voltha/voltha-ofagent:1.4.0'
-dashdImage: 'voltha/voltha-dashd:1.4.0'
-shovelImage: 'voltha/voltha-shovel:1.4.0'
vcliImage: 'voltha/voltha-cli:1.4.0'
vcoreImage: 'voltha/voltha-voltha:1.4.0'