Add metricRelabelings values to helm charts (#946)

* victoria-logs-single: Add metricRelabelings value * victoria-metrics-agent: Add metricRelabelings value * victoria-metrics-alert: Add metricRelabelings value * victoria-metrics-auth: Add metricRelabelings value * victoria-metrics-cluster: Add metricRelabelings value * victoria-metrics-gateway: Add metricRelabelings value * victoria-metrics-single: Add metricRelabelings value
VictoriaMetrics · Mar 28, 2024 · 538135f · 538135f
1 parent 72f7196
commit 538135f
Show file tree

Hide file tree

Showing 23 changed files with 60 additions and 0 deletions.
diff --git a/charts/victoria-logs-single/README.md b/charts/victoria-logs-single/README.md
@@ -197,6 +197,7 @@ Change the values according to the need of the environment in ``victoria-logs-si
 | server.serviceMonitor.annotations | object | `{}` | Service Monitor annotations |
 | server.serviceMonitor.enabled | bool | `false` | Enable deployment of Service Monitor for server component. This is Prometheus operator object |
 | server.serviceMonitor.extraLabels | object | `{}` | Service Monitor labels |
+| server.serviceMonitor.metricRelabelings | list | `[]` | Service Monitor metricRelabelings |
 | server.serviceMonitor.relabelings | list | `[]` | Service Monitor relabelings |
 | server.startupProbe | object | `{}` |  |
 | server.statefulSet.enabled | bool | `true` | Creates statefulset instead of deployment, useful when you want to keep the cache |

diff --git a/charts/victoria-logs-single/templates/server-service-monitor.yaml b/charts/victoria-logs-single/templates/server-service-monitor.yaml
@@ -41,4 +41,8 @@ spec:
       relabelings:
           {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.server.serviceMonitor.metricRelabelings }}
+      metricRelabelings:
+          {{- toYaml . | nindent 8 }}
+      {{- end }}
   {{- end }}
diff --git a/charts/victoria-logs-single/values.yaml b/charts/victoria-logs-single/values.yaml
@@ -273,6 +273,8 @@ server:
 #      insecureSkipVerify: true
     # -- Service Monitor relabelings
     relabelings: []
+    # -- Service Monitor metricRelabelings
+    metricRelabelings: []
 
 fluent-bit:
   # -- Enable deployment of fluent-bit

diff --git a/charts/victoria-metrics-agent/README.md b/charts/victoria-metrics-agent/README.md
@@ -354,6 +354,7 @@ Change the values according to the need of the environment in ``victoria-metrics
 | serviceMonitor.annotations | object | `{}` |  |
 | serviceMonitor.enabled | bool | `false` |  |
 | serviceMonitor.extraLabels | object | `{}` |  |
+| serviceMonitor.metricRelabelings | list | `[]` |  |
 | serviceMonitor.relabelings | list | `[]` |  |
 | statefulset.clusterMode | bool | `false` | create cluster of vmagents. See https://docs.victoriametrics.com/vmagent.html#scraping-big-number-of-targets available since 1.77.2 version https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.77.2 |
 | statefulset.enabled | bool | `false` |  |

diff --git a/charts/victoria-metrics-agent/templates/service-monitor.yaml b/charts/victoria-metrics-agent/templates/service-monitor.yaml
@@ -41,4 +41,8 @@ spec:
       relabelings:
           {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.serviceMonitor.metricRelabelings }}
+      metricRelabelings:
+          {{- toYaml . | nindent 8 }}
+      {{- end }}
   {{- end }}
diff --git a/charts/victoria-metrics-agent/values.yaml b/charts/victoria-metrics-agent/values.yaml
@@ -233,6 +233,7 @@ serviceMonitor:
   extraLabels: {}
   annotations: {}
   relabelings: []
+  metricRelabelings: []
 #    interval: 15s
 #    scrapeTimeout: 5s
   # -- Commented. HTTP scheme to use for scraping.

