ScriptFanix/IngRRD
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

better graph period chooser

Browse Source
This commit is contained in:
Vincent Riquer 2015-01-30 16:08:33 +01:00
parent 8964230c5b
commit a8e01a37ed
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
index
View File

@ -367,18 +367,27 @@ then
<table style="width:$(( graph_width + 97 ))px"> <table style="width:$(( graph_width + 97 ))px">
<tr> <tr>
<td> <td>
<a href="?hist&amp;start=$(( start - 604800 ))&amp;end=$end">&lt;&lt;</a> <a href="?hist&amp;start=$(rrdtool first ingress.rrd)&amp;end=$end">First</a>
<a href="?hist&amp;start=$(( start - 86400 ))&amp;end=$end">&lt;</a> <a href="?hist&amp;start=$(( start - 365 * 86400 ))&amp;end=$end">-Y</a>
<a href="?hist&amp;start=$default_start&amp;end=$end">R</a> <a href="?hist&amp;start=$(( start - 30 * 86400 ))&amp;end=$end">-M</a>
<a href="?hist&amp;start=$(( start + 86400 ))&amp;end=$end">&gt;</a> <a href="?hist&amp;start=$(( start - 604800 ))&amp;end=$end">-W</a>
<a href="?hist&amp;start=$(( start + 604800 ))&amp;end=$end">&gt;&gt;</a> <a href="?hist&amp;start=$(( start - 86400 ))&amp;end=$end">-D</a>
<a href="?hist&amp;start=$now&amp;end=$end">Now</a>
<a href="?hist&amp;start=$(( start + 86400 ))&amp;end=$end">+D</a>
<a href="?hist&amp;start=$(( start + 604800 ))&amp;end=$end">+W</a>
<a href="?hist&amp;start=$(( start + 30 * 86400 ))&amp;end=$end">+M</a>
<a href="?hist&amp;start=$(( start + 365 * 86400 ))&amp;end=$end">+Y</a>
</td> </td>
<td align="right"> <td align="right">
<a href="?hist&amp;start=$start&amp;end=$(( end - 604800 ))">&lt;&lt;</a> <a href="?hist&amp;start=$start&amp;end=$(( end - 365 * 86400 ))">-Y</a>
<a href="?hist&amp;start=$start&amp;end=$(( end - 86400 ))">&lt;</a> <a href="?hist&amp;start=$start&amp;end=$(( end - 30 * 86400 ))">-M</a>
<a href="?hist&amp;start=$start&amp;end=$default_end">R</a> <a href="?hist&amp;start=$start&amp;end=$(( end - 604800 ))">-W</a>
<a href="?hist&amp;start=$start&amp;end=$(( end + 86400 ))">&gt;</a> <a href="?hist&amp;start=$start&amp;end=$(( end - 86400 ))">-D</a>
<a href="?hist&amp;start=$start&amp;end=$(( end + 604800 ))">&gt;&gt;</a> <a href="?hist&amp;start=$start&amp;end=$now">Now</a>
<a href="?hist&amp;start=$start&amp;end=$(( end + 86400 ))">+D</a>
<a href="?hist&amp;start=$start&amp;end=$(( end + 604800 ))">+W</a>
<a href="?hist&amp;start=$start&amp;end=$(( end + 30 * 86400 ))">+M</a>
<a href="?hist&amp;start=$start&amp;end=$(( end + 365 * 86400 ))">+Y</a>
</td> </td>
</tr> </tr>
</table> </table>
@ -606,10 +615,8 @@ else
next=('COMMENT:\n') next=('COMMENT:\n')
fi fi
(( start > -1209600 )) && datastart=-1209600 (( start - now > -1209600 )) && datastart=-1209600
(( end < 157680001 )) && dataend="+157680001" (( end - now < 157680001 )) && dataend="+157680001"
(( start > 0 )) && start="+$start"
(( end > 0 )) && end="+$end"
(( datastart > 0 )) && datastart="+$datastart" (( datastart > 0 )) && datastart="+$datastart"
rrdtool graph - \ rrdtool graph - \

6
settings
View File

@ -29,9 +29,11 @@ L14color=8B1479
L15color=6B127D L15color=6B127D
L16color=591494 L16color=591494
default_start=-604800
default_end=1209600
default_prevperiod=1m default_prevperiod=1m
now=$(date +%s)
(( default_start = now - 604800 ))
(( default_end = now + 1209600 ))
start=$default_start start=$default_start
end=$default_end end=$default_end