replace vlogs helmchart by operator

Signed-off-by: Andrei Kvapil <[email protected]>
aenix-io · Aug 29, 2024 · 5f1dfb0 · 5f1dfb0
1 parent 0f4d416
commit 5f1dfb0
Show file tree

Hide file tree

Showing 77 changed files with 36,242 additions and 23,170 deletions.
diff --git a/packages/extra/monitoring/Makefile b/packages/extra/monitoring/Makefile
@@ -5,6 +5,6 @@ include ../../../scripts/package.mk
 generate:
 	readme-generator -v values.yaml -s values.schema.json.tmp -r README.md
 	cat values.schema.json.tmp | \
-		jq '.properties.metricsStorages.items.type = "object"' \
+		jq '.properties.metricsStorages.items.type = "object" | .properties.logsStorages.items.type = "object"' \
 		> values.schema.json
 	rm -f values.schema.json.tmp
diff --git a/packages/extra/monitoring/README.md b/packages/extra/monitoring/README.md
@@ -8,4 +8,5 @@
 | ----------------- | --------------------------------------------------------------------------------------------------------- | ------- |
 | `host`            | The hostname used to access the grafana externally (defaults to 'grafana' subdomain for the tenant host). | `""`    |
 | `metricsStorages` | Configuration of metrics storage instances                                                                | `[]`    |
+| `logsStorages`    | Configuration of logs storage instances                                                                   | `[]`    |
 | `oncall.enabled`  | Enable Grafana OnCall                                                                                     | `false` |
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
diff --git a/packages/extra/monitoring/templates/vlogs/vlogs.yaml b/packages/extra/monitoring/templates/vlogs/vlogs.yaml
@@ -0,0 +1,15 @@
+{{- range .Values.logsStorages }}
+apiVersion: operator.victoriametrics.com/v1beta1
+kind: VLogs
+metadata:
+  name: {{ .name }}
+spec:
+  storage:
+    resources:
+      requests:
+        storage: {{ .storage }}
+    storageClassName: {{ .storageClassName }}
+    accessModes: [ReadWriteOnce]
+  retentionPeriod: "{{ .retentionPeriod }}"
+  removePvcAfterDelete: true
+{{- end }}
diff --git a/packages/extra/monitoring/values.schema.json b/packages/extra/monitoring/values.schema.json
@@ -15,6 +15,14 @@
         "type": "object"
       }
     },
+    "logsStorages": {
+      "type": "array",
+      "description": "Configuration of logs storage instances",
+      "default": "[]",
+      "items": {
+        "type": "object"
+      }
+    },
     "oncall": {
       "type": "object",
       "properties": {

diff --git a/packages/extra/monitoring/values.yaml b/packages/extra/monitoring/values.yaml
@@ -17,11 +17,11 @@ metricsStorages:
   storage: 10Gi
   storageClassName: ""
 
-## @param metricsStorages [array] Configuration of logs storage instances
+## @param logsStorages [array] Configuration of logs storage instances
 ##
 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