From 79820a0c10b7355d7f1d9ce7435e5f436962d403 Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Sat, 30 Oct 2021 20:59:54 +0200
Subject: [PATCH] flux min

---
 bundles/grafana/items.py      | 1 +
 data/grafana/flux.mako        | 3 +++
 data/grafana/rows/proc_cpu.py | 3 ++-
 data/grafana/rows/proc_ram.py | 3 ++-
 nodes/wb.offsite-backups.py   | 2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/bundles/grafana/items.py b/bundles/grafana/items.py
index 6e80882..428b086 100644
--- a/bundles/grafana/items.py
+++ b/bundles/grafana/items.py
@@ -138,6 +138,7 @@ for dashboard_id, monitored_node in enumerate(monitored_nodes, start=1):
                         negative=query_config.get('negative', False),
                         boolean_to_int=query_config.get('boolean_to_int', False),
                         resolution=query_config.get('resolution', 1) * 4,
+                        minimum=query_config.get('minimum', None),
                         filters={
                             'host': monitored_node.name,
                             **query_config['filters'],
diff --git a/data/grafana/flux.mako b/data/grafana/flux.mako
index c95ee18..73ffd05 100644
--- a/data/grafana/flux.mako
+++ b/data/grafana/flux.mako
@@ -4,6 +4,9 @@ from(bucket: "${bucket}")
 <% values = values if isinstance(values, list) else [values] %>\
   |> filter(fn: (r) => ${' or '.join(f'r["{key}"] == "{value}"' for value in values)})
 % endfor
+% if minimum:
+  |> filter(fn: (r) => r._value > ${minimum})
+% endif
 % if function == 'derivative':
   |> derivative(nonNegative: true)
 % endif
diff --git a/data/grafana/rows/proc_cpu.py b/data/grafana/rows/proc_cpu.py
index 68ad7e7..ae334dd 100644
--- a/data/grafana/rows/proc_cpu.py
+++ b/data/grafana/rows/proc_cpu.py
@@ -9,7 +9,8 @@
                         'cpu_usage',
                     ],
                 },
-                'resolution': 6,
+                'minimum': 1,
+                'resolution': 2,
             },
         },
         'unit': 'percent',
diff --git a/data/grafana/rows/proc_ram.py b/data/grafana/rows/proc_ram.py
index 7b79fd8..4a92af4 100644
--- a/data/grafana/rows/proc_ram.py
+++ b/data/grafana/rows/proc_ram.py
@@ -9,7 +9,8 @@
                         'memory_rss',
                     ],
                 },
-                'resolution': 6,
+                'minimum': 10*(10**6),
+                'resolution': 2,
             },
         },
         'unit': 'bytes',
diff --git a/nodes/wb.offsite-backups.py b/nodes/wb.offsite-backups.py
index 60a3d23..7c80da8 100644
--- a/nodes/wb.offsite-backups.py
+++ b/nodes/wb.offsite-backups.py
@@ -56,7 +56,7 @@
         },
         'smartctl': {
             '/dev/disk/by-id/ata-TOSHIBA_MG06ACA10TE_61C0A1B1FKQE': {
-                'apm': 32,
+                'apm': 1,
             },
         },
         'zfs': {