Skip to content
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

Added 2n device detection. #8490

Merged
merged 22 commits into from Apr 7, 2018

Conversation

Projects
None yet
5 participants
@theherodied
Copy link
Contributor

theherodied commented Mar 29, 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

@theherodied theherodied force-pushed the theherodied:theherodied-2n-1 branch from b2886a2 to f887803 Mar 29, 2018

@@ -0,0 +1,11 @@
os: 2N IP Force

This comment has been minimized.

@laf

laf Mar 29, 2018

Member

os needs to be 2nipforce. Is the firmware called this or the product?

Does the firmware have a name? If not, then maybe just ip-force as the name.

@@ -0,0 +1,966 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>

This comment has been minimized.

@laf

laf Mar 29, 2018

Member

You need to compress this + remove the width / height.

https://jakearchibald.github.io/svgomg/

This comment has been minimized.

@laf

laf Mar 29, 2018

Member

In fact you seem to just have a png embedded so you'll need to just use the raw png file instead.

This comment has been minimized.

@theherodied

theherodied Mar 29, 2018

Author Contributor

Thanks. I'll take a look at it.

All they have listed is Device Description as "2n IP Force". I'll be adding the snmprec along with some other things when I have a chance.

@kkrumm1 kkrumm1 added the Device 🖥 label Mar 30, 2018

theherodied added some commits Apr 3, 2018

@theherodied

This comment has been minimized.

Copy link
Contributor Author

theherodied commented Apr 3, 2018

@murrant, will you perform some magic on the 2n logo?

theherodied added some commits Apr 3, 2018

@laf
Copy link
Member

laf left a comment

If you can also generate the json test data that would be ace https://docs.librenms.org/#Developing/os/Test-Units/#example-workflow

* @author https://github.com/theherodied/
*/
// SNMPv2-SMI::enterprises.6530.11.1.0 = STRING: "2N IP Force"
$hardware = trim(snmp_get($device, '.1.3.6.1.4.1.6530.11.1.0', '-OQv', '', ''), '" ');

This comment has been minimized.

@laf

laf Apr 4, 2018

Member

Same comments as the other PR for this :D

@murrant

This comment has been minimized.

Copy link
Member

murrant commented Apr 6, 2018

You need to remove the padding around the icon and then minimize it.

murrant added some commits Apr 6, 2018

Update heliosip.json
Forgot to clear os cache

@murrant murrant changed the title Added 2n device detection. Work In Progress. Added 2n device detection. Apr 6, 2018

theherodied added some commits Apr 7, 2018

@scrutinizer-notifier

This comment has been minimized.

Copy link

scrutinizer-notifier commented Apr 7, 2018

The inspection completed: No new issues

@theherodied

This comment has been minimized.

Copy link
Contributor Author

theherodied commented Apr 7, 2018

@laf, I think this is done. Let me know if I missed anything from the reviews.
@murrant, I redid the svg. Getting a little better at it I think.

@murrant

murrant approved these changes Apr 7, 2018

Json added

@murrant murrant merged commit a81e2d2 into librenms:master Apr 7, 2018

2 checks passed

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

@theherodied theherodied deleted the theherodied:theherodied-2n-1 branch Apr 8, 2018

TheMysteriousX added a commit to TheMysteriousX/librenms that referenced this pull request May 20, 2018

Added 2n device detection. (librenms#8490)
* Added 2n Intercom mib

* Added 2n png logo

* Added 2n definitions yaml

* changed 2n logo. still needs to be changed later.

* changed 2n logo. still needs to be changed later 2.

* changed os name

* png not working

* trying svg. need to fix still.

* changed to object id detection

* added includes/polling/os/2nipforce.php

* named file correctly 2nipforce.inc.php

* added 2nipforce.snmprec

* added uptime to over graphs

* Changed to HeliosIP OS

* Changed to HeliosIP OS

* Removed Device Traffic from over graphs

* working on review requests 001

* Like so

* Create heliosip.json

* Update heliosip.json

Forgot to clear os cache

* Removed svg dimensions.

* Made 2n logo again.

@lock lock bot locked as resolved and limited conversation to collaborators Jun 7, 2018

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
You can’t perform that action at this time.