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

docker_cpu: fix data for container names starting with numbers

Browse source
This commit is contained in:
Andreas Perhab 2020-07-23 17:08:26 +02:00 • committed by Lars Kruse
parent a1cff256cd
commit 0853d409f3
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/docker/docker_cpu
View file

@ -62,10 +62,13 @@ for my $i (1 .. $#containers)
my @fields = split / +/, $containers[$i]; my @fields = split / +/, $containers[$i];
my $id = $fields[0]; my $id = $fields[0];
my $name = $fields[$#fields]; my $name = $fields[$#fields];
my $label = $name;
# manage container name containing arithmetic operators and dots. E.g, my-container. # manage container name containing arithmetic operators and dots. E.g, my-container.
$name =~ s/[-\+*\/\.]/_/g; $name =~ s/[-\+*\/\.]/_/g;
# truncate container name with "," character. # truncate container name with "," character.
$name =~ s/,.*//g; $name =~ s/,.*//g;
# prefix if container starts with 0-9
$name =~ s/^([0-9])/c$1/;
if (open(my $file, '<', "/sys/fs/cgroup/cpuacct/docker/$id/cpuacct.usage")) if (open(my $file, '<', "/sys/fs/cgroup/cpuacct/docker/$id/cpuacct.usage"))
{ {
my $total_cpu_ns = <$file>; my $total_cpu_ns = <$file>;
@ -75,7 +78,7 @@ for my $i (1 .. $#containers)
{ {
my @ncpu = split / /, <$file>; my @ncpu = split / /, <$file>;
close $file; close $file;
push @result, {'name'=>$name, 'total_cpu_ns'=>$total_cpu_ns, 'ncpu'=>$#ncpu}; push @result, {'name'=>$name, 'label'=>$label, 'total_cpu_ns'=>$total_cpu_ns, 'ncpu'=>$#ncpu};
} }
} }
} }
@ -100,7 +103,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config")
foreach(@result) foreach(@result)
{ {
print "$$_{'name'}.label $$_{'name'}\n"; print "$$_{'name'}.label $$_{'label'}\n";
print "$$_{'name'}.draw LINE2\n"; print "$$_{'name'}.draw LINE2\n";
print "$$_{'name'}.min 0\n"; print "$$_{'name'}.min 0\n";
print "$$_{'name'}.type DERIVE\n"; print "$$_{'name'}.type DERIVE\n";