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

Merged
merged 4 commits into from Jul 1, 2016

Projects

None yet

3 participants

@brandune
Contributor

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.

@laf
Member
laf commented Jun 30, 2016

Works fine for me although it needs a rebase :(

@laf laf added the Blocker label Jun 30, 2016
brandune added some commits Jun 24, 2016
@brandune brandune adding name to authors and signing contributors agreement
    I agree to the conditions of the Contributor Agreement
    contained in doc/General/Contributing.md.
4202b79
@brandune brandune create common method for generating type_wheres 4ad75fb
@brandune brandune giving graph widgets option to manually specify port type 1aab030
@brandune brandune matching default port description types with their names
cccb07d
@brandune
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