Updating Network Monitoring After Upgrading the Junos Space Network Management Platform
Overview
After upgrading the Junos Space Network Management Platform, the Network Monitoring configuration files might not contain the configuration file changes for the latest version. During the Junos Space Network Management upgrade process, the Software Install Status window displays a message if there are any configuration files in conflict. You can also access the /var/log/install.log file to view any files that have conflicts. To manually merge files that contain conflicts, you must perform all of the following steps. When the upgrade process encounters no files in conflict, the files are auto-merged and you do not need to perform the following steps.
Step 1: Monitoring the Software Install Status Window for File Conflicts
Check for the following message in the Software Install Status window during the upgrade of the Junos Space Network Management Platform:
WARNING: Conflict observed during OpenNMS git-merge so please merge the changes manually: Please go to folder /opt/opennms/etc, and merge the *.old.bak files to current running files.
When logged in from the Junos Space Network Management Platform command-line interface (CLI), you can also check for file conflicts from the /var/log/install.log file. The following example message from the install.log file shows three files with conflicts that you will need to manually merge to resolve:
opennms-post.pl 62: Error while running git merge opennms-auto-upgrade/pristine: merge -Xpatience -Xignore-space-change -Xignore-all-space -Xrenormalize opennms-auto-upgrade/pristine: command returned error: 1 at /usr/lib/perl5/site_perl/5.8.8/Error.pm line 343. opennms-post.pl 63: The following files are in conflict: opennms-post.pl 65: eventconf.xml opennms-post.pl 65: events/ncs-component.events.xml opennms-post.pl 65: linkd-configuration.xml
If no files with conflicts are found during the upgrade process, the files are automatically merged, and you do not need to perform any additional steps. Otherwise, you must complete each of the following steps.
Step 2: Identifying Files with Conflicts
If you discovered one or more files with conflicts during the previous step, perform the following steps to identify the files with conflicts:
Step 3: Merging Files with Conflicts
After identifying the files with conflicts, you must perform the following steps to manually merge each of the files and resolve all conflicts:
Step 4: Verifying the Manual Merge Status of Configuration Files
From the Junos Space CLI, execute the following commands to verify that the configuration file changes are merged correctly:
/opt/opennms/bin/config-tools/conflict-resolve.pl git status
If the file changes were merged correctly, Junos Space displays the following message:
nothing to commit (working directory clean)
Step 5: Final Steps After Upgrading Network Monitoring
Perform the following steps after upgrading Network Monitoring: