X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=vnfs%2FDAaaS%2Fdeploy%2Fcollection%2Fcharts%2Fprometheus%2Ftemplates%2Fprometheus.yaml;h=5349492037a7bd20c79f817f848bcf8a5a202ab4;hb=938afb8217d5414c4cd0d63650e24d0398ddcc91;hp=27c97d10e8b8e4b769e21fc2264bd73630535f6b;hpb=e7cf41ad23960f23c03a553f62f5d710054ede23;p=demo.git

diff --git a/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/prometheus.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/prometheus.yaml
index 27c97d10..53494920 100644
--- a/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/prometheus.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/prometheus.yaml
@@ -15,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 }}