From dcb02c43fa933215ee21a04f5cbfdf7562dd146e Mon Sep 17 00:00:00 2001 From: Rosiak Date: Mon, 21 Sep 2015 18:44:21 +0200 Subject: [PATCH 1/3] Basic HP MSM Discovery Fix #1947 --- includes/definitions.inc.php | 8 ++++++++ includes/discovery/os/hpmsm.inc.php | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 includes/discovery/os/hpmsm.inc.php diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php index 762034ea93..5ea1b0d445 100644 --- a/includes/definitions.inc.php +++ b/includes/definitions.inc.php @@ -1290,6 +1290,14 @@ $config['os'][$os]['icon'] = 'generic'; $config['os'][$os]['over'][0]['graph'] = 'device_bits'; $config['os'][$os]['over'][0]['text'] = 'Traffic'; +// HP MSM +$os = 'hpmsm'; +$config['os'][$os]['text'] = 'HP MSM'; +$config['os'][$os]['type'] = 'wireless'; +$config['os'][$os]['icon'] = 'hp'; +$config['os'][$os]['over'][0]['graph'] = 'device_bits'; +$config['os'][$os]['over'][0]['text'] = 'Traffic'; + // Appliances $os = 'fortios'; $config['os'][$os]['text'] = 'FortiOS'; diff --git a/includes/discovery/os/hpmsm.inc.php b/includes/discovery/os/hpmsm.inc.php new file mode 100644 index 0000000000..594cd2242c --- /dev/null +++ b/includes/discovery/os/hpmsm.inc.php @@ -0,0 +1,20 @@ + + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. Please see LICENSE.txt at the top level of + * the source code distribution for details. + */ +if (!$os) { + if (strpos($sysObjectId, '1.3.6.1.4.1.8744.1') !== false) { + $split_oid = explode('.',$sysObjectId); + $model_oid = $split_oid[count($split_oid)-1]; + if ($model_oid >= 40 && $model_oid < 50) { + $os = 'hpmsm'; + } + } +} From 1081d417df6909b031527677785b780bb4de4e26 Mon Sep 17 00:00:00 2001 From: Rosiak Date: Mon, 21 Sep 2015 18:45:38 +0200 Subject: [PATCH 2/3] Update changelog --- doc/General/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/General/Changelog.md b/doc/General/Changelog.md index f4d0831179..1ff997b3b3 100644 --- a/doc/General/Changelog.md +++ b/doc/General/Changelog.md @@ -32,6 +32,7 @@ - Added support for saving notes for devices (PR1927) - Added detection for: - FortiOS (PR1815) + - HP MSM (PR1953) - Discovery / Poller: - Added Proxmox support (PR1789) - Documentation: From 389586be0202943d2caecf2750ee39415c3f434e Mon Sep 17 00:00:00 2001 From: Rosiak Date: Mon, 21 Sep 2015 19:56:14 +0200 Subject: [PATCH 3/3] Expand device discovery --- includes/discovery/os/hpmsm.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/discovery/os/hpmsm.inc.php b/includes/discovery/os/hpmsm.inc.php index 594cd2242c..f586c1bc8f 100644 --- a/includes/discovery/os/hpmsm.inc.php +++ b/includes/discovery/os/hpmsm.inc.php @@ -13,7 +13,7 @@ if (!$os) { if (strpos($sysObjectId, '1.3.6.1.4.1.8744.1') !== false) { $split_oid = explode('.',$sysObjectId); $model_oid = $split_oid[count($split_oid)-1]; - if ($model_oid >= 40 && $model_oid < 50) { + if ($model_oid >= 40 && $model_oid < 60 || $model_oid = 67) { $os = 'hpmsm'; } }