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

Issue 6342 - Add support for Nokia (Alcatel-Lucent) SAS-Sx 7210 #6344

Merged
merged 5 commits into from Apr 4, 2017

Conversation

Projects
None yet
5 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

fixes: #6344

@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
Revert "I agree to the conditions of the Contributor Agreement contai…
…ned in doc/General/Contributing.md."

This reverts commit 2b89f9e.
@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
Show outdated Hide outdated includes/polling/os/timos.inc.php
$versionEscaped = $majorVersion . '\.' . $minorVersion . '\.' . $versionModifier;
$pattern = '~' . $versionEscaped . '\sboth\/hops\s(?\'hardware\'.*)\sCopyright~';
preg_match($pattern, $description, $matches);

This comment has been minimized.

@murrant

murrant Apr 4, 2017

Member

I've got a little more sample data, might I suggest this regex (also you don't need the version in the regex):

$pattern = "(cpm|both)\/(hops64|hops|x86_64) (?'hardware'.*) Copyright";
preg_match($pattern, $poll_device['sysDescr'], $matches);
@murrant

murrant Apr 4, 2017

Member

I've got a little more sample data, might I suggest this regex (also you don't need the version in the regex):

$pattern = "(cpm|both)\/(hops64|hops|x86_64) (?'hardware'.*) Copyright";
preg_match($pattern, $poll_device['sysDescr'], $matches);

This comment has been minimized.

@EnzoZafra

EnzoZafra Apr 4, 2017

Contributor

Fixed, thanks!

@EnzoZafra

EnzoZafra Apr 4, 2017

Contributor

Fixed, thanks!

@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 4, 2017

The inspection completed: No new issues

The inspection completed: No new issues

@murrant murrant merged commit f85f8c1 into librenms:master Apr 4, 2017

2 checks passed

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

@EnzoZafra EnzoZafra referenced this pull request Apr 4, 2017

Closed

New Device Support - Nokia SAS-Sx 7210 (Alcatel-Lucent) #6342

5 of 5 tasks complete

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

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

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