projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
930d01e
)
contrib/collection.cgi: Fix the `charge' and `current' graphs.
author
Florian Forster
<octo@noris.net>
Fri, 28 Sep 2007 10:32:28 +0000
(10:32 +0000)
committer
Florian Forster
<octo@noris.net>
Fri, 28 Sep 2007 10:32:28 +0000
(10:32 +0000)
contrib/collection.cgi
patch
|
blob
|
history
diff --git
a/contrib/collection.cgi
b/contrib/collection.cgi
index
ebd937e
..
ce0dc3d
100755
(executable)
--- a/
contrib/collection.cgi
+++ b/
contrib/collection.cgi
@@
-944,10
+944,10
@@
sub load_graph_definitions
'GPRINT:max:MAX:%5.1lf%s Max,',
'GPRINT:avg:LAST:%5.1lf%s Last\l'
],
'GPRINT:max:MAX:%5.1lf%s Max,',
'GPRINT:avg:LAST:%5.1lf%s Last\l'
],
- charge => [
- 'DEF:avg={file}:
charg
e:AVERAGE',
- 'DEF:min={file}:
charg
e:MIN',
- 'DEF:max={file}:
charg
e:MAX',
+ charge => [
'-v', 'Ah',
+ 'DEF:avg={file}:
valu
e:AVERAGE',
+ 'DEF:min={file}:
valu
e:MIN',
+ 'DEF:max={file}:
valu
e:MAX',
"AREA:max#$HalfBlue",
"AREA:min#$Canvas",
"LINE1:avg#$FullBlue:Charge",
"AREA:max#$HalfBlue",
"AREA:min#$Canvas",
"LINE1:avg#$FullBlue:Charge",
@@
-956,18
+956,6
@@
sub load_graph_definitions
'GPRINT:max:MAX:%5.1lf%sAh Max,',
'GPRINT:avg:LAST:%5.1lf%sAh Last\l'
],
'GPRINT:max:MAX:%5.1lf%sAh Max,',
'GPRINT:avg:LAST:%5.1lf%sAh Last\l'
],
- charge_percent => [
- 'DEF:avg={file}:percent:AVERAGE',
- 'DEF:min={file}:percent:MIN',
- 'DEF:max={file}:percent:MAX',
- "AREA:max#$HalfBlue",
- "AREA:min#$Canvas",
- "LINE1:avg#$FullBlue:Charge",
- 'GPRINT:min:MIN:%5.1lf%s%% Min,',
- 'GPRINT:avg:AVERAGE:%5.1lf%s%% Avg,',
- 'GPRINT:max:MAX:%5.1lf%s%% Max,',
- 'GPRINT:avg:LAST:%5.1lf%s%% Last\l'
- ],
cpu => ['-v', 'CPU load',
'DEF:avg={file}:value:AVERAGE',
'DEF:min={file}:value:MIN',
cpu => ['-v', 'CPU load',
'DEF:avg={file}:value:AVERAGE',
'DEF:min={file}:value:MIN',
@@
-980,10
+968,10
@@
sub load_graph_definitions
'GPRINT:max:MAX:%6.2lf%% Max,',
'GPRINT:avg:LAST:%6.2lf%% Last\l'
],
'GPRINT:max:MAX:%6.2lf%% Max,',
'GPRINT:avg:LAST:%6.2lf%% Last\l'
],
- current => [
- 'DEF:avg={file}:
current
:AVERAGE',
- 'DEF:min={file}:
current
:MIN',
- 'DEF:max={file}:
current
:MAX',
+ current => [
'-v', 'Ampere',
+ 'DEF:avg={file}:
value
:AVERAGE',
+ 'DEF:min={file}:
value
:MIN',
+ 'DEF:max={file}:
value
:MAX',
"AREA:max#$HalfBlue",
"AREA:min#$Canvas",
"LINE1:avg#$FullBlue:Current",
"AREA:max#$HalfBlue",
"AREA:min#$Canvas",
"LINE1:avg#$FullBlue:Current",