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

webui: Updated remaining display options where we do not show sysName if hostname is IP #6585

Merged
merged 2 commits into from May 5, 2017

Conversation

Projects
None yet
6 participants
@laf
Member

laf commented May 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.

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: #4715

Think this catches the last of the hostnames that are IPs but ip_to_sysname option is on. The name of the function may not be the best choice - any suggestions welcome.

@laf laf added the WebUI label May 4, 2017

@mention-bot

This comment has been minimized.

Show comment
Hide comment
@mention-bot

mention-bot May 4, 2017

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

mention-bot commented May 4, 2017

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

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment

LibreNMS-CI commented May 4, 2017

Auto-Deploy finished, Test PR at http://6585.ci.librenms.org or https://6585.ci.librenms.org

@murrant

This comment has been minimized.

Show comment
Hide comment
@murrant

murrant May 5, 2017

Member

How about display_device_name() or format_hostname()

Member

murrant commented May 5, 2017

How about display_device_name() or format_hostname()

Show outdated Hide outdated includes/common.php
* @return string
**/
function ip_to_sysname($device, $ip)
function process_hostname($device, $hostname)

This comment has been minimized.

@murrant

murrant May 5, 2017

Member

You could make the second argument optional, that would make most of the calls cleaner.

@murrant

murrant May 5, 2017

Member

You could make the second argument optional, that would make most of the calls cleaner.

@aldemira

This comment has been minimized.

Show comment
Hide comment
@aldemira

aldemira May 5, 2017

Contributor

Last time I've forced ip_to_sysname, the devices which didn't have any sysname became unclickable in the all devices page. Maybe I should put this as an issue.

Contributor

aldemira commented May 5, 2017

Last time I've forced ip_to_sysname, the devices which didn't have any sysname became unclickable in the all devices page. Maybe I should put this as an issue.

@laf

This comment has been minimized.

Show comment
Hide comment
@laf

laf May 5, 2017

Member

@murrant all updated

@aldemira also taken care of in this, we only use sysName if it's available.

Member

laf commented May 5, 2017

@murrant all updated

@aldemira also taken care of in this, we only use sysName if it's available.

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment

LibreNMS-CI commented May 5, 2017

Auto-Deploy finished, Test PR at http://6585.ci.librenms.org or https://6585.ci.librenms.org

@scrutinizer-notifier

This comment has been minimized.

Show comment
Hide comment
@scrutinizer-notifier

scrutinizer-notifier May 5, 2017

The inspection completed: 1 new issues, 1 updated code elements

scrutinizer-notifier commented May 5, 2017

The inspection completed: 1 new issues, 1 updated code elements

@murrant murrant merged commit 34c35f3 into librenms:master May 5, 2017

3 checks passed

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

@laf laf deleted the laf:webui/issue-4715 branch May 5, 2017

@lock

This comment has been minimized.

Show comment
Hide comment
@lock

lock bot May 18, 2018

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

lock bot commented May 18, 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 18, 2018

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