greatbody
/
glances
mirror of https://github.com/nicolargo/glances
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

If the container name is lon, then display the start, not the end - Related to #1732

pull/2144/head
nicolargo 2022-09-25 17:52:20 +02:00
parent 28c6589280
commit 7849b9b991
3 changed files with 48 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glances/outputs/static/js/components/plugin-docker.vue
View File

@ -9,7 +9,7 @@
<div class="table-cell">Uptime</div> <div class="table-cell">Uptime</div>
<div class="table-cell">CPU%</div> <div class="table-cell">CPU%</div>
<div class="table-cell">MEM</div> <div class="table-cell">MEM</div>
<div class="table-cell">RSS</div> <div class="table-cell">/MAX</div>
<div class="table-cell">IOR/s</div> <div class="table-cell">IOR/s</div>
<div class="table-cell">IOW/s</div> <div class="table-cell">IOW/s</div>
<div class="table-cell">RX/s</div> <div class="table-cell">RX/s</div>
@ -35,7 +35,7 @@
{{ $filters.bytes(container.memory) }} {{ $filters.bytes(container.memory) }}
</div> </div>
<div class="table-cell"> <div class="table-cell">
{{ $filters.bytes(container.rss) }} {{ $filters.bytes(container.limit) }}
</div> </div>
<div class="table-cell"> <div class="table-cell">
{{ $filters.bits(container.ior / container.io_time_since_update) }} {{ $filters.bits(container.ior / container.io_time_since_update) }}
@ -78,14 +78,14 @@ export default {
'uptime': containerData.Uptime, 'uptime': containerData.Uptime,
'cpu': containerData.cpu.total, 'cpu': containerData.cpu.total,
'memory': containerData.memory.usage != undefined ? containerData.memory.usage : '?', 'memory': containerData.memory.usage != undefined ? containerData.memory.usage : '?',
'rss': containerData.memory.rss != undefined ? containerData.memory.rss : '?', 'limit': containerData.memory.limit != undefined ? containerData.memory.limit : '?',
'ior': containerData.io.ior != undefined ? containerData.io.ior : '?', 'ior': containerData.io.ior != undefined ? containerData.io.ior : '?',
'iow': containerData.io.iow != undefined ? containerData.io.iow : '?', 'iow': containerData.io.iow != undefined ? containerData.io.iow : '?',
'io_time_since_update': containerData.io.time_since_update, 'io_time_since_update': containerData.io.time_since_update,
'rx': containerData.network.rx != undefined ? containerData.network.rx : '?', 'rx': containerData.network.rx != undefined ? containerData.network.rx : '?',
'tx': containerData.network.tx != undefined ? containerData.network.tx : '?', 'tx': containerData.network.tx != undefined ? containerData.network.tx : '?',
'net_time_since_update': containerData.network.time_since_update, 'net_time_since_update': containerData.network.time_since_update,
'command': containerData.Command, 'command': containerData.Command.join(' '),
'image': containerData.Image 'image': containerData.Image
}; };
}); });

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

File diff suppressed because one or more lines are too long

47
glances/plugins/glances_docker.py
View File

