refactor: move include based discovery after yaml discovery #5401

Merged
merged 1 commit into from Jan 11, 2017

Projects

None yet

5 participants

@murrant
Contributor
murrant commented Jan 11, 2017

Fix edgeswitch detection to include rather than exclude
Fix zynos detection it requires both sysOjbectId and sysDescr to match
move zywall detection to yaml
remove linux exceptions as they aren't needed

DO NOT DELETE THIS TEXT

Please note

Please read this information carefully. You can run ./scripts/pre-commit.php to check your code before submitting.

@murrant murrant refactor: move include based discovery after yaml discovery
Fix edgeswitch detection to include rather than exclude
Fix zynos detection it requires both sysOjbectId and sysDescr to match
move zywall detection to yaml
e9c4145
@mention-bot

Thank you for submitting a PR @murrant! We have found the following @laf, @crcro and @Rosiak based on the history of these files to review this PR.

@scrutinizer-notifier

The inspection completed: 1 updated code elements

@laf laf merged commit 8156fd5 into librenms:master Jan 11, 2017

2 checks passed

Auto-Deploy Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@murrant murrant deleted the murrant:swap-os-discovery-order branch Jan 12, 2017
@@ -1,5 +0,0 @@
-<?php
-
-if (starts_with($sysObjectId, '.1.3.6.1.4.1.4413') && !str_contains($sysDescr, array('vxworks', 'Quanta', 'FASTPATH Switching'), true)) {
@laf
laf Jan 12, 2017 Member

Think this has broken the detection, #5404

@murrant
murrant Jan 12, 2017 Contributor

Edgeswitch == UnifiSwitch?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment