akpw · byteit101 · Oct 4, 2024 · Oct 4, 2024 · Oct 5, 2024 · Oct 5, 2024
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/README.md b/README.md
@@ -95,6 +95,7 @@ The default configuration file comes with a sample configuration, making it easy
 
     poe = True                      # POE metrics
     monitor = True                  # Interface monitor metrics
+    monitor_sfp_unplugged = False   # Interface monitor metrics for unplugged SFP/SFP+ ports
     netwatch = True                 # Netwatch metrics
     public_ip = True                # Public IP metrics
     wireless = True                 # WLAN general metrics
@@ -473,4 +474,4 @@ mktxp is running as pid 36704
 
 **Running Tests**
 - TDB
-- Run via: `$ python setup.py test`
+- Run via: `$ python setup.py test`
diff --git a/deploy/kubernetes/secret.yaml b/deploy/kubernetes/secret.yaml
@@ -5,7 +5,7 @@ metadata:
 type: Opaque
 stringData:
     _mktxp.conf: |
-        ## Copyright (c) 2020 Arseniy Kuznetsov
+        ## Copyright (c) 2024 Arseniy Kuznetsov
         ##
         ## This program is free software; you can redistribute it and/or
         ## modify it under the terms of the GNU General Public License
@@ -39,7 +39,7 @@ stringData:
 
             compact_default_conf_values = False  # Compact mktxp.conf, so only specific values are kept on the individual routers' level
     mktxp.conf: |
-        ## Copyright (c) 2020 Arseniy Kuznetsov
+        ## Copyright (c) 2024 Arseniy Kuznetsov
         ##
         ## This program is free software; you can redistribute it and/or
         ## modify it under the terms of the GNU General Public License
@@ -92,6 +92,7 @@ stringData:
 
             poe = True                      # POE metrics
             monitor = True                  # Interface monitor metrics
+            monitor_sfp_unplugged = False   # Interface monitor metrics for unplugged SFP/SFP+ ports
             netwatch = True                 # Netwatch metrics
             public_ip = True                # Public IP metrics
             wireless = True                 # WLAN general metrics

diff --git a/mktxp/cli/checks/chk_pv.py b/mktxp/cli/checks/chk_pv.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/mktxp/cli/config/_mktxp.conf b/mktxp/cli/config/_mktxp.conf
@@ -1,4 +1,4 @@
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/mktxp/cli/config/config.py b/mktxp/cli/config/config.py
@@ -1,5 +1,5 @@
 # coding=utf8
-# Copyright (c) 2020 Arseniy Kuznetsov
+# Copyright (c) 2024 Arseniy Kuznetsov
 ##
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -89,6 +89,7 @@ class MKTXPConfigKeys:
     FE_IPV6_NEIGHBOR_KEY = 'ipv6_neighbor'
 
     FE_MONITOR_KEY = 'monitor'
+    FE_MONITOR_SFP_UNPLUGGED_KEY = 'monitor_sfp_unplugged'
     FE_WIRELESS_KEY = 'wireless'
     FE_WIRELESS_CLIENTS_KEY = 'wireless_clients'
     FE_CAPSMAN_KEY = 'capsman'
