changeset 201:2595cf510c5d

rm zfs metrics (moved to a k8s service)
author drewp@bigasterisk.com
date Fri, 23 Jun 2023 23:03:44 -0700
parents 49bba71efe8a
children a5399e8b47b6
files files/zfs_metrics/zfs.mtail files/zfs_metrics/zfs_space_metrics.service files/zfs_metrics/zfs_space_metrics.sh system.py
diffstat 4 files changed, 0 insertions(+), 52 deletions(-) [+]
line wrap: on
line diff
--- a/files/zfs_metrics/zfs.mtail	Fri Jun 23 23:03:25 2023 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-gauge zfs_space_avail           by name
-gauge zfs_space_used            by name
-gauge zfs_space_used_snap       by name
-gauge zfs_space_used_ds         by name
-gauge zfs_space_used_ref_reserv by name
-gauge zfs_space_used_child      by name
-
-# output of `zfs list -Hp -o space`
-/(?P<name>\S+)\s+(?P<f0>\d+)\s+(?P<f1>\d+)\s+(?P<f2>\d+)\s+(?P<f3>\d+)\s+(?P<f4>\d+)\s+(?P<f5>\d+)/ {
-    zfs_space_avail[$name] = $f0
-    zfs_space_used[$name] = $f1
-    zfs_space_used_snap[$name] = $f2
-    zfs_space_used_ds[$name] = $f3
-    zfs_space_used_ref_reserv[$name] = $f4
-    zfs_space_used_child[$name] = $f5
-}
--- a/files/zfs_metrics/zfs_space_metrics.service	Fri Jun 23 23:03:25 2023 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-# written by pyinfra
-
-[Unit]
-Description=zfs space metrics
-After=zfs-mount.service
-
-[Service]
-Type=simple
-
-ExecStart=zsh /opt/zfs_metrics/zfs_space_metrics.sh
-
-[Install]
-WantedBy=multi-user.target
--- a/files/zfs_metrics/zfs_space_metrics.sh	Fri Jun 23 23:03:25 2023 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-#!/bin/zsh
-
-LOG=/tmp/zfs_space_metrics_pipe
-rm -f ${LOG}
-mkfifo ${LOG}
-
-while (true) {
-    zfs list -Hp -o space                           
-    sleep 1m
-} > ${LOG} &
-
-mtail -logtostderr -progs /opt/zfs_metrics/ -port 9985 -logs ${LOG}
\ No newline at end of file
--- a/system.py	Fri Jun 23 23:03:25 2023 -0700
+++ b/system.py	Fri Jun 23 23:03:44 2023 -0700
@@ -42,8 +42,6 @@
     apt.packages(packages=['nfs-kernel-server'])
     files.template(src='templates/bang_exports.j2', dest='/etc/exports')
 
-    # sudo zfs set sharenfs="rw=10.5.0.0/16" stor6
-
 def smaller_journals():
     files.line(name='shorter systemctl log window, for disk space',
                path='/etc/systemd/journald.conf',
@@ -54,14 +52,6 @@
         files.template(src="templates/webforward.service.j2", dest=f"/etc/systemd/system/web_forward_{port}.service", port=port)
         systemd.service(service=f'web_forward_{port}', enabled=True, restarted=True)
 
-# todo move to k8s (and run on ditto, and record pool status too)
-def zfs_metrics():
-    files.put(src='files/zfs_metrics/zfs_space_metrics.sh', dest='/opt/zfs_metrics/zfs_space_metrics.sh')
-    files.put(src='files/zfs_metrics/zfs.mtail', dest='/opt/zfs_metrics/zfs.mtail')
-    files.put(src='files/zfs_metrics/zfs_space_metrics.service',
-               dest=f'/etc/systemd/system/zfs_space_metrics.service')
-    systemd.service(service=f'zfs_space_metrics', enabled=True, restarted=True, daemon_reload=True)
-
 server.hostname(hostname=host.name)
 timezone()
 fstab()
@@ -81,7 +71,6 @@
 
 if host.name in ['bang', 'ditto']:
     nfs_server()
-    zfs_metrics()
 
 if host.name == 'prime':
     smaller_journals()