290 |
|
&updaterrd($machine, "users", $date, $rrdstep, \%xmlhash, @data); |
291 |
|
|
292 |
|
# paging |
293 |
< |
@data = ( "packet.pages.swapins:swapins:GAUGE", |
294 |
< |
"packet.pages.swapouts:swapouts:GAUGE", |
293 |
> |
@data = ( "packet.pages.pageins:pageins:GAUGE", |
294 |
> |
"packet.pages.pageouts:pageouts:GAUGE", |
295 |
|
); |
296 |
|
&updaterrd($machine, "paging", $date, $rrdstep, \%xmlhash, @data); |
297 |
|
|
301 |
|
my($mount) = $xmlhash{"packet.disk.p$i.attributes.mount"}; |
302 |
|
$mount =~ s/_/$hex_underscore/g; |
303 |
|
$mount =~ s/\//$hex_slash/g; |
304 |
< |
@data = ( "packet.disk.p$i.attributes.kbytes:kbytes:GAUGE", |
304 |
> |
@data = ( "packet.disk.p$i.attributes.total:total:GAUGE", |
305 |
|
"packet.disk.p$i.attributes.used:used:GAUGE", |
306 |
|
"packet.disk.p$i.attributes.totalinodes:totalinodes:GAUGE", |
307 |
|
"packet.disk.p$i.attributes.freeinodes:freeinodes:GAUGE", |
308 |
|
); |
309 |
|
&updaterrd($machine, "disk-$mount", $date, $rrdstep, \%xmlhash, @data); |
310 |
|
++$i; |
311 |
+ |
} |
312 |
+ |
|
313 |
+ |
# diskio |
314 |
+ |
$i = 0; |
315 |
+ |
while(defined $xmlhash{"packet.diskio.p$i.attributes.name"}) { |
316 |
+ |
my($name) = $xmlhash{"packet.diskio.p$i.attributes.name"}; |
317 |
+ |
@data = ( "packet.diskio.p$i.attributes.rbytes:rbytes:GAUGE", |
318 |
+ |
"packet.diskio.p$i.attributes.wbytes:wbytes:GAUGE", |
319 |
+ |
); |
320 |
+ |
&updaterrd($machine, "diskio-$name", $date, $rrdstep, \%xmlhash, @data); |
321 |
+ |
++$i |
322 |
+ |
} |
323 |
+ |
|
324 |
+ |
# net |
325 |
+ |
$i = 0; |
326 |
+ |
while(defined $xmlhash{"packet.net.p$i.attributes.name"}) { |
327 |
+ |
my($name) = $xmlhash{"packet.net.p$i.attributes.name"}; |
328 |
+ |
@data = ( "packet.net.p$i.attributes.rx:rx:GAUGE", |
329 |
+ |
"packet.net.p$i.attributes.tx:tx:GAUGE", |
330 |
+ |
); |
331 |
+ |
&updaterrd($machine, "net-$name", $date, $rrdstep, \%xmlhash, |
332 |
+ |
@data); |
333 |
+ |
++$i |
334 |
|
} |
335 |
|
} |
336 |
|
|