From 5a8fa5b474efed9a98a196003ee3ecd1a3445ee3 Mon Sep 17 00:00:00 2001
From: Ronny Trommer <ronny@opennms.org>
Date: Thu, 17 May 2018 16:41:09 +0200
Subject: [PATCH] Cleanup

---
 README.adoc                             | 31 +++++++++++--------------
 datacollection/netsnmp.disk.dc.xml      |  3 +--
 datacollection/netsnmp.lmsensors.dc.xml |  3 +--
 datacollection/netsnmp.system.dc.xml    |  3 +--
 events/netsnmp.events.xml               |  2 +-
 5 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/README.adoc b/README.adoc
index 285c03d..38e68d4 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,8 +1,8 @@
-# net-snmp
+= Net-SNMP
 
 OpenNMS configuration for *nix systems with Net-SNMP agent installed.
 
-## Requirements
+== Requirements
 
 Running OpenNMS *NIX operating system
 
@@ -19,36 +19,36 @@ Running OpenNMS on Windows operating system
 - If linking is not possible, you can copy the files to the location
 - Optional: git
 
-## Installation
+== Installation
 
 .Download and install from GitHub
 [source, bash]
 ----
-cd $OPENNMS_HOME/etc/modules-available
+mkdir ${HOME}/opennms-config-workspace
+cd ${HOME}/opennms-config-workspace
 git clone https://github.com/opennms-config-modules/net-snmp.git
 ----
 
-### Events
-.Install 'netsnmp.events.xml'
+=== Events
+
+.Install events
 [source, bash]
 ----
-cd $OPENNMS_HOME/etc/events
-ln -s ../modules-available/net-snmp/events/*.xml .
+cp ${HOME}/opennms-config-workspace/net-snmp/events/*.xml ${OPENNMS_HOME}/etc/events
 ----
 
 .Include in eventconf.xml
 [source, xml]
 ----
-<event-file>events/netsnmp.events.xml</event-file>
+<event-file>events/net-snmp.events.xml</event-file>
 ----
 
-### Datacollection
+=== Data Collection
 
 .Install datacollection configuration
 [source, bash]
 ----
-cd $OPENNMS_HOME/etc/datacollection
-ln -s ../modules-available/net-snmp/datacollection/*.xml .
+cp ${HOME}/opennms-config-workspace/net-snmp/datacollection/*.xml ${OPENNMS_HOME}/etc/datacollection
 ----
 
 .Include in datacollection-config.xml
@@ -59,13 +59,10 @@ ln -s ../modules-available/net-snmp/datacollection/*.xml .
 <include-collection dataCollectionGroup="Net-SNMP-system"/>
 ----
 
-### Graph report definitions
+=== Graph Report Definitions
 
 .Install graph report definitions
 [source, bash]
 ----
-cd $OPENNMS_HOME/etc/snmp-graph.properties.d
-ln -s ../modules-available/net-snmp/graphs/*.properties .
+cp ${HOME}/opennms-config-workspace/net-snmp/graphs/*.properties ${OPENNMS_HOME}/etc/snmp-graph.properties.d
 ----
-
-Licensed under the GNU Affero General Public License 3+. You may obtain a copy of the License at http://www.gnu.org/licenses/agpl-3.0.html.
diff --git a/datacollection/netsnmp.disk.dc.xml b/datacollection/netsnmp.disk.dc.xml
index 906e424..bd4f406 100644
--- a/datacollection/netsnmp.disk.dc.xml
+++ b/datacollection/netsnmp.disk.dc.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0"?>
-<datacollection-group name="Net-SNMP-disk">
+<datacollection-group xmlns="https://xmlns.opennms.org/xsd/config/datacollection" name="Net-SNMP-disk">
     <resourceType name="diskIOIndex" label="Disk IO (UCD-SNMP MIB)"
                   resourceLabel="${diskIODevice} (index ${index})">
         <persistenceSelectorStrategy class="org.opennms.netmgt.collectd.PersistRegexSelectorStrategy">
diff --git a/datacollection/netsnmp.lmsensors.dc.xml b/datacollection/netsnmp.lmsensors.dc.xml
index b958acc..68f9f71 100644
--- a/datacollection/netsnmp.lmsensors.dc.xml
+++ b/datacollection/netsnmp.lmsensors.dc.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0"?>
-<datacollection-group name="Net-SNMP-lmsensors">
+<datacollection-group xmlns="https://xmlns.opennms.org/xsd/config/datacollection" name="Net-SNMP-lmsensors">
     <resourceType name="lmTempIndex" label="Hardware Sensors: Temperature (lmSensors MIB)"
                   resourceLabel="${lms-tempdevice} (index ${index})">
         <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
diff --git a/datacollection/netsnmp.system.dc.xml b/datacollection/netsnmp.system.dc.xml
index f709777..f054ff6 100644
--- a/datacollection/netsnmp.system.dc.xml
+++ b/datacollection/netsnmp.system.dc.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0"?>
-<datacollection-group name="Net-SNMP-system">
+<datacollection-group xmlns="https://xmlns.opennms.org/xsd/config/datacollection" name="Net-SNMP-system">
     <group name="ucd-loadavg" ifType="ignore">
         <mibObj oid=".1.3.6.1.4.1.2021.10.1.5" instance="1" alias="loadavg1" type="integer"/>
         <mibObj oid=".1.3.6.1.4.1.2021.10.1.5" instance="2" alias="loadavg5" type="integer"/>
diff --git a/events/netsnmp.events.xml b/events/netsnmp.events.xml
index 9ca9e4c..2fbd39c 100644
--- a/events/netsnmp.events.xml
+++ b/events/netsnmp.events.xml
@@ -1,4 +1,4 @@
-<events xmlns="http://xmlns.opennms.org/xsd/eventconf">
+<events xmlns="https://xmlns.opennms.org/xsd/eventconf">
     <!-- Start of auto generated data from MIB: NET-SNMP-AGENT-MIB -->
     <event>
         <mask>