@@ -162,7 +163,7 @@ class MKTXPConfigKeys:
 
     BOOLEAN_KEYS_NO = {ENABLED_KEY, SSL_KEY, NO_SSL_CERTIFICATE, FE_CHECK_FOR_UPDATES, FE_KID_CONTROL_DEVICE, FE_KID_CONTROL_DYNAMIC,
                        SSL_CERTIFICATE_VERIFY, FE_IPV6_ROUTE_KEY, FE_IPV6_DHCP_POOL_KEY, FE_IPV6_FIREWALL_KEY, FE_IPV6_NEIGHBOR_KEY, FE_CONNECTION_STATS_KEY, FE_BGP_KEY,
-                       FE_IPSEC_KEY, FE_LTE_KEY, FE_SWITCH_PORT_KEY, FE_ROUTING_STATS_KEY, FE_CERTIFICATE_KEY}
+                       FE_IPSEC_KEY, FE_LTE_KEY, FE_MONITOR_SFP_UNPLUGGED_KEY, FE_SWITCH_PORT_KEY, FE_ROUTING_STATS_KEY, FE_CERTIFICATE_KEY}
 
     # Feature keys enabled by default
     BOOLEAN_KEYS_YES = {PLAINTEXT_LOGIN_KEY, FE_DHCP_KEY, FE_PACKAGE_KEY, FE_DHCP_LEASE_KEY, FE_IP_CONNECTIONS_KEY, FE_INTERFACE_KEY, 
@@ -189,7 +190,7 @@ class ConfigEntry:
                                                        MKTXPConfigKeys.USER_KEY, MKTXPConfigKeys.PASSWD_KEY,
                                                        MKTXPConfigKeys.SSL_KEY, MKTXPConfigKeys.NO_SSL_CERTIFICATE, MKTXPConfigKeys.SSL_CERTIFICATE_VERIFY, MKTXPConfigKeys.PLAINTEXT_LOGIN_KEY,
                                                        MKTXPConfigKeys.FE_DHCP_KEY, MKTXPConfigKeys.FE_PACKAGE_KEY, MKTXPConfigKeys.FE_DHCP_LEASE_KEY, MKTXPConfigKeys.FE_INTERFACE_KEY,
-                                                       MKTXPConfigKeys.FE_MONITOR_KEY, MKTXPConfigKeys.FE_WIRELESS_KEY, MKTXPConfigKeys.FE_WIRELESS_CLIENTS_KEY,
+                                                       MKTXPConfigKeys.FE_MONITOR_KEY, MKTXPConfigKeys.FE_MONITOR_SFP_UNPLUGGED_KEY, MKTXPConfigKeys.FE_WIRELESS_KEY, MKTXPConfigKeys.FE_WIRELESS_CLIENTS_KEY,
                                                        MKTXPConfigKeys.FE_IP_CONNECTIONS_KEY, MKTXPConfigKeys.FE_CONNECTION_STATS_KEY, MKTXPConfigKeys.FE_CAPSMAN_KEY, MKTXPConfigKeys.FE_CAPSMAN_CLIENTS_KEY, MKTXPConfigKeys.FE_POE_KEY, 
                                                        MKTXPConfigKeys.FE_NETWATCH_KEY, MKTXPConfigKeys.MKTXP_USE_COMMENTS_OVER_NAMES, MKTXPConfigKeys.FE_PUBLIC_IP_KEY,
                                                        MKTXPConfigKeys.FE_ROUTE_KEY, MKTXPConfigKeys.FE_DHCP_POOL_KEY, MKTXPConfigKeys.FE_FIREWALL_KEY, MKTXPConfigKeys.FE_NEIGHBOR_KEY,

diff --git a/mktxp/cli/config/mktxp.conf b/mktxp/cli/config/mktxp.conf
@@ -1,4 +1,4 @@
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License
@@ -51,6 +51,7 @@
 
     poe = True                      # POE metrics
     monitor = True                  # Interface monitor metrics
+    monitor_sfp_unplugged = False   # Interface monitor metrics for unplugged SFP/SFP+ ports
     netwatch = True                 # Netwatch metrics
     public_ip = True                # Public IP metrics
     wireless = True                 # WLAN general metrics

diff --git a/mktxp/cli/dispatch.py b/mktxp/cli/dispatch.py
@@ -1,6 +1,6 @@
 #!.usr/bin/env python
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License
@@ -101,6 +101,9 @@ def print(self, args):
         elif args['conn_stats']:
             OutputProcessor.conn_stats(args['entry_name'])
 
+        elif args['interface_stats']:
+            OutputProcessor.interface_stats(args['entry_name'])
+
         else:
             print("Select metric option(s) to print out, or run 'mktxp print -h' to find out more")
 

diff --git a/mktxp/cli/options.py b/mktxp/cli/options.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License
@@ -149,6 +149,10 @@ def parse_commands(self, parser):
                 help = "IP connections stats",
                 action = 'store_true')
 
