Adds VictoriaMetrics Monitors

qameta · Sep 20, 2023 · 2c60162 · 2c60162
1 parent 31167b6
commit 2c60162
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 5 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,4 +26,4 @@ jobs:
           password: ${{ secrets.ARTIFACTORY_PASS }}
           repoName: allure-testops
           chart: charts/allure-testops
-          version: 2.0.2
+          version: 2.0.3
diff --git a/charts/allure-testops/Chart.yaml b/charts/allure-testops/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: allure-testops
-version: 2.0.2
+version: 2.0.3
 appVersion: 4.20.3
 
 description: Allure TestOps

diff --git a/charts/allure-testops/templates/infra/monitoring.yaml b/charts/allure-testops/templates/infra/monitoring.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.monitoring.enabled }}
+{{- if eq .Values.monitoring.kind "prometheus" }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -14,7 +15,7 @@ spec:
   endpoints:
     - port: http
       path: "/management/prometheus"
-      interval: 10s
+      interval: {{ .Values.monitoring.interval}}
       honorLabels: true
 
 ---
@@ -32,7 +33,7 @@ spec:
   endpoints:
     - port: http
       path: "{{ .Values.allure.uaaContextPath }}management/prometheus"
-      interval: 10s
+      interval: {{ .Values.monitoring.interval}}
       honorLabels: true
 
 ---
@@ -50,6 +51,61 @@ spec:
   endpoints:
     - port: http
       path: "{{ .Values.allure.reportContextPath }}management/prometheus"
-      interval: 10s
+      interval: {{ .Values.monitoring.interval}}
       honorLabels: true
+{{- else if eq .Values.monitoring.kind "victoria" }}
+---
+apiVersion: operator.victoriametrics.com/v1beta1
+kind: VMServiceScrape
+metadata:
+  name: testops-gateway
+spec:
+  namespaceSelector:
+    any: false
+  selector:
+    matchLabels:
+      app: {{ template "allure-testops.gateway.fullname" . }}
+  endpoints:
+    - path: /management/prometheus
+      interval: {{ .Values.monitoring.interval}}
+      port: http
+      metricRelabelConfigs:
+        - action: drop
+          regex: lettuce_command_(completion_seconds_bucket|firstresponse_seconds_bucket|completion_seconds)
+          sourceLabels:
+            - __name__
+
+---
+apiVersion: operator.victoriametrics.com/v1beta1
+kind: VMServiceScrape
+metadata:
+  name: testops-uaa
+spec:
+  namespaceSelector:
+    any: false
+  selector:
+    matchLabels:
+      app: {{ template "allure-testops.uaa.fullname" . }}
+  endpoints:
+    - path: "{{ .Values.allure.uaaContextPath }}management/prometheus"
+      interval: {{ .Values.monitoring.interval}}
+      port: http
+
+---
+apiVersion: operator.victoriametrics.com/v1beta1
+kind: VMServiceScrape
+metadata:
+  name: testops-report
+spec:
+  namespaceSelector:
+    any: false
+  selector:
+    matchLabels:
+      app: {{ template "allure-testops.report.fullname" . }}
+  endpoints:
+    - path: "{{ .Values.allure.reportContextPath }}management/prometheus"
+      interval: {{ .Values.monitoring.interval}}
+      port: http
+
+{{- end }}
 {{- end }}
diff --git a/charts/allure-testops/values.yaml b/charts/allure-testops/values.yaml
@@ -541,6 +541,9 @@ report:
 # Before enabling monitoring make sure you have Prometheus & Prometheus Operator Installed
 monitoring:
   enabled: false
+  # prometheus for Prometheus Operator ServiceMonitor, victoria for VictoriaMetrics Operator ServiceScrape
+  kind: prometheus
+  interval: 15s
 
 ### Always leave it as it is
 ## Role Based Access Control