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

Merge remote-tracking branch 'origin/master' into prod

Browse Source 
* origin/master:
  add timing information
  fix vim accident #dontfeedthetroll
This commit is contained in:
Vincent Riquer 2015-02-01 17:12:49 +01:00
commit 4968e925fb
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
index
View File

@ -60,8 +60,7 @@ then
-d @$(rrdtool last ingress.rrd)
)
Expires: $(LC_ALL=C TZ=GMT date +'%a, %d %b %Y %X %Z' -d '1 hour')
Cache-Control: max-age=0, must-revalidate
refresh: 600
refresh: 300
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
@ -72,6 +71,12 @@ then
<link rel="stylesheet" type="text/css" href="/ingrrd.css" />
</head>
<body>
<div style="font-size:10px; color:#606060; text-align:right; position:absolute; top:12px; right:0px;">
EOHTML
times
date '+%Y-%m-%d %H:%M:%S'
cat <<-EOHTML
</div>
<div style="width:$(( graph_width + 97 ))px" class="container">
EOHTML
@ -137,6 +142,7 @@ then
for level in {1..16}
do
prevtimestamp=$maxtimestamp
never=0
maxtimestamp=0
tableline=()
@ -297,11 +303,14 @@ then
echo "${tableline[@]}"
if (( level > curlevel ))
then
(( maxtimestamp < prevtimestamp )) \
&& maxtimestamp=$prevtimestamp
cat <<-EOHTML
<td class="date">$(date +%Y-%m-%d -d @$maxtimestamp)</td>
EOHTML
fi
echo '</tr>'
prevtimestamp=$maxtimestamp
done
cat <<-EOHTML
</table>
@ -461,6 +470,12 @@ then
</table>
</div>
</div>
<div style="font-size:10px; color:#606060; text-align:right; position:absolute; top:24px; right:0px;">
EOHTML
times
date '+%Y-%m-%d %H:%M:%S'
cat <<-EOHTML
</div>
</body></html>
EOHTML
else
@ -472,7 +487,6 @@ else
-d @$(rrdtool last ingress.rrd)
)
Expires: $(LC_ALL=C TZ=GMT date +'%a, %d %b %Y %X %Z' -d '1 hour')
Cache-Control: max-age=0, must-revalidate
EOHEAD

2
lib/medals
View File

@ -1,4 +1,4 @@
/bin/bash: :n: command not found
#!/bin/bash
medals() {
local \