data/grafana/rows/routeros_errors.py: fixes and optimizations

bin/wireguard-client-config

@@ -4,20 +4,21 @@ from bundlewrap.repo import Repository
 from os.path import realpath, dirname
 from sys import argv
 from ipaddress import ip_network, ip_interface
+import argparse
 
-if len(argv) != 3:
-    print(f'usage: {argv[0]} <node> <client>')
-    exit(1)
 
+# get info from repo
 repo = Repository(dirname(dirname(realpath(__file__))))
-server_node = repo.get_node(argv[1])
+server_node = repo.get_node('htz.mails')
+available_clients = server_node.metadata.get('wireguard/clients').keys()
 
-if argv[2] not in server_node.metadata.get('wireguard/clients'):
-    print(f'client {argv[2]} not found in: {server_node.metadata.get("wireguard/clients").keys()}')
-    exit(1)
-
-data = server_node.metadata.get(f'wireguard/clients/{argv[2]}')
+# parse args
+parser = argparse.ArgumentParser(description='Generate WireGuard client configuration.')
+parser.add_argument('client', choices=available_clients, help='The client name to generate the configuration for.')
+args = parser.parse_args()
 
+# get cert
+data = server_node.metadata.get(f'wireguard/clients/{args.client}')
 vpn_network = ip_interface(server_node.metadata.get('wireguard/my_ip')).network
 allowed_ips = [
     vpn_network,
@@ -43,10 +44,15 @@ Endpoint = {ip_interface(server_node.metadata.get('network/external/ipv4')).ip}:
 PersistentKeepalive = 10
 '''
 
-print('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
-print(conf)
-print('<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<')
-
-if input("print qrcode? [Yn]: ").upper() in ['', 'Y']:
-    import pyqrcode
-    print(pyqrcode.create(conf).terminal(quiet_zone=1))
+answer = input("print config or qrcode? [Cq]: ").strip().upper()
+match answer:
+    case '' | 'C':
+        print('>>>>>>>>>>>>>>>')
+        print(conf)
+        print('<<<<<<<<<<<<<<<')
+    case 'Q':
+        import pyqrcode
+        print(pyqrcode.create(conf).terminal(quiet_zone=1))
+    case _:
+        print(f'Invalid option "{answer}".')
+        exit(1)

bundles/routeros-monitoring/metadata.py

@@ -181,6 +181,13 @@ def routeros_monitoring_telegraf_inputs(metadata):
                                             "is_tag": True,
                                         },
 
+                                        # join IF-MIB for better labels
+                                        {
+                                            "name": "ifAlias",
+                                            "oid": "IF-MIB::ifAlias",
+                                            "is_tag": True,
+                                        },
+
                                         # =========================
                                         # Physical layer (L1/L2)
                                         # =========================

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 }))

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',