Merge pull request #37 from weka/sept-2023

Sept 2023
weka · Sep 15, 2023 · 1fd8376 · 1fd8376
2 parents 01ca8cc + c28ee79
commit 1fd8376
Show file tree

Hide file tree

Showing 8 changed files with 1,176 additions and 4 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,8 +6,8 @@ services:
     image: grafana/grafana:8.4.6
     volumes:
       - /dev/log:/dev/log
-      - ${PWD}/etc_grafana_provisioning:/etc/grafana/provisioning
-      - ${PWD}/var_lib_grafana:/var/lib/grafana/
+      - ${PWD}/etc_grafana/:/etc/grafana/
+      - ${PWD}/var_lib_grafana/:/var/lib/grafana/
       - ${PWD}/usr_share_grafana_public_img:/usr/share/grafana/public/img/weka
     restart: always
     ports:

diff --git a/etc_grafana/grafana.ini b/etc_grafana/grafana.ini
diff --git a/...rafana_provisioning/WEKA_Symbol_Color.svg → ...rafana/provisioning/WEKA_Symbol_Color.svg b/...rafana_provisioning/WEKA_Symbol_Color.svg → ...rafana/provisioning/WEKA_Symbol_Color.svg
diff --git a/...ovisioning/dashboards/weka_dashboards.yml → ...ovisioning/dashboards/weka_dashboards.yml b/...ovisioning/dashboards/weka_dashboards.yml → ...ovisioning/dashboards/weka_dashboards.yml
diff --git a/...grafana_provisioning/datasources/loki.yml → ...grafana/provisioning/datasources/loki.yml b/...grafana_provisioning/datasources/loki.yml → ...grafana/provisioning/datasources/loki.yml
diff --git a/...a_provisioning/datasources/prometheus.yml → ...a/provisioning/datasources/prometheus.yml b/...a_provisioning/datasources/prometheus.yml → ...a/provisioning/datasources/prometheus.yml
diff --git a/install.sh b/install.sh
@@ -11,5 +11,5 @@ chown 10001 loki_data/
 chgrp 10001 loki_data/
 
 # this is so the Grafana database persists between container restarts
-chmod 755 var_lib_grafana/
-chown -R 472:0 var_lib_grafana/
+chmod 755 var_lib_grafana/ etc_grafana/
+chown -R 472:0 var_lib_grafana/ etc_grafana/
diff --git a/snaptool.yml b/snaptool.yml
@@ -0,0 +1,53 @@
+cluster:
+    auth_token_file: auth-token.json
+    force_https: true
+    hosts:
+    - weka66
+    - weka67
+    - weka65
+    verify_cert: false
+filesystems:
+    fs01: default
+    fs02: workhoursHourlyUp, weekendsNoon
+    fs03: workhoursEvery20, weekendsNoon, fridayUpload
+schedules:
+    default:
+        daily:
+            every: Mon,Tue,Wed,Thu,Fri,Sat
+            retain: 14
+        hourly:
+            at: 9:00am
+            every: Mon,Tue,Wed,Thu,Fri
+            interval: 60
+            retain: 8
+            until: 5pm
+        monthly:
+            every: month
+            retain: 6
+        weekly:
+            every: Sunday
+            retain: 8
+    fridayUpload:
+        at: 7pm
+        every: Friday
+        retain: 3
+        upload: true
+    weekendsNoon:
+        at: 1200
+        every: Sat,Sun
+        retain: 4
+    workhoursEvery20:
+        at: 0900
+        every: Mon,Tue,Wed,Thu,Fri
+        interval: 20
+        retain: 7
+        until: 5pm
+    workhoursHourlyUp:
+        at: 0900
+        every: Mon,Tue,Wed,Thu,Fri
+        interval: 60
+        retain: 7
+        until: 5pm
+        upload: true
+snaptool:
+    port: 8090