diff --git a/charts/victoria-metrics-alert/README.md b/charts/victoria-metrics-alert/README.md
@@ -244,4 +244,5 @@ Change the values according to the need of the environment in ``victoria-metrics
 | serviceMonitor.annotations | object | `{}` |  |
 | serviceMonitor.enabled | bool | `false` |  |
 | serviceMonitor.extraLabels | object | `{}` |  |
+| serviceMonitor.metricRelabelings | list | `[]` |  |
 | serviceMonitor.relabelings | list | `[]` |  |
diff --git a/charts/victoria-metrics-alert/templates/service-monitor.yaml b/charts/victoria-metrics-alert/templates/service-monitor.yaml
@@ -41,4 +41,8 @@ spec:
       relabelings:
           {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.serviceMonitor.metricRelabelings }}
+      metricRelabelings:
+          {{- toYaml . | nindent 8 }}
+      {{- end }}
   {{- end }}
diff --git a/charts/victoria-metrics-alert/values.yaml b/charts/victoria-metrics-alert/values.yaml
@@ -277,6 +277,7 @@ serviceMonitor:
   extraLabels: {}
   annotations: {}
   relabelings: []
+  metricRelabelings: []
 #    interval: 15s
 #    scrapeTimeout: 5s
 # -- Commented. HTTP scheme to use for scraping.

diff --git a/charts/victoria-metrics-auth/README.md b/charts/victoria-metrics-auth/README.md
@@ -160,5 +160,6 @@ Change the values according to the need of the environment in ``victoria-metrics
 | serviceMonitor.annotations | object | `{}` |  |
 | serviceMonitor.enabled | bool | `false` |  |
 | serviceMonitor.extraLabels | object | `{}` |  |
+| serviceMonitor.metricRelabelings | list | `[]` |  |
 | serviceMonitor.relabelings | list | `[]` |  |
 | tolerations | list | `[]` | Tolerations configurations. Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ |
diff --git a/charts/victoria-metrics-auth/templates/service-monitor.yaml b/charts/victoria-metrics-auth/templates/service-monitor.yaml
@@ -41,4 +41,8 @@ spec:
       relabelings:
           {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.serviceMonitor.metricRelabelings }}
+      metricRelabelings:
+          {{- toYaml . | nindent 8 }}
+      {{- end }}
   {{- end }}
diff --git a/charts/victoria-metrics-auth/values.yaml b/charts/victoria-metrics-auth/values.yaml
@@ -183,6 +183,7 @@ serviceMonitor:
   extraLabels: {}
   annotations: {}
   relabelings: []
+  metricRelabelings: []
 #    interval: 15s
 #    scrapeTimeout: 5s
   # -- Commented. HTTP scheme to use for scraping.

diff --git a/charts/victoria-metrics-cluster/README.md b/charts/victoria-metrics-cluster/README.md
@@ -180,6 +180,7 @@ Change the values according to the need of the environment in ``victoria-metrics
 | vminsert.serviceMonitor.annotations | object | `{}` | Service Monitor annotations |
 | vminsert.serviceMonitor.enabled | bool | `false` | Enable deployment of Service Monitor for vminsert component. This is Prometheus operator object |
 | vminsert.serviceMonitor.extraLabels | object | `{}` | Service Monitor labels |
+| vminsert.serviceMonitor.metricRelabelings | list | `[]` | Service Monitor metricRelabelings |
 | vminsert.serviceMonitor.namespace | string | `""` | Target namespace of ServiceMonitor manifest |
 | vminsert.serviceMonitor.relabelings | list | `[]` | Service Monitor relabelings |
 | vminsert.strategy | object | `{}` |  |
@@ -256,6 +257,7 @@ Change the values according to the need of the environment in ``victoria-metrics
 | vmselect.serviceMonitor.annotations | object | `{}` | Service Monitor annotations |
 | vmselect.serviceMonitor.enabled | bool | `false` | Enable deployment of Service Monitor for vmselect component. This is Prometheus operator object |
 | vmselect.serviceMonitor.extraLabels | object | `{}` | Service Monitor labels |
