286 |
|
close DEF; |
287 |
|
} |
288 |
|
my(@data) = ( "packet.queue.attributes.queue$i:size:GAUGE", |
289 |
< |
"packet.queue.attributes.total:total:GAUGE", |
289 |
> |
"packet.queue.attributes.total:total:COUNTER", |
290 |
|
); |
291 |
|
&updaterrd($machine, "$hash\_$i", $date, $rrdstep, \%xmlhash, @data); |
292 |
|
++$i; |
338 |
|
foreach my $dataitem (@data) { |
339 |
|
if($dataitem =~ /^(\S+):\S+:\S+$/) { |
340 |
|
# pull the values straight out of the xmlhash |
341 |
< |
$updateparams .= ":$xmlhash{$1}"; |
341 |
> |
my($value) = $xmlhash{$1}; |
342 |
> |
# if it's undefined we'll set it to 0 |
343 |
> |
# this probably shouldn't happen, but it'd be best to handle it "nicely" :) |
344 |
> |
$value = "0" if not defined $value; |
345 |
> |
$updateparams .= ":$value"; |
346 |
|
} |
347 |
|
} |
348 |
|
# perform the update |
397 |
|
"RRA:MAX:0.5:60:672", |
398 |
|
# 1m in 1hr samples |
399 |
|
"RRA:AVERAGE:0.5:240:744", |
400 |
< |
"RRA:MAX:0.5:60:744", |
400 |
> |
"RRA:MAX:0.5:240:744", |
401 |
> |
# 1y in 12hr samples |
402 |
> |
"RRA:AVERAGE:0.5:2880:730", |
403 |
> |
"RRA:MAX:0.5:2880:730", |
404 |
|
); |
405 |
|
RRDs::create (@rrdcmd); |
406 |
|
my($err) = RRDs::error; |