1
0
mirror of https://github.com/moexe/FFFGateway-Monitoring.git synced 2024-11-23 22:23:41 +01:00

Merge pull request #4 from rohammer/master

mrtg vervollständigt, links im Menü, GWsel. ...Farbe???
This commit is contained in:
moexe 2017-01-23 18:01:29 +01:00 committed by GitHub
commit 91d3d00eeb
5 changed files with 54 additions and 84 deletions

View File

@ -5,7 +5,7 @@ html {
} }
body { body {
background-color:#FBFBEF; background-color:#FFFFFF;
text-align:left; text-align:left;
font-family:Arial, Helvetica, sans-serif; font-family:Arial, Helvetica, sans-serif;
# font-family:Verdana, sans-serif; # font-family:Verdana, sans-serif;
@ -30,7 +30,7 @@ body {
#bodybox { #bodybox {
float:left; float:left;
background-color:#FBFBEF; # background-color:#FBFBEF;
width:100%; width:100%;
@ -38,7 +38,7 @@ body {
} }
#content { #content {
background-color:#FBFBEF; # background-color:#FBFBEF;
margin-right:2.5em; margin-right:2.5em;
margin-left:2.5em; margin-left:2.5em;
margin-top:1em; margin-top:1em;
@ -110,7 +110,7 @@ div.mrtg img {
} }
#content { #content {
background-color:#FBFBEF; # background-color:#FBFBEF;
float:left; float:left;
width:95%; width:95%;
margin-right:0.5em; margin-right:0.5em;

View File

@ -19,7 +19,7 @@ to work with the chosen theme.
/* Set menu background color here */ /* Set menu background color here */
.rm-nav ul, .rm-nav ul,
.rm-menu { .rm-menu {
background-color: rgb(0, 0, 0); background-color: rgb(128, 51, 0);
margin-top: 0; margin-top: 0;
} }

View File

@ -7,7 +7,7 @@
height: 100%; height: 100%;
} }
header { header {
background-color: #000; background-color: rgb(128, 51, 0);
} }
header:after { header:after {
content: " "; content: " ";
@ -29,12 +29,12 @@ h1 {
.main .dev-output pre { .main .dev-output pre {
overflow: auto; overflow: auto;
max-height: 500px; max-height: 500px;
background-color: #EBF4FD; background-color: #FFFFFF;
padding: 0 1em 1em; padding: 0 1em 1em;
} }
.brand { .brand {
float: left; float: left;
height: 80px; height: 20px;
} }
.brand p { .brand p {
margin: 0; margin: 0;
@ -44,10 +44,10 @@ h1 {
} }
.logo { .logo {
font-size: 1.4em; font-size: 1.4em;
line-height: 40px; line-height: 20px;
margin: 20px 0 0; margin: 20px 0 0;
width: 50px; width: 50px;
height: 40px; height: 20px;
/* background-color: #3C97D5; */ /* background-color: #3C97D5; */
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;
@ -60,7 +60,7 @@ h1 {
} }
.rm-toggle.rm-button { .rm-toggle.rm-button {
margin-top: 25px; margin-top: 10px;
} }
.rm-css-animate.rm-menu-expanded { .rm-css-animate.rm-menu-expanded {

View File

@ -155,7 +155,9 @@
<header> <header>
<div class="wrapper"> <div class="wrapper">
<div class="brand"> <div class="brand">
<p><a href="#" class="logo">FFF-Hassberge</a></p>
<p><a href="#" class="logo">FFF</a></p>
</div> </div>
<!-- START Responsive Menu HTML --> <!-- START Responsive Menu HTML -->
@ -166,55 +168,22 @@
<ul> <ul>
<li><a href="#">Die Gateways</a> <li><a href="#">Die Gateways</a>
<ul> <ul>
<li><a href="http://78.47.36.148">fff-has</a></li> <li><a href="http://78.47.36.148">fff-has</a></li>
<li><a href="http://78.47.161.124">fff-has1</a></li> <li><a href="http://78.47.161.124">fff-has1</a></li>
<li><a href="http://5.189.166.50">fff-has2</a></li> <li><a href="http://5.189.166.50">fff-has2</a></li>
<li><a href="http://213.136.93.106:8080">fff-has3</a></li> <li><a href="http://213.136.93.106">fff-has3</a></li>
<li><a href="http://5.189.142.26">fff-roffl</a></li> <li><a href="http://5.189.142.26">fff-roffl</a></li>
<li><a href="http://163.172.161.233">fff-rola1</a></li> <li><a href="http://163.172.161.233/top">fff-rola1</a></li>
<ul>
<li><a href="#">Sub Sub Item 1</a></li>
<li><a href="#">Sub Sub Item 2</a></li>
<li><a href="#">Sub Sub Item 3</a></li>
<li><a href="#">Sub Sub Item 4</a></li>
<li><a href="#">Sub Sub Item 5</a></li>
<li><a href="#">Sub Sub Item 6</a></li>
<li><a href="#">Sub Sub Item 7</a></li>
</ul></li>
<li><a href="#">Sub Item 4</a></li>
<li><a href="#">Sub Item 5</a></li>
<li><a href="#">Sub Item 6</a>
<ul>
<li><a href="#">Sub Sub Item 1</a></li>
<li><a href="#">Sub Sub Item 2</a></li>
<li><a href="#">Sub Sub Item 3</a></li>
<li><a href="#">Sub Sub Item 4</a></li>
<li><a href="#">Sub Sub Item 5</a></li>
<li><a href="#">Sub Sub Item 6</a></li>
<li><a href="#">Sub Sub Item 7</a></li>
</ul></li>
<li><a href="#">Sub Item 7</a></li>
<li><a href="#">Sub Item 8</a></li>
<li><a href="#">Sub Item 9</a></li>
</ul></li> </ul></li>
<li><a href="#">Main Item 2</a>
<li><a href="#">Babel / olsr</a>
<ul> <ul>
<li><a href="#">Sub Item 1</a></li> <li><a href="http://78.47.36.148:8080">fff-has</a></li>
<li><a href="#">Sub Item 2</a></li> <li><a href="http://78.47.161.124:8080">fff-has1</a></li>
<li><a href="#">Sub Item 3</a> <li><a href="http://5.189.166.50:8081">fff-has2</a></li>
<ul> <li><a href="http://213.136.93.106:8080">fff-has3</a></li>
<li><a href="#">Sub Sub Item 1</a></li> <li><a href="http://5.189.142.26:8080">fff-roffl</a></li>
<li><a href="#">Sub Sub Item 2</a></li> <li><a href="http://163.172.161.233:8082">fff-rola1</a></li>
<li><a href="#">Sub Sub Item 3</a></li>
<li><a href="#">Sub Sub Item 4</a></li>
<li><a href="#">Sub Sub Item 5</a></li>
<li><a href="#">Sub Sub Item 6</a></li>
<li><a href="#">Sub Sub Item 7</a></li>
</ul></li>
<li><a href="#">Sub Item 4</a></li>
<li><a href="#">Sub Item 5</a></li>
</ul></li> </ul></li>
<li><a href="#">Main Item 3</a> <li><a href="#">Main Item 3</a>
<ul> <ul>
@ -223,12 +192,6 @@
<li><a href="#">Sub Item 3</a></li> <li><a href="#">Sub Item 3</a></li>
<li><a href="#">Sub Item 4</a></li> <li><a href="#">Sub Item 4</a></li>
</ul></li> </ul></li>
<li><a href="#">Main Item 4</a></li>
<li><a href="#">Main Item 5</a>
<ul>
<li><a href="#">Sub Item 1</a></li>
<li><a href="#">Sub Item 2</a></li>
</ul></li>
</ul> </ul>
</nav> </nav>
</div><!-- .rm-container --> </div><!-- .rm-container -->

View File

@ -29,30 +29,40 @@ echo "<tr><td>DHCP:</td><td>Leases in use: <b>$leases</b></td><td><img src=img/$
</table> </table>
<hr /> <hr />
<b>Aktuelle default Route table fff:</b><br>
<?php <?php
$route = shell_exec('ip r s table fff | head -1');
echo "$route<br><br>";
$l2tp = shell_exec('ip l | grep -c l2tp'); $l2tp = shell_exec('ip l | grep -c l2tp');
echo "Anzahl der l2tp Tunnel: <b>$l2tp</b><br><br>"; echo "<b>Anzahl der l2tp Tunnel</b><br>has-sued: <b>$l2tp</b><br><br>";
$gwsel = shell_exec('sudo batctl gw');
echo "<b>Gateway-selection:</b><br>";
echo "$gwsel<br><br>";
echo "<b>Die anderen GW in der Hood</b><br>"; $gwselsued = file_get_contents('http://10.50.60.22/bat0.dat');
$other = shell_exec('sudo batctl gwl | grep MBit | tr -s " " | cut -f 2,3,8 -d" "'); $gwselhas = file_get_contents('http://10.50.60.22/bat2.dat');
$othergw = explode(PHP_EOL, $other);
for($i = 0; $i < count($othergw); ++$i) { echo "<b>Gatewayselection Hood has:</b><br>";
echo "$othergw[$i]<br>"; $gwsel_has = explode(PHP_EOL, $gwselhas);
for($i = 0; $i < count($gwsel_has); ++$i) {
echo "$gwsel_has[$i]<br>";
} }
echo "<b>Gatewayselection Hood has-sued</b><br>";
$gwsel_sued = explode(PHP_EOL, $gwselsued);
for($i = 0; $i < count($gwsel_sued); ++$i) {
echo "$gwsel_sued[$i]<br>";
}
$clients = file_get_contents('http://5.189.166.50/test.html');
echo $clients;
?> ?>
<hr /> <hr />
</div> </div>
<div class=mrtg> <div class=mrtg>
<b>Speedtest der has und has-sued GWs (Kabel, wr-841, l2tp)</b>
<img src="http://163.172.161.233/top/img/speed.png">
<hr />
<H1>Durchsatz eth0</H1> <H1>Durchsatz eth0</H1>
<b>GW has</b> <b>GW has</b>
<img src="http://78.47.36.148/localhost_eth0-day.png"> <img src="http://78.47.36.148/localhost_eth0-day.png">
@ -63,19 +73,16 @@ for($i = 0; $i < count($othergw); ++$i) {
<b>GW has2</b> <b>GW has2</b>
<img src="http://5.189.166.50/localhost_eth0-day.png"> <img src="http://5.189.166.50/localhost_eth0-day.png">
<b>GW has3</b> <br><b>GW has3 - kein mrtg</b><br>
<img src="img/ampelrot.jpg">
<b>GW roffl</b> <b>GW roffl</b>
<img src="img/ampelrot.jpg"> <img src="http://5.189.142.26/localhost_eth0-day.png">
<b>GW rola1</b> <b>GW rola1</b>
<img src="http://163.172.161.233/mrtg/localhost_eth0-day.png"> <img src="http://163.172.161.233/mrtg/localhost_eth0-day.png">
<hr /> <hr />
<b>Speedtest der has und has-sued GWs (Kabel, wr-841, l2tp)</b>
<img src="http://163.172.161.233/top/img/speed.png">
</div> </div>
</div></div> </div></div>