From 178c812a7cca17fa2e8c60527198d0f0d728e08e Mon Sep 17 00:00:00 2001
From: CroneKorkN <i@ckn.li>
Date: Tue, 30 Dec 2025 12:25:23 +0100
Subject: [PATCH] data/grafana/rows/routeros_errors.py: fixes and optimizations

---
 data/grafana/flux.mako               |  2 ++
 data/grafana/rows/routeros_errors.py | 24 ++++++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/data/grafana/flux.mako b/data/grafana/flux.mako
index 0adf9b2..f2c37cb 100644
--- a/data/grafana/flux.mako
+++ b/data/grafana/flux.mako
@@ -13,6 +13,8 @@ from(bucket: "${bucket}")
 % endif
 % if function == 'derivative':
   |> derivative(nonNegative: true)
+% elif function == 'difference':
+  |> difference(nonNegative: true)
 % endif
 % if boolean_to_int:
   |> map(fn: (r) => ({r with _value: if r._value == true then 1 else 0 }))
diff --git a/data/grafana/rows/routeros_errors.py b/data/grafana/rows/routeros_errors.py
index d36beb9..79d90e5 100644
--- a/data/grafana/rows/routeros_errors.py
+++ b/data/grafana/rows/routeros_errors.py
@@ -11,11 +11,12 @@
                     ],
                     'operating_system': 'routeros',
                 },
-                'function': 'derivative',
+                'function': 'difference',
+                'over': 0,
             },
             'mikrotik': {
                 'filters': {
-                    '_measurement': 'interface_mikrotik',
+                    '_measurement': 'interface_errors',
                     '_field': [
                         'rx_fcs_errors',
                         'rx_align_errors',
@@ -30,13 +31,14 @@
                     ],
                     'operating_system': 'routeros',
                 },
-                'function': 'derivative',
+                'function': 'difference',
+                'over': 0,
             },
         },
         'min': 0,
-        'unit': 'pps',
+        'unit': 'cps',
         'tooltip': 'multi',
-        'display_name': '${__field.name} ${__field.labels.ifName}',
+        'display_name': '${__field.name} ${__field.labels.ifName} ${__field.labels.ifAlias}',
         'legend': {
             'displayMode': 'table',
             'placement': 'right',
@@ -57,11 +59,12 @@
                     ],
                     'operating_system': 'routeros',
                 },
-                'function': 'derivative',
+                'function': 'difference',
+                'over': 0,
             },
             'mikrotik': {
                 'filters': {
-                    '_measurement': 'interface_mikrotik',
+                    '_measurement': 'interface_errors',
                     '_field': [
                         'rx_too_short',
                         'rx_too_long',
@@ -75,13 +78,14 @@
                     ],
                     'operating_system': 'routeros',
                 },
-                'function': 'derivative',
+                'function': 'difference',
+                'over': 0,
             },
         },
         'min': 0,
-        'unit': 'pps',
+        'unit': 'cps',
         'tooltip': 'multi',
-        'display_name': '${__field.name} ${__field.labels.ifName}',
+        'display_name': '${__field.name} ${__field.labels.ifName} ${__field.labels.ifAlias}',
         'legend': {
             'displayMode': 'table',
             'placement': 'right',