t # This is a combination of 11 commits.

More mibs needed from http://www.ieee802.org/1/files/public/MIBs/

Updated mib names

Updated poller function and siklu call

Updates for Siklu detection

Removed one graph not supported

Added rfOperationalFrequency graph

Removed modulation graph

Work on siklu support

Siklu packets supports

Last updates for Siklu support

Updated more siklu support
This commit is contained in:
laf
2015-04-30 16:55:06 +01:00
parent d56a7e01ca
commit 0f43550fcf
14 changed files with 3143 additions and 42 deletions
@@ -2,7 +2,7 @@
include("includes/graphs/common.inc.php");
$rrdfilename = $config['rrd_dir'] . "/".$device['hostname']."/siklu-mib.rrd";
$rrdfilename = $config['rrd_dir'] . "/".$device['hostname']."/siklu-wireless.rrd";
if (file_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'db Now Min Max\\n'";
@@ -2,7 +2,7 @@
include("includes/graphs/common.inc.php");
$rrdfilename = $config['rrd_dir'] . "/".$device['hostname']."/siklu-mib.rrd";
$rrdfilename = $config['rrd_dir'] . "/".$device['hostname']."/siklu-wireless.rrd";
if (file_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dbm Now Min Max\\n'";
@@ -1,15 +0,0 @@
<?php
include("includes/graphs/common.inc.php");
$rrdfilename = $config['rrd_dir'] . "/".$device['hostname']."/siklu-mib.rrd";
if (file_exists($rrdfilename)) {
$rrd_options .= " COMMENT:' Now Min Max\\n'";
$rrd_options .= " DEF:rfModulationType=".$rrdfilename.":rfModulationType:AVERAGE ";
$rrd_options .= " LINE1:rfModulationType#CC0000:'Modulation ' ";
$rrd_options .= " GPRINT:rfModulationType:LAST:%3.2lf ";
$rrd_options .= " GPRINT:rfModulationType:MIN:%3.2lf ";
$rrd_options .= " GPRINT:rfModulationType:MAX:%3.2lf\\\l ";
}
@@ -0,0 +1,15 @@
<?php
include("includes/graphs/common.inc.php");
$rrdfilename = $config['rrd_dir'] . "/".$device['hostname']."/siklu-wireless.rrd";
if (file_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'Hz Now Min Max\\n'";
$rrd_options .= " DEF:rfOperFreq=".$rrdfilename.":rfOperFreq:AVERAGE ";
$rrd_options .= " LINE1:rfOperFreq#CC0000:'RSSI ' ";
$rrd_options .= " GPRINT:rfOperFreq:LAST:%3.2lf ";
$rrd_options .= " GPRINT:rfOperFreq:MIN:%3.2lf ";
$rrd_options .= " GPRINT:rfOperFreq:MAX:%3.2lf\\\l ";
}
@@ -0,0 +1,20 @@
<?php
include("includes/graphs/common.inc.php");
$rrdfilename = $config['rrd_dir'] . "/".$device['hostname']."/siklu-interface.rrd";
if (file_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'bps Now Ave Max \\n'";
$rrd_options .= " DEF:rfInOctets=".$rrdfilename.":rfInOctets:AVERAGE ";
$rrd_options .= " DEF:rfOutOctets=".$rrdfilename.":rfOutOctets:AVERAGE ";
$rrd_options .= " LINE1:rfInOctets#00FF00:'In ' ";
$rrd_options .= " GPRINT:rfInOctets:LAST:%0.2lf%s ";
$rrd_options .= " GPRINT:rfInOctets:MIN:%0.2lf%s ";
$rrd_options .= " GPRINT:rfInOctets:MAX:%0.2lf%s\\\l ";
$rrd_options .= " LINE1:rfOutOctets#CC0000:'Out ' ";
$rrd_options .= " GPRINT:rfOutOctets:LAST:%0.2lf%s ";
$rrd_options .= " GPRINT:rfOutOctets:MIN:%0.2lf%s ";
$rrd_options .= " GPRINT:rfOutOctets:MAX:%0.2lf%s\\\l ";
}
@@ -0,0 +1,30 @@
<?php
include("includes/graphs/common.inc.php");
$rrdfilename = $config['rrd_dir'] . "/".$device['hostname']."/siklu-interface.rrd";
if (file_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'bps Now Ave Max \\n'";
$rrd_options .= " DEF:rfInGoodOctets=".$rrdfilename.":rfInGoodOctets:AVERAGE ";
$rrd_options .= " DEF:rfInErroredOctets=".$rrdfilename.":rfInErroredOctets:AVERAGE ";
$rrd_options .= " DEF:rfInIdleOctets=".$rrdfilename.":rfInIdleOctets:AVERAGE ";
$rrd_options .= " DEF:rfOutIdleOctets=".$rrdfilename.":rfOutIdleOctets:AVERAGE ";
$rrd_options .= " LINE1:rfInGoodOctets#00FF00:'Good Octets ' ";
$rrd_options .= " GPRINT:rfInGoodOctets:LAST:%0.2lf%s ";
$rrd_options .= " GPRINT:rfInGoodOctets:MIN:%0.2lf%s ";
$rrd_options .= " GPRINT:rfInGoodOctets:MAX:%0.2lf%s\\\l ";
$rrd_options .= " LINE1:rfInErroredOctets#CC0000:'Errored Octets ' ";
$rrd_options .= " GPRINT:rfInErroredOctets:LAST:%0.2lf%s ";
$rrd_options .= " GPRINT:rfInErroredOctets:MIN:%0.2lf%s ";
$rrd_options .= " GPRINT:rfInErroredOctets:MAX:%0.2lf%s\\\l ";
$rrd_options .= " LINE1:rfInIdleOctets#0022FF:'Lost Octets ' ";
$rrd_options .= " GPRINT:rfInIdleOctets:LAST:%0.2lf%s ";
$rrd_options .= " GPRINT:rfInIdleOctets:MIN:%0.2lf%s ";
$rrd_options .= " GPRINT:rfInIdleOctets:MAX:%0.2lf%s\\\l ";
$rrd_options .= " LINE1:rfOutIdleOctets#DD9CFB:'Lost Octets ' ";
$rrd_options .= " GPRINT:rfOutIdleOctets:LAST:%0.2lf%s ";
$rrd_options .= " GPRINT:rfOutIdleOctets:MIN:%0.2lf%s ";
$rrd_options .= " GPRINT:rfOutIdleOctets:MAX:%0.2lf%s\\\l ";
}
@@ -0,0 +1,25 @@
<?php
include("includes/graphs/common.inc.php");
$rrdfilename = $config['rrd_dir'] . "/".$device['hostname']."/siklu-interface.rrd";
if (file_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'pps Now Ave Max \\n'";
$rrd_options .= " DEF:rfInGoodPkts=".$rrdfilename.":rfInGoodPkts:AVERAGE ";
$rrd_options .= " DEF:rfInErroredPkts=".$rrdfilename.":rfInErroredPkts:AVERAGE ";
$rrd_options .= " DEF:rfInLostPkts=".$rrdfilename.":rfInLostPkts:AVERAGE ";
$rrd_options .= " LINE1:rfInGoodPkts#00FF00:'Good Pkts ' ";
$rrd_options .= " GPRINT:rfInGoodPkts:LAST:%0.2lf%s ";
$rrd_options .= " GPRINT:rfInGoodPkts:MIN:%0.2lf%s ";
$rrd_options .= " GPRINT:rfInGoodPkts:MAX:%0.2lf%s\\\l ";
$rrd_options .= " LINE1:rfInErroredPkts#CC0000:'Errored Pkts ' ";
$rrd_options .= " GPRINT:rfInErroredPkts:LAST:%0.2lf%s ";
$rrd_options .= " GPRINT:rfInErroredPkts:MIN:%0.2lf%s ";
$rrd_options .= " GPRINT:rfInErroredPkts:MAX:%0.2lf%s\\\l ";
$rrd_options .= " LINE1:rfInLostPkts#0022FF:'Lost Pkts ' ";
$rrd_options .= " GPRINT:rfInLostPkts:LAST:%0.2lf%s ";
$rrd_options .= " GPRINT:rfInLostPkts:MIN:%0.2lf%s ";
$rrd_options .= " GPRINT:rfInLostPkts:MAX:%0.2lf%s\\\l ";
}
@@ -0,0 +1,20 @@
<?php
include("includes/graphs/common.inc.php");
$rrdfilename = $config['rrd_dir'] . "/".$device['hostname']."/siklu-interface.rrd";
if (file_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'pps Now Ave Max \\n'";
$rrd_options .= " DEF:rfInPkts=".$rrdfilename.":rfInPkts:AVERAGE ";
$rrd_options .= " DEF:rfOutPkts=".$rrdfilename.":rfOutPkts:AVERAGE ";
$rrd_options .= " LINE1:rfInPkts#00FF00:'In ' ";
$rrd_options .= " GPRINT:rfInPkts:LAST:%0.2lf%s ";
$rrd_options .= " GPRINT:rfInPkts:MIN:%0.2lf%s ";
$rrd_options .= " GPRINT:rfInPkts:MAX:%0.2lf%s\\\l ";
$rrd_options .= " LINE1:rfOutPkts#CC0000:'Out ' ";
$rrd_options .= " GPRINT:rfOutPkts:LAST:%0.2lf%s ";
$rrd_options .= " GPRINT:rfOutPkts:MIN:%0.2lf%s ";
$rrd_options .= " GPRINT:rfOutPkts:MAX:%0.2lf%s\\\l ";
}