replace vlogs helmchart by operator

aenix-io · Aug 28, 2024 · ba514de · ba514de
1 parent 0f4d416
commit ba514de
Show file tree

Hide file tree

Showing 73 changed files with 36,227 additions and 23,164 deletions.
diff --git a/packages/extra/monitoring/templates/vlogs/grafana-datasource.yaml b/packages/extra/monitoring/templates/vlogs/grafana-datasource.yaml
@@ -2,13 +2,13 @@
 apiVersion: grafana.integreatly.org/v1beta1
 kind: GrafanaDatasource
 metadata:
-  name: vlog-{{ .name }}
+  name: vlogs-{{ .name }}
 spec:
   datasource:
     access: proxy
     type: victorialogs-datasource
-    name: vlog-{{ .name }}
-    url: http://vlog-{{ .name }}-0.vlog-{{ .name }}.{{ $.Release.Namespace }}.svc:9428
+    name: vlogs-{{ .name }}
+    url: http://vlogs-{{ .name }}.{{ $.Release.Namespace }}.svc:9428
   instanceSelector:
     matchLabels:
       dashboards: grafana

diff --git a/packages/extra/monitoring/templates/vlogs/vlogs-release.yaml b/packages/extra/monitoring/templates/vlogs/vlogs-release.yaml
@@ -1,31 +1,15 @@
 {{- range .Values.logsStorages }}
-apiVersion: helm.toolkit.fluxcd.io/v2
-kind: HelmRelease
+apiVersion: operator.victoriametrics.com/v1beta1
+kind: VLogs
 metadata:
-  name: vlog-{{ .name }}-system
-  labels:
-    app.kubernetes.io/instance: {{ $.Release.Name }}
-    app.kubernetes.io/managed-by: {{ $.Release.Service }}
+  name: {{ .name }}
 spec:
-  chart:
-    spec:
-      chart: cozy-victoria-logs
-      reconcileStrategy: Revision
-      sourceRef:
-        kind: HelmRepository
-        name: cozystack-system
-        namespace: cozy-system
-      version: '*'
-  interval: 1m0s
-  timeout: 5m0s
-  values:
-    global:
-      victoriaLogs:
-        server:
-          fullnameOverride: vlog-{{ .name }}
-    victoria-logs-single:
-      server:
-        persistentVolume:
-          enabled: true
-          size: 10Gi
+  storage:
+    resources:
+      requests:
+        storage: {{ .storage }}
+    storageClassName: {{ .storageClassName }}
+    accessModes: [ReadWriteOnce]
+  retentionPeriod: "{{ .retentionPeriod }}"
+  removePvcAfterDelete: true
 {{- end }}
diff --git a/packages/extra/monitoring/values.yaml b/packages/extra/monitoring/values.yaml
@@ -21,7 +21,7 @@ metricsStorages:
 ##
 logsStorages:
 - name: generic
-  retentionPeriod: "1m"
+  retentionPeriod: "1"
   storage: 10Gi
   storageClassName: replicated
 

diff --git a/packages/system/monitoring/values.yaml b/packages/system/monitoring/values.yaml
@@ -39,7 +39,7 @@ fluent-bit:
       [OUTPUT]
           Name http
           Match kube.*
-          Host vlog-generic.tenant-root.svc
+          Host vlogs-generic.tenant-root.svc
           port 9428
           compress gzip
           uri /insert/jsonline?_stream_fields=stream,kubernetes_pod_name,kubernetes_container_name,kubernetes_namespace_name&_msg_field=log&_time_field=date

diff --git a/packages/system/victoria-logs/.helmignore b/packages/system/victoria-logs/.helmignore
diff --git a/packages/system/victoria-logs/Chart.yaml b/packages/system/victoria-logs/Chart.yaml
diff --git a/packages/system/victoria-logs/Makefile b/packages/system/victoria-logs/Makefile
diff --git a/packages/system/victoria-logs/charts/victoria-logs-single/CHANGELOG.md b/packages/system/victoria-logs/charts/victoria-logs-single/CHANGELOG.md
diff --git a/packages/system/victoria-logs/charts/victoria-logs-single/Chart.lock b/packages/system/victoria-logs/charts/victoria-logs-single/Chart.lock
diff --git a/packages/system/victoria-logs/charts/victoria-logs-single/Chart.yaml b/packages/system/victoria-logs/charts/victoria-logs-single/Chart.yaml