Oxidized config diffs #2994

Merged
merged 11 commits into from Feb 13, 2016

Projects

None yet

3 participants

@murrant
Contributor
murrant commented Feb 12, 2016

Several items for this PR need feedback:

  1. Configs only show for admin users, not readonly users. (It was level 7 before, which LibreNMS doesn't support.)
  2. UI is slightly unintuitive, but ok once you figure it out, suggestions for improvement?
  3. GeSHi, kind of stinks. Perhaps a javascript based formatting library instead? Thoughts?
    4. I removed the $config['oxidized']['features']['versioning']. Can someone test with older versions of Oxidized that don't support versioning to make sure it fails gracefully? Reverted

Issue #2812

murrant added some commits Feb 10, 2016
@murrant murrant Generate and display diffs between versions. Clicking show diff gener…
…ates a diff between the shown version and the selected version.
b5106f4
@murrant murrant Mark displayed diffs. 0e8ea8b
@murrant murrant Remove array_column() use, it requires php 5.5 9a2d22d
@murrant murrant Import GeSHi diff type. 3eddfd4
@murrant murrant Remove $config['oxidized']['features']['versioning']. I did not updat…
…e the schema to remove the entry from the config table.

Update the documentation a bit.

Issue #2812
aa9d479
@murrant murrant Merge branch 'master' into config_diff
28216f6
@laf
Member
laf commented Feb 12, 2016

For versioning. Only git output supports this so now we would do a http call for each page load regardless. IMHO we should keep the config in place.

murrant added some commits Feb 12, 2016
@murrant murrant Use Oxidized's built in diffing capability. Drops the need for xdiff …
…and one http call.
cc344bf
@murrant murrant Restore $config['oxidized']['features']['versioning'].
3189775
@murrant murrant Fix inverted diff.
564146d
@murrant murrant Always define $config_total. Default is 1.
f824fd1
@murrant murrant Add GeSHi GPv2+ acknowledgement.
916c568
@laf laf merged commit 2e7fab4 into librenms:master Feb 13, 2016

1 of 2 checks passed

Auto-Deploy Triggered
Details
Scrutinizer 2 new issues
Details
@Rosiak Rosiak referenced this pull request Feb 13, 2016
Closed

Oxidized config diffs #2812

@murrant murrant deleted the murrant:config_diff branch Feb 14, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment