logs: bump victorialogs to v1.40.0, enable vlagent collector in collector chart

Author: AndrewChubatiuk

charts/victoria-logs-cluster/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## Next release
 
-- TODO
+- bump VictoriaLogs version to [v1.40.0](https://github.com/VictoriaMetrics/VictoriaLogs/releases/tag/v1.40.0).
 
 ## 0.0.19
 

charts/victoria-logs-cluster/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 type: application
-appVersion: v1.39.0
+appVersion: v1.40.0
 description: The VictoriaLogs cluster Helm chart deploys VictoriaLogs cluster database in Kubernetes.
 name: victoria-logs-cluster
 version: 0.0.19

charts/victoria-logs-collector/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## Next release
 
-- TODO
+- support VLAgent logs collection when `.Values.native: true`
 
 ## 0.1.2
 

charts/victoria-logs-collector/Chart.yaml

@@ -3,6 +3,7 @@ type: application
 name: victoria-logs-collector
 description: VictoriaLogs Collector - collects logs from Kubernetes containers and stores them to VictoriaLogs
 version: 0.1.2
+appVersion: 1.40.0
 sources:
   - https://github.com/VictoriaMetrics/helm-charts
 icon: https://avatars.githubusercontent.com/u/43720803?s=200&v=4

charts/victoria-logs-collector/templates/_helpers.tpl

@@ -1,9 +1,9 @@
 {{- define "victoria-logs-collector.image" }}
-  {{- $registry := .Values.global.image.registry | default "docker.io" }}
-  {{- if .Values.native }}
-    {{- $tag := required "'image' must be set when 'native' is true" (.Values.image).tag }}
-    {{- printf "%s/%s:%s" $registry "victoriametrics/vlagent" $tag }}
+  {{- $Values := (.helm).Values | default .Values -}}
+  {{- if $Values.native }}
+    {{- include "vm.image" . }}
   {{- else }}
+    {{- $registry := $Values.global.image.registry | default "docker.io" }}
     {{- printf "%s/%s:%s" $registry "timberio/vector" "0.51.1-alpine" }}
   {{- end }}
 {{- end }}

charts/victoria-logs-collector/templates/daemonset.yaml

@@ -40,7 +40,7 @@ spec:
       {{- end }}
       containers:
         - name: victoria-logs-collector
-          image: {{ include "victoria-logs-collector.image" . }}
+          image: {{ include "victoria-logs-collector.image" $ctx }}
           imagePullPolicy: IfNotPresent
           {{- if .Values.securityContext.enabled }}
           securityContext: {{ omit .Values.securityContext "enabled" | toYaml | nindent 12 }}

charts/victoria-logs-collector/values.yaml

@@ -45,6 +45,22 @@ msgField:
   - message
   - msg
 
+# -- Enable VLAgent logs collection
+native: false
+
+image:
+  # -- Image registry
+  registry: ""
+  # -- Image repository
+  repository: victoriametrics/vlagent
+  # -- Image tag, set to `Chart.AppVersion` by default
+  tag: "" # rewrites Chart.AppVersion
+  # -- Variant of the image to use.
+  # e.g. enterprise, scratch
+  variant: ""
+  # -- Image pull policy
+  pullPolicy: IfNotPresent
+
 # -- Environment variables (ex.: secret tokens).
 env: []
   # - name: VL_PASSWORD

charts/victoria-logs-multilevel/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## Next release
 
-- TODO
+- bump VictoriaLogs version to [v1.40.0](https://github.com/VictoriaMetrics/VictoriaLogs/releases/tag/v1.40.0).
 
 ## 0.0.1
 

charts/victoria-logs-multilevel/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 type: application
-appVersion: v1.36.1
+appVersion: v1.40.0
 description: The VictoriaLogs multilevel Helm chart deploys global read for multiple storage groups.
 name: victoria-logs-multilevel
 version: 0.0.1

charts/victoria-logs-single/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## Next release
 
-- TODO
+- bump VictoriaLogs version to [v1.40.0](https://github.com/VictoriaMetrics/VictoriaLogs/releases/tag/v1.40.0).
 
 ## 0.11.18