2
0
mirror of https://github.com/munin-monitoring/contrib.git synced 2018-11-08 00:59:34 +01:00

Merge pull request #662 from farrokhi/master

Fix fieldname matching and correctly draw inout graphs [pf_table_ plugin]
This commit is contained in:
sumpfralle 2016-10-17 00:45:21 +02:00 committed by GitHub
commit 9d14b92df4

View File

@ -113,19 +113,18 @@ if ( defined($ARGV[0])) {
print "in.label in\n";
print "in.type DERIVE\n";
print "in.draw AREASTACK\n";
print "in.draw AREA\n";
print "in.colour C00000\n";
print "in.cdef in,8,*\n";
print "in.min 0\n";
print "in.graph no\n";
print "out.label out\n";
print "out.label bps\n";
print "out.type DERIVE\n";
print "out.negative in\n";
print "out.draw AREASTACK\n";
print "out.colour 0000C0\n";
print "out.draw AREA\n";
print "out.colour COLOUR18\n";
print "out.cdef out,8,*\n";
print "out.min 0\n";
print "out.graph no\n";
foreach my $field (qw(in out)) {
print_thresholds($field);
@ -191,9 +190,10 @@ sub tables {
foreach (split(/\n/, $output)) {
if (m|^[cpairhC\-]{7}\s+(\w+)$|) {
if (m|^[cpairhC\-]{7}\s+(\S+)$|) {
$name = $1;
$tables{$name}->{"name"} = $1;
$name =~ s/\-/_/;
$tables{$name}->{"name"} = $name;
next;
}