Merge remote-tracking branch 'origin/master' into prod
* origin/master: add Translator better graph period chooser
This commit is contained in:
Vincent Riquer
commit
6c2f3bd95a
1
add.html
1
add.html
@ -70,6 +70,7 @@ then
|
|||||||
DS:Mercenary:GAUGE:$((48*60*60)):0:NaN \
|
DS:Mercenary:GAUGE:$((48*60*60)):0:NaN \
|
||||||
DS:Engineer:GAUGE:$((48*60*60)):0:NaN \
|
DS:Engineer:GAUGE:$((48*60*60)):0:NaN \
|
||||||
DS:Recruiter:GAUGE:$((48*60*60)):0:NaN \
|
DS:Recruiter:GAUGE:$((48*60*60)):0:NaN \
|
||||||
|
DS:Translator:GAUGE:$((48*60*60)):0:NaN \
|
||||||
DS:Hackaton:GAUGE:$((48*60*60)):0:NaN \
|
DS:Hackaton:GAUGE:$((48*60*60)):0:NaN \
|
||||||
RRA:HWPREDICT:8760:8e-1:8e-1:$((24)) \
|
RRA:HWPREDICT:8760:8e-1:8e-1:$((24)) \
|
||||||
RRA:AVERAGE:99e-2:1:$((24*15)) \
|
RRA:AVERAGE:99e-2:1:$((24*15)) \
|
||||||
|
|||||||
4
import
4
import
@ -24,7 +24,7 @@ do
|
|||||||
done
|
done
|
||||||
read_query_string
|
read_query_string
|
||||||
|
|
||||||
template=AP:Explorer:Seer:XM:Walked:Builder:Connector:Mind_Controller:MU:Longest_Link:Largest_Field:Recharger:Liberator:Pioneer:Engineer:Purifier:Neutralized:Links_Destroyed:Fields_Destroyed:Guardian:Link_Maintained:Link_Length_x_Days:Field_Held:Field_x_Days:Mercenary:Hacker:Hackaton:Recruiter
|
template=AP:Explorer:Seer:XM:Walked:Builder:Connector:Mind_Controller:MU:Longest_Link:Largest_Field:Recharger:Liberator:Pioneer:Engineer:Purifier:Neutralized:Links_Destroyed:Fields_Destroyed:Guardian:Link_Maintained:Link_Length_x_Days:Field_Held:Field_x_Days:Mercenary:Hacker:Translator:Hackaton:Recruiter
|
||||||
|
|
||||||
if [[ $REQUEST_METHOD == POST ]]
|
if [[ $REQUEST_METHOD == POST ]]
|
||||||
then
|
then
|
||||||
@ -135,6 +135,7 @@ else
|
|||||||
DS:Mercenary:GAUGE:$((48*60*60)):0:NaN \
|
DS:Mercenary:GAUGE:$((48*60*60)):0:NaN \
|
||||||
DS:Engineer:GAUGE:$((48*60*60)):0:NaN \
|
DS:Engineer:GAUGE:$((48*60*60)):0:NaN \
|
||||||
DS:Recruiter:GAUGE:$((48*60*60)):0:NaN \
|
DS:Recruiter:GAUGE:$((48*60*60)):0:NaN \
|
||||||
|
DS:Translator:GAUGE:$((48*60*60)):0:NaN \
|
||||||
DS:Hackaton:GAUGE:$((48*60*60)):0:NaN \
|
DS:Hackaton:GAUGE:$((48*60*60)):0:NaN \
|
||||||
RRA:HWPREDICT:8760:8e-1:8e-1:$((24)) \
|
RRA:HWPREDICT:8760:8e-1:8e-1:$((24)) \
|
||||||
RRA:AVERAGE:99e-2:1:$((24*15)) \
|
RRA:AVERAGE:99e-2:1:$((24*15)) \
|
||||||
@ -162,6 +163,7 @@ else
|
|||||||
<p>Import data from e.g. https://www.agent-stats.com/ <br/>
|
<p>Import data from e.g. https://www.agent-stats.com/ <br/>
|
||||||
<small>Expected format: <tt>YYYY-MM-DD hh:mm:ss
|
<small>Expected format: <tt>YYYY-MM-DD hh:mm:ss
|
||||||
${template[@]//:/ }</tt></small></p>
|
${template[@]//:/ }</tt></small></p>
|
||||||
|
<p>Latest data: $(date +"%Y-%m-%d %H:%M:%S" -d @${last[time]%:})</p>
|
||||||
<form method="post" action="import">
|
<form method="post" action="import">
|
||||||
<input type="hidden" name="start" value="$start" />
|
<input type="hidden" name="start" value="$start" />
|
||||||
<input type="hidden" name="end" value="$end" />
|
<input type="hidden" name="end" value="$end" />
|
||||||
|
|||||||
35
index
35
index
@ -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&start=$(( start - 604800 ))&end=$end"><<</a>
|
<a href="?hist&start=$(rrdtool first ingress.rrd)&end=$end">First</a>
|
||||||
<a href="?hist&start=$(( start - 86400 ))&end=$end"><</a>
|
<a href="?hist&start=$(( start - 365 * 86400 ))&end=$end">-Y</a>
|
||||||
<a href="?hist&start=$default_start&end=$end">R</a>
|
<a href="?hist&start=$(( start - 30 * 86400 ))&end=$end">-M</a>
|
||||||
<a href="?hist&start=$(( start + 86400 ))&end=$end">></a>
|
<a href="?hist&start=$(( start - 604800 ))&end=$end">-W</a>
|
||||||
<a href="?hist&start=$(( start + 604800 ))&end=$end">>></a>
|
<a href="?hist&start=$(( start - 86400 ))&end=$end">-D</a>
|
||||||
|
<a href="?hist&start=$now&end=$end">Now</a>
|
||||||
|
<a href="?hist&start=$(( start + 86400 ))&end=$end">+D</a>
|
||||||
|
<a href="?hist&start=$(( start + 604800 ))&end=$end">+W</a>
|
||||||
|
<a href="?hist&start=$(( start + 30 * 86400 ))&end=$end">+M</a>
|
||||||
|
<a href="?hist&start=$(( start + 365 * 86400 ))&end=$end">+Y</a>
|
||||||
</td>
|
</td>
|
||||||
<td align="right">
|
<td align="right">
|
||||||
<a href="?hist&start=$start&end=$(( end - 604800 ))"><<</a>
|
<a href="?hist&start=$start&end=$(( end - 365 * 86400 ))">-Y</a>
|
||||||
<a href="?hist&start=$start&end=$(( end - 86400 ))"><</a>
|
<a href="?hist&start=$start&end=$(( end - 30 * 86400 ))">-M</a>
|
||||||
<a href="?hist&start=$start&end=$default_end">R</a>
|
<a href="?hist&start=$start&end=$(( end - 604800 ))">-W</a>
|
||||||
<a href="?hist&start=$start&end=$(( end + 86400 ))">></a>
|
<a href="?hist&start=$start&end=$(( end - 86400 ))">-D</a>
|
||||||
<a href="?hist&start=$start&end=$(( end + 604800 ))">>></a>
|
<a href="?hist&start=$start&end=$now">Now</a>
|
||||||
|
<a href="?hist&start=$start&end=$(( end + 86400 ))">+D</a>
|
||||||
|
<a href="?hist&start=$start&end=$(( end + 604800 ))">+W</a>
|
||||||
|
<a href="?hist&start=$start&end=$(( end + 30 * 86400 ))">+M</a>
|
||||||
|
<a href="?hist&start=$start&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 - \
|
||||||
|
|||||||
15
settings
15
settings
@ -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
|
||||||
@ -64,6 +66,7 @@ uinames=(
|
|||||||
"Largest Field MUs x Days"
|
"Largest Field MUs x Days"
|
||||||
"Unique missions completed"
|
"Unique missions completed"
|
||||||
Hacks
|
Hacks
|
||||||
|
"Glyph Hack Points"
|
||||||
"Agents Recruited"
|
"Agents Recruited"
|
||||||
"Consecutive Days Hacking"
|
"Consecutive Days Hacking"
|
||||||
)
|
)
|
||||||
@ -94,6 +97,7 @@ dsnames=(
|
|||||||
Field_x_Days
|
Field_x_Days
|
||||||
Mercenary
|
Mercenary
|
||||||
Hacker
|
Hacker
|
||||||
|
Translator
|
||||||
Recruiter
|
Recruiter
|
||||||
Hackaton
|
Hackaton
|
||||||
)
|
)
|
||||||
@ -112,6 +116,7 @@ medals=(
|
|||||||
Mercenary
|
Mercenary
|
||||||
Engineer
|
Engineer
|
||||||
Hacker
|
Hacker
|
||||||
|
Translator
|
||||||
Recruiter
|
Recruiter
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -212,3 +217,9 @@ silver["Recruiter"]=10
|
|||||||
gold["Recruiter"]=25
|
gold["Recruiter"]=25
|
||||||
platinum["Recruiter"]=50
|
platinum["Recruiter"]=50
|
||||||
black["Recruiter"]=100
|
black["Recruiter"]=100
|
||||||
|
|
||||||
|
bronze["Translator"]=200
|
||||||
|
silver["Translator"]=2000
|
||||||
|
gold["Translator"]=6000
|
||||||
|
platinum["Translator"]=20000
|
||||||
|
black["Translator"]=50000
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user