From 5c4ed305ec94bc38cdc125ddc52f0abd3d989cad Mon Sep 17 00:00:00 2001 From: "R. Morris" Date: Sat, 16 Jan 2016 22:46:14 -0600 Subject: [PATCH] Grab the most current files. --- includes/definitions.inc.php | 19 +++++++++---------- includes/discovery/os/lenovoemc.inc.php | 8 ++++---- includes/polling/os/lenovoemc.inc.php | 2 +- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php index 834b986c51..df20fd4b5a 100644 --- a/includes/definitions.inc.php +++ b/includes/definitions.inc.php @@ -1438,16 +1438,15 @@ $config['os'][$os]['over'][2]['text'] = 'Memory Usage'; // Lenovo EMC (NAS) $os = 'lenovoemc'; $config['os'][$os]['type'] = 'storage'; -$config['os'][$os]['group'] = 'unix'; -$config['os'][$os]['text'] = 'Linux'; -$config['os'][$os]['ifXmcbc'] = 1; -$config['os'][$os]['ifname'] = 1; -$config['os'][$os]['over'][0]['graph'] = 'device_processor'; -$config['os'][$os]['over'][0]['text'] = 'Processor Usage'; -$config['os'][$os]['over'][1]['graph'] = 'device_ucd_memory'; -$config['os'][$os]['over'][1]['text'] = 'Memory Usage'; -$config['os'][$os]['over'][2]['graph'] = 'device_storage'; -$config['os'][$os]['over'][2]['text'] = 'Storage Usage'; +$config['os'][$os]['group'] = 'storage'; +$config['os'][$os]['text'] = 'LenovoEMC'; +$config['os'][$os]['icon'] = 'lenovo'; +$config['os'][$os]['over'][0]['graph'] = 'device_bits'; +$config['os'][$os]['over'][0]['text'] = 'Device Traffic'; +$config['os'][$os]['over'][1]['graph'] = 'device_processor'; +$config['os'][$os]['over'][1]['text'] = 'CPU Usage'; +$config['os'][$os]['over'][2]['graph'] = 'device_mempool'; +$config['os'][$os]['over'][2]['text'] = 'Memory Usage'; // Graph Types require_once $config['install_dir'].'/includes/load_db_graph_types.inc.php'; diff --git a/includes/discovery/os/lenovoemc.inc.php b/includes/discovery/os/lenovoemc.inc.php index 71360a560d..a25843b54a 100644 --- a/includes/discovery/os/lenovoemc.inc.php +++ b/includes/discovery/os/lenovoemc.inc.php @@ -5,10 +5,10 @@ if (!$os) { $os = 'lenovoemc'; $lenovoemc_mibs = array( - "fanValue" => "IOMEGANAS-MIB", - "tempValue" => "IOMEGANAS-MIB", - "raidStatus" => "IOMEGANAS-MIB", - "diskStatus" => "IOMEGANAS-MIB" + "fanValue" => "IOMEGANAS-MIB", + "tempValue" => "IOMEGANAS-MIB", + "raidStatus" => "IOMEGANAS-MIB", + "diskStatus" => "IOMEGANAS-MIB" ); register_mibs($device, $lenovoemc_mibs, "includes/discovery/os/lenovoemc.inc.php"); } diff --git a/includes/polling/os/lenovoemc.inc.php b/includes/polling/os/lenovoemc.inc.php index fa8537e59c..f834016a4c 100644 --- a/includes/polling/os/lenovoemc.inc.php +++ b/includes/polling/os/lenovoemc.inc.php @@ -1,5 +1,5 @@