| 105 |
|
sub include_disk() { |
| 106 |
|
|
| 107 |
|
# Run the df program. |
| 108 |
< |
my(@df) = `$dfbin -ak`; |
| 108 |
> |
my(@df) = `$dfbin -akl`; |
| 109 |
|
|
| 110 |
|
# Go through each line of the program, looking for each thing we want. |
| 111 |
|
my($partition_no) = 0; |
| 268 |
|
# The following need to be specified in megabytes. |
| 269 |
|
# If they are preceeded by a G, then multiply by 1024. |
| 270 |
|
|
| 271 |
< |
$top =~ / ([0-9]+?)([KMG]) av/; |
| 271 |
> |
$top =~ /Mem:.*?([0-9]+)([KMG])\s+(av|total)/; |
| 272 |
|
my($real) = $1; |
| 273 |
|
$real*=1024 if $2 eq "G"; |
| 274 |
|
$real/=1024 if $2 eq "K"; |
| 275 |
|
&print_pair(0, "packet.memory.total", int($real)); |
| 276 |
|
|
| 277 |
< |
$top =~ / ([0-9]+?)([KMG]) free/; |
| 277 |
> |
$top =~ /Mem:.*?([0-9]+)([KMG])\s+free/; |
| 278 |
|
my($free) = $1; |
| 279 |
|
$free*=1024 if $2 eq "G"; |
| 280 |
|
$free/=1024 if $2 eq "K"; |
| 281 |
|
&print_pair(0, "packet.memory.free", int($free)); |
| 282 |
|
|
| 283 |
< |
$top =~ /Swap:\s+([0-9]]+?)([KMG]) av/; |
| 283 |
> |
$top =~ /Swap:.*?([0-9]+)([KMG])\s+(av|total)/; |
| 284 |
|
my($swap_total) = $1; |
| 285 |
|
$swap_total*=1024 if $2 eq "G"; |
| 286 |
|
$swap_total/=1024 if $2 eq "K"; |
| 287 |
|
&print_pair(0, "packet.swap.total", int($swap_total)); |
| 288 |
|
|
| 289 |
< |
$top =~ /Swap:.*, ([0-9]+?)([KMG]) free/; |
| 289 |
> |
$top =~ /Swap:.*?([0-9]+)([KMG])\s+free/; |
| 290 |
|
my($swap_free) = $1; |
| 291 |
|
$swap_free*=1024 if $2 eq "G"; |
| 292 |
|
$swap_free/=1024 if $2 eq "K"; |
