etc-pristine configuration format differs from webapp saved configuration

Description

Hello,

Several configuration files in etc-pristine uses a identation/formatting that differs from the same file when saved in from the webinterface. Ex:

-<?xml version="1.0"?>
-<groupinfo xmlns="http://xmlns.opennms.org/xsd/groups">

  • <header>

  • <rev>1.3</rev>

  • <created>Wednesday, February 6, 2002 10:10:00 AM EST</created>

  • <mstation>dhcp-219.internal.opennms.org</mstation>

  • </header>

  • <groups>

  • <group>

  • <name>Admin</name>

  • <comments>The administrators</comments>

  • <user>admin</user>

  • </group>

  • <group>

  • <name>Remoting Users</name>

  • <comments>Users with access for submitting remote poller management data.</comments>

  • <user>remoting</user>

  • </group>

  • </groups>
    +<?xml version="1.0" encoding="UTF-8"?>
    +<groupinfo xmlns="http://xmlns.opennms.org/xsd/groups">
    + <header>
    + <rev>1.3</rev>
    + <created>Tuesday, May 14, 2013 10:32:53 PM GMT</created>
    + <mstation>dhcp-219.internal.opennms.org</mstation>
    + </header>
    + <groups>
    + <group>
    + <name>Admin</name>
    + <default-map>Santa Catarina</default-map>
    + <comments>The administrators</comments>
    + <user>admin</user>
    + </group>
    + <group>
    + <name>Remoting Users</name>
    + <comments>Users with access for submitting remote poller management data.</comments>
    + <user>remoting</user>
    + </group>
    + </groupinfo>

This results in unnecessary conflicts when doing a opennms upgrade. There is other examples as long lines being broken in two and changing the number of spaces in indentation.

Please, regenerate all etc-pristine files using the webapp.

Acceptance / Success Criteria

None

is duplicated by

Lucidchart Diagrams

Activity

Show:

Benjamin Reed October 16, 2017 at 6:57 PM

the updated version of this got merged to develop for Horizon 21: https://github.com/OpenNMS/opennms/pull/1694

Jesse White June 1, 2017 at 10:16 AM

Luiz Angelo Daros de Luca December 8, 2016 at 4:11 PM

Going on...

  • collectd-configuration.xml: identation, xml header and missing props.

  • poll-outages.xml: lost xml header (wrong?), added xmlns and condensed into a single line

  • poller-configuration.xml: lost xml header (wrong?), added xmlns and a bunch of props

  • threshd-configuration.xml: added encoding, lost <?castor (is it important?), addex xmlns, removed threads prop (unsused?) and minor space cleanup

  • datacollection-config.xml: lost xml header (wrong?), added xmlns and identation

I'll create a PR with the current state. However, some files might need to also get the writer fixed.

Luiz Angelo Daros de Luca December 8, 2016 at 2:42 PM

I tested today with 18.0.2

After installation, changed format without contents:

  • discovery-configuration.xml: added xml header, no identation at all (all in one line)

  • service-configuration.xml: changed identation

On OpenNMS, doing and undoing changes:

  • groups.xml: changed ident, added encoding

  • discovery-configuration.xml: changed once more, with a better indentation. Installation seems to use a different writer. Added xmlns, changed packets-per-second format to float, removed commented contents

  • snmp-config.xml: removed xml header (why?), added xmlns.

  • notifications.xml: added encoding on xml header, added prop writeable for all notifications

  • destination-path.xml: added encoding, xmlns, target interval and fixed identation

  • notifd-configuration.xml: added encoding, xmlns and a bunch of notifd-configuration props

Fixed

Details

Assignee

Reporter

Components

Sprint

Fix versions

Affects versions

Priority

PagerDuty

Created December 4, 2013 at 4:12 PM
Updated October 16, 2017 at 6:57 PM
Resolved October 16, 2017 at 6:57 PM