+| vmselect.serviceMonitor.metricRelabelings | list | `[]` | Service Monitor metricRelabelings |
 | vmselect.serviceMonitor.namespace | string | `""` | Target namespace of ServiceMonitor manifest |
 | vmselect.serviceMonitor.relabelings | list | `[]` | Service Monitor relabelings |
 | vmselect.statefulSet.enabled | bool | `false` | Deploy StatefulSet instead of Deployment for vmselect. Useful if you want to keep cache data. |
@@ -296,6 +298,7 @@ Change the values according to the need of the environment in ``victoria-metrics
 | vmstorage.persistentVolume.existingClaim | string | `""` | Existing Claim name. Requires vmstorage.persistentVolume.enabled: true. If defined, PVC must be created manually before volume will be bound |
 | vmstorage.persistentVolume.labels | object | `{}` | Persistent volume labels |
 | vmstorage.persistentVolume.mountPath | string | `"/storage"` | Data root path. Vmstorage data Persistent Volume mount root path |
+| vmstorage.persistentVolume.name | string | `"vmstorage-volume"` |  |
 | vmstorage.persistentVolume.size | string | `"8Gi"` | Size of the volume. |
 | vmstorage.persistentVolume.storageClass | string | `""` | Storage class name. Will be empty if not setted |
 | vmstorage.persistentVolume.subPath | string | `""` | Mount subpath |
@@ -328,6 +331,7 @@ Change the values according to the need of the environment in ``victoria-metrics
 | vmstorage.serviceMonitor.annotations | object | `{}` | Service Monitor annotations |
 | vmstorage.serviceMonitor.enabled | bool | `false` | Enable deployment of Service Monitor for vmstorage component. This is Prometheus operator object |
 | vmstorage.serviceMonitor.extraLabels | object | `{}` | Service Monitor labels |
+| vmstorage.serviceMonitor.metricRelabelings | list | `[]` | Service Monitor metricRelabelings |
 | vmstorage.serviceMonitor.namespace | string | `""` | Target namespace of ServiceMonitor manifest |
 | vmstorage.serviceMonitor.relabelings | list | `[]` | Service Monitor relabelings |
 | vmstorage.terminationGracePeriodSeconds | int | `60` | Pod's termination grace period in seconds |

diff --git a/charts/victoria-metrics-cluster/templates/vminsert-service-monitor.yaml b/charts/victoria-metrics-cluster/templates/vminsert-service-monitor.yaml
@@ -41,4 +41,8 @@ spec:
       relabelings:
           {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.vminsert.serviceMonitor.metricRelabelings }}
+      metricRelabelings:
+          {{- toYaml . | nindent 8 }}
+      {{- end }}
   {{- end }}
diff --git a/charts/victoria-metrics-cluster/templates/vmselect-service-monitor.yaml b/charts/victoria-metrics-cluster/templates/vmselect-service-monitor.yaml
@@ -41,4 +41,8 @@ spec:
       relabelings:
           {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.vmselect.serviceMonitor.metricRelabelings }}
+      metricRelabelings:
+          {{- toYaml . | nindent 8 }}
+      {{- end }}
   {{- end }}
diff --git a/charts/victoria-metrics-cluster/templates/vmstorage-service-monitor.yaml b/charts/victoria-metrics-cluster/templates/vmstorage-service-monitor.yaml
@@ -41,4 +41,8 @@ spec:
       relabelings:
           {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.vmstorage.serviceMonitor.metricRelabelings }}
+      metricRelabelings:
+          {{- toYaml . | nindent 8 }}
+      {{- end }}
   {{- end }}
diff --git a/charts/victoria-metrics-cluster/values.yaml b/charts/victoria-metrics-cluster/values.yaml
@@ -267,6 +267,8 @@ vmselect:
 #      insecureSkipVerify: true
     # -- Service Monitor relabelings
     relabelings: []
+    # -- Service Monitor metricRelabelings
+    metricRelabelings: []
 
 vminsert:
   # -- Enable deployment of vminsert component. Deployment is used