+        optional_args_group.add_argument('-if', '--interface_stats', dest='interface_stats',
+                help = "Interface stats",
+                action = 'store_true')
+
 
     # Options checking
     def _check_args(self, args, parser):

diff --git a/mktxp/cli/output/capsman_out.py b/mktxp/cli/output/capsman_out.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/mktxp/cli/output/conn_stats_out.py b/mktxp/cli/output/conn_stats_out.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/mktxp/cli/output/dhcp_out.py b/mktxp/cli/output/dhcp_out.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/mktxp/cli/output/interface_stats_out.py b/mktxp/cli/output/interface_stats_out.py
@@ -0,0 +1,42 @@
+# coding=utf8
+## Copyright (c) 2024 Arseniy Kuznetsov
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License
+## as published by the Free Software Foundation; either version 2
+## of the License, or (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+
+from mktxp.flow.processor.output import BaseOutputProcessor
+from mktxp.datasource.interface_ds import InterfaceMonitorMetricsDataSource
+
+
+class InterfaceStatsOutput:
+    ''' Interface Stats Output
+    '''
+    @staticmethod
+    def clients_summary(router_entry):
+        monitor_labels = ['status', 'rate', 'full_duplex', 'name', 'sfp_temperature', 'sfp_module_present', 'sfp_wavelength', 'sfp_tx_power', 'sfp_rx_power', 'sfp_supply_voltage', 'sfp_tx_bias_current', 'sfp_rx_loss', 'sfp_tx_fault']
+        monitor_records = InterfaceMonitorMetricsDataSource.metric_records(router_entry, metric_labels = monitor_labels, add_router_id = False, running_only = not router_entry.config_entry.monitor_sfp_unplugged)
+        if not monitor_records:
+            print('No monitor stats records')
+            return
+
+        output_records_cnt = 0
+        output_entry = BaseOutputProcessor.OutputInterfaceStatsEntry
+        output_table = BaseOutputProcessor.output_table(output_entry)
+
+        for record in monitor_records:
+            output_table.add_row(output_entry(**record))
+            output_table.add_row(output_entry())
+            output_records_cnt += 1
+
+        print (output_table.draw())
+
+        print(f'Total interfaces: {output_records_cnt}')
+
diff --git a/mktxp/cli/output/wifi_out.py b/mktxp/cli/output/wifi_out.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/mktxp/collector/bandwidth_collector.py b/mktxp/collector/bandwidth_collector.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/mktxp/collector/base_collector.py b/mktxp/collector/base_collector.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/mktxp/collector/bgp_collector.py b/mktxp/collector/bgp_collector.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/mktxp/collector/capsman_collector.py b/mktxp/collector/capsman_collector.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/mktxp/collector/certificate_collector.py b/mktxp/collector/certificate_collector.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/mktxp/collector/connection_collector.py b/mktxp/collector/connection_collector.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/mktxp/collector/dhcp_collector.py b/mktxp/collector/dhcp_collector.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/mktxp/collector/firewall_collector.py b/mktxp/collector/firewall_collector.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/mktxp/collector/health_collector.py b/mktxp/collector/health_collector.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/mktxp/collector/identity_collector.py b/mktxp/collector/identity_collector.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/mktxp/collector/interface_collector.py b/mktxp/collector/interface_collector.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/mktxp/collector/ipsec_collector.py b/mktxp/collector/ipsec_collector.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/mktxp/collector/kid_control_device_collector.py b/mktxp/collector/kid_control_device_collector.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/mktxp/collector/lte_collector.py b/mktxp/collector/lte_collector.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/mktxp/collector/mktxp_collector.py b/mktxp/collector/mktxp_collector.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/mktxp/collector/monitor_collector.py b/mktxp/collector/monitor_collector.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License
@@ -25,17 +25,19 @@ def collect(router_entry):
         if not router_entry.config_entry.monitor:
             return
 
