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

deduping type_where code, adding manual types to graph widgets, updating default descriptions #3722

Merged
merged 4 commits into from Jul 1, 2016

Conversation

Projects
None yet
3 participants
@brandune
Contributor

brandune commented Jun 24, 2016

Follow-up to #3597

It was found that the first PR caused a change in behavior when using the default $config of LibreNMS, where the values for transit_descr, peering_descr, etc, are empty strings. The main branch always searches for $type in '$type_descr' regardless of $config, but my branch ignored that value if there was something set in $config. Since those values are configured but blank by default, my branch wouldn't return the same set of interfaces.

To fix this, there's an extra commit here that changes the default value for each description type to the name of the type itself. This makes my branch consistent with the main branch with the default config.

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@LibreNMS-CI

LibreNMS-CI commented Jun 24, 2016

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

@laf

This comment has been minimized.

Show comment
Hide comment
@laf

laf Jun 30, 2016

Member

Works fine for me although it needs a rebase :(

Member

laf commented Jun 30, 2016

Works fine for me although it needs a rebase :(

@laf laf added the Blocker 🚫 label Jun 30, 2016

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@LibreNMS-CI

LibreNMS-CI commented Jul 1, 2016

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

@brandune

This comment has been minimized.

Show comment
Hide comment
@brandune

brandune Jul 1, 2016

Contributor

Rebased!

Contributor

brandune commented Jul 1, 2016

Rebased!

@laf laf merged commit e980c84 into librenms:master Jul 1, 2016

2 checks passed

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

@laf laf removed the Blocker 🚫 label Jul 3, 2016

@brandune brandune deleted the brandune:rollup_graphs_redux branch Jul 6, 2016

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