mirrors
/
munin-contrib
mirror of https://github.com/munin-monitoring/contrib.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

docker_: sanitize value container names 

docker_ plugin sanitized container names when printing config but
not values which led to a disparity resulting in no data on graphs
for all containers whose names are subject to sanitization. (#1212)
This commit is contained in:
Daniel Neugebauer 2021-05-01 13:56:07 +02:00 committed by Lars Kruse
parent ae7a2f6c65
commit 51af0be02b
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/docker/docker_
View File

@ -298,8 +298,9 @@ def print_containers_cpu(client):
- float(stats["precpu_stats"]["system_cpu_usage"]))
if system_delta > 0.0:
cpu_percent = cpu_delta / system_delta * 100.0 * os.cpu_count()
print(container.name + '.value', cpu_percent)
print(container.name + '.extinfo', container_attributes(container))
clean_container_name = clean_fieldname(container.name)
print(clean_container_name + '.value', cpu_percent)
print(clean_container_name + '.extinfo', container_attributes(container))
def print_containers_memory(client):
@ -310,8 +311,9 @@ def print_containers_memory(client):
else:
memory_usage = stats['memory_stats']['usage']
extinfo = 'Total memory usage'
print(container.name + '.value', memory_usage)
print(container.name + '.extinfo', container_attributes(container, extinfo))
clean_container_name = clean_fieldname(container.name)
print(clean_container_name + '.value', memory_usage)
print(clean_container_name + '.extinfo', container_attributes(container, extinfo))
def print_containers_network(client):
@ -321,9 +323,10 @@ def print_containers_network(client):
for data in stats['networks'].values():
tx_bytes += data['tx_bytes']
rx_bytes += data['rx_bytes']
print(container.name + '_up.value', tx_bytes)
print(container.name + '_down.value', rx_bytes)
print(container.name + '_up.extinfo', container_attributes(container))
clean_container_name = clean_fieldname(container.name)
print(clean_container_name + '_up.value', tx_bytes)
print(clean_container_name + '_down.value', rx_bytes)
print(clean_container_name + '_up.extinfo', container_attributes(container))
def volume_summary(volume):