Merge pull request #9 from pbasov/fixes

Fix grafana victorialogs datasource, update version
K0rdent · Dec 19, 2024 · 58057e5 · 58057e5
2 parents 04e19ee + 4a1adf7
commit 58057e5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/charts/motel-mothership/templates/grafana/grafana.yaml b/charts/motel-mothership/templates/grafana/grafana.yaml
@@ -37,10 +37,11 @@ spec:
                   ver=$(curl -s https://api.github.com/repos/VictoriaMetrics/victoriametrics-datasource/releases/latest | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+' | head -1)
                   curl -L https://github.com/VictoriaMetrics/victoriametrics-datasource/releases/download/$ver/victoriametrics-datasource-$ver.tar.gz -o /var/lib/grafana/plugins/vm-plugin.tar.gz
                   vlver=$(curl -s https://api.github.com/repos/VictoriaMetrics/victorialogs-datasource/releases/latest | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+' | head -1)
-                  curl -L https://github.com/VictoriaMetrics/victorialogs-datasource/releases/download/$vlver/victorialogs-datasource-$vlver.tar.gz -o /var/lib/grafana/plugins/vl-plugin.tar.gz
+                  curl -L https://github.com/VictoriaMetrics/victorialogs-datasource/releases/download/$vlver/victoriametrics-logs-datasource-$vlver.tar.gz -o /var/lib/grafana/plugins/vl-plugin.tar.gz
                   tar -xf /var/lib/grafana/plugins/vl-plugin.tar.gz -C /var/lib/grafana/plugins/
                   tar -xf /var/lib/grafana/plugins/vm-plugin.tar.gz -C /var/lib/grafana/plugins/
                   rm /var/lib/grafana/plugins/vm-plugin.tar.gz
+                  rm /var/lib/grafana/plugins/vl-plugin.tar.gz
               volumeMounts:
                 - name: grafana-data
                   mountPath: /var/lib/grafana
@@ -50,7 +51,7 @@ spec:
               claimName: grafana-vm-pvc
   config:
     plugins:
-      allow_loading_unsigned_plugins: victoriametrics-datasource,victorialogs-datasource
+      allow_loading_unsigned_plugins: victoriametrics-datasource,victoriametrics-logs-datasource
     security:
       admin_user: {{ .Values.grafana.security.admin_user | quote }}
       admin_password: {{ .Values.grafana.security.admin_password | quote }}

diff --git a/charts/motel-mothership/templates/grafana/logs-datasource.yaml b/charts/motel-mothership/templates/grafana/logs-datasource.yaml
@@ -12,7 +12,7 @@ spec:
     access: proxy
     isDefault: false
     name: {{ .name }}
-    type: {{ .type | default "victorialogs-datasource" }}
+    type: {{ .type | default "victoriametrics-logs-datasource " }}
     url: {{ .url }}
     basicAuth: true
     basicAuthUser: {{ .auth.username | quote }}

diff --git a/charts/motel-regional/templates/grafana/grafana.yaml b/charts/motel-regional/templates/grafana/grafana.yaml
@@ -37,7 +37,7 @@ spec:
                   ver=$(curl -s https://api.github.com/repos/VictoriaMetrics/victoriametrics-datasource/releases/latest | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+' | head -1)
                   curl -L https://github.com/VictoriaMetrics/victoriametrics-datasource/releases/download/$ver/victoriametrics-datasource-$ver.tar.gz -o /var/lib/grafana/plugins/vm-plugin.tar.gz
                   vlver=$(curl -s https://api.github.com/repos/VictoriaMetrics/victorialogs-datasource/releases/latest | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+' | head -1)
-                  curl -L https://github.com/VictoriaMetrics/victorialogs-datasource/releases/download/$vlver/victorialogs-datasource-$vlver.tar.gz -o /var/lib/grafana/plugins/vl-plugin.tar.gz
+                  curl -L https://github.com/VictoriaMetrics/victorialogs-datasource/releases/download/$vlver/victoriametrics-logs-datasource-$vlver.tar.gz -o /var/lib/grafana/plugins/vl-plugin.tar.gz
                   tar -xf /var/lib/grafana/plugins/vl-plugin.tar.gz -C /var/lib/grafana/plugins/
                   tar -xf /var/lib/grafana/plugins/vm-plugin.tar.gz -C /var/lib/grafana/plugins/
                   rm /var/lib/grafana/plugins/vm-plugin.tar.gz
@@ -50,7 +50,7 @@ spec:
               claimName: grafana-vm-pvc
   config:
     plugins:
-      allow_loading_unsigned_plugins: victoriametrics-datasource,victorialogs-datasource
+      allow_loading_unsigned_plugins: victoriametrics-datasource,victoriametrics-logs-datasource
     security:
       admin_user: {{ .Values.grafana.security.admin_user | quote }}
       admin_password: {{ .Values.grafana.security.admin_password | quote }}

diff --git a/charts/motel-regional/templates/grafana/logs-datasource.yaml b/charts/motel-regional/templates/grafana/logs-datasource.yaml
@@ -11,7 +11,7 @@ spec:
     access: proxy
     isDefault: true
     name: vls
-    type: victorialogs-datasource
+    type: victoriametrics-logs-datasource
     url: http://{{ .Release.Name }}-victoria-logs-single-server:9428
   instanceSelector:
     matchLabels: