diff --git a/includes/discovery/current.inc.php b/includes/discovery/current.inc.php index 24991d0d9..597f4a3dc 100644 --- a/includes/discovery/current.inc.php +++ b/includes/discovery/current.inc.php @@ -1,228 +1,7 @@ 1) $descr .= " Phase $i"; - $current = snmp_get($device, $current_oid, "-Oqv"); - if (!$current) - { - $current_oid .= ".0"; - $current = snmp_get($device, $current_oid, "-Oqv"); - } - $current /= 10; - $type = "mge-ups"; - $precision = 10; - $index = $i; - $warnlimit = NULL; - $lowlimit = 0; - $limit = NULL; - $lowwarnlimit = NULL; - echo discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $current); - - } - $oids = trim(snmp_walk($device, "1.3.6.1.4.1.705.1.6.1", "-OsqnU")); - if ($debug) { echo($oids."\n"); } - list($unused,$numPhase) = explode(' ',$oids); - for($i = 1; $i <= $numPhase;$i++) - { - unset($current); - $current_oid = ".1.3.6.1.4.1.705.1.6.2.1.6.$i"; - $descr = "Input"; if ($numPhase > 1) $descr .= " Phase $i"; - $current = snmp_get($device, $current_oid, "-Oqv"); - if (!$current) - { - $current_oid .= ".0"; - $current = snmp_get($device, $current_oid, "-Oqv"); - } - $current /= 10; - $type = "mge-ups"; - $precision = 10; - $index = 100+$i; - $warnlimit = NULL; - $lowlimit = 0; - $limit = NULL; - $lowwarnlimit = NULL; - echo discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $current); - } -} - -## Riello UPS -if ($device['os'] == "netmanplus" || $device['os'] == 'deltaups') -{ - echo("RFC1628 "); - - $oids = snmp_walk($device, "1.3.6.1.2.1.33.1.2.6", "-Osqn", "UPS-MIB"); - if ($debug) { echo($oids."\n"); } - $oids = trim($oids); - foreach(explode("\n", $oids) as $data) - { - $data = trim($data); - if ($data) - { - list($oid,$descr) = explode(" ", $data,2); - $split_oid = explode('.',$oid); - $current_id = $split_oid[count($split_oid)-1]; - $current_oid = "1.3.6.1.2.1.33.1.2.6.$current_id"; - $precision = 10; - $current = snmp_get($device, $current_oid, "-O vq") / $precision; - $descr = "Battery" . (count(explode("\n",$oids)) == 1 ? '' : ' ' . ($current_id+1)); - $type = "rfc1628"; - $index = 500+$current_id; - echo discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '10', '1', NULL, NULL, NULL, NULL, $current); - } - } - - $oids = trim(snmp_walk($device, "1.3.6.1.2.1.33.1.4.3.0", "-OsqnU")); - if ($debug) { echo($oids."\n"); } - list($unused,$numPhase) = explode(' ',$oids); - for($i = 1; $i <= $numPhase;$i++) - { - $current_oid = ".1.3.6.1.2.1.33.1.4.4.1.3.$i"; - $descr = "Output"; if ($numPhase > 1) $descr .= " Phase $i"; - $current = snmp_get($device, $current_oid, "-Oqv"); - $type = "rfc1628"; - $precision = 1; - $index = $i; - echo discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '1', '1', NULL, NULL, NULL, NULL, $current); - } - - $oids = trim(snmp_walk($device, "1.3.6.1.2.1.33.1.3.2.0", "-OsqnU")); - if ($debug) { echo($oids."\n"); } - list($unused,$numPhase) = explode(' ',$oids); - for($i = 1; $i <= $numPhase;$i++) - { - $current_oid = "1.3.6.1.2.1.33.1.3.3.1.4.$i"; - $descr = "Input"; if ($numPhase > 1) $descr .= " Phase $i"; - $current = snmp_get($device, $current_oid, "-Oqv"); - $type = "rfc1628"; - $precision = 1; - $index = 100+$i; - echo discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '1', '1', NULL, NULL, NULL, NULL, $current); - } - - $oids = trim(snmp_walk($device, "1.3.6.1.2.1.33.1.5.2.0", "-OsqnU")); - if ($debug) { echo($oids."\n"); } - list($unused,$numPhase) = explode(' ',$oids); - for($i = 1; $i <= $numPhase;$i++) - { - $current_oid = "1.3.6.1.2.1.33.1.5.3.1.3.$i"; - $descr = "Bypass"; if ($numPhase > 1) $descr .= " Phase $i"; - $current = snmp_get($device, $current_oid, "-Oqv"); - $type = "rfc1628"; - $precision = 1; - $index = 200+$i; - echo discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '1', '1', NULL, NULL, NULL, NULL, $current); - } -} - - - -if ($device['os'] == "gamatronicups") { - - for($i = 1; $i <= 3 ;$i++) { - $current_oid = "GAMATRONIC-MIB::gamatronicLTD.5.4.1.1.3.$i"; - $descr = "Input Phase $i"; - $current = snmp_get($device, $current_oid, "-Oqv"); - $type = "gamatronicups"; - $precision = 1; - $index = $i; - $lowlimit = 0; - $warnlimit = NULL; - $limit = NULL; - - echo discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '1', '1', $lowlimit, NULL, NULL, NULL, $current); - } - - - - - for($i = 1; $i <= 3 ;$i++) { - $current_oid = "GAMATRONIC-MIB::gamatronicLTD.5.5.1.1.3.$i"; - $descr = "Output Phase $i"; - $current = snmp_get($device, $current_oid, "-Oqv"); - $type = "gamatronicups"; - $precision = 1; - $index = 100+$i; - $lowlimit = 0; - $warnlimit = NULL; - $limit = NULL; - echo discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '1', '1', $lowlimit, NULL, NULL, NULL, $current); - } - -} +include_dir("includes/discovery/current"); if($debug) { print_r($valid['current']); } diff --git a/includes/discovery/current/apc.inc.php b/includes/discovery/current/apc.inc.php new file mode 100644 index 000000000..7e27fefd8 --- /dev/null +++ b/includes/discovery/current/apc.inc.php @@ -0,0 +1,67 @@ + diff --git a/includes/discovery/current/gamatronicups.inc.php b/includes/discovery/current/gamatronicups.inc.php new file mode 100644 index 000000000..bea016238 --- /dev/null +++ b/includes/discovery/current/gamatronicups.inc.php @@ -0,0 +1,38 @@ + diff --git a/includes/discovery/current/mgeups.inc.php b/includes/discovery/current/mgeups.inc.php new file mode 100644 index 000000000..13ccb22b9 --- /dev/null +++ b/includes/discovery/current/mgeups.inc.php @@ -0,0 +1,59 @@ + 1) $descr .= " Phase $i"; + $current = snmp_get($device, $current_oid, "-Oqv"); + if (!$current) + { + $current_oid .= ".0"; + $current = snmp_get($device, $current_oid, "-Oqv"); + } + $current /= 10; + $type = "mge-ups"; + $precision = 10; + $index = $i; + $warnlimit = NULL; + $lowlimit = 0; + $limit = NULL; + $lowwarnlimit = NULL; + echo discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $current); + + } + $oids = trim(snmp_walk($device, "1.3.6.1.4.1.705.1.6.1", "-OsqnU")); + if ($debug) { echo($oids."\n"); } + list($unused,$numPhase) = explode(' ',$oids); + for($i = 1; $i <= $numPhase;$i++) + { + unset($current); + $current_oid = ".1.3.6.1.4.1.705.1.6.2.1.6.$i"; + $descr = "Input"; if ($numPhase > 1) $descr .= " Phase $i"; + $current = snmp_get($device, $current_oid, "-Oqv"); + if (!$current) + { + $current_oid .= ".0"; + $current = snmp_get($device, $current_oid, "-Oqv"); + } + $current /= 10; + $type = "mge-ups"; + $precision = 10; + $index = 100+$i; + $warnlimit = NULL; + $lowlimit = 0; + $limit = NULL; + $lowwarnlimit = NULL; + echo discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '10', '1', $lowlimit, $lowwarnlimit, $warnlimit, $limit, $current); + } +} +?> diff --git a/includes/discovery/current/rfc1628.inc.php b/includes/discovery/current/rfc1628.inc.php new file mode 100644 index 000000000..4e0d58528 --- /dev/null +++ b/includes/discovery/current/rfc1628.inc.php @@ -0,0 +1,74 @@ + 1) $descr .= " Phase $i"; + $current = snmp_get($device, $current_oid, "-Oqv"); + $type = "rfc1628"; + $precision = 1; + $index = $i; + echo discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '1', '1', NULL, NULL, NULL, NULL, $current); + } + + $oids = trim(snmp_walk($device, "1.3.6.1.2.1.33.1.3.2.0", "-OsqnU")); + if ($debug) { echo($oids."\n"); } + list($unused,$numPhase) = explode(' ',$oids); + for($i = 1; $i <= $numPhase;$i++) + { + $current_oid = "1.3.6.1.2.1.33.1.3.3.1.4.$i"; + $descr = "Input"; if ($numPhase > 1) $descr .= " Phase $i"; + $current = snmp_get($device, $current_oid, "-Oqv"); + $type = "rfc1628"; + $precision = 1; + $index = 100+$i; + echo discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '1', '1', NULL, NULL, NULL, NULL, $current); + } + + $oids = trim(snmp_walk($device, "1.3.6.1.2.1.33.1.5.2.0", "-OsqnU")); + if ($debug) { echo($oids."\n"); } + list($unused,$numPhase) = explode(' ',$oids); + for($i = 1; $i <= $numPhase;$i++) + { + $current_oid = "1.3.6.1.2.1.33.1.5.3.1.3.$i"; + $descr = "Bypass"; if ($numPhase > 1) $descr .= " Phase $i"; + $current = snmp_get($device, $current_oid, "-Oqv"); + $type = "rfc1628"; + $precision = 1; + $index = 200+$i; + echo discover_sensor($valid_sensor, 'current', $device, $current_oid, $index, $type, $descr, '1', '1', NULL, NULL, NULL, NULL, $current); + } +} + +?> diff --git a/includes/discovery/frequencies.inc.php b/includes/discovery/frequencies.inc.php index 8519b3d93..0de99da80 100644 --- a/includes/discovery/frequencies.inc.php +++ b/includes/discovery/frequencies.inc.php @@ -1,154 +1,7 @@ 1) $descr .= " Phase $i"; - $current = snmp_get($device, $freq_oid, "-Oqv"); - if (!$current) - { - $freq_oid .= ".0"; - $current = snmp_get($device, $freq_oid, "-Oqv"); - } - $current /= 10; - $type = "mge-ups"; - $divisor = 10; - $index = $i; - echo discover_sensor($valid_sensor, 'freq', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); - } - $oids = trim(snmp_walk($device, "1.3.6.1.4.1.705.1.6.1", "-OsqnU")); - if ($debug) { echo($oids."\n"); } - list($unused,$numPhase) = explode(' ',$oids); - for($i = 1; $i <= $numPhase;$i++) - { - $freq_oid = ".1.3.6.1.4.1.705.1.6.2.1.3.$i"; - $descr = "Input"; if ($numPhase > 1) $descr .= " Phase $i"; - $current = snmp_get($device, $freq_oid, "-Oqv"); - if (!$current) - { - $freq_oid .= ".0"; - $current = snmp_get($device, $freq_oid, "-Oqv"); - } - $current /= 10; - $type = "mge-ups"; - $divisor = 10; - $index = 100+$i; - echo discover_sensor($valid_sensor, 'freq', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); - } -} - -## RFC1628 -if ($device['os'] == "netmanplus" || $device['os'] == "deltaups") -{ - echo("RFC1628 "); - - $oids = trim(snmp_walk($device, "1.3.6.1.2.1.33.1.3.2.0", "-OsqnU")); - if ($debug) { echo($oids."\n"); } - list($unused,$numPhase) = explode(' ',$oids); - for($i = 1; $i <= $numPhase;$i++) - { - $freq_oid = "1.3.6.1.2.1.33.1.3.3.1.2.$i"; - $descr = "Input"; if ($numPhase > 1) $descr .= " Phase $i"; - $current = snmp_get($device, $freq_oid, "-Oqv") / 10; - $type = "rfc1628"; - $divisor = 10; - $index = '3.2.0.'.$i; - echo discover_sensor($valid_sensor, 'freq', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); - } - - $freq_oid = "1.3.6.1.2.1.33.1.4.2.0"; - $descr = "Output"; - $current = snmp_get($device, $freq_oid, "-Oqv") / 10; - $type = "rfc1628"; - $divisor = 10; - $index = '4.2.0'; - echo discover_sensor($valid_sensor, 'freq', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); - - $freq_oid = "1.3.6.1.2.1.33.1.5.1.0"; - $descr = "Bypass"; - $current = snmp_get($device, $freq_oid, "-Oqv") / 10; - $type = "rfc1628"; - $divisor = 10; - $index = '5.1.0'; - echo discover_sensor($valid_sensor, 'freq', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); -} - -## APC -if ($device['os'] == "apc") -{ - $oids = snmp_walk($device, "1.3.6.1.4.1.318.1.1.8.5.3.2.1.4", "-OsqnU", ""); - if ($debug) { echo($oids."\n"); } - if ($oids) echo("APC In "); - $divisor = 1; - $type = "apc"; - foreach(explode("\n", $oids) as $data) - { - $data = trim($data); - if ($data) - { - list($oid,$current) = explode(" ", $data,2); - $split_oid = explode('.',$oid); - $index = $split_oid[count($split_oid)-1]; - $oid = "1.3.6.1.4.1.318.1.1.8.5.3.2.1.4." . $index; - $descr = "Input Feed " . chr(64+$index); - discover_sensor($valid_sensor, 'freq', $device, $oid, "3.2.1.4.$index", $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); - } - } - - $oids = snmp_walk($device, "1.3.6.1.4.1.318.1.1.8.5.4.2.1.4", "-OsqnU", ""); - if ($debug) { echo($oids."\n"); } - if ($oids) echo(" APC Out "); - $divisor = 1; - $type = "apc"; - foreach(explode("\n", $oids) as $data) - { - $data = trim($data); - if ($data) - { - list($oid,$current) = explode(" ", $data,2); - $split_oid = explode('.',$oid); - $index = $split_oid[count($split_oid)-3]; - $oid = "1.3.6.1.4.1.318.1.1.8.5.4.2.1.4." . $index; - $descr = "Output Feed"; if (count(explode("\n", $oids)) > 1) { $descr .= " $index"; } - discover_sensor($valid_sensor, 'freq', $device, $oid, "4.2.1.4.$index", $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); - } - } - - $oids = snmp_get($device, "1.3.6.1.4.1.318.1.1.1.3.2.4.0", "-OsqnU", ""); - if ($debug) { echo($oids."\n"); } - if ($oids) - { - echo(" APC In "); - list($oid,$current) = explode(" ",$oids); - $divisor = 1; - $type = "apc"; - $index = "3.2.4.0"; - $descr = "Input"; - discover_sensor($valid_sensor, 'freq', $device, $oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); - } - - $oids = snmp_get($device, "1.3.6.1.4.1.318.1.1.1.4.2.2.0", "-OsqnU", ""); - if ($debug) { echo($oids."\n"); } - if ($oids) - { - echo(" APC Out "); - list($oid,$current) = explode(" ",$oids); - $divisor = 1; - $type = "apc"; - $index = "4.2.2.0"; - $descr = "Output"; - discover_sensor($valid_sensor, 'freq', $device, $oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); - } -} +echo("Frequencies: "); +include_dir("includes/discovery/frequencies"); if($debug) { print_r($valid['freq']); } diff --git a/includes/discovery/frequencies/apc.inc.php b/includes/discovery/frequencies/apc.inc.php new file mode 100644 index 000000000..c8d8db877 --- /dev/null +++ b/includes/discovery/frequencies/apc.inc.php @@ -0,0 +1,72 @@ + 1) { $descr .= " $index"; } + discover_sensor($valid_sensor, 'freq', $device, $oid, "4.2.1.4.$index", $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); + } + } + + $oids = snmp_get($device, "1.3.6.1.4.1.318.1.1.1.3.2.4.0", "-OsqnU", ""); + if ($debug) { echo($oids."\n"); } + if ($oids) + { + echo(" APC In "); + list($oid,$current) = explode(" ",$oids); + $divisor = 1; + $type = "apc"; + $index = "3.2.4.0"; + $descr = "Input"; + discover_sensor($valid_sensor, 'freq', $device, $oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); + } + + $oids = snmp_get($device, "1.3.6.1.4.1.318.1.1.1.4.2.2.0", "-OsqnU", ""); + if ($debug) { echo($oids."\n"); } + if ($oids) + { + echo(" APC Out "); + list($oid,$current) = explode(" ",$oids); + $divisor = 1; + $type = "apc"; + $index = "4.2.2.0"; + $descr = "Output"; + discover_sensor($valid_sensor, 'freq', $device, $oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); + } +} +?> diff --git a/includes/discovery/frequencies/mgeups.inc.php b/includes/discovery/frequencies/mgeups.inc.php new file mode 100644 index 000000000..8f23fd493 --- /dev/null +++ b/includes/discovery/frequencies/mgeups.inc.php @@ -0,0 +1,48 @@ + 1) $descr .= " Phase $i"; + $current = snmp_get($device, $freq_oid, "-Oqv"); + if (!$current) + { + $freq_oid .= ".0"; + $current = snmp_get($device, $freq_oid, "-Oqv"); + } + $current /= 10; + $type = "mge-ups"; + $divisor = 10; + $index = $i; + echo discover_sensor($valid_sensor, 'freq', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); + } + $oids = trim(snmp_walk($device, "1.3.6.1.4.1.705.1.6.1", "-OsqnU")); + if ($debug) { echo($oids."\n"); } + list($unused,$numPhase) = explode(' ',$oids); + for($i = 1; $i <= $numPhase;$i++) + { + $freq_oid = ".1.3.6.1.4.1.705.1.6.2.1.3.$i"; + $descr = "Input"; if ($numPhase > 1) $descr .= " Phase $i"; + $current = snmp_get($device, $freq_oid, "-Oqv"); + if (!$current) + { + $freq_oid .= ".0"; + $current = snmp_get($device, $freq_oid, "-Oqv"); + } + $current /= 10; + $type = "mge-ups"; + $divisor = 10; + $index = 100+$i; + echo discover_sensor($valid_sensor, 'freq', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); + } +} +?> diff --git a/includes/discovery/frequencies/rfc1628.inc.php b/includes/discovery/frequencies/rfc1628.inc.php new file mode 100644 index 000000000..22d2a6ee0 --- /dev/null +++ b/includes/discovery/frequencies/rfc1628.inc.php @@ -0,0 +1,40 @@ + 1) $descr .= " Phase $i"; + $current = snmp_get($device, $freq_oid, "-Oqv") / 10; + $type = "rfc1628"; + $divisor = 10; + $index = '3.2.0.'.$i; + echo discover_sensor($valid_sensor, 'freq', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); + } + + $freq_oid = "1.3.6.1.2.1.33.1.4.2.0"; + $descr = "Output"; + $current = snmp_get($device, $freq_oid, "-Oqv") / 10; + $type = "rfc1628"; + $divisor = 10; + $index = '4.2.0'; + echo discover_sensor($valid_sensor, 'freq', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); + + $freq_oid = "1.3.6.1.2.1.33.1.5.1.0"; + $descr = "Bypass"; + $current = snmp_get($device, $freq_oid, "-Oqv") / 10; + $type = "rfc1628"; + $divisor = 10; + $index = '5.1.0'; + echo discover_sensor($valid_sensor, 'freq', $device, $freq_oid, $index, $type, $descr, $divisor, '1', NULL, NULL, NULL, NULL, $current); +} +?>