Mirrors/Munin-Contrib
1
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2025-07-22 02:51:03 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1122 from shtrom/plugin/docker_improvements

Browse source 
[docker_] Fix a few bugs
This commit is contained in:
Lars Kruse 2020-09-19 02:24:58 +02:00 • committed by GitHub
commit 7f789c47cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/docker/docker_
View file

@ -260,14 +260,13 @@ def parallel_container_stats(client):
def print_containers_cpu(client): def print_containers_cpu(client):
for container, stats in parallel_container_stats(client): for container, stats in parallel_container_stats(client):
cpu_count = len(stats["cpu_stats"]["cpu_usage"]["percpu_usage"])
cpu_percent = 0.0 cpu_percent = 0.0
cpu_delta = (float(stats["cpu_stats"]["cpu_usage"]["total_usage"]) cpu_delta = (float(stats["cpu_stats"]["cpu_usage"]["total_usage"])
- float(stats["precpu_stats"]["cpu_usage"]["total_usage"])) - float(stats["precpu_stats"]["cpu_usage"]["total_usage"]))
system_delta = (float(stats["cpu_stats"]["system_cpu_usage"]) system_delta = (float(stats["cpu_stats"]["system_cpu_usage"])
- float(stats["precpu_stats"]["system_cpu_usage"])) - float(stats["precpu_stats"]["system_cpu_usage"]))
if system_delta > 0.0: if system_delta > 0.0:
cpu_percent = cpu_delta / system_delta * 100.0 * cpu_count cpu_percent = cpu_delta / system_delta * 100.0 * os.cpu_count()
print(container.name + '.value', cpu_percent) print(container.name + '.value', cpu_percent)
print(container.name + '.extinfo', container_attributes(container)) print(container.name + '.extinfo', container_attributes(container))
@ -287,13 +286,13 @@ def print_containers_network(client):
rx_bytes += data['rx_bytes'] rx_bytes += data['rx_bytes']
print(container.name + '_up.value', tx_bytes) print(container.name + '_up.value', tx_bytes)
print(container.name + '_down.value', rx_bytes) print(container.name + '_down.value', rx_bytes)
print(container.name + '.extinfo', container_attributes(container)) print(container.name + '_up.extinfo', container_attributes(container))
def volume_summary(volume): def volume_summary(volume):
summary = f"{volume.short_id}" summary = f"{volume.short_id}"
if volume.attrs['Labels']: if volume.attrs['Labels']:
summary += " ({', '.join(volume.attrs['Labels'])})" summary += f" ({', '.join(volume.attrs['Labels'])})"
return summary return summary