add victoria helm chart support

open-rpa · Oct 13, 2022 · bb1e501 · bb1e501
1 parent 4f71bdb
commit bb1e501
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 17 deletions.
diff --git a/charts/openflow/Chart.yaml b/charts/openflow/Chart.yaml
@@ -17,3 +17,7 @@ dependencies:
   version: "0.x"
   repository: "https://jaegertracing.github.io/helm-charts"
   condition: jaeger.enabled
+- name: victoria-metrics-cluster
+  version: "0.x"
+  repository: "https://victoriametrics.github.io/helm-charts"
+  condition: victoria-metrics-cluster.enabled
diff --git a/charts/openflow/templates/deployments.yaml b/charts/openflow/templates/deployments.yaml
@@ -368,7 +368,7 @@ spec:
               value: {{ .Values.openflow.otel_metric_url | quote }}
 {{- else }}
 
-  {{- if or (eq .Values.prometheus.enabled true) (eq .Values.victoriametrics.enabled true) }}
+  {{- if or (eq (index .Values "victoria-metrics-cluster" "enabled") true) (eq .Values.victoriametrics.enabled true) }}
     {{- if (eq .Values.exporter.exposed true) }}
             - name: otel_metric_url
               value: "{{ $oteluri }}/v1/metrics"

diff --git a/charts/openflow/templates/grafana.yaml b/charts/openflow/templates/grafana.yaml
@@ -187,7 +187,11 @@ data:
             {
               "name": "Prometheus",
               "type": "prometheus",
-              "url": "http://victoriametrics:8428",
+              {{- if .Values.victoriametrics.selectendpoint }}
+                "url": "{{ .Values.victoriametrics.selectendpoint }}",
+              {{- else }}
+                endpoint: "http://{{ .Release.Name }}-victoria-metrics-cluster-vmselect.{{ .Release.Namespace }}.svc.cluster.local:8480/select/0/prometheus/"
+              {{- end }}
               "access":"proxy",
               "editable": true,
               "orgId": 1,

diff --git a/charts/openflow/templates/otel.yaml b/charts/openflow/templates/otel.yaml
@@ -17,25 +17,24 @@ data:
       prometheus:
           config:
             scrape_configs:
-              # - job_name: 'otel-collector'
-              #   scrape_interval: 5s
-              #   static_configs:
-              #     - targets: ['0.0.0.0:8888']
-              # - job_name: k8s
-              #   kubernetes_sd_configs:
-              #   - role: pod
-              #   relabel_configs:
-              #   - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
-              #     regex: "true"
-              #     action: keep
-              #   metric_relabel_configs:
-              #   - source_labels: [__name__]
-              #     regex: "(request_duration_seconds.*|response_duration_seconds.*)"
-              #     action: keep
               - job_name: 'kube-state-collector'
                 scrape_interval: 5s
                 static_configs:
                   - targets: ['{{ .Values.exporter.kubestatemetrics.exporttarget }}','{{ .Values.exporter.kubestatemetrics.kubesystemtarget }}']
+  {{- if (eq (index .Values "victoria-metrics-cluster" "enabled") true) }}
+              - job_name: 'victoria-metrics-cluster'
+                scrape_interval: 5s
+                static_configs:
+    {{- if (index .Values "victoria-metrics-cluster" "exporttarget") }}
+                  - targets: 
+                    {{- toYaml (index .Values "victoria-metrics-cluster" "exporttarget") | nindent 20 }}
+    {{- else }}
+                  - targets: ['{{ .Release.Name }}-victoria-metrics-cluster-vmstorage:8482',
+                  '{{ .Release.Name }}-victoria-metrics-cluster-vmselect:8482',
+                  '{{ .Release.Name }}-victoria-metrics-cluster-vminsert:8482']
+
+    {{- end }}
+  {{- end }}
 {{- end }}
   {{- if (eq .Values.loki.enabled true) }}
       loki:
@@ -146,7 +145,13 @@ data:
        endpoint: "0.0.0.0:9464"
       #  namespace: otelcollector
       prometheusremotewrite:
+      {{- if .Values.victoriametrics.insertendpoint }}
+        endpoint: "{{ .Values.victoriametrics.insertendpoint }}"
+      {{- else if (eq (index .Values "victoria-metrics-cluster" "enabled") true) }}
+        endpoint: "http://{{ .Release.Name }}-victoria-metrics-cluster-vminsert.{{ .Release.Namespace }}.svc.cluster.local:8480/insert/0/prometheus/"
+      {{- else }}
         endpoint: "http://victoriametrics:8428/api/v1/write"
+      {{- end }}
     service:
       extensions: [health_check, zpages]
       pipelines:

diff --git a/charts/openflow/values.yaml b/charts/openflow/values.yaml
@@ -410,9 +410,13 @@ cassandra:
     storageclass:
   storagesize: 10Gi
   resources: {}
+victoria-metrics-cluster:
+  enabled: false
 victoriametrics: # for exposing all all metric data for grafana, optionally also saving all metric data, we use victoriametrics
   enabled: false
   exposed: false
+  # insertendpoint: http://openflow-victoria-metrics-cluster-vminsert.stats.svc.cluster.local:8480/insert/0/prometheus/
+  # selectendpoint: http://openflow-victoria-metrics-cluster-vmselect.stats.svc.cluster.local:8481/select/0/prometheus/
   retentionPeriod: # override default retension of 1 month https://github.com/VictoriaMetrics/VictoriaMetrics#retention
   persistence:
     enabled: false