Helm charts for Prometheus Kafka Remote Writer

[demo.git] / vnfs / DAaaS / deploy / collection / charts / prometheus / templates / prometheus.yaml

diff --git a/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/prometheus.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/prometheus.yaml
index 9c3d84c..5349492 100644 (file)
--- a/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/prometheus.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/prometheus.yaml
@@ -7,6 +7,7 @@ metadata:
   "helm.sh/hook": post-install
   "helm.sh/hook-weight": "2"
 spec:
+  serviceAccountName: {{ template "prometheus.serviceAccountName" . }}
   serviceMonitorSelector:
     matchLabels:
       app: {{ template "prometheus.name" . }}-prometheus
@@ -14,34 +15,5 @@ spec:
   serviceMonitorNamespaceSelector:
     matchNames:
       - {{ .Release.Namespace | quote }}
-
-  # TODO: Templatizing multiple remote read/write.
-  # Especially Kafka adapater.
-  remoteRead:
-  - url: "{{ .Values.m3db.url }}/api/v1/prom/remote/read"
-    # To test reading even when local Prometheus has the data
-    readRecent: true
-  remoteWrite:
-  - url: "{{ .Values.m3db.url }}/api/v1/prom/remote/write"
-    # To differentiate between local and remote storage we will add a storage label
-    writeRelabelConfigs:
-      - targetLabel: metrics_storage
-        replacement: m3db_remote
-  - url: "{{ .Values.kafkaAdapter.url }}/receive"
-  containers:
-  - name: {{ template "prometheus.name" . }}-adapter
-    image: "{{ .Values.kafkaAdapter.image.repository }}:{{ .Values.kafkaAdapter.image.tag }}"
-    imagePullPolicy: {{ .Values.kafkaAdapter.image.pullPolicy }}
-    env:
-    - name: KAFKA_BROKER_LIST
-      value: {{ .Values.kafkaAdapter.broker }}
-    - name: KAFKA_TOPIC
-      value: {{ .Values.kafkaAdapter.topic }}
-    - name: SERIALIZATION_FORMAT
-      value: {{ .Values.kafkaAdapter.serializationFormat }}
-    - name: PORT
-      value: {{ quote .Values.kafkaAdapter.port }}
-    - name: LOG_LEVEL
-      value: {{ .Values.kafkaAdapter.logLevel }}
-    resources:
-{{ toYaml .Values.kafkaAdapter.resources | indent 6 }}
+  resources:
+{{ toYaml .Values.prometheus.resources | indent 4 }}