-        monitor_labels = ['status', 'rate', 'full_duplex', 'name', 'sfp_temperature', 'sfp_module_present', 'sfp_wavelength', 'sfp_tx_power', 'sfp_rx_power']
+        monitor_labels = ['status', 'rate', 'full_duplex', 'name', 'sfp_temperature', 'sfp_module_present', 'sfp_wavelength', 'sfp_tx_power', 'sfp_rx_power', 'sfp_supply_voltage', 'sfp_tx_bias_current', 'sfp_rx_loss', 'sfp_tx_fault']
         translation_table = {
                 'status': lambda value: '1' if value=='link-ok' else '0',
                 'rate': lambda value: MonitorCollector._rates(value) if value else '0',
                 'full_duplex': lambda value: '1' if value=='true' else '0',
                 'name': lambda value: value if value else '',
                 'sfp_module_present': lambda value: '1' if value=='true' else '0',
+                'sfp_rx_loss': lambda value: '1' if value=='true' else '0',
+                'sfp_tx_fault': lambda value: '1' if value=='true' else '0',
                 'sfp_temperature': lambda value: value if value else '0'
                 }
         monitor_records = InterfaceMonitorMetricsDataSource.metric_records(router_entry, metric_labels = monitor_labels, 
-                                                                                        translation_table=translation_table, include_comments = True)   
+                                                                                        translation_table=translation_table, include_comments = True, running_only = not router_entry.config_entry.monitor_sfp_unplugged)
         if monitor_records:
             monitor_status_metrics = BaseCollector.gauge_collector('interface_status', 'Current interface link status', monitor_records, 'status', ['name'])
             yield monitor_status_metrics
@@ -55,6 +57,10 @@ def collect(router_entry):
                 yield BaseCollector.gauge_collector('interface_sfp_wavelength', 'Current SFP Wavelength',sfp_metrics, 'sfp_wavelength', ['name'])
                 yield BaseCollector.gauge_collector('interface_sfp_tx_power', 'Current SFP TX Power', sfp_metrics, 'sfp_tx_power', ['name'])
                 yield BaseCollector.gauge_collector('interface_sfp_rx_power', 'Current SFP RX Power', sfp_metrics, 'sfp_rx_power', ['name'])
+                yield BaseCollector.gauge_collector('interface_sfp_supply_voltage', 'Current SFP Supply Voltage', sfp_metrics, 'sfp_supply_voltage', ['name'])
+                yield BaseCollector.gauge_collector('interface_sfp_tx_bias_current', 'Current SFP TX Bias Current', sfp_metrics, 'sfp_tx_bias_current', ['name'])
+                yield BaseCollector.gauge_collector('interface_sfp_tx_fault', 'Current SFP Suffering TX fault', sfp_metrics, 'sfp_tx_fault', ['name'])
+                yield BaseCollector.gauge_collector('interface_sfp_rx_loss', 'Current SFP Suffering RX loss', sfp_metrics, 'sfp_rx_loss', ['name'])
 
 
     @staticmethod

diff --git a/mktxp/collector/neighbor_collector.py b/mktxp/collector/neighbor_collector.py
@@ -1,5 +1,5 @@
 # coding=utf8
-# Copyright (c) 2020 Arseniy Kuznetsov
+# Copyright (c) 2024 Arseniy Kuznetsov
 ##
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/mktxp/collector/netwatch_collector.py b/mktxp/collector/netwatch_collector.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/mktxp/collector/package_collector.py b/mktxp/collector/package_collector.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/mktxp/collector/poe_collector.py b/mktxp/collector/poe_collector.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

diff --git a/mktxp/collector/pool_collector.py b/mktxp/collector/pool_collector.py
@@ -1,5 +1,5 @@
 # coding=utf8
-## Copyright (c) 2020 Arseniy Kuznetsov
+## Copyright (c) 2024 Arseniy Kuznetsov
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License