Update (VictoriaMetrics#203)

* updates app versions to 1.66.1 * adds serviceMonitors to vmagent and vmalert VictoriaMetrics#200 * make merge * make merge
krakazyabra · Sep 22, 2021 · fa853d2 · fa853d2
1 parent 2b34c3d
commit fa853d2
Show file tree

Hide file tree

Showing 24 changed files with 557 additions and 426 deletions.
diff --git a/charts/victoria-metrics-agent/Chart.yaml b/charts/victoria-metrics-agent/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 name: victoria-metrics-agent
 description: Victoria Metrics Agent - collects metrics from various sources and stores them to VictoriaMetrics
-version: 0.7.26
-appVersion: v1.65.0
+version: 0.7.28
+appVersion: v1.66.1
diff --git a/charts/victoria-metrics-agent/README.md b/charts/victoria-metrics-agent/README.md
@@ -1,6 +1,6 @@
 # Helm Chart For Victoria Metrics Agent.
 
- ![Version: 0.7.26](https://img.shields.io/badge/Version-0.7.26-informational?style=flat-square)
+ ![Version: 0.7.28](https://img.shields.io/badge/Version-0.7.28-informational?style=flat-square)
 
 Victoria Metrics Agent - collects metrics from various sources and stores them to VictoriaMetrics
 
@@ -319,6 +319,9 @@ Change the values according to the need of the environment in ``victoria-metrics
 | serviceAccount.annotations | object | `{}` |  |
 | serviceAccount.create | bool | `true` |  |
 | serviceAccount.name | string | `nil` |  |
+| serviceMonitor.annotations | object | `{}` |  |
+| serviceMonitor.enabled | bool | `false` |  |
+| serviceMonitor.extraLabels | object | `{}` |  |
 | statefulset.enabled | bool | `false` |  |
 | statefulset.updateStrategy | object | `{}` |  |
 | tolerations | list | `[]` |  |
diff --git a/charts/victoria-metrics-agent/templates/service-monitor.yaml b/charts/victoria-metrics-agent/templates/service-monitor.yaml
@@ -0,0 +1,33 @@
+{{- if .Values.serviceMonitor.enabled -}}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  {{- if .Values.serviceMonitor.annotations }}
+  annotations:
+{{ toYaml .Values.serviceMonitor.annotations | indent 4 }}
+  {{- end }}
+  labels:
+  {{- include "chart.labels" . | nindent 4 }}
+  {{- if .Values.serviceMonitor.extraLabels }}
+{{ toYaml .Values.serviceMonitor.extraLabels | indent 4 }}
+  {{- end }}
+  name: {{ template "chart.fullname" . }}
+  {{- if .Values.serviceMonitor.namespace }}
+  namespace: {{ .Values.serviceMonitor.namespace }}
+  {{- end }}
+spec:
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      {{- include "chart.matchLabels" . | nindent 6 }} 
+  endpoints:
+    - port: http
+      {{- if .Values.serviceMonitor.interval }}
+      interval: {{ .Values.serviceMonitor.interval }}
+      {{- end }}
+      {{- if .Values.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
+      {{- end }}
+  {{- end }}
diff --git a/charts/victoria-metrics-agent/values.yaml b/charts/victoria-metrics-agent/values.yaml
@@ -189,6 +189,13 @@ affinity: {}
 # otherwise .config values will be used
 configMap: ""
 
+serviceMonitor:
+  enabled: false
+  extraLabels: {}
+  annotations: {}
+#    interval: 15s
+#    scrapeTimeout: 5s
+
 persistence:
   enabled: false
   # storageClassName: default

diff --git a/charts/victoria-metrics-alert/Chart.yaml b/charts/victoria-metrics-alert/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 name: victoria-metrics-alert
 description: Victoria Metrics Alert - executes a list of given MetricsQL expressions (rules) and sends alerts to Alert Manager.
-version: 0.4.4
-appVersion: v1.65.0
+version: 0.4.5
+appVersion: v1.66.1
diff --git a/charts/victoria-metrics-alert/README.md b/charts/victoria-metrics-alert/README.md
@@ -1,6 +1,6 @@
 # Helm Chart For Victoria Metrics Alert.
 
- ![Version: 0.4.4](https://img.shields.io/badge/Version-0.4.4-informational?style=flat-square)
+ ![Version: 0.4.5](https://img.shields.io/badge/Version-0.4.5-informational?style=flat-square)
 
 Victoria Metrics Alert - executes a list of given MetricsQL expressions (rules) and sends alerts to Alert Manager.
 
@@ -195,4 +195,7 @@ Change the values according to the need of the environment in ``victoria-metrics
 | serviceAccount.annotations | object | `{}` |  |
 | serviceAccount.automountToken | bool | `true` |  |
 | serviceAccount.create | bool | `true` |  |
-| serviceAccount.name | string | `nil` |  |
+| serviceAccount.name | string | `nil` |  |
+| serviceMonitor.annotations | object | `{}` |  |
+| serviceMonitor.enabled | bool | `false` |  |
+| serviceMonitor.extraLabels | object | `{}` |  |
diff --git a/charts/victoria-metrics-alert/templates/service-monitor.yaml b/charts/victoria-metrics-alert/templates/service-monitor.yaml
@@ -0,0 +1,33 @@
+{{- if .Values.serviceMonitor.enabled -}}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  {{- if .Values.serviceMonitor.annotations }}
+  annotations:
+{{ toYaml .Values.serviceMonitor.annotations | indent 4 }}
+  {{- end }}
+  labels:
+  {{- include "chart.labels" . | nindent 4 }}
+  {{- if .Values.serviceMonitor.extraLabels }}
+{{ toYaml .Values.serviceMonitor.extraLabels | indent 4 }}
+  {{- end }}
+  name: {{ template "chart.fullname" . }}
+  {{- if .Values.serviceMonitor.namespace }}
+  namespace: {{ .Values.serviceMonitor.namespace }}
+  {{- end }}
+spec:
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      {{- include "chart.matchLabels" . | nindent 6 }} 
+  endpoints:
+    - port: http
+      {{- if .Values.serviceMonitor.interval }}
+      interval: {{ .Values.serviceMonitor.interval }}
+      {{- end }}
+      {{- if .Values.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
+      {{- end }}
+  {{- end }}
diff --git a/charts/victoria-metrics-alert/values.yaml b/charts/victoria-metrics-alert/values.yaml
@@ -184,6 +184,13 @@ server:
     alerts:
       groups: []
 
+serviceMonitor:
+  enabled: false
+  extraLabels: {}
+  annotations: {}
+#    interval: 15s
+#    scrapeTimeout: 5s
+
 alertmanager:
   enabled: false
   replicaCount: 1

diff --git a/charts/victoria-metrics-auth/Chart.yaml b/charts/victoria-metrics-auth/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 1.65.0
+appVersion: 1.66.1
 description: Victoria Metrics Auth - is a simple auth proxy and router for VictoriaMetrics.
 name: victoria-metrics-auth
-version: 0.2.27
+version: 0.2.28
diff --git a/charts/victoria-metrics-auth/README.md b/charts/victoria-metrics-auth/README.md
@@ -1,6 +1,6 @@
 # Helm Chart For Victoria Metrics Auth.
 
- ![Version: 0.2.27](https://img.shields.io/badge/Version-0.2.27-informational?style=flat-square)
+ ![Version: 0.2.28](https://img.shields.io/badge/Version-0.2.28-informational?style=flat-square)
 
 Victoria Metrics Auth - is a simple auth proxy and router for VictoriaMetrics.
 
@@ -114,7 +114,7 @@ Change the values according to the need of the environment in ``victoria-metrics
 | fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"IfNotPresent"` | Pull policy of Docker image |
 | image.repository | string | `"victoriametrics/vmauth"` | Victoria Metrics Auth Docker repository and image name |
-| image.tag | string | `"v1.65.0"` | Tag of Docker image |
+| image.tag | string | `"v1.66.1"` | Tag of Docker image |
 | imagePullSecrets | list | `[]` |  |
 | ingress.annotations | object | `{}` |  |
 | ingress.enabled | bool | `false` |  |

diff --git a/charts/victoria-metrics-auth/values.yaml b/charts/victoria-metrics-auth/values.yaml
@@ -9,7 +9,7 @@ image:
   # -- Victoria Metrics Auth Docker repository and image name
   repository: victoriametrics/vmauth
   # -- Tag of Docker image
-  tag: v1.65.0
+  tag: v1.66.1
   # -- Pull policy of Docker image
   pullPolicy: IfNotPresent
 

diff --git a/charts/victoria-metrics-cluster/Chart.yaml b/charts/victoria-metrics-cluster/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 1.65.0
+appVersion: 1.66.1
 description: Victoria Metrics Cluster version - high-performance, cost-effective and scalable TSDB, long-term remote storage for Prometheus
 name: victoria-metrics-cluster
-version: 0.9.3
+version: 0.9.4
diff --git a/charts/victoria-metrics-cluster/README.md b/charts/victoria-metrics-cluster/README.md
@@ -1,6 +1,6 @@
 # Victoria Metrics Helm Chart for Cluster Version
 
- ![Version: 0.9.3](https://img.shields.io/badge/Version-0.9.3-informational?style=flat-square)
+ ![Version: 0.9.4](https://img.shields.io/badge/Version-0.9.4-informational?style=flat-square)
 
 Victoria Metrics Cluster version - high-performance, cost-effective and scalable TSDB, long-term remote storage for Prometheus
 
@@ -133,7 +133,7 @@ Change the values according to the need of the environment in ``victoria-metrics
 | vminsert.horizontalPodAutoscaler.minReplicas | int | `2` | Minimum replicas for HPA to use to scale the vminsert component |
 | vminsert.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
 | vminsert.image.repository | string | `"victoriametrics/vminsert"` | Image repository |
-| vminsert.image.tag | string | `"v1.65.0-cluster"` | Image tag |
+| vminsert.image.tag | string | `"v1.66.1-cluster"` | Image tag |
 | vminsert.ingress.annotations | object | `{}` | Ingress annotations |
 | vminsert.ingress.enabled | bool | `false` | Enable deployment of ingress for vminsert component |
 | vminsert.ingress.extraLabels | object | `{}` |  |
@@ -195,7 +195,7 @@ Change the values according to the need of the environment in ``victoria-metrics
 | vmselect.horizontalPodAutoscaler.minReplicas | int | `2` | Minimum replicas for HPA to use to scale the vmselect component |
 | vmselect.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
 | vmselect.image.repository | string | `"victoriametrics/vmselect"` | Image repository |
-| vmselect.image.tag | string | `"v1.65.0-cluster"` | Image tag |
+| vmselect.image.tag | string | `"v1.66.1-cluster"` | Image tag |
 | vmselect.ingress.annotations | object | `{}` | Ingress annotations |
 | vmselect.ingress.enabled | bool | `false` | Enable deployment of ingress for vmselect component |
 | vmselect.ingress.extraLabels | object | `{}` |  |
@@ -263,7 +263,7 @@ Change the values according to the need of the environment in ``victoria-metrics
 | vmstorage.fullnameOverride | string | `nil` | Overrides the full name of vmstorage component |
 | vmstorage.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
 | vmstorage.image.repository | string | `"victoriametrics/vmstorage"` | Image repository |
-| vmstorage.image.tag | string | `"v1.65.0-cluster"` | Image tag |
+| vmstorage.image.tag | string | `"v1.66.1-cluster"` | Image tag |
 | vmstorage.initContainers | list | `[]` |  |
 | vmstorage.name | string | `"vmstorage"` | vmstorage container name |
 | vmstorage.nodeSelector | object | `{}` | Pod's node selector. Ref: [https://kubernetes.io/docs/user-guide/node-selection/](https://kubernetes.io/docs/user-guide/node-selection/) |
@@ -318,7 +318,7 @@ Change the values according to the need of the environment in ``victoria-metrics
 | vmstorage.vmbackupmanager.extraArgs."envflag.prefix" | string | `"VM_"` |  |
 | vmstorage.vmbackupmanager.extraArgs.loggerFormat | string | `"json"` |  |
 | vmstorage.vmbackupmanager.image.repository | string | `"victoriametrics/vmbackupmanager"` | vmbackupmanager image repository |
-| vmstorage.vmbackupmanager.image.tag | string | `"v1.65.0-enterprise"` | vmbackupmanager image tag |
+| vmstorage.vmbackupmanager.image.tag | string | `"v1.66.1-enterprise"` | vmbackupmanager image tag |
 | vmstorage.vmbackupmanager.livenessProbe.failureThreshold | int | `10` |  |
 | vmstorage.vmbackupmanager.livenessProbe.initialDelaySeconds | int | `30` |  |
 | vmstorage.vmbackupmanager.livenessProbe.periodSeconds | int | `30` |  |

diff --git a/charts/victoria-metrics-cluster/values.yaml b/charts/victoria-metrics-cluster/values.yaml
@@ -38,7 +38,7 @@ vmselect:
     # -- Image repository
     repository: victoriametrics/vmselect
     # -- Image tag
-    tag: v1.65.0-cluster
+    tag: v1.66.1-cluster
     # -- Image pull policy
     pullPolicy: IfNotPresent
   # -- Name of Priority Class
@@ -246,7 +246,7 @@ vminsert:
     # -- Image repository
     repository: victoriametrics/vminsert
     # -- Image tag
-    tag: v1.65.0-cluster
+    tag: v1.66.1-cluster
     # -- Image pull policy
     pullPolicy: IfNotPresent
   # -- Name of Priority Class
@@ -392,7 +392,7 @@ vmstorage:
     # -- Image repository
     repository: victoriametrics/vmstorage
     # -- Image tag
-    tag: v1.65.0-cluster
+    tag: v1.66.1-cluster
     # -- Image pull policy
     pullPolicy: IfNotPresent
   # -- Name of Priority Class
@@ -562,7 +562,7 @@ vmstorage:
       # -- vmbackupmanager image repository
       repository: victoriametrics/vmbackupmanager
       # -- vmbackupmanager image tag
-      tag: v1.65.0-enterprise
+      tag: v1.66.1-enterprise
     # -- disable hourly backups
     disableHourly: false
     # -- disable daily backups

diff --git a/charts/victoria-metrics-single/Chart.yaml b/charts/victoria-metrics-single/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 1.65.0
+appVersion: 1.66.1
 description: Victoria Metrics Single version - high-performance, cost-effective and scalable TSDB, long-term remote storage for Prometheus
 name: victoria-metrics-single
-version: 0.8.4
+version: 0.8.5
diff --git a/charts/victoria-metrics-single/README.md b/charts/victoria-metrics-single/README.md
@@ -1,6 +1,6 @@
 # Victoria Metrics Helm Chart for Single Version
 
- ![Version: 0.8.4](https://img.shields.io/badge/Version-0.8.4-informational?style=flat-square)
+ ![Version: 0.8.5](https://img.shields.io/badge/Version-0.8.5-informational?style=flat-square)
 
 Victoria Metrics Single version - high-performance, cost-effective and scalable TSDB, long-term remote storage for Prometheus