nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-11-24 13:23:12 +03:00
Code Issues Projects Releases Wiki Activity

Done for network

Browse Source
This commit is contained in:
nicolargo 2024-02-10 17:19:24 +01:00
parent bd5e297a0e
commit 255b57a18a
8 changed files with 153 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/glances.conf
View File

@ -179,7 +179,7 @@ tx_careful=70
tx_warning=80
tx_critical=90
# Define the list of hidden network interfaces (comma-separated regexp)
#hide=docker.*,lo
hide=docker.*,lo
# Define the list of wireless network interfaces to be show (comma-separated)
#show=docker.*
# It is possible to overwrite the bitrate thresholds per interface

10
glances/outputs/glances_stdout_apidoc.py
View File

@ -134,6 +134,7 @@ def print_plugin_description(plugin, stat):
# For each plugins with a description
print('Fields descriptions:')
print('')
time_since_update = False
for field, description in iteritems(stat.fields_description):
print(
'* **{}**: {} (unit is *{}*)'.format(
@ -147,6 +148,7 @@ def print_plugin_description(plugin, stat):
)
)
if 'rate' in description and description['rate']:
time_since_update = True
print('* **{}**: {} (unit is *{}* per second)'.format(
field + '_rate_per_sec',
(description['description'][:-1]
@ -165,6 +167,14 @@ def print_plugin_description(plugin, stat):
if 'unit' in description
else 'None'
))
if time_since_update:
print('* **{}**: {} (unit is *{}*)'.format(
'time_since_update',
'Number of seconds since last update',
'seconds'
))
print('')
else:
logger.error('No fields_description variable defined for plugin {}'.format(plugin))

25
glances/outputs/static/js/components/plugin-network.vue
View File

@ -17,24 +17,24 @@
<span class="hidden-lg">{{ $filters.minSize(network.ifname) }}</span>
</div>
<div class="table-cell" v-show="!args.network_cumul && !args.network_sum">
{{ args.byte ? $filters.bytes(network.rx / network.time_since_update) : $filters.bits(network.rx / network.time_since_update) }}
{{ args.byte ? $filters.bytes(network.bytes_recv_rate_per_sec) : $filters.bits(network.bytes_recv_rate_per_sec) }}
</div>
<div class="table-cell" v-show="!args.network_cumul && !args.network_sum">
{{ args.byte ? $filters.bytes(network.tx / network.time_since_update) : $filters.bits(network.tx / network.time_since_update) }}
{{ args.byte ? $filters.bytes(network.bytes_sent_rate_per_sec) : $filters.bits(network.bytes_sent_rate_per_sec) }}
</div>
<div class="table-cell" v-show="!args.network_cumul && args.network_sum"></div>
<div class="table-cell" v-show="!args.network_cumul && args.network_sum">
{{ args.byte ? $filters.bytes(network.cx / network.time_since_update) : $filters.bits(network.cx / network.time_since_update) }}
{{ args.byte ? $filters.bytes(network.bytes_all_rate_per_sec) : $filters.bits(network.bytes_all_rate_per_sec) }}
</div>
<div class="table-cell" v-show="args.network_cumul && !args.network_sum">
{{ args.byte ? $filters.bytes(network.cumulativeRx) : $filters.bits(network.cumulativeRx) }}
{{ args.byte ? $filters.bytes(network.bytes_recv) : $filters.bits(network.bytes_recv) }}
</div>
<div class="table-cell" v-show="args.network_cumul && !args.network_sum">
{{ args.byte ? $filters.bytes(network.cumulativeTx) : $filters.bits(network.cumulativeTx) }}
{{ args.byte ? $filters.bytes(network.bytes_sent) : $filters.bits(network.bytes_sent) }}
</div>
<div class="table-cell" v-show="args.network_cumul && args.network_sum"></div>
<div class="table-cell" v-show="args.network_cumul && args.network_sum">
{{ args.byte ? $filters.bytes(network.cumulativeCx) : $filters.bits(network.cumulativeCx) }}
{{ args.byte ? $filters.bytes(network.bytes_all) : $filters.bits(network.bytes_all) }}
</div>
</div>
</section>
@ -69,13 +69,12 @@ export default {
const network = {
interfaceName: networkData['interface_name'],
ifname: alias ? alias : networkData['interface_name'],
rx: networkData['rx'],
tx: networkData['tx'],
cx: networkData['cx'],
time_since_update: networkData['time_since_update'],
cumulativeRx: networkData['cumulative_rx'],
cumulativeTx: networkData['cumulative_tx'],
cumulativeCx: networkData['cumulative_cx']
bytes_recv_rate_per_sec: networkData['bytes_recv_rate_per_sec'],
bytes_sent_rate_per_sec: networkData['bytes_sent_rate_per_sec'],
bytes_all_rate_per_sec: networkData['bytes_all_rate_per_sec'],
bytes_recv: networkData['bytes_recv'],
bytes_sent: networkData['bytes_sent'],
bytes_all: networkData['bytes_all']
};
return network;

2
glances/outputs/static/public/glances.js vendored
View File

File diff suppressed because one or more lines are too long

3
glances/plugins/cpu/__init__.py
View File

@ -291,6 +291,9 @@ class PluginModel(GlancesPluginModel):
self.views[key]['decoration'] = self.get_alert(self.stats[key], header=key)
# Alert only but depend on Core number
for key in ['ctx_switches']:
# Skip alert if no timespan to measure
if self.stats.get('time_since_update', 0) == 0:
continue
if key in self.stats:
self.views[key]['decoration'] = self.get_alert(
self.stats[key], maximum=100 * self.stats['cpucore'], header=key

10
glances/plugins/diskio/__init__.py
View File

@ -46,7 +46,7 @@ fields_description = {
'description': 'Number of bytes written.',
'rate': True,
'unit': 'byte',
}
},
}
# Define the history items list
@ -100,16 +100,14 @@ class PluginModel(GlancesPluginModel):
# Init new stats
stats = self.get_init_value()
# Update the stats
if self.input_method == 'local':
stats = self.update_local()
elif self.input_method == 'snmp':
# Update stats using SNMP
# No standard way for the moment...
stats = self.get_init_value()
else:
stats = self.get_init_value()
pass
# Update the stats
self.stats = stats
return stats
@ -134,7 +132,7 @@ class PluginModel(GlancesPluginModel):
continue
# Filter stats to keep only the fields we want (define in fields_description)
# It will also convert psutil.sdiskio to a standard Python dict
# It will also convert psutil objects to a standard Python dict
stat = self.filter_stats(disk_stat)
# Add the key

284
glances/plugins/network/__init__.py
View File

@ -10,54 +10,37 @@
"""Network plugin."""
from __future__ import unicode_literals
import base64
from glances.timer import getTimeSinceLastUpdate
from glances.plugins.plugin.model import GlancesPluginModel
from glances.logger import logger
import psutil
# {'interface_name': 'mpqemubr0-dummy',
# 'alias': None,
# 'time_since_update': 2.081636428833008,
# 'cumulative_rx': 0,
# 'rx': 0, 'cumulative_tx': 0, 'tx': 0, 'cumulative_cx': 0, 'cx': 0,
# 'is_up': False,
# 'speed': 0,
# 'key': 'interface_name'}
# Fields description
# description: human readable description
# short_name: shortname to use un UI
# unit: unit type
# rate: if True then compute and add *_gauge and *_rate_per_is fields
# min_symbol: Auto unit should be used if value > than 1 'X' (K, M, G)...
fields_description = {
'interface_name': {
'description': 'Interface name.',
'unit': 'string'
'description': 'Interface name.'
},
'alias': {
'description': 'Interface alias name (optional).',
'unit': 'string'
'description': 'Interface alias name (optional).'
},
'rx': {
'description': 'The received/input rate.',
'unit': 'bitpersecond'
},
'tx': {
'description': 'The sent/output rate.',
'unit': 'bitpersecond'
},
'cx': {
'description': 'The cumulative received+sent rate.',
'unit': 'bitpersecond'
},
'cumulative_rx': {
'description': 'The number of bytes received through the interface (cumulative).',
'bytes_recv': {
'description': 'Number of bytes received.',
'rate': True,
'unit': 'byte',
},
'cumulative_tx': {
'description': 'The number of bytes sent through the interface (cumulative).',
'unit': 'byte'
'bytes_sent': {
'description': 'Number of bytes sent.',
'rate': True,
'unit': 'byte',
},
'cumulative_cx': {
'description': 'The cumulative number of bytes reveived and sent through the interface (cumulative).',
'bytes_all': {
'description': 'Number of bytes received and sent.',
'rate': True,
'unit': 'byte',
},
'speed': {
@ -67,11 +50,7 @@ fields_description = {
'is_up': {
'description': 'Is the interface up ?',
'unit': 'bool'
},
'time_since_update': {
'description': 'Number of seconds since last update.',
'unit': 'seconds'
},
}
}
# SNMP OID
@ -80,15 +59,23 @@ fields_description = {
snmp_oid = {
'default': {
'interface_name': '1.3.6.1.2.1.2.2.1.2',
'cumulative_rx': '1.3.6.1.2.1.2.2.1.10',
'cumulative_tx': '1.3.6.1.2.1.2.2.1.16',
'bytes_recv': '1.3.6.1.2.1.2.2.1.10',
'bytes_sent': '1.3.6.1.2.1.2.2.1.16',
}
}
# Define the history items list
items_history_list = [
{'name': 'rx', 'description': 'Download rate per second', 'y_unit': 'bit/s'},
{'name': 'tx', 'description': 'Upload rate per second', 'y_unit': 'bit/s'},
{
'name': 'bytes_recv_rate_per_sec',
'description': 'Download rate per second',
'y_unit': 'B/s'
},
{
'name': 'bytes_sent_rate_per_sec',
'description': 'Upload rate per second',
'y_unit': 'B/s'
},
]
@ -116,7 +103,7 @@ class PluginModel(GlancesPluginModel):
self.hide_zero = config.get_bool_value(self.plugin_name, 'hide_zero', default=False)
else:
self.hide_zero = False
self.hide_zero_fields = ['rx', 'tx']
self.hide_zero_fields = ['bytes_recv', 'bytes_sent']
# Force a first update because we need two update to have the first stat
self.update()
@ -133,13 +120,28 @@ class PluginModel(GlancesPluginModel):
:return: list of stats dict (one dict per interface)
"""
# Init new stats
if self.input_method == 'local':
stats = self.update_local()
else:
stats = self.get_init_value()
if self.input_method == 'local':
# Update the stats
self.stats = stats
return self.stats
@GlancesPluginModel._manage_rate
def update_local(self):
# Update stats using the standard system lib
stats = self.get_init_value()
# Grab network interface stat using the psutil net_io_counter method
# Example:
# { 'veth4cbf8f0a': snetio(
# bytes_sent=102038421, bytes_recv=1263258,
# packets_sent=25046, packets_recv=14114,
# errin=0, errout=0, dropin=0, dropout=0), ... }
try:
net_io_counters = psutil.net_io_counters(pernic=True)
except UnicodeDecodeError as e:
@ -148,6 +150,10 @@ class PluginModel(GlancesPluginModel):
# Grab interface's status (issue #765)
# Grab interface's speed (issue #718)
# Example:
# { 'veth4cbf8f0a': snicstats(
# isup=True, duplex=<NicDuplex.NIC_DUPLEX_FULL: 2>,
# speed=10000, mtu=1500, flags='up,broadcast,running,multicast'), ... }
net_status = {}
try:
net_status = psutil.net_if_stats()
@ -155,130 +161,36 @@ class PluginModel(GlancesPluginModel):
# see psutil #797/glances #1106
logger.debug('Can not get network interface status ({})'.format(e))
# Previous network interface stats are stored in the network_old variable
if not hasattr(self, 'network_old'):
# First call, we init the network_old var
try:
self.network_old = net_io_counters
except (IOError, UnboundLocalError):
pass
return self.stats
# By storing time data we enable Rx/s and Tx/s calculations in the
# XML/RPC API, which would otherwise be overly difficult work
# for users of the API
time_since_update = getTimeSinceLastUpdate('net')
# Loop over interfaces
network_new = net_io_counters
for net in network_new:
for interface_name, interface_stat in net_io_counters.items():
# Do not take hidden interface into account
# or KeyError: 'eth0' when interface is not connected #1348
if not self.is_display(net) or net not in net_status:
if not self.is_display(interface_name) or interface_name not in net_status:
continue
try:
cumulative_rx = network_new[net].bytes_recv
cumulative_tx = network_new[net].bytes_sent
cumulative_cx = cumulative_rx + cumulative_tx
rx = cumulative_rx - self.network_old[net].bytes_recv
tx = cumulative_tx - self.network_old[net].bytes_sent
cx = rx + tx
netstat = {
'interface_name': net,
'alias': self.has_alias(net),
'time_since_update': time_since_update,
'cumulative_rx': cumulative_rx,
'rx': rx,
'cumulative_tx': cumulative_tx,
'tx': tx,
'cumulative_cx': cumulative_cx,
'cx': cx,
# Interface status
'is_up': net_status[net].isup,
# Filter stats to keep only the fields we want (define in fields_description)
# It will also convert psutil objects to a standard Python dict
stat = self.filter_stats(interface_stat)
stat.update(self.filter_stats(net_status[interface_name]))
# Add the key
stat['key'] = self.get_key()
# Add disk name
stat['interface_name'] = interface_name
# Add alias define in the configuration file
stat['alias'] = self.has_alias(interface_name)
# Add sent + revc stats
stat['bytes_all'] = stat['bytes_sent'] + stat['bytes_recv']
# Interface speed in Mbps, convert it to bps
# Can be always 0 on some OSes
'speed': net_status[net].speed * 1048576,
# Set the key for the dict
'key': self.get_key(),
}
except KeyError:
continue
else:
# Append the interface stats to the list
stats.append(netstat)
stat['speed'] = stat['speed'] * 1048576
# Save stats to compute next bitrate
self.network_old = network_new
stats.append(stat)
elif self.input_method == 'snmp':
# Update stats using SNMP
# SNMP bulk command to get all network interface in one shot
try:
net_io_counters = self.get_stats_snmp(snmp_oid=snmp_oid[self.short_system_name], bulk=True)
except KeyError:
net_io_counters = self.get_stats_snmp(snmp_oid=snmp_oid['default'], bulk=True)
# Previous network interface stats are stored in the network_old variable
if not hasattr(self, 'network_old'):
# First call, we init the network_old var
try:
self.network_old = net_io_counters
except (IOError, UnboundLocalError):
pass
else:
# See description in the 'local' block
time_since_update = getTimeSinceLastUpdate('net')
# Loop over interfaces
network_new = net_io_counters
for net in network_new:
# Do not take hidden interface into account
if not self.is_display(net):
continue
try:
# Windows: a tips is needed to convert HEX to TXT
# http://blogs.technet.com/b/networking/archive/2009/12/18/how-to-query-the-list-of-network-interfaces-using-snmp-via-the-ifdescr-counter.aspx
if self.short_system_name == 'windows':
try:
interface_name = str(base64.b16decode(net[2:-2].upper()))
except TypeError:
interface_name = net
else:
interface_name = net
cumulative_rx = float(network_new[net]['cumulative_rx'])
cumulative_tx = float(network_new[net]['cumulative_tx'])
cumulative_cx = cumulative_rx + cumulative_tx
rx = cumulative_rx - float(self.network_old[net]['cumulative_rx'])
tx = cumulative_tx - float(self.network_old[net]['cumulative_tx'])
cx = rx + tx
netstat = {
'interface_name': interface_name,
'alias': self.has_alias(interface_name),
'time_since_update': time_since_update,
'cumulative_rx': cumulative_rx,
'rx': rx,
'cumulative_tx': cumulative_tx,
'tx': tx,
'cumulative_cx': cumulative_cx,
'cx': cx,
}
except KeyError:
continue
else:
netstat['key'] = self.get_key()
stats.append(netstat)
# Save stats to compute next bitrate
self.network_old = network_new
# Update the stats
self.stats = stats
return self.stats
return stats
def update_views(self):
"""Update stats views."""
@ -291,27 +203,29 @@ class PluginModel(GlancesPluginModel):
# Add specifics information
# Alert
for i in self.get_raw():
if i['time_since_update'] == 0:
# Skip alert if no timespan to measure
if 'bytes_recv_rate_per_sec' not in i or 'bytes_sent_rate_per_sec' not in i:
continue
if_real_name = i['interface_name'].split(':')[0]
# Convert rate in bps (to be able to compare to interface speed)
bps_rx = int(i['rx'] // i['time_since_update'] * 8)
bps_tx = int(i['tx'] // i['time_since_update'] * 8)
# Convert rate to bps (to be able to compare to interface speed)
bps_rx = int(i['bytes_recv_rate_per_sec'] * 8)
bps_tx = int(i['bytes_sent_rate_per_sec'] * 8)
# Decorate the bitrate with the configuration file thresholds
if_real_name = i['interface_name'].split(':')[0]
alert_rx = self.get_alert(bps_rx, header=if_real_name + '_rx')
alert_tx = self.get_alert(bps_tx, header=if_real_name + '_tx')
# If nothing is define in the configuration file...
# ... then use the interface speed (not available on all systems)
if alert_rx == 'DEFAULT' and 'speed' in i and i['speed'] != 0:
alert_rx = self.get_alert(current=bps_rx, maximum=i['speed'], header='rx')
if alert_tx == 'DEFAULT' and 'speed' in i and i['speed'] != 0:
alert_tx = self.get_alert(current=bps_tx, maximum=i['speed'], header='tx')
# then decorates
self.views[i[self.get_key()]]['rx']['decoration'] = alert_rx
self.views[i[self.get_key()]]['tx']['decoration'] = alert_tx
self.views[i[self.get_key()]]['bytes_recv']['decoration'] = alert_rx
self.views[i[self.get_key()]]['bytes_sent']['decoration'] = alert_tx
def msg_curse(self, args=None, max_width=None):
"""Return the dict to display in the curse interface."""
@ -384,35 +298,35 @@ class PluginModel(GlancesPluginModel):
unit = 'b'
if args.network_cumul:
rx = self.auto_unit(int(i['cumulative_rx'] * to_bit)) + unit
tx = self.auto_unit(int(i['cumulative_tx'] * to_bit)) + unit
sx = self.auto_unit(int(i['cumulative_rx'] * to_bit) + int(i['cumulative_tx'] * to_bit)) + unit
rx = self.auto_unit(int(i['bytes_recv'] * to_bit)) + unit
tx = self.auto_unit(int(i['bytes_sent'] * to_bit)) + unit
ax = self.auto_unit(int(i['bytes_all'] * to_bit)) + unit
else:
rx = self.auto_unit(int(i['rx'] // i['time_since_update'] * to_bit)) + unit
tx = self.auto_unit(int(i['tx'] // i['time_since_update'] * to_bit)) + unit
sx = (
self.auto_unit(
int(i['rx'] // i['time_since_update'] * to_bit)
+ int(i['tx'] // i['time_since_update'] * to_bit)
)
+ unit
)
rx = self.auto_unit(int(i['bytes_recv_rate_per_sec'] * to_bit)) + unit
tx = self.auto_unit(int(i['bytes_sent_rate_per_sec'] * to_bit)) + unit
ax = self.auto_unit(int(i['bytes_all_rate_per_sec'] * to_bit)) + unit
# New line
ret.append(self.curse_new_line())
msg = '{:{width}}'.format(if_name, width=name_max_width)
ret.append(self.curse_add_line(msg))
if args.network_sum:
msg = '{:>14}'.format(sx)
msg = '{:>14}'.format(ax)
ret.append(self.curse_add_line(msg))
else:
msg = '{:>7}'.format(rx)
ret.append(
self.curse_add_line(msg, self.get_views(item=i[self.get_key()], key='rx', option='decoration'))
self.curse_add_line(msg,
self.get_views(item=i[self.get_key()],
key='bytes_recv',
option='decoration'))
)
msg = '{:>7}'.format(tx)
ret.append(
self.curse_add_line(msg, self.get_views(item=i[self.get_key()], key='tx', option='decoration'))
self.curse_add_line(msg,
self.get_views(item=i[self.get_key()],
key='bytes_sent',
option='decoration'))
)
return ret

1
glances/plugins/plugin/model.py
View File

@ -1239,6 +1239,7 @@ class GlancesPluginModel(object):
# For all the field with the rate=True flag
if 'rate' in self.fields_description[field] and self.fields_description[field]['rate'] is True:
# Create a new metadata with the gauge
stat['time_since_update'] = self.time_since_last_update
stat[field + '_gauge'] = stat[field]
if field + '_gauge' in stat_previous:
# The stat becomes the delta between the current and the previous value