From 130d20f6a99beb99b5370ed108732a15a4ce6440 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sun, 30 Mar 2008 20:00:45 +0200 Subject: [PATCH] collection.cgi: Make sure to pass valid variable names to rrdgraph. Variable names used with DEF, VDEF, etc. must be made up of the characters "A-Z, a-z, 0-9, -, _". In meta_graph_generic_stack() variable names have been generated from the instance name which may, however, contain illegal characters. Now, all illegal characters will be replaced with "_" and a number will be prepended to the variable name to make sure the name is still unique. Thanks to Joerg Jaspert for pointing this out and helpful debugging information. Signed-off-by: Sebastian Harl Signed-off-by: Florian Forster --- contrib/collection.cgi | 45 ++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/contrib/collection.cgi b/contrib/collection.cgi index 4d1ec894..e82388b0 100755 --- a/contrib/collection.cgi +++ b/contrib/collection.cgi @@ -2463,12 +2463,21 @@ sub meta_graph_generic_stack @RRDDefaultArgs, @{$opts->{'rrd_opts'}}); my $max_inst_name = 0; + my @vnames = (); + + for ($i = 0; $i < @$sources; $i++) + { + my $tmp = $sources->[$i]->{'name'}; + $tmp =~ tr/A-Za-z0-9\-_/_/c; + $vnames[$i] = $i . $tmp; + } for ($i = 0; $i < @$sources; $i++) { my $inst_data = $sources->[$i]; my $inst_name = $inst_data->{'name'} || confess; my $file = $inst_data->{'file'} || confess; + my $vname = $vnames[$i]; if (length ($inst_name) > $max_inst_name) { @@ -2478,27 +2487,23 @@ sub meta_graph_generic_stack confess ("No such file: $file") if (!-e $file); push (@cmd, - qq#DEF:${inst_name}_min=$file:value:MIN#, - qq#DEF:${inst_name}_avg=$file:value:AVERAGE#, - qq#DEF:${inst_name}_max=$file:value:MAX#, - qq#CDEF:${inst_name}_nnl=${inst_name}_avg,UN,0,${inst_name}_avg,IF#); + qq#DEF:${vname}_min=$file:value:MIN#, + qq#DEF:${vname}_avg=$file:value:AVERAGE#, + qq#DEF:${vname}_max=$file:value:MAX#, + qq#CDEF:${vname}_nnl=${vname}_avg,UN,0,${vname}_avg,IF#); } { - my $inst_data = $sources->[@$sources - 1]; - my $inst_name = $inst_data->{'name'}; + my $vname = $vnames[@vnames - 1]; - push (@cmd, qq#CDEF:${inst_name}_stk=${inst_name}_nnl#); + push (@cmd, qq#CDEF:${vname}_stk=${vname}_nnl#); } for (my $i = 1; $i < @$sources; $i++) { - my $inst_data0 = $sources->[@$sources - ($i + 1)]; - my $inst_data1 = $sources->[@$sources - $i]; - - my $inst_name0 = $inst_data0->{'name'}; - my $inst_name1 = $inst_data1->{'name'}; + my $vname0 = $vnames[@vnames - ($i + 1)]; + my $vname1 = $vnames[@vnames - $i]; - push (@cmd, qq#CDEF:${inst_name0}_stk=${inst_name0}_nnl,${inst_name1}_stk,+#); + push (@cmd, qq#CDEF:${vname0}_stk=${vname0}_nnl,${vname1}_stk,+#); } for (my $i = 0; $i < @$sources; $i++) @@ -2506,6 +2511,8 @@ sub meta_graph_generic_stack my $inst_data = $sources->[$i]; my $inst_name = $inst_data->{'name'}; + my $vname = $vnames[$i]; + my $legend = sprintf ('%-*s', $max_inst_name, $inst_name); my $line_color; @@ -2525,12 +2532,12 @@ sub meta_graph_generic_stack } $area_color = _color_to_string (_get_faded_color ($area_color)); - push (@cmd, qq(AREA:${inst_name}_stk#$area_color), - qq(LINE1:${inst_name}_stk#$line_color:$legend), - qq(GPRINT:${inst_name}_min:MIN:$number_format Min,), - qq(GPRINT:${inst_name}_avg:AVERAGE:$number_format Avg,), - qq(GPRINT:${inst_name}_max:MAX:$number_format Max,), - qq(GPRINT:${inst_name}_avg:LAST:$number_format Last\\l), + push (@cmd, qq(AREA:${vname}_stk#$area_color), + qq(LINE1:${vname}_stk#$line_color:$legend), + qq(GPRINT:${vname}_min:MIN:$number_format Min,), + qq(GPRINT:${vname}_avg:AVERAGE:$number_format Avg,), + qq(GPRINT:${vname}_max:MAX:$number_format Max,), + qq(GPRINT:${vname}_avg:LAST:$number_format Last\\l), ); } -- 2.30.2