Merge pull request #24 from Randsw/develop

feat(helm): Add prometheus rule. Bump chart version (#23)

Author: Randsw

helm-chart/kubeinfo-backend/Chart.yaml

@@ -14,13 +14,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.6
+version: 0.1.7
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.1.8"
+appVersion: "0.2.2"
 maintainers:
   - name: Randsw
     email: randsw06@gmail.com

helm-chart/kubeinfo-backend/templates/prometheusrule.yaml

@@ -0,0 +1,20 @@
+{{- if .Values.metrics.prometheusRule.enabled -}}
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ include "kubeinfo-backend.fullname" . }}
+{{- if .Values.metrics.prometheusRule.namespace }}
+  namespace: {{ .Values.metrics.prometheusRule.namespace | quote }}
+{{- end }}
+  labels:
+    {{- include "kubeinfo-backend.labels" . | nindent 4 }}
+  {{- if .Values.metrics.prometheusRule.additionalLabels }}
+    {{- toYaml .Values.metrics.prometheusRule.additionalLabels | nindent 4 }}
+  {{- end }}
+spec:
+{{- if .Values.metrics.prometheusRule.rules }}
+  groups:
+  - name: {{ template "kubeinfo-backend.fullname" . }}
+    rules: {{- toYaml .Values.metrics.prometheusRule.rules | nindent 4 }}
+{{- end }}
+{{- end }}

helm-chart/kubeinfo-backend/templates/servicemonitor.yaml

@@ -8,7 +8,6 @@ metadata:
 {{- end }}
   labels:
     {{- include "kubeinfo-backend.labels" . | nindent 4 }}
-    app.kubernetes.io/component: controller
   {{- if .Values.metrics.serviceMonitor.additionalLabels }}
     {{- toYaml .Values.metrics.serviceMonitor.additionalLabels | nindent 4 }}
   {{- end }}

helm-chart/kubeinfo-backend/values.yaml

@@ -55,7 +55,6 @@ resources: {}
 # Probes
 livenessProbe:
   httpGet:
-    # should match container.healthCheckPath
     path: "/healthz"
     port: 8080
     scheme: HTTP
@@ -67,7 +66,6 @@ livenessProbe:
 
 readinessProbe:
   httpGet:
-    # should match container.healthCheckPath
     path: "/healthz"
     port: 8080
     scheme: HTTP
@@ -155,7 +153,7 @@ metrics:
   prometheusRule:
     enabled: false
     additionalLabels: {}
-    # namespace: ""
+    namespace: ""
     rules: []
       # # These are just examples rules, please adapt them to your needs
       # - alert: NGINXConfigFailed