@ -206,7 +206,7 @@ class Plugin(GlancesPlugin):
for container in containers: for container in containers:
if container.id not in self.thread_list: if container.id not in self.thread_list:
# Thread did not exist in the internal dict # Thread did not exist in the internal dict
# Create it and add it to the internal dict # Create it, add it to the internal dict and start it
logger.debug( logger.debug(
"{} plugin - Create thread for container {}".format(self.plugin_name, container.id[:12]) "{} plugin - Create thread for container {}".format(self.plugin_name, container.id[:12])
) )
@ -234,10 +234,8 @@ class Plugin(GlancesPlugin):
container_stats = {} container_stats = {}
# The key is the container name and not the Id # The key is the container name and not the Id
container_stats['key'] = self.get_key() container_stats['key'] = self.get_key()
# Export name (first name in the Names list, without the /) # Export name
container_stats['name'] = nativestr(container.name) container_stats['name'] = nativestr(container.name)
# Export global Names (used by the WebUI)
container_stats['Names'] = [nativestr(container.name)]
# Container Id # Container Id
container_stats['Id'] = container.id container_stats['Id'] = container.id
# Container Image # Container Image
@ -556,15 +554,15 @@ class Plugin(GlancesPlugin):
ret.append(self.curse_add_line(msg)) ret.append(self.curse_add_line(msg))
msg = '{:>7}'.format('MEM') msg = '{:>7}'.format('MEM')
ret.append(self.curse_add_line(msg)) ret.append(self.curse_add_line(msg))
msg = '{:>7}'.format('/MAX') msg = '/{:<7}'.format('MAX')
ret.append(self.curse_add_line(msg)) ret.append(self.curse_add_line(msg))
msg = '{:>7}'.format('IOR/s') msg = '{:>7}'.format('IOR/s')
ret.append(self.curse_add_line(msg)) ret.append(self.curse_add_line(msg))
msg = '{:>7}'.format('IOW/s') msg = ' {:<7}'.format('IOW/s')
ret.append(self.curse_add_line(msg)) ret.append(self.curse_add_line(msg))
msg = '{:>7}'.format('Rx/s') msg = '{:>7}'.format('Rx/s')
ret.append(self.curse_add_line(msg)) ret.append(self.curse_add_line(msg))
msg = '{:>7}'.format('Tx/s') msg = ' {:<7}'.format('Tx/s')
ret.append(self.curse_add_line(msg)) ret.append(self.curse_add_line(msg))
msg = ' {:8}'.format('Command') msg = ' {:8}'.format('Command')
ret.append(self.curse_add_line(msg)) ret.append(self.curse_add_line(msg))
@ -596,19 +594,24 @@ class Plugin(GlancesPlugin):
msg = '{:>7}'.format('_') msg = '{:>7}'.format('_')
ret.append(self.curse_add_line(msg, self.get_views(item=container['name'], key='mem', option='decoration'))) ret.append(self.curse_add_line(msg, self.get_views(item=container['name'], key='mem', option='decoration')))
try: try:
msg = '{:>7}'.format(self.auto_unit(container['memory']['limit'])) msg = '/{:<7}'.format(self.auto_unit(container['memory']['limit']))
except KeyError: except KeyError:
msg = '{:>7}'.format('_') msg = '/{:<7}'.format('_')
ret.append(self.curse_add_line(msg)) ret.append(self.curse_add_line(msg))
# IO R/W # IO R/W
unit = 'B' unit = 'B'
for r in ['ior', 'iow']:
try: try:
value = self.auto_unit(int(container['io'][r] // container['io']['time_since_update'])) + unit value = self.auto_unit(int(container['io']['ior'] // container['io']['time_since_update'])) + unit
msg = '{:>7}'.format(value) msg = '{:>7}'.format(value)
except KeyError: except KeyError:
msg = '{:>7}'.format('_') msg = '{:>7}'.format('_')
ret.append(self.curse_add_line(msg)) ret.append(self.curse_add_line(msg))
try:
value = self.auto_unit(int(container['io']['iow'] // container['io']['time_since_update'])) + unit
msg = ' {:<7}'.format(value)
except KeyError:
msg = ' {:<7}'.format('_')
ret.append(self.curse_add_line(msg))
# NET RX/TX # NET RX/TX
if args.byte: if args.byte:
# Bytes per second (for dummy) # Bytes per second (for dummy)
@ -618,18 +621,26 @@ class Plugin(GlancesPlugin):
# Bits per second (for real network administrator | Default) # Bits per second (for real network administrator | Default)
to_bit = 8 to_bit = 8
unit = 'b' unit = 'b'
for r in ['rx', 'tx']:
try: try:
value = ( value = (
self.auto_unit( self.auto_unit(
int(container['network'][r] // container['network']['time_since_update'] * to_bit) int(container['network']['rx'] // container['network']['time_since_update'] * to_bit)
) ) + unit
+ unit
) )
msg = '{:>7}'.format(value) msg = '{:>7}'.format(value)
except KeyError: except KeyError:
msg = '{:>7}'.format('_') msg = '{:>7}'.format('_')
ret.append(self.curse_add_line(msg)) ret.append(self.curse_add_line(msg))
try:
value = (
self.auto_unit(
int(container['network']['tx'] // container['network']['time_since_update'] * to_bit)
) + unit
)
msg = ' {:<7}'.format(value)
except KeyError:
msg = ' {:<7}'.format('_')
ret.append(self.curse_add_line(msg))
# Command # Command
if container['Command'] is not None: if container['Command'] is not None:
msg = ' {}'.format(' '.join(container['Command'])) msg = ' {}'.format(' '.join(container['Command']))
@ -641,11 +652,7 @@ class Plugin(GlancesPlugin):
def _msg_name(self, container, max_width): def _msg_name(self, container, max_width):
"""Build the container name.""" """Build the container name."""
name = container['name'] name = container['name'][:max_width]
if len(name) > max_width:
name = '_' + name[-max_width + 1 :]
else:
name = name[:max_width]
return ' {:{width}}'.format(name, width=max_width) return ' {:{width}}'.format(name, width=max_width)
def container_alert(self, status): def container_alert(self, status):