redesigned graph defining system (still seems a bit batshit, but nevermind). lots of improvements to various pollers, only writing RRDs if valid data is returned, etc.

git-svn-id: http://www.observium.org/svn/observer/trunk@1506 61d68cd4-352d-0410-923a-c4978735b2b8
2024-10-07 16:52:45 +00:00 · 2010-07-28 19:43:02 +00:00
parent 927c92e8dd
commit f29e7b755b
67 changed files with 264 additions and 338 deletions
--- a/includes/polling/os/allied.inc.php
+++ b/includes/polling/os/allied.inc.php
@@ -47,6 +47,4 @@ $version = str_replace("\"","", $version);
 $features = str_replace("\"","", $features);
 $hardware = str_replace("\"","", $hardware);

-include("includes/polling/hr-mib.inc.php");
-
 ?>
--- a/includes/polling/os/extremeware.inc.php
+++ b/includes/polling/os/extremeware.inc.php
@@ -41,7 +41,4 @@ $version = str_replace("\"","", $version);
 $features = str_replace("\"","", $features);
 $hardware = str_replace("\"","", $hardware);

-
-include("includes/polling/hr-mib.inc.php");
-
 ?>
--- a/includes/polling/os/fortigate.inc.php
+++ b/includes/polling/os/fortigate.inc.php
@@ -10,37 +10,25 @@ $serial       = shell_exec($config['snmpget']. " -M ".$config['mibdir']." -m FOR
 $version = preg_replace("/(.+)\ (.+),(.+),(.+)/", "Fortinet \\1||\\2||\\3||\\4", $fnSysVersion);
 list($hardware,$version,$features) = explode("||", $version);

-$cpurrd   = $config['rrd_dir'] . "/" . $device['hostname'] . "/fortigate-cpu.rrd";
-$memrrd   = $config['rrd_dir'] . "/" . $device['hostname'] . "/fortigate-memory.rrd";
-$sessrrd  = $config['rrd_dir'] . "/" . $device['hostname'] . "/fortigate-sessions.rrd";
+#$cmd  = $config['snmpget'] . " -M ".$config['mibdir']. " -m FORTINET-MIB-280 -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'];
+#$cmd .= " fnSysCpuUsage.0 fnSysMemUsage.0 fnSysSesCount.0 fnSysMemCapacity.0";
+#$data = shell_exec($cmd);
+#list ($cpu, $mem, $ses, $memsize) = explode("\n", $data);

-$cmd  = $config['snmpget'] . " -M ".$config['mibdir']. " -m FORTINET-MIB-280 -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'];
-$cmd .= " fnSysCpuUsage.0 fnSysMemUsage.0 fnSysSesCount.0 fnSysMemCapacity.0";
-$data = shell_exec($cmd);
-list ($cpu, $mem, $ses, $memsize) = explode("\n", $data);
+$sessrrd  = $config['rrd_dir'] . "/" . $device['hostname'] . "/fortigate_sessions.rrd";

-if (!is_file($cpurrd)) {
-   shell_exec($config['rrdtool']." create $cpurrd --step 300 DS:cpu:GAUGE:600:0:100 \
-     RRA:AVERAGE:0.5:1:800 RRA:AVERAGE:0.5:6:800 RRA:AVERAGE:0.5:24:800 RRA:AVERAGE:0.5:288:800 \
-     RRA:MAX:0.5:1:800 RRA:MAX:0.5:6:800 RRA:MAX:0.5:24:800 RRA:MAX:0.5:288:800");
-}
+$sessions = snmp_get($device, "fnSysSesCount.0", "FORTINET-MIB-280");

-if (!is_file($memrrd)) {
-
-      shell_exec($config['rrdtool'] . " create $memrrd --step 300 \
-       DS:mem:GAUGE:600:0:10000000000 DS:memcapacity:GAUGE:600:0:10000000000 \
-       RRA:AVERAGE:0.5:1:800 RRA:AVERAGE:0.5:6:800 RRA:AVERAGE:0.5:24:800 RRA:AVERAGE:0.5:288:800 \
-       RRA:MAX:0.5:1:800 RRA:MAX:0.5:6:800 RRA:MAX:0.5:24:800 RRA:MAX:0.5:288:800");
-}
-
-if (!is_file($sessrrd)) {
+if(is_numeric($sessions)
+{
+  if (!is_file($sessrrd)) 
+  {
   `rrdtool create $sessrrd --step 300 DS:sessions:GAUGE:600:0:3000000 \
     RRA:AVERAGE:0.5:1:800 RRA:AVERAGE:0.5:6:800 RRA:AVERAGE:0.5:24:800 RRA:AVERAGE:0.5:288:800 \
-     RRA:MAX:0.5:1:800 RRA:MAX:0.5:6:800 RRA:MAX:0.5:24:800 RRA:MAX:0.5:288:800`;
+     RRA:MAX:0.5:1:800 RRA:MAX:0.5:6:800 RRA:MAX:0.5:24:800 RRA:MAX:0.5:288:800`;  
+  }
+  shell_exec($config['rrdtool'] . " update $sessrrd N:$ses");
+  $graphs['fortigate_sessions']
 }

-shell_exec($config['rrdtool'] . " update $cpurrd N:$cpu");
-shell_exec($config['rrdtool'] . " update $memrrd N:$mem:$memsize");
-shell_exec($config['rrdtool'] . " update $sessrrd N:$ses");
-
 ?>
--- a/includes/polling/os/junos.inc.php
+++ b/includes/polling/os/junos.inc.php
@@ -17,8 +17,6 @@ list($version) = explode("]", $jun_ver);
 list(,$version) =  explode("[", $version);
 $features = "";

-echo("$hardware - $version - $features - $serial\n");
-
 $cpurrd   = $config['rrd_dir'] . "/" . $device['hostname'] . "/junos-cpu.rrd";

 #$cpu_cmd  = $config['snmpget'] . " -m JUNIPER-MIB -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'];
@@ -46,6 +44,4 @@ if (is_numeric($cpu_usage))
  rrdtool_update($cpurrd, " N:$cpu_usage");
 }

-include("includes/polling/hr-mib.inc.php");
-
 ?>
--- a/includes/polling/os/junose.inc.php
+++ b/includes/polling/os/junose.inc.php
@@ -18,17 +18,10 @@ list(,$version) =  explode("(", $version);
 list($features) = explode("]", $junose_version);
 list(,$features) =  explode("[", $features);

-echo("$hardware - $version - $features - $serial\n");
-
 $cpurrd   = $config['rrd_dir'] . "/" . $device['hostname'] . "/junose-cpu.rrd";

 #$cpu_cmd  = $config['snmpget'] . " -m JUNIPER-MIB -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'];
 #$cpu_cmd .= " .1.3.6.1.4.1.2636.3.1.13.1.8.9.1.0.0";
 #$cpu_usage = trim(shell_exec($cpu_cmd));

-include("includes/polling/hr-mib.inc.php");
-include("includes/polling/junose-atm-vp.inc.php");
-
-
-
 ?>
--- a/includes/polling/os/redback.inc.php
+++ b/includes/polling/os/redback.inc.php
@@ -1,6 +1,4 @@
 <?php

-include("includes/polling/ucd-mib.inc.php");
-include("includes/polling/hr-mib.inc.php");

 ?>
--- a/includes/polling/os/screenos.inc.php
+++ b/includes/polling/os/screenos.inc.php
@@ -3,11 +3,9 @@
 echo("Doing Juniper Netscreen (ScreenOS)");

 $version = preg_replace("/(.+)\ version\ (.+)\ \(SN:\ (.+)\,\ (.+)\)/", "Juniper Netscreen \\1||\\2||\\3||\\4", $sysDescr);
-#echo("$version\n");
 list($hardware,$version,$serial,$features) = explode("||", $version);

 $sessrrd  = $config['rrd_dir'] . "/" . $device['hostname'] . "/screenos-sessions.rrd";
-
 $sess_cmd  = $config['snmpget'] . " -M ".$config['mibdir'] . " -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'];
 $sess_cmd .= " .1.3.6.1.4.1.3224.16.3.2.0 .1.3.6.1.4.1.3224.16.3.3.0 .1.3.6.1.4.1.3224.16.3.4.0";
 $sess_data = shell_exec($sess_cmd);
@@ -30,4 +28,6 @@ if (!is_file($sessrrd)) {

 rrdtool_update("$sessrrd", "N:$sessalloc:$sessmax:$sessfailed");

+$graphs['netscreen_sessions'] = TRUE;
+
 ?>
--- a/includes/polling/os/speedtouch.inc.php
+++ b/includes/polling/os/speedtouch.inc.php
@@ -17,8 +17,4 @@ if($loop) {
    $version = $matches[1];
 }

-echo("$hardware - $version - $features - $serial\n");
-
-#include("hr-mib.inc.php");
-
 ?>
--- a/includes/polling/os/unix.inc.php
+++ b/includes/polling/os/unix.inc.php
@@ -46,7 +46,4 @@
        if(strpos($hw, "No") !== FALSE) { unset($hw); } else { $hardware = "Dell " . $hw; }
      }

-echo("$version - $hardware - $features ");
-
-include("includes/polling/ucd-mib.inc.php");
-include("includes/polling/hr-mib.inc.php");
+?>
--- a/includes/polling/os/windows.inc.php
+++ b/includes/polling/os/windows.inc.php
@@ -32,7 +32,4 @@

   ### Detect processor type? : I.E.  x86 Family 15 Model 2 Stepping 7

-include("includes/polling/ucd-mib.inc.php");
-include("includes/polling/hr-mib.inc.php");
-
 ?>