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

use $rrdfile everywhere

Browse Source
This commit is contained in:
Vincent Riquer 2015-02-01 22:17:10 +01:00
parent 38c9949dd7
commit a7c2b63dbe
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
add
View File

@ -64,13 +64,13 @@ do
ds="${ds//ds[/}" ds="${ds//ds[/}"
ds="${ds//]*/}" ds="${ds//]*/}"
datasets+=("$ds") datasets+=("$ds")
done < <(rrdtool info ingress.rrd |grep index) done < <(rrdtool info "$rrdfile" |grep index)
for ds in ${dsnames[@]} for ds in ${dsnames[@]}
do do
if [[ ! ${datasets[@]} =~ $ds ]] if [[ ! ${datasets[@]} =~ $ds ]]
then then
cp -f ingress.rrd ingress.rrd.bak_add_$ds cp -f "$rrdfile" "$rrdfile".bak_add_$ds
./dsaddtor.pl ingress.rrd $ds GAUGE $((48*60*60)) 0 NaN ./dsaddtor.pl "$rrdfile" $ds GAUGE $((48*60*60)) 0 NaN
fi fi
done done
data=N data=N
@ -82,7 +82,7 @@ do
done done
echo ${POST["innovator"]} > .innovator echo ${POST["innovator"]} > .innovator
rrdtool update ingress.rrd -t $template "$data" rrdtool update "$rrdfile" -t $template "$data"
if [ -n "$CACHE_DIR" ] if [ -n "$CACHE_DIR" ]
then then

10
import
View File

@ -66,20 +66,20 @@ then
ds="${ds//ds[/}" ds="${ds//ds[/}"
ds="${ds//]*/}" ds="${ds//]*/}"
datasets+=("$ds") datasets+=("$ds")
done < <(rrdtool info ingress.rrd |grep index) done < <(rrdtool info "$rrdfile" |grep index)
for ds in ${dsnames[@]} for ds in ${dsnames[@]}
do do
if [[ ! ${datasets[@]} =~ $ds ]] if [[ ! ${datasets[@]} =~ $ds ]]
then then
cp -f ingress.rrd ingress.rrd.bak_add_$ds cp -f "$rrdfile" "$rrdfile".bak_add_$ds
./dsaddtor.pl ingress.rrd $ds GAUGE $((48*60*60)) 0 NaN ./dsaddtor.pl "$rrdfile" $ds GAUGE $((48*60*60)) 0 NaN
fi fi
done done
while read date hour data while read date hour data
do do
data=$(date -d "$date $hour" +%s):${data// /:} data=$(date -d "$date $hour" +%s):${data// /:}
rrdtool update ingress.rrd -t $template "$data" 2>&1 rrdtool update "$rrdfile" -t $template "$data" 2>&1
done <<<"${POST["data"]}" done <<<"${POST["data"]}"
if [ -n "$CACHE_DIR" ] if [ -n "$CACHE_DIR" ]
@ -106,7 +106,7 @@ else
EOHTML EOHTML
if ! [ -w "$rrdfile" ] if ! [ -w "$rrdfile" ]
then then
rrdtool create ingress.rrd -s $((60*60)) \ rrdtool create "$rrdfile" -s $((60*60)) \
DS:AP:GAUGE:$((2*24*60*60)):0:NaN \ DS:AP:GAUGE:$((2*24*60*60)):0:NaN \
DS:Explorer:GAUGE:$((48*60*60)):0:NaN \ DS:Explorer:GAUGE:$((48*60*60)):0:NaN \
DS:Seer:GAUGE:$((48*60*60)):0:NaN \ DS:Seer:GAUGE:$((48*60*60)):0:NaN \

2
index
View File

@ -376,7 +376,7 @@ then
<table style="width:$(( graph_width + 97 ))px"> <table style="width:$(( graph_width + 97 ))px">
<tr> <tr>
<td> <td>
<a href="?hist&amp;start=$(rrdtool first ingress.rrd)&amp;end=$end">First</a> <a href="?hist&amp;start=$(rrdtool first "$rrdfile")&amp;end=$end">First</a>
<a href="?hist&amp;start=$(( start - 365 * 86400 ))&amp;end=$end">-Y</a> <a href="?hist&amp;start=$(( start - 365 * 86400 ))&amp;end=$end">-Y</a>
<a href="?hist&amp;start=$(( start - 30 * 86400 ))&amp;end=$end">-M</a> <a href="?hist&amp;start=$(( start - 30 * 86400 ))&amp;end=$end">-M</a>
<a href="?hist&amp;start=$(( start - 604800 ))&amp;end=$end">-W</a> <a href="?hist&amp;start=$(( start - 604800 ))&amp;end=$end">-W</a>

2
lib/readold
View File

@ -18,6 +18,6 @@ readold() {
done done
) )
} < <( } < <(
rrdtool fetch -s "$when" ingress.rrd AVERAGE | sed '/: nan/d' rrdtool fetch -s "$when" "$rrdfile" AVERAGE | sed '/: nan/d'
) )
} }