diff options
Diffstat (limited to 'glances/plugins/glances_mem.py')
| -rw-r--r-- | glances/plugins/glances_mem.py | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/glances/plugins/glances_mem.py b/glances/plugins/glances_mem.py index cf6ce4c5..6b4ace8c 100644 --- a/glances/plugins/glances_mem.py +++ b/glances/plugins/glances_mem.py @@ -19,10 +19,10 @@ """Virtual memory plugin.""" -import psutil - from glances.plugins.glances_plugin import GlancesPlugin +import psutil + # SNMP OID # Total RAM in machine: .1.3.6.1.4.1.2021.4.5.0 # Total RAM used: .1.3.6.1.4.1.2021.4.6.0 @@ -78,7 +78,7 @@ class Plugin(GlancesPlugin): # Reset stats self.reset() - if self.get_input() == 'local': + if self.input_method == 'local': # Update stats using the standard system lib # Grab MEM using the PSUtil virtual_memory method vm_stats = psutil.virtual_memory() @@ -112,18 +112,18 @@ class Plugin(GlancesPlugin): self.stats['free'] += self.stats['cached'] # used=total-free self.stats['used'] = self.stats['total'] - self.stats['free'] - elif self.get_input() == 'snmp': + elif self.input_method == 'snmp': # Update stats using SNMP - if self.get_short_system_name() in ('windows', 'esxi'): + if self.short_system_name in ('windows', 'esxi'): # Mem stats for Windows|Vmware Esxi are stored in the FS table try: - fs_stat = self.set_stats_snmp(snmp_oid=snmp_oid[self.get_short_system_name()], + fs_stat = self.get_stats_snmp(snmp_oid=snmp_oid[self.short_system_name], bulk=True) except KeyError: self.reset() else: for fs in fs_stat: - # The Physical Memory (Windows) or Real Memory (VmWare) + # The Physical Memory (Windows) or Real Memory (VMware) # gives statistics on RAM usage and availability. if fs in ('Physical Memory', 'Real Memory'): self.stats['total'] = int(fs_stat[fs]['size']) * int(fs_stat[fs]['alloc_unit']) @@ -133,7 +133,7 @@ class Plugin(GlancesPlugin): break else: # Default behavor for others OS - self.stats = self.set_stats_snmp(snmp_oid=snmp_oid['default']) + self.stats = self.get_stats_snmp(snmp_oid=snmp_oid['default']) if self.stats['total'] == '': self.reset() @@ -161,13 +161,13 @@ class Plugin(GlancesPlugin): return self.stats def update_views(self): - """Update stats views""" + """Update stats views.""" # Call the father's method GlancesPlugin.update_views(self) # Add specifics informations # Alert and log - self.views['used']['decoration'] = self.get_alert_log(self.stats['used'], max=self.stats['total']) + self.views['used']['decoration'] = self.get_alert_log(self.stats['used'], maximum=self.stats['total']) # Optional for key in ['active', 'inactive', 'buffers', 'cached']: if key in self.stats: @@ -179,59 +179,59 @@ class Plugin(GlancesPlugin): ret = [] # Only process if stats exist... - if self.stats == {}: + if not self.stats: return ret # Build the string message # Header - msg = '{0:5} '.format(_("MEM")) + msg = '{0:5} '.format('MEM') ret.append(self.curse_add_line(msg, "TITLE")) # Percent memory usage msg = '{0:>7.1%}'.format(self.stats['percent'] / 100) ret.append(self.curse_add_line(msg)) # Active memory usage if 'active' in self.stats: - msg = ' {0:9}'.format(_("active:")) + msg = ' {0:9}'.format('active:') ret.append(self.curse_add_line(msg, optional=self.get_views(key='active', option='optional'))) msg = '{0:>7}'.format(self.auto_unit(self.stats['active'])) ret.append(self.curse_add_line(msg, optional=self.get_views(key='active', option='optional'))) # New line ret.append(self.curse_new_line()) # Total memory usage - msg = '{0:6}'.format(_("total:")) + msg = '{0:6}'.format('total:') ret.append(self.curse_add_line(msg)) msg = '{0:>7}'.format(self.auto_unit(self.stats['total'])) ret.append(self.curse_add_line(msg)) # Inactive memory usage if 'inactive' in self.stats: - msg = ' {0:9}'.format(_("inactive:")) + msg = ' {0:9}'.format('inactive:') ret.append(self.curse_add_line(msg, optional=self.get_views(key='inactive', option='optional'))) msg = '{0:>7}'.format(self.auto_unit(self.stats['inactive'])) ret.append(self.curse_add_line(msg, optional=self.get_views(key='inactive', option='optional'))) # New line ret.append(self.curse_new_line()) # Used memory usage - msg = '{0:6}'.format(_("used:")) + msg = '{0:6}'.format('used:') ret.append(self.curse_add_line(msg)) msg = '{0:>7}'.format(self.auto_unit(self.stats['used'])) ret.append(self.curse_add_line( msg, self.get_views(key='used', option='decoration'))) # Buffers memory usage if 'buffers' in self.stats: - msg = ' {0:9}'.format(_("buffers:")) + msg = ' {0:9}'.format('buffers:') ret.append(self.curse_add_line(msg, optional=self.get_views(key='buffers', option='optional'))) msg = '{0:>7}'.format(self.auto_unit(self.stats['buffers'])) ret.append(self.curse_add_line(msg, optional=self.get_views(key='buffers', option='optional'))) # New line ret.append(self.curse_new_line()) # Free memory usage - msg = '{0:6}'.format(_("free:")) + msg = '{0:6}'.format('free:') ret.append(self.curse_add_line(msg)) msg = '{0:>7}'.format(self.auto_unit(self.stats['free'])) ret.append(self.curse_add_line(msg)) # Cached memory usage if 'cached' in self.stats: - msg = ' {0:9}'.format(_("cached:")) + msg = ' {0:9}'.format('cached:') ret.append(self.curse_add_line(msg, optional=self.get_views(key='cached', option='optional'))) msg = '{0:>7}'.format(self.auto_unit(self.stats['cached'])) ret.append(self.curse_add_line(msg, optional=self.get_views(key='cached', option='optional'))) |