From 6264f2abea00d97b7d6eb4749e182071de9a3d53 Mon Sep 17 00:00:00 2001 From: nicolargo Date: Wed, 1 May 2024 13:42:58 +0200 Subject: [PATCH] Switch to forks of pysnmp as it is unmaintained #2741 --- README.rst | 2 +- glances/plugins/help/__init__.py | 50 ++++++++++++++++--------- glances/plugins/mem/__init__.py | 8 +--- glances/plugins/now/__init__.py | 4 +- glances/plugins/percpu/__init__.py | 5 ++- glances/plugins/plugin/model.py | 10 +++-- glances/plugins/processlist/__init__.py | 2 +- glances/plugins/quicklook/__init__.py | 2 +- glances/plugins/sensors/__init__.py | 2 +- glances/plugins/smart/__init__.py | 2 +- glances/plugins/system/__init__.py | 2 +- glances/snmp.py | 7 +--- optional-requirements.txt | 2 +- 13 files changed, 56 insertions(+), 42 deletions(-) diff --git a/README.rst b/README.rst index 3a751964..617ba122 100644 --- a/README.rst +++ b/README.rst @@ -121,7 +121,7 @@ Optional dependencies: - ``pygal`` (for the graph export module) - ``pymdstat`` (for RAID support) [Linux-only] - ``pymongo`` (for the MongoDB export module) -- ``pysnmp`` (for SNMP support) +- ``pysnmp-lextudio`` (for SNMP support) - ``pySMART.smartx`` (for HDD Smart support) [Linux-only] - ``pyzmq`` (for the ZeroMQ export module) - ``requests`` (for the Ports, Cloud plugins and RESTful export module) diff --git a/glances/plugins/help/__init__.py b/glances/plugins/help/__init__.py index 607d682f..0fe571fa 100644 --- a/glances/plugins/help/__init__.py +++ b/glances/plugins/help/__init__.py @@ -106,30 +106,46 @@ class PluginModel(GlancesPluginModel): ('toggle_linux_percentage', msg_col.format('0', 'Load, Linux/percentage')), ('toggle_cpu_individual_combined', msg_col.format('1', 'CPU, individual/combined')), ('toggle_gpu_individual_combined', msg_col.format('6', 'GPU, individual/combined')), - ('toggle_short_full', - msg_col.format('S', - 'Process names, short/full') if self.args.webserver else msg_col.format('/', 'Process names, short/full')), + ( + 'toggle_short_full', + ( + msg_col.format('S', 'Process names, short/full') + if self.args and self.args.webserver + else msg_col.format('/', 'Process names, short/full') + ), + ), ('header_miscellaneous', msg_header.format('MISCELLANEOUS:')), - ('misc_erase_process_filter', - '' if self.args.webserver else msg_col.format('E', 'Erase process filter')), - ('misc_generate_history_graphs', - '' if self.args.webserver else msg_col.format('g', 'Generate history graphs')), + ( + 'misc_erase_process_filter', + '' if self.args and self.args.webserver else msg_col.format('E', 'Erase process filter'), + ), + ( + 'misc_generate_history_graphs', + '' if self.args and self.args.webserver else msg_col.format('g', 'Generate history graphs'), + ), ('misc_help', msg_col.format('h', 'HELP')), - ('misc_accumulate_processes_by_program', - '' if self.args.webserver else msg_col.format('j', 'Display threads or programs')), + ( + 'misc_accumulate_processes_by_program', + '' if self.args and self.args.webserver else msg_col.format('j', 'Display threads or programs'), + ), ('misc_increase_nice_process', msg_col.format('+', 'Increase nice process')), ('misc_decrease_nice_process', msg_col.format('-', 'Decrease nice process (need admin rights)')), - ('misc_kill_process', - '' if self.args.webserver else msg_col.format('k', 'Kill process')), - ('misc_reset_processes_summary_min_max', - '' if self.args.webserver else msg_col.format('M', 'Reset processes summary min/max')), - ('misc_quit', - '' if self.args.webserver else msg_col.format('q', 'QUIT (or Esc or Ctrl-C)')), + ('misc_kill_process', '' if self.args and self.args.webserver else msg_col.format('k', 'Kill process')), + ( + 'misc_reset_processes_summary_min_max', + '' if self.args and self.args.webserver else msg_col.format('M', 'Reset processes summary min/max'), + ), + ( + 'misc_quit', + '' if self.args and self.args.webserver else msg_col.format('q', 'QUIT (or Esc or Ctrl-C)'), + ), ('misc_reset_history', msg_col.format('r', 'Reset history')), ('misc_delete_warning_alerts', msg_col.format('w', 'Delete warning alerts')), ('misc_delete_warning_and_critical_alerts', msg_col.format('x', 'Delete warning & critical alerts')), - ('misc_edit_process_filter_pattern', - '' if self.args.webserver else ' ENTER: Edit process filter pattern'), + ( + 'misc_edit_process_filter_pattern', + '' if self.args and self.args.webserver else ' ENTER: Edit process filter pattern', + ), ] ) diff --git a/glances/plugins/mem/__init__.py b/glances/plugins/mem/__init__.py index b44181b1..5921b131 100644 --- a/glances/plugins/mem/__init__.py +++ b/glances/plugins/mem/__init__.py @@ -204,12 +204,8 @@ class PluginModel(GlancesPluginModel): self.reset() return self.stats - for key in iterkeys(stats): - if stats[key] != '': - stats[key] = float(stats[key]) * 1024 - - # Use the 'free'/htop calculation - stats['free'] = stats['free'] - stats['total'] + (stats['buffers'] + stats['cached']) + for k in stats: + stats[k] = int(stats[k]) * 1024 # used=total-free stats['used'] = stats['total'] - stats['free'] diff --git a/glances/plugins/now/__init__.py b/glances/plugins/now/__init__.py index 3f997b71..dd88b954 100644 --- a/glances/plugins/now/__init__.py +++ b/glances/plugins/now/__init__.py @@ -53,9 +53,9 @@ class PluginModel(GlancesPluginModel): # Set the message position self.align = 'bottom' - if args.strftime_format: + if args and args.strftime_format: self.strftime = args.strftime_format - elif config is not None: + elif config: if 'global' in config.as_dict(): self.strftime = config.as_dict()['global']['strftime_format'] diff --git a/glances/plugins/percpu/__init__.py b/glances/plugins/percpu/__init__.py index d16ffb45..aa1204e4 100644 --- a/glances/plugins/percpu/__init__.py +++ b/glances/plugins/percpu/__init__.py @@ -108,7 +108,10 @@ class PluginModel(GlancesPluginModel): self.display_curse = True # Manage the maximum number of CPU to display (related to enhancement request #2734) - self.max_cpu_display = config.get_int_value('percpu', 'max_cpu_display', 4) + if config: + self.max_cpu_display = config.get_int_value('percpu', 'max_cpu_display', 4) + else: + self.max_cpu_display = 4 def get_key(self): """Return the key of the list.""" diff --git a/glances/plugins/plugin/model.py b/glances/plugins/plugin/model.py index 5a65d9a0..e711fb3f 100644 --- a/glances/plugins/plugin/model.py +++ b/glances/plugins/plugin/model.py @@ -350,8 +350,10 @@ class GlancesPluginModel(object): ret = {} if bulk: # Bulk request - snmp_result = snmp_client.getbulk_by_oid(0, 10, itervalues(*snmp_oid)) - + snmp_result = snmp_client.getbulk_by_oid(0, + 10, + *list(itervalues(snmp_oid))) + logger.info(snmp_result) if len(snmp_oid) == 1: # Bulk command for only one OID # Note: key is the item indexed but the OID result @@ -379,7 +381,7 @@ class GlancesPluginModel(object): index += 1 else: # Simple get request - snmp_result = snmp_client.get_by_oid(itervalues(*snmp_oid)) + snmp_result = snmp_client.get_by_oid(*list(itervalues(snmp_oid))) # Build the internal dict with the SNMP result for key in iterkeys(snmp_oid): @@ -623,7 +625,7 @@ class GlancesPluginModel(object): """Return the plugin refresh time""" ret = self.get_limits(item='refresh') if ret is None: - ret = self.args.time + ret = self.args.time if hasattr(self.args, 'time') else 2 return ret def get_refresh_time(self): diff --git a/glances/plugins/processlist/__init__.py b/glances/plugins/processlist/__init__.py index ae4b0dcd..e29d2225 100644 --- a/glances/plugins/processlist/__init__.py +++ b/glances/plugins/processlist/__init__.py @@ -194,7 +194,7 @@ class PluginModel(GlancesPluginModel): config.as_dict()['processlist']['export'])) # The default sort key could also be overwrite by command line (see #1903) - if args.sort_processes_key is not None: + if args and args.sort_processes_key is not None: glances_processes.set_sort_key(args.sort_processes_key, False) # Note: 'glances_processes' is already init in the processes.py script diff --git a/glances/plugins/quicklook/__init__.py b/glances/plugins/quicklook/__init__.py index 6cf4ea25..48dd474b 100644 --- a/glances/plugins/quicklook/__init__.py +++ b/glances/plugins/quicklook/__init__.py @@ -92,7 +92,7 @@ class PluginModel(GlancesPluginModel): self.display_curse = True # Manage the maximum number of CPU to display (related to enhancement request #2734) - self.max_cpu_display = config.get_int_value('percpu', 'max_cpu_display', 4) + self.max_cpu_display = config.get_int_value('percpu', 'max_cpu_display', 4) if config else 4 # Define the stats list self.stats_list = self.get_conf_value('list', default=self.DEFAULT_STATS_LIST) diff --git a/glances/plugins/sensors/__init__.py b/glances/plugins/sensors/__init__.py index 35e04678..1eec639c 100644 --- a/glances/plugins/sensors/__init__.py +++ b/glances/plugins/sensors/__init__.py @@ -101,7 +101,7 @@ class PluginModel(GlancesPluginModel): self.display_curse = True # Not necessary to refresh every refresh time - if self.get_refresh() == args.time: + if args and self.get_refresh() == args.time: self.set_refresh(self.get_refresh() * DEFAULT_REFRESH) def get_key(self): diff --git a/glances/plugins/smart/__init__.py b/glances/plugins/smart/__init__.py index 644efa04..f2e33d32 100644 --- a/glances/plugins/smart/__init__.py +++ b/glances/plugins/smart/__init__.py @@ -125,7 +125,7 @@ class PluginModel(GlancesPluginModel): def __init__(self, args=None, config=None, stats_init_value=[]): """Init the plugin.""" # check if user is admin - if not is_admin(): + if not is_admin() and args: disable(args, "smart") logger.debug("Current user is not admin, HDD SMART plugin disabled.") diff --git a/glances/plugins/system/__init__.py b/glances/plugins/system/__init__.py index 8e0e65fe..419d803e 100644 --- a/glances/plugins/system/__init__.py +++ b/glances/plugins/system/__init__.py @@ -132,7 +132,7 @@ class PluginModel(GlancesPluginModel): self.set_refresh(60) # Get the default message (if defined) - self.system_info_msg = config.get_value('system', 'system_info_msg') + self.system_info_msg = config.get_value('system', 'system_info_msg') if config else None @GlancesPluginModel._check_decorator @GlancesPluginModel._log_result_decorator diff --git a/glances/snmp.py b/glances/snmp.py index 368efd19..fb6a6d93 100644 --- a/glances/snmp.py +++ b/glances/snmp.py @@ -41,12 +41,9 @@ class GlancesSNMPClient(object): ret = {} for name, val in varBinds: if str(val) == '': - ret[name.prettyPrint()] = '' + ret[str(name)] = '' else: - ret[name.prettyPrint()] = val.prettyPrint() - # In Python 3, prettyPrint() return 'b'linux'' instead of 'linux' - if ret[name.prettyPrint()].startswith('b\''): - ret[name.prettyPrint()] = ret[name.prettyPrint()][2:-1] + ret[str(name)] = val.prettyPrint() return ret def __get_result__(self, errorIndication, errorStatus, errorIndex, varBinds): diff --git a/optional-requirements.txt b/optional-requirements.txt index 6a92e6f8..37d5dd79 100644 --- a/optional-requirements.txt +++ b/optional-requirements.txt @@ -27,7 +27,7 @@ pygal pymdstat pymongo; python_version >= "3.7" nvidia-ml-py; python_version >= "3.5" -pysnmp +pysnmp-lextudio; python_version >= "3.7" pySMART.smartx python-dateutil pyzmq