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

newdevice: Added support for Teradici PCoIP card #6347

Merged
merged 3 commits into from Apr 6, 2017

Conversation

Projects
None yet
6 participants
@EnzoZafra
Contributor

EnzoZafra commented Apr 4, 2017

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.

  • Have you signed the Contributors agreement - please do NOT submit a pull request unless you have (signing the agreement in the same pull request is fine). Your commit message for signing the agreement must appear as per the docs.
  • Have you followed our code guidelines?

Testers

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

@mention-bot

This comment has been minimized.

Show comment
Hide comment
@mention-bot

mention-bot Apr 4, 2017

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

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

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment

@murrant murrant added the Device 🖥 label Apr 4, 2017

@EnzoZafra EnzoZafra referenced this pull request Apr 4, 2017

Closed

New Device Support - Teradici PcoIP #6346

5 of 5 tasks complete

@laf laf changed the title from Added device discovery for Teradici PCoIP card to newdevice: Added support for Teradici PCoIP card Apr 5, 2017

@laf

laf approved these changes Apr 5, 2017

Just a couple of changes on this.

Show outdated Hide outdated includes/definitions/teradici-pcoip.yaml
- teradici
over:
- { graph: device_bits, text: 'Device Bits' }
#- { graph: device_pcoip-net-latency, text: 'Net Latency' }

This comment has been minimized.

@laf

laf Apr 5, 2017

Member

can you remove the two commented out lines please.

@laf

laf Apr 5, 2017

Member

can you remove the two commented out lines please.

Show outdated Hide outdated includes/polling/os/teradici-pcoip.inc.php
//SNMPv2-SMI::enterprises.25071.1.2.6.1.1.8.1 = STRING: "DXM13-9 PV2.0.D"
//SNMPv2-SMI::enterprises.25071.1.2.6.1.1.9.1 = STRING: "4.7.5"
$hardware = trim(snmp_get($device, '1.3.6.1.4.1.25071.1.2.6.1.1.5.1', '-OQv', '', ''), '" ');

This comment has been minimized.

@laf

laf Apr 5, 2017

Member

You don't need the , '', '' in the snmp_get call, those are optional.

@laf

laf Apr 5, 2017

Member

You don't need the , '', '' in the snmp_get call, those are optional.

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@@ -0,0 +1,11 @@
os: teradici-pcoip
text: 'Teradici PCoIP'
type: workstation

This comment has been minimized.

@laf

laf Apr 5, 2017

Member

Sorry didn't spot this earlier.

If you are adding a new type then this needs to go into includes/definitions.inc.php (see network, firewall, appliance as examples).

@laf

laf Apr 5, 2017

Member

Sorry didn't spot this earlier.

If you are adding a new type then this needs to go into includes/definitions.inc.php (see network, firewall, appliance as examples).

This comment has been minimized.

@EnzoZafra

EnzoZafra Apr 6, 2017

Contributor

I see lines that point to an icon for device types, i.e. $config['device_types'][$i]['icon'] = 'server.png';
Where are these stored? I could not find them

@EnzoZafra

EnzoZafra Apr 6, 2017

Contributor

I see lines that point to an icon for device types, i.e. $config['device_types'][$i]['icon'] = 'server.png';
Where are these stored? I could not find them

This comment has been minimized.

@laf

laf Apr 6, 2017

Member

For now that line isn't used but it's best to keep it until we either add support or remove those config lines.

@laf

laf Apr 6, 2017

Member

For now that line isn't used but it's best to keep it until we either add support or remove those config lines.

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@scrutinizer-notifier

This comment has been minimized.

Show comment
Hide comment
@scrutinizer-notifier

scrutinizer-notifier Apr 6, 2017

The inspection completed: 1 updated code elements

The inspection completed: 1 updated code elements

@laf laf merged commit 5b32f71 into librenms:master Apr 6, 2017

2 checks passed

Auto-Deploy Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

murrant added a commit to murrant/librenms that referenced this pull request Apr 7, 2017

newdevice: Added support for Teradici PCoIP card (#6347)
* Added device discoery for Teradici PCoIP card

* Removed redundant arguments from snmp_get and comments in os definition

* Added 'workstations' as a device type

@EnzoZafra EnzoZafra deleted the EnzoZafra:issue-6346 branch Apr 13, 2017

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