@@ -459,6 +461,8 @@ vminsert:
 #      insecureSkipVerify: true
     # -- Service Monitor relabelings
     relabelings: []
+    # -- Service Monitor metricRelabelings
+    metricRelabelings: []
 
 vmstorage:
   # -- Enable deployment of vmstorage component. StatefulSet is used
@@ -733,6 +737,8 @@ vmstorage:
 #      insecureSkipVerify: true
     # -- Service Monitor relabelings
     relabelings: []
+    # -- Service Monitor metricRelabelings
+    metricRelabelings: []
 
 # -- Enterprise license key configuration for VictoriaMetrics enterprise.
 # Required only for VictoriaMetrics enterprise.

diff --git a/charts/victoria-metrics-gateway/README.md b/charts/victoria-metrics-gateway/README.md
@@ -225,6 +225,7 @@ Change the values according to the need of the environment in ``victoria-metrics
 | serviceMonitor.annotations | object | `{}` |  |
 | serviceMonitor.enabled | bool | `false` |  |
 | serviceMonitor.extraLabels | object | `{}` |  |
+| serviceMonitor.metricRelabelings | list | `[]` |  |
 | serviceMonitor.relabelings | list | `[]` |  |
 | tolerations | list | `[]` | Tolerations configurations. Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ |
 | write.url | string | `""` | Write endpoint without suffixes, victoriametrics or vminsert. Example http://victoroametrics:8428 or http://vminsert:8480 |
diff --git a/charts/victoria-metrics-gateway/templates/service-monitor.yaml b/charts/victoria-metrics-gateway/templates/service-monitor.yaml
@@ -41,4 +41,8 @@ spec:
       relabelings:
           {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.serviceMonitor.metricRelabelings }}
+      metricRelabelings:
+          {{- toYaml . | nindent 8 }}
+      {{- end }}
   {{- end }}
diff --git a/charts/victoria-metrics-gateway/values.yaml b/charts/victoria-metrics-gateway/values.yaml
@@ -151,6 +151,7 @@ serviceMonitor:
   extraLabels: {}
   annotations: {}
   relabelings: []
+  metricRelabelings: []
   #    interval: 15s
   #    scrapeTimeout: 5s
   # -- Commented. HTTP scheme to use for scraping.

diff --git a/charts/victoria-metrics-single/README.md b/charts/victoria-metrics-single/README.md
@@ -194,6 +194,7 @@ Change the values according to the need of the environment in ``victoria-metrics
 | server.serviceMonitor.annotations | object | `{}` | Service Monitor annotations |
 | server.serviceMonitor.enabled | bool | `false` | Enable deployment of Service Monitor for server component. This is Prometheus operator object |
 | server.serviceMonitor.extraLabels | object | `{}` | Service Monitor labels |
+| server.serviceMonitor.metricRelabelings | list | `[]` | Service Monitor metricRelabelings |
 | server.serviceMonitor.relabelings | list | `[]` | Service Monitor relabelings |
 | server.startupProbe | object | `{}` |  |
 | server.statefulSet.enabled | bool | `true` | Creates statefulset instead of deployment, useful when you want to keep the cache |

diff --git a/charts/victoria-metrics-single/templates/server-service-monitor.yaml b/charts/victoria-metrics-single/templates/server-service-monitor.yaml
@@ -41,4 +41,8 @@ spec:
       relabelings:
           {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.server.serviceMonitor.metricRelabelings }}
+      metricRelabelings:
+          {{- toYaml . | nindent 8 }}
+      {{- end }}
   {{- end }}
diff --git a/charts/victoria-metrics-single/values.yaml b/charts/victoria-metrics-single/values.yaml
@@ -356,6 +356,8 @@ server:
 #      insecureSkipVerify: true
     # -- Service Monitor relabelings
     relabelings: []
+    # -- Service Monitor metricRelabelings
+    metricRelabelings: []
 
   # -- Scrape configuration for victoriametrics
   scrape: