Skip to content

Commit

Permalink
Fix CDEF variable substitution
Browse files Browse the repository at this point in the history
The variable name substitution in CDEFs is severely broken in munin 2.0. For instance in `foo.cdef=foo,foo,PREV(foo),+,+` only first `foo` will be replaced by corresponding `afoo` `ifoo` or `gfoo`, and rrdtool will fail to render the graph. Fix handling consecutive variable instances by using regexp lookahead/lookbehind, and extend the regexp to also handle variable name in parentheses, which will fix `PREV()`.
  • Loading branch information
AMDmi3 committed Sep 17, 2018
1 parent 0832b17 commit f046285
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions master/lib/Munin/Master/GraphOld.pm
Expand Up @@ -13,7 +13,7 @@ feature propper object orientation like munin-update and will have to
wait until later.
Copyright (C) 2002-2010 Jimmy Olsen, Audun Ytterdal, Kjell Magne
Øierud, Nicolai Langfeldt, Linpro AS, Redpill Linpro AS and others.
Øierud, Nicolai Langfeldt, Linpro AS, Redpill Linpro AS and others.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
Expand Down Expand Up @@ -1793,9 +1793,9 @@ sub expand_cdef {
my $fieldname = munin_get_node_name($field);
my $rrdname = &orig_to_cdef($service, $fieldname);
if ($cdef =~ /\b$fieldname\b/) {
$max =~ s/([,=])$fieldname([,=]|$)/$1a$rrdname$2/g;
$min =~ s/([,=])$fieldname([,=]|$)/$1i$rrdname$2/g;
$avg =~ s/([,=])$fieldname([,=]|$)/$1g$rrdname$2/g;
$max =~ s/(?<=[,=(])$fieldname(?=[,=)]|$)/a$rrdname/g;
$min =~ s/(?<=[,=(])$fieldname(?=[,=)]|$)/i$rrdname/g;
$avg =~ s/(?<=[,=(])$fieldname(?=[,=)]|$)/g$rrdname/g;
}
}

Expand Down

0 comments on commit f046285

Please sign in to comment.