From 19a92fdbfc9b6ecdbac7bb553bfcb863f8277e4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Rosiak?= Date: Sun, 8 Jan 2017 15:53:10 +0200 Subject: [PATCH] newdevice: Improve Checkpoint Discovery (#5334) --- includes/definitions/gaia.yaml | 2 +- includes/discovery/os/linux.inc.php | 1 + tests/OSDiscoveryTest.php | 1 + tests/snmpsim/gaia1.snmprec | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 tests/snmpsim/gaia1.snmprec diff --git a/includes/definitions/gaia.yaml b/includes/definitions/gaia.yaml index e9f49bae4d..3be46f0fbb 100644 --- a/includes/definitions/gaia.yaml +++ b/includes/definitions/gaia.yaml @@ -9,4 +9,4 @@ over: - { graph: device_mempool, text: 'Memory Usage' } discovery: - sysObjectId: - - .1.3.6.1.4.1.2620.1.6.123.1.49 + - .1.3.6.1.4.1.2620.1.6.123.1 diff --git a/includes/discovery/os/linux.inc.php b/includes/discovery/os/linux.inc.php index 138cf00e13..8adc0681d9 100644 --- a/includes/discovery/os/linux.inc.php +++ b/includes/discovery/os/linux.inc.php @@ -10,6 +10,7 @@ $skip_oids = array( '.1.3.6.1.4.1.9.1.1348', // Cisco Unified Communications Manager '.1.3.6.1.4.1.3375.2.1', // F5 '.1.3.6.1.4.1.534.', // Eaton + '.1.3.6.1.4.1.2620.1.6.123.1' // Checkpoint ); if (starts_with($sysDescr, 'Linux') && !starts_with($sysObjectId, $skip_oids)) { diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php index 35a07d0ffd..a47a6356c5 100644 --- a/tests/OSDiscoveryTest.php +++ b/tests/OSDiscoveryTest.php @@ -634,6 +634,7 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase public function testGaia() { $this->checkOS('gaia'); + $this->checkOS('gaia', 'gaia1'); } public function testGamatronicups() diff --git a/tests/snmpsim/gaia1.snmprec b/tests/snmpsim/gaia1.snmprec new file mode 100644 index 0000000000..085184ceb7 --- /dev/null +++ b/tests/snmpsim/gaia1.snmprec @@ -0,0 +1,2 @@ +1.3.6.1.2.1.1.1.0|4|Linux st1fw01 2.6.18-92cpx86_64 #1 SMP Mon Jan 19 12:13:55 +1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.2620.1.6.123.1.41