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

Add OPNsense support #8199

Merged
merged 7 commits into from Feb 8, 2018

Conversation

Projects
None yet
5 participants
@axemann
Contributor

axemann commented Feb 5, 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

Fixes: #8196

@CLAassistant

This comment has been minimized.

CLAassistant commented Feb 5, 2018

CLA assistant check
All committers have signed the CLA.

@@ -159,4 +159,8 @@
$output = preg_split("/ /", $device['sysDescr']);
$version = $output[2];
$hardware = $output[6];
} elseif ($device['os'] == "opnsense") {

This comment has been minimized.

@murrant

murrant Feb 5, 2018

Member

please move this to opnsense.inc.php instead of unix.inc.php

@murrant

This comment has been minimized.

Member

murrant commented Feb 5, 2018

Thanks for the contribution. Mostly looks ok, the os polling is in the wrong file.

The icon is ok, but SVG icons and logos are preferred if you can get them: https://docs.librenms.org/Developing/os/Initial-Detection/#icon-and-logo

@laf laf added the Device 🖥 label Feb 5, 2018

axemann added some commits Feb 5, 2018

Merge branch 'issue-8196' of https://github.com/axemann/librenms into…
… issue-8196

Revert unix.inc.php, move polling to opnsense.inc.php
@axemann

This comment has been minimized.

Contributor

axemann commented Feb 5, 2018

@murrant Glad to help out any way I can on an awesome project. :-)

I'll move the polling to a new file, but I'm not 100% sure how to revert my changes to unix.inc.php on here, outside of editing and re-pushing it. I'll reach out to the OPNsense folks, too, and see if they have the logo in SVG format.

@laf

This comment has been minimized.

Member

laf commented Feb 6, 2018

@axemann You can just remove the changes to unix.inc.php, commit that file and push it with the other changes and it will look like it's never happened :)

@axemann

This comment has been minimized.

Contributor

axemann commented Feb 6, 2018

@laf Hopefully this last commit will do the trick...

@scrutinizer-notifier

This comment has been minimized.

scrutinizer-notifier commented Feb 6, 2018

The inspection completed: 712 Issues, 37 Patches

@murrant

murrant approved these changes Feb 7, 2018

You can just replace the icon/logo later if you get svg images.

@murrant murrant merged commit f6cc671 into librenms:master Feb 8, 2018

2 checks passed

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

@axemann axemann deleted the axemann:issue-8196 branch Feb 28, 2018

inetAnt added a commit to criteo-forks/librenms that referenced this pull request Mar 19, 2018

Add OPNsense support (librenms#8199)
* Add OPNsense support

* Add OPNsense support (librenms#8196)

* Revert unix.inc.php, move polling to opnsense.inc.php

* Revert unix.inc.php

* Update opnsense.inc.php
@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.