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

Fix bug get_graph_by_port_hostname() only hostname #6936

Merged
merged 2 commits into from Jul 4, 2017

Conversation

Projects
None yet
6 participants
@bitency
Contributor

bitency commented Jul 3, 2017

From the documentation:

Function: get_graph_by_port_hostname top
Get a graph of a port for a particular device.

hostname can be either the device hostname or id

But the function is only works with a hostname and not with a ID.
I have modified a few things that solve the problem.

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

Fix bug get_graph_by_port_hostname() only hostname
From the documentation:

Function: get_graph_by_port_hostname top
Get a graph of a port for a particular device.

hostname can be either the device hostname or id

But the function is only works with a hostname and not with a ID.
I have modified a few things that solve the problem.
@CLAassistant

This comment has been minimized.

Show comment
Hide comment
@CLAassistant

CLAassistant Jul 3, 2017

CLA assistant check
All committers have signed the CLA.

CLAassistant commented Jul 3, 2017

CLA assistant check
All committers have signed the CLA.

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment

LibreNMS-CI commented Jul 3, 2017

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

Show outdated Hide outdated html/includes/api_functions.inc.php
@@ -51,6 +51,7 @@ function get_graph_by_port_hostname()
$app = \Slim\Slim::getInstance();
$router = $app->router()->getCurrentRoute()->getParams();
$hostname = $router['hostname'];
$device_id = ctype_digit($hostname) ? $hostname : getidbyname($hostname);

This comment has been minimized.

@murrant

murrant Jul 3, 2017

Member

I'm not sure that it matters, but this does an additional sql query.
You could also modify the query below.

@murrant

murrant Jul 3, 2017

Member

I'm not sure that it matters, but this does an additional sql query.
You could also modify the query below.

Show outdated Hide outdated html/includes/api_functions.inc.php
@@ -51,6 +51,7 @@ function get_graph_by_port_hostname()
$app = \Slim\Slim::getInstance();
$router = $app->router()->getCurrentRoute()->getParams();
$hostname = $router['hostname'];
$device_id = ctype_digit($hostname) ? $hostname : getidbyname($hostname);

This comment has been minimized.

@laf

laf Jul 3, 2017

Member

Thanks, looks like the indentation here needs two more spaces.

@laf

laf Jul 3, 2017

Member

Thanks, looks like the indentation here needs two more spaces.

This comment has been minimized.

@murrant

murrant Jul 3, 2017

Member

It's a tab instead of spaces :)

@murrant

murrant Jul 3, 2017

Member

It's a tab instead of spaces :)

This comment has been minimized.

@laf

laf Jul 3, 2017

Member

:)

@laf

laf Jul 3, 2017

Member

:)

@laf laf merged commit 2ba7093 into librenms:master Jul 4, 2017

2 of 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
@scrutinizer-notifier

This comment has been minimized.

Show comment
Hide comment
@scrutinizer-notifier

scrutinizer-notifier Jul 4, 2017

The inspection completed: 1 updated code elements

scrutinizer-notifier commented Jul 4, 2017

The inspection completed: 1 updated code elements

@lock

This comment has been minimized.

Show comment
Hide comment
@lock

lock bot May 17, 2018

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

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

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