cleanup

sjultra · Oct 11, 2023 · 107fd77 · 107fd77
1 parent f79e569
commit 107fd77
Show file tree

Hide file tree

Showing 29 changed files with 16 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,12 @@
 data/influxdb/*
 data/grafana/*
 .env
-*/**/node_modules
+*/**/node_modules
+
+data/
+/influxdb/
+/grafana/dashboards/*
+!/grafana/dashboards/smokeping.json
+!/grafana/dashboards/dashboard.yml
+/grafana/datasources/*
+!/grafana/datasources/influxdb.yml
diff --git a/helm/service/files/data/influxdb/data/_internal/_series/00/0000 b/helm/service/files/data/influxdb/data/_internal/_series/00/0000
diff --git a/helm/service/files/data/influxdb/data/_internal/_series/01/0000 b/helm/service/files/data/influxdb/data/_internal/_series/01/0000
diff --git a/helm/service/files/data/influxdb/data/_internal/_series/02/0000 b/helm/service/files/data/influxdb/data/_internal/_series/02/0000
diff --git a/helm/service/files/data/influxdb/data/_internal/_series/03/0000 b/helm/service/files/data/influxdb/data/_internal/_series/03/0000
diff --git a/helm/service/files/data/influxdb/data/_internal/_series/04/0000 b/helm/service/files/data/influxdb/data/_internal/_series/04/0000
diff --git a/helm/service/files/data/influxdb/data/_internal/_series/05/0000 b/helm/service/files/data/influxdb/data/_internal/_series/05/0000
diff --git a/helm/service/files/data/influxdb/data/_internal/_series/06/0000 b/helm/service/files/data/influxdb/data/_internal/_series/06/0000
diff --git a/helm/service/files/data/influxdb/data/_internal/_series/07/0000 b/helm/service/files/data/influxdb/data/_internal/_series/07/0000
diff --git a/helm/service/files/data/influxdb/data/_internal/monitor/1/fields.idx b/helm/service/files/data/influxdb/data/_internal/monitor/1/fields.idx
diff --git a/helm/service/files/data/influxdb/data/speedtest/_series/00/0000 b/helm/service/files/data/influxdb/data/speedtest/_series/00/0000
diff --git a/helm/service/files/data/influxdb/data/speedtest/_series/01/0000 b/helm/service/files/data/influxdb/data/speedtest/_series/01/0000
diff --git a/helm/service/files/data/influxdb/data/speedtest/_series/02/0000 b/helm/service/files/data/influxdb/data/speedtest/_series/02/0000
diff --git a/helm/service/files/data/influxdb/data/speedtest/_series/03/0000 b/helm/service/files/data/influxdb/data/speedtest/_series/03/0000
diff --git a/helm/service/files/data/influxdb/data/speedtest/_series/04/0000 b/helm/service/files/data/influxdb/data/speedtest/_series/04/0000
diff --git a/helm/service/files/data/influxdb/data/speedtest/_series/05/0000 b/helm/service/files/data/influxdb/data/speedtest/_series/05/0000
diff --git a/helm/service/files/data/influxdb/data/speedtest/_series/06/0000 b/helm/service/files/data/influxdb/data/speedtest/_series/06/0000
diff --git a/helm/service/files/data/influxdb/data/speedtest/_series/07/0000 b/helm/service/files/data/influxdb/data/speedtest/_series/07/0000
diff --git a/helm/service/files/data/influxdb/data/speedtest/autogen/2/fields.idx b/helm/service/files/data/influxdb/data/speedtest/autogen/2/fields.idx
diff --git a/helm/service/files/data/influxdb/meta/meta.db b/helm/service/files/data/influxdb/meta/meta.db
diff --git a/helm/service/files/data/influxdb/wal/_internal/monitor/1/_00001.wal b/helm/service/files/data/influxdb/wal/_internal/monitor/1/_00001.wal
diff --git a/helm/service/files/data/influxdb/wal/speedtest/autogen/2/_00001.wal b/helm/service/files/data/influxdb/wal/speedtest/autogen/2/_00001.wal
diff --git a/...ana/provisioning/dashboards/dashboard.yml → ...ce/files/grafana/dashboards/dashboard.yml b/...ana/provisioning/dashboards/dashboard.yml → ...ce/files/grafana/dashboards/dashboard.yml
diff --git a/...na/provisioning/dashboards/speedtest.json → ...e/files/grafana/dashboards/speedtest.json b/...na/provisioning/dashboards/speedtest.json → ...e/files/grafana/dashboards/speedtest.json
diff --git a/...ana/provisioning/datasources/influxdb.yml → ...ce/files/grafana/datasources/influxdb.yml b/...ana/provisioning/datasources/influxdb.yml → ...ce/files/grafana/datasources/influxdb.yml
diff --git a/helm/service/templates/grafana-provisioning-dashboard.yaml b/helm/service/templates/grafana-provisioning-dashboard.yaml
@@ -3,7 +3,7 @@ kind: ConfigMap
 metadata:
   name: {{ include "<chart-name>.fullname" . }}-grafana-provisioning-dashboards
 data:
-  {{- range $path, $bytes := .Files.Glob "files/grafana/provisioning/dashboards/*" }}
-  {{ $path | replace "files/grafana/provisioning/dashboards/" "" }}: |-
+  {{- range $path, $bytes := .Files.Glob "files/grafana/dashboards/*" }}
+  {{ $path | replace "files/grafana/dashboards/" "" }}: |-
     {{ $.Files.Get $path | nindent 4 }}
   {{- end }}
diff --git a/helm/service/templates/grafana-provisioning-datasource.yaml b/helm/service/templates/grafana-provisioning-datasource.yaml
@@ -3,7 +3,7 @@ kind: ConfigMap
 metadata:
   name: {{ include "<chart-name>.fullname" . }}-grafana-provisioning-datasources
 data:
-  {{- range $path, $bytes := .Files.Glob "files/grafana/provisioning/datasources/*" }}
-  {{ $path | replace "files/grafana/provisioning/datasources/" "" }}: |-
+  {{- range $path, $bytes := .Files.Glob "files/grafana/datasources/*" }}
+  {{ $path | replace "files/grafana/datasources/" "" }}: |-
     {{ $.Files.Get $path | nindent 4 }}
   {{- end }}
diff --git a/helm/service/templates/influxdb.yaml b/helm/service/templates/influxdb.yaml
@@ -57,6 +57,8 @@ spec:
           value: {{ .Values.influxdb.adminPassword }}
         - name: INFLUXDB_DB
           value: {{ .Values.influxdb.db }}
+        - name: DB_NAME
+          value: {{ .Values.influxdb.db }}
       volumes:
       - name: influxdb-data
         persistentVolumeClaim:

diff --git a/helm/service/values.yaml b/helm/service/values.yaml
@@ -3,7 +3,7 @@
 ingressHost: rancher.vzxy.net
 
 influxdb:
-  image: influxdb:1.8
+  image: sjultra/influxdb-legacy:latest
   adminUser: admin
   adminPassword: password
   db: speedtest