Please don't post this stuff to the mailing list, this is what jira is for.
note also that patch won't include binary files, like images.
adam.
On 2013-09-12 12:53, Karl-Johan Reimann wrote:
Here are CPU/memory polling and discovery modules. I could not get a hold of the MIBs, unfortunately.
Index: includes/discovery/mempools/seos.inc.php
--- includes/discovery/mempools/seos.inc.php (revision 0) +++ includes/discovery/mempools/seos.inc.php (revision 0) @@ -0,0 +1,21 @@ +<?php +/// +//// Hardcoded discovery of memory usage on SmartEdge devices. +///// +//// RBN-MEMORY-MIB::rbnMemoryKBytesInUse.0 +//// RBN-MEMORY-MIB::rbnMemoryFreeKBytes.0 +//
+if ($device['os'] == "seos") +{
- echo("SmartEdge OS: ");
- $used = snmp_get($device, ".1.3.6.1.4.1.2352.2.16.1.2.1.4.1",
"-OvQ");
- $free = snmp_get($device, ".1.3.6.1.4.1.2352.2.16.1.2.1.3.1",
"-OvQ");
- if (is_numeric($free) && is_numeric($used))
- {
- discover_mempool($valid_mempool, $device, 0, "seos", "Memory",
"1", NULL, NULL);
- }
+} +?>
Index: includes/discovery/processors/seos.inc.php
--- includes/discovery/processors/seos.inc.php (revision 0) +++ includes/discovery/processors/seos.inc.php (revision 0) @@ -0,0 +1,23 @@ +<?php
+/// +// Hardcoded discovery of cpu usage on SmartEdge devices. +/// +// RBN-CPU-METER-MIB::rbnCpuMeterFiveMinuteAvg.0
+if ($device['os'] == "seos") +{
- echo("SmartEdge : ");
- $descr = "Processor";
- $usage = snmp_get($device, ".1.3.6.1.4.1.2352.2.6.1.3.0", "-Ovq");
- if (is_numeric($usage))
- {
- discover_processor($valid['processor'], $device,
".1.3.6.1.4.1.2352.2.6.1.3.0", "0", "seos", $descr, "1", $usage, NULL, NULL);
- }
+}
+unset ($processors_array);
+?>
Index: includes/polling/mempools/seos.inc.php
--- includes/polling/mempools/seos.inc.php (revision 0) +++ includes/polling/mempools/seos.inc.php (revision 0) @@ -0,0 +1,13 @@ +<?php
+# RBN-MEMORY-MIB::rbnMemoryKBytesInUse.0 = INTEGER: 896420 +# RBN-MEMORY-MIB::rbnMemoryFreeKBytes.0 = INTEGER: 6412568
- $mempool['used'] = snmp_get($device,
".1.3.6.1.4.1.2352.2.16.1.2.1.4.1", "-OvQ");
- $mempool['free'] = snmp_get($device,
".1.3.6.1.4.1.2352.2.16.1.2.1.3.1", "-OvQ");
- $mempool['used'] *= 1024;
- $mempool['free'] *= 1024;
- $mempool['total'] = $mempool['total'] + $mempool['free']
+?>
/Kalle Reimann
-----Original Message----- From: observium [mailto:observium-bounces@observium.org] On Behalf Of Karl-Johan Reimann Sent: den 12 september 2013 08:52 To: Observium Network Observation System Subject: [Observium] Added support for Ericsson SmartEdge routers
Hi, I've added basic support for SmartEdge routers (previously known as Redback). I removed the Redback discovery file, which didn't have an entry in os.inc.php.
Index: html/images/os/ericsson.png
Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream
Property changes on: html/images/os/ericsson.png ___________________________________________________________________ Added: svn:mime-type
- application/octet-stream
Index: includes/discovery/os/seos.inc.php
--- includes/discovery/os/seos.inc.php (revision 0) +++ includes/discovery/os/seos.inc.php (revision 0) @@ -0,0 +1,11 @@ +<?php
+if (!$os) +{
- if (strstr($sysDescr, "SmartEdge"))
- {
$os = "seos";- }
+}
+?> Index: includes/discovery/os/redback.inc.php =================================================================== --- includes/discovery/os/redback.inc.php (revision 4484) +++ includes/discovery/os/redback.inc.php (working copy) @@ -1,8 +0,0 @@ -<?php
-if (!$os) -{
- if (preg_match("/Redback/", $sysDescr)) { $os = "redback"; }
-}
-?> \ No newline at end of file Index: includes/definitions/os.inc.php =================================================================== --- includes/definitions/os.inc.php (revision 4484) +++ includes/definitions/os.inc.php (working copy) @@ -1270,6 +1270,14 @@ $config['os'][$os]['type'] = "firewall"; $config['os'][$os]['icon'] = "draytek";
+// SmartEdge OS
+$os = "seos"; +$config['os'][$os]['text'] = "SmartEdge OS"; +$config['os'][$os]['type'] = "network"; +$config['os'][$os]['icon'] = "ericsson";
foreach ($config['os'] as $this_os => $blah) { if (isset($config['os'][$this_os]['group']))
/Kalle Reimann _______________________________________________ observium mailing list observium@observium.org http://postman.memetic.org/cgi-bin/mailman/listinfo/observium