New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding OID for Cisco FTD model 9300 Ref. #8212 #8285

Merged
merged 4 commits into from Feb 28, 2018

Conversation

Projects
None yet
3 participants
@boudreau
Contributor

boudreau commented Feb 22, 2018

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.

Testers

If you would like to test this pull request then please run: ./scripts/github-apply <pr_id>, i.e ./scripts/github-apply 5926

boudreau added some commits Feb 22, 2018

@boudreau boudreau referenced this pull request Feb 22, 2018

Closed

adding OID for Cisco FTD model 9300 #8212

0 of 1 task complete
@@ -14,7 +14,7 @@
use LibreNMS\RRD\RrdDefinition;
if ($device['os_group'] == 'cisco' && $device['os'] == 'asa' && $device['type'] == 'firewall') {
if ($device['os_group'] == ( 'cisco' && $device['os'] == 'asa' || 'cisco' && $device['os'] == 'ftd' ) && $device['type'] == 'firewall') {

This comment has been minimized.

@laf

laf Feb 27, 2018

Member

This line looks wrong to me, should it not be:

if ($device['os_group'] == 'cisco' && ($device['os'] == 'asa' || 'cisco' && $device['os'] == 'ftd') && $device['type'] == 'firewall') {

Or you could do:

if ($device['os_group'] == 'cisco' && str_contains($device['os'], ['asa','ftd']) && $device['type'] == 'firewall') {
@scrutinizer-notifier

This comment has been minimized.

scrutinizer-notifier commented Feb 28, 2018

The inspection completed: No new issues

@laf

laf approved these changes Feb 28, 2018

@laf laf merged commit 68d42b0 into librenms:master Feb 28, 2018

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details
@lock

This comment has been minimized.

lock bot commented May 16, 2018

This thread has been automatically locked since there has not been any recent activity after it was closed.

@lock lock bot locked as resolved and limited conversation to collaborators May 16, 2018

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