webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed ACPI-Cooling device graph because always 0 collected

Browse Source 
Disabled collecting of ACPI-Cooling device data
Change linewith of ACPI Temp graph
This commit is contained in:
Arne Fitzennreiter
2008-10-22 07:39:54 +02:00
parent 19342e56a9
commit 4be3afa089
3 changed files with 14 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
config/cfgroot/graphs.pl
View File

@@ -1057,7 +1057,7 @@ sub updatethermaltempgraph {
"-h 125",
"-l 0",
"-r",
"-t "."ACPI Thermal-Zone Temperature"." ".$Lang::tr{$period},
"-t "."ACPI Thermal-Zone Temperature"." - ".$Lang::tr{$period},
"-v Grad Celsius",
"--color=SHADEA".$color{"color19"},
"--color=SHADEB".$color{"color19"},
@@ -1073,7 +1073,7 @@ sub updatethermaltempgraph {
my $j=$i+1;
push(@command,"DEF:temp".$i."_=".$mainsettings{'RRDLOG'}."/collectd/localhost/thermal-thermal_zone".$i."/temperature-temperature.rrd:value:AVERAGE"
,"CDEF:temp".$i."=temp".$i."_,1,/"
,"LINE1:temp".$i.$color{"color1$j"}."A0:Temp ".$i." "
,"LINE2:temp".$i.$color{"color1$j"}."A0:Temp ".$i." "
,"GPRINT:temp".$i.":MAX:%3.0lf Grad C"
,"GPRINT:temp".$i.":AVERAGE:%3.0lf Grad C"
,"GPRINT:temp".$i.":MIN:%3.0lf Grad C"
@@ -1085,50 +1085,6 @@ sub updatethermaltempgraph {
print "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
}
sub updatethermalcoolinggraph {
my $thermalcount = `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/thermal-cooling_device* | wc -l`;
my $period = $_[0];
my @command = (
"-",
"--start",
"-1".$period,
"-aPNG",
"-i",
"-z",
"-W www.ipfire.org",
"--alt-y-grid",
"-w 600",
"-h 125",
"-l 0",
"-r",
"-t "."ACPI Thermal-Zone Cooling Device"." ".$Lang::tr{$period},
"-v State",
"--color=SHADEA".$color{"color19"},
"--color=SHADEB".$color{"color19"},
"--color=BACK".$color{"color21"},
"COMMENT:".sprintf("%-15s",$Lang::tr{'caption'}),
"COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}),
"COMMENT:".sprintf("%15s",$Lang::tr{'average'}),
"COMMENT:".sprintf("%15s",$Lang::tr{'minimal'}),
"COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j"
);
for(my $i = 0; $i < $thermalcount; $i++) {
my $j=$i+1;
push(@command,"DEF:cooling".$i."_=".$mainsettings{'RRDLOG'}."/collectd/localhost/thermal-cooling_device".$i."/gauge-cooling_state.rrd:value:AVERAGE"
,"CDEF:cooling".$i."=cooling".$i."_,1,/"
,"LINE1:cooling".$i.$color{"color1$j"}."A0:cooling ".$i." "
,"GPRINT:cooling".$i.":MAX:%3.0lf"
,"GPRINT:cooling".$i.":AVERAGE:%3.0lf"
,"GPRINT:cooling".$i.":MIN:%3.0lf"
,"GPRINT:cooling".$i.":LAST:%3.0lf\\j");
}
RRDs::graph (@command);
$ERROR = RRDs::error;
print "Error in RRD::graph for thermal cooling: ".$ERROR."\n" if $ERROR;
}
# Generate a random color, used by Qos Graph to be independent from the amount of values

12
config/collectd/collectd.conf
View File

@@ -81,3 +81,15 @@ LoadPlugin syslog
<Plugin syslog>
LogLevel info
</Plugin>
<Plugin thermal>
Device "cooling_device0"
Device "cooling_device1"
Device "cooling_device2"
Device "cooling_device3"
Device "cooling_device4"
Device "cooling_device5"
Device "cooling_device6"
Device "cooling_device7"
IgnoreSelected true
</Plugin>

10
html/cgi-bin/hardwaregraphs.cgi
View File

@@ -67,10 +67,6 @@ if ( $querry[0] =~ "hwtemp"){
print "Content-type: image/png\n\n";
binmode(STDOUT);
&Graphs::updatethermaltempgraph($querry[1]);
}elsif ( $querry[0] =~ "thermalcooling"){
print "Content-type: image/png\n\n";
binmode(STDOUT);
&Graphs::updatethermalcoolinggraph($querry[1]);
}elsif ( $querry[0] =~ "sd?" || $querry[0] =~ "hd?" ){
print "Content-type: image/png\n\n";
binmode(STDOUT);
@@ -111,12 +107,6 @@ if ( $querry[0] =~ "hwtemp"){
&Header::closebox();
}
if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/thermal-thermal_zone*` ) {
&Header::openbox('100%', 'center', "ACPI Thermal-Zone Cooling $Lang::tr{'graph'}");
&Graphs::makegraphbox("hardwaregraphs.cgi","thermalcooling","day");
&Header::closebox();
}
if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/sensors-*` ) {
&Header::openbox('100%', 'center', "hwtemp $Lang::tr{'graph'}");
&Graphs::makegraphbox("hardwaregraphs.cgi","hwtemp","day");