mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove commit from 3188

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@3192 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2012-05-15 18:18:20 +00:00
parent fc9347e273
commit d7765f7ab9
7 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
includes/definitions.inc.php
View File

@@ -663,18 +663,6 @@ $config['os'][$os]['text'] = "APC Management Module";
$config['os'][$os]['type'] = "power";
$config['os'][$os]['over'][0]['graph'] = "device_current";
$config['os'][$os]['over'][0]['text'] = "Current";
$config['os'][$os]['over'][1]['graph'] = "device_voltage";
$config['os'][$os]['over'][1]['text'] = "Voltage";
$os = "apcups";
$config['os'][$os]['text'] = "APC UPS";
$config['os'][$os]['type'] = "power";
$config['os'][$os]['group'] = "ups";
$config['os'][$os]['icon'] = "apc";
$config['os'][$os]['over'][0]['graph'] = "device_voltage";
$config['os'][$os]['over'][0]['text'] = "Voltage";
$config['os'][$os]['over'][1]['graph'] = "device_frequency";
$config['os'][$os]['over'][1]['text'] = "Frequencies";
$os = "netbotz";
$config['os'][$os]['text'] = "Netbotz Environment sensor";

2
includes/discovery/current/apc.inc.php
View File

@@ -1,6 +1,6 @@
<?php
## APC PDUs
## APC
if ($device['os'] == "apc")
{
# PDU - Phase

2
includes/discovery/frequencies/apc.inc.php
View File

@@ -1,7 +1,7 @@
<?php
## APC
if ($device['os'] == "apc" || $device['os'] == "apcups")
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"); }

2
includes/discovery/humidity/apc.inc.php
View File

@@ -1,6 +1,6 @@
<?php
if ($device['os'] == "apc" || $device['os'] == "apcups")
if ($device['os'] == "apc")
{
# Environmental monitoring on UPSes etc
# FIXME emConfigProbesTable may also be used? But not filled out on my device...

3
includes/discovery/os/apc.inc.php
View File

@@ -2,8 +2,7 @@
if (!$os)
{
if (strstr(snmp_get($device, "SNMPv2-SMI::enterprises.318.1.1.1.1.1.1.0", "-Oqv", ""), "UPS")) { $os = "apcups"; }
elseif (strstr($sysDescr, "APC Web/SNMP Management Card")) { $os = "apc"; }
if (strstr($sysDescr, "APC Web/SNMP Management Card")) { $os = "apc"; }
elseif (strstr($sysDescr, "APC Switched Rack PDU")) { $os = "apc"; }
elseif (strstr($sysDescr, "APC MasterSwitch PDU")) { $os = "apc"; }
elseif (strstr($sysDescr, "APC Metered Rack PDU")) { $os = "apc"; }

2
includes/discovery/temperatures/apc.inc.php
View File

@@ -1,6 +1,6 @@
<?php
if ($device['os'] == "apc" || $device['os'] == "apcups")
if ($device['os'] == "apc")
{
$oids = snmp_get($device, "1.3.6.1.4.1.318.1.1.1.2.2.2.0", "-OsqnU", "");
if ($debug) { echo($oids."\n"); }

2
includes/discovery/voltages/apc.inc.php
View File

@@ -1,7 +1,7 @@
<?php
## APC Voltages
if ($device['os'] == "apc" || $device['os'] == "apcups")
if ($device['os'] == "apc")
{
$oids = snmp_walk($device, "1.3.6.1.4.1.318.1.1.8.5.3.3.1.3", "-OsqnU", "");
if ($debug) { echo($oids."\n"); }