Merge pull request #9 from prosimcorp/feat/searchruler-custom-metrics

feat(searchruler): Upgraded to v0.4.0 with customMetrics

Author: dfradehubs

charts/searchruler/Chart.yaml

@@ -6,8 +6,8 @@ type: application
 description: >-
   A Helm chart for SearchRuler, a ruler Engine that allows you 
   to create and manage rules for your search engine.
-version: 0.3.2 # chart version
-appVersion: "0.3.2" # searchruler version
+version: 0.4.0 # chart version
+appVersion: "0.4.0" # searchruler version
 kubeVersion: ">=1.22.0-0" # kubernetes version
 home: https://github.com/prosimcorp/searchruler
 sources:

charts/searchruler/templates/deployment.yaml

@@ -38,6 +38,10 @@ spec:
           {{- if .Values.controller.webserver.enabled }}
           - --webserver-address=127.0.0.1:8082
           {{- end }}
+          {{- if .Values.controller.customMetrics.enabled }}
+          - --rules-metrics-bind-address=127.0.0.1:9090
+          - --rules-metrics-refresh-rate=10
+          {{- end }}
           {{- if or .Values.controller.metrics.enabled .Values.controller.webserver.enabled }}
           ports:
             {{- if .Values.controller.metrics.enabled }}
@@ -50,6 +54,11 @@ spec:
               name: webserver
               protocol: TCP
             {{- end }}
+            {{- if .Values.controller.customMetrics.enabled }}
+            - containerPort: 9090
+              name: custom-metrics
+              protocol: TCP
+            {{- end }}
           {{- end }}
           command:
             - /manager

charts/searchruler/templates/service.yaml

@@ -35,4 +35,25 @@ spec:
   selector:
     {{- include "searchruler.selectorLabels" . | nindent 4 }}
 
+---
+{{- end }}
+
+{{- if and (.Values.controller.customMetrics.enabled) (.Values.controller.customMetrics.service.enabled) }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "searchruler.fullname" . }}-custom-metrics
+  labels:
+    {{- include "searchruler.labels" . | nindent 4 }}
+    {{- .Values.controller.customMetrics.service.labels | toYaml | nindent 4 }}
+spec:
+  type: {{ .Values.controller.customMetrics.service.type }}
+  ports:
+    - port: {{ .Values.controller.customMetrics.service.port }}
+      name: custom-metrics
+      protocol: TCP
+      targetPort: custom-metrics
+  selector:
+    {{- include "searchruler.selectorLabels" . | nindent 4 }}
+
 {{- end }}

charts/searchruler/values.yaml

@@ -82,3 +82,12 @@ controller:
       enabled: true
       type: ClusterIP
       port: 8082
+
+  customMetrics:
+    enabled: true
+
+    service:
+      enabled: true
+      labels: {}
+      type: ClusterIP
+      port: 9090