###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2008 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2005-2010 IPFire Team #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
my %color = ();
my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
-&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color);
-my @querry = split(/\?/,$ENV{'QUERY_STRING'});
-$querry[0] = '' unless defined $querry[0];
-$querry[1] = 'hour' unless defined $querry[1];
+&Header::showhttpheaders();
+&Header::openpage($Lang::tr{'memory information'}, 1, '');
+&Header::openbigbox('100%', 'left');
-if ( $querry[0] =~ "memory"){
- print "Content-type: image/png\n\n";
- binmode(STDOUT);
- &Graphs::updatememorygraph($querry[1]);
-}elsif ( $querry[0] =~ "swap"){
- print "Content-type: image/png\n\n";
- binmode(STDOUT);
- &Graphs::updateswapgraph($querry[1]);
-}else{
- &Header::showhttpheaders();
- &Header::openpage($Lang::tr{'memory information'}, 1, '');
- &Header::openbigbox('100%', 'left');
-
- &Header::openbox('100%', 'center', "Memory $Lang::tr{'graph'}");
- &Graphs::makegraphbox("memory.cgi","memory","day");
- &Header::closebox();
+&Header::openbox('100%', 'center', "Memory $Lang::tr{'graph'}");
+&Graphs::makegraphbox("memory.cgi","memory","day");
+&Header::closebox();
+if (-f "$mainsettings{'RRDLOG'}/collectd/localhost/swap") {
&Header::openbox('100%', 'center', "Swap $Lang::tr{'graph'}");
&Graphs::makegraphbox("memory.cgi","swap","day");
&Header::closebox();
-
- &Header::openbox('100%', 'center', $Lang::tr{'memory'});
- print "<table width='95%' cellspacing='5'>";
- my $ram=0;
- my $size=0;
- my $used=0;
- my $free=0;
- my $percent=0;
- my $shared=0;
- my $buffers=0;
- my $cached=0;
+}
- open(FREE,'/usr/bin/free |');
- while(<FREE>){
- if ($_ =~ m/^\s+total\s+used\s+free\s+shared\s+buffers\s+cached$/ ){
- print <<END
+&Header::openbox('100%', 'center', $Lang::tr{'memory'});
+print "<table width='95%' cellspacing='5'>";
+my $size=0;
+my $used=0;
+my $free=0;
+my $percent=0;
+my $shared=0;
+my $buffers=0;
+my $cached=0;
+my $available=0;
+
+# output format: kibibytes, wide mode (buffers and cache in two columns)
+open(my $cmd_fh, "-|", '/usr/bin/free -k -w') or die $!;
+while(<$cmd_fh>){
+ if ($_ =~ m/^\s+total\s+used\s+free\s+shared\s+buffers\s+cache\s+available$/ ){
+ print <<END
<tr>
-<td align='center'> </td>
-<td align='center' class='boldbase'><b>$Lang::tr{'size'}</b></td>
-<td align='center' class='boldbase'><b>$Lang::tr{'used'}</b></td>
-<td align='center' class='boldbase'><b>$Lang::tr{'free'}</b></td>
-<td align='left' class='boldbase' colspan='2'><b>$Lang::tr{'percentage'}</b></td>
+ <td align='center'> </td>
+ <td align='center' class='boldbase'><b>$Lang::tr{'size'}</b></td>
+ <td align='center' class='boldbase'><b>$Lang::tr{'used'}</b></td>
+ <td align='center' class='boldbase'><b>$Lang::tr{'free'}</b></td>
+ <td align='left' class='boldbase' colspan='2'><b>$Lang::tr{'percentage'}</b></td>
</tr>
END
;
- }else{
- if ($_ =~ m/^Mem:\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)$/){
- ($ram,$size,$used,$free,$shared,$buffers,$cached) = ($1,$1,$2,$3,$4,$5,$6);
- ($percent = ($used/$size)*100) =~ s/^(\d+)(\.\d+)?$/$1%/;
- print <<END
+ }else{
+ if ($_ =~ m/^Mem:\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)$/){
+ ($size,$used,$free,$shared,$buffers,$cached,$available) = ($1,$2,$3,$4,$5,$6,$7);
+ ($percent = ($used/$size)*100) =~ s/^(\d+)(\.\d+)?$/$1%/;
+ print <<END
<tr>
-<td class='boldbase'><b>$Lang::tr{'ram'}</b></td>
-<td align='center'>$size KB</td>
+ <td class='boldbase'><b>$Lang::tr{'ram'}</b></td>
END
;
- }elsif($_ =~ m/^Swap:\s+(\d+)\s+(\d+)\s+(\d+)$/){
- ($size,$used,$free) = ($1,$2,$3);
- if ($size != 0){
- ($percent = ($used/$size)*100) =~ s/^(\d+)(\.\d+)?$/$1%/;
- }else{
- ($percent = '');
- }
- print <<END
+ }elsif($_ =~ m/^Swap:\s+(\d+)\s+(\d+)\s+(\d+)$/){
+ ($size,$used,$free) = ($1,$2,$3);
+ if ($size != 0){
+ ($percent = ($used/$size)*100) =~ s/^(\d+)(\.\d+)?$/$1%/;
+ }else{
+ ($percent = '');
+ }
+ print <<END
<tr>
-<td class='boldbase'><b>$Lang::tr{'swap'}</b></td>
-<td align='center'>$size KB</td>
+ <td class='boldbase'><b>$Lang::tr{'swap'}</b></td>
END
;
- }elsif($ram and $_ =~ m/^-\/\+ buffers\/cache:\s+(\d+)\s+(\d+)$/ ){
- ($used,$free) = ($1,$2);
- ($percent = ($used/$ram)*100) =~ s/^(\d+)(\.\d+)?$/$1%/;
- print "<tr><td colspan='2' class='boldbase'><b>$Lang::tr{'excluding buffers and cache'}</b></td>";
- }
- print <<END
-<td align='center'>$used KB</td>
-<td align='center'>$free KB</td>
-<td>
+ }
+ print <<END
+ <td align='center'>$size KiB</td>
+ <td align='center'>$used KiB</td>
+ <td align='center'>$free KiB</td>
+ <td>
END
;
- &percentbar($percent);
- print <<END
+ &percentbar($percent);
+ print <<END
</td>
-<td align='left'>$percent</td>
+ <td align='left'>$percent</td>
</tr>
END
;
- }
}
- close FREE;
- print <<END
-<tr><td class='boldbase' colspan='2'><br /></td></tr>
-<tr><td class='boldbase'><b>$Lang::tr{'shared'}</b></td><td align='center'>$shared KB</td></tr>
-<tr><td class='boldbase'><b>$Lang::tr{'buffers'}</b></td><td align='center'>$buffers KB</td></tr>
-<tr><td class='boldbase'><b>$Lang::tr{'cached'}</b></td><td align='center'>$cached KB</td></tr>
+}
+close($cmd_fh);
+print <<END
+<tr><td colspan='6'><br /></td></tr>
+<tr><td class='boldbase'><b>$Lang::tr{'shared'}</b></td><td align='center'>$shared KiB</td></tr>
+<tr><td class='boldbase'><b>$Lang::tr{'buffers'}</b></td><td align='center'>$buffers KiB</td></tr>
+<tr><td class='boldbase'><b>$Lang::tr{'cached'}</b></td><td align='center'>$cached KiB</td></tr>
+<tr><td class='boldbase'><b>$Lang::tr{'available'}</b></td><td align='center'>$available KiB</td></tr>
</table>
END
;
- &Header::closebox();
+&Header::closebox();
- &Header::closebigbox();
- &Header::closepage();
-}
+&Header::closebigbox();
+&Header::closepage();
sub percentbar{
my $percent = $_[0];
projects / people / pmueller / ipfire-2.x.git / blobdiff