Merge remote-tracking branch 'origin/foundation' into develop

Conflicts: integrations/opennms-dns-provisioning-adapter/pom.xml integrations/opennms-puppet-provisioning-adapter/pom.xml integrations/opennms-reverse-dns-provisioning-adapter/pom.xml opennms-assemblies/http-remoting/pom.xml opennms-services/src/test/java/org/opennms/netmgt/collectd/HttpCollectorTest.java
OpenNMS · Feb 23, 2015 · dbd7353 · dbd7353
2 parents 9dc3d6e + 7b0e610
commit dbd7353
Show file tree

Hide file tree

Showing 41 changed files with 228 additions and 25 deletions.
diff --git a/core/test-api/db/pom.xml b/core/test-api/db/pom.xml
@@ -125,6 +125,11 @@
       <artifactId>opennms-rrd-jrobin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>

diff --git a/core/upgrade/pom.xml b/core/upgrade/pom.xml
@@ -51,6 +51,10 @@
       <groupId>org.opennms</groupId>
       <artifactId>opennms-rrd-jrobin</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+    </dependency>
     <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>

diff --git a/features/juniper-tca-collector/pom.xml b/features/juniper-tca-collector/pom.xml
@@ -104,6 +104,11 @@
       <artifactId>opennms-rrd-jrobin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.opennms.core.test-api</groupId>
       <artifactId>org.opennms.core.test-api.db</artifactId>

diff --git a/...juniper-tca-collector/src/test/java/org/opennms/netmgt/collectd/tca/TcaCollectorTest.java b/...juniper-tca-collector/src/test/java/org/opennms/netmgt/collectd/tca/TcaCollectorTest.java
@@ -65,7 +65,7 @@
 import org.opennms.netmgt.model.OnmsIpInterface;
 import org.opennms.netmgt.model.OnmsNode;
 import org.opennms.netmgt.rrd.RrdUtils;
-import org.opennms.netmgt.rrd.RrdUtils.StrategyName;
+import org.opennms.netmgt.rrd.jrobin.JRobinRrdStrategy;
 import org.opennms.netmgt.snmp.SnmpObjId;
 import org.opennms.netmgt.snmp.SnmpUtils;
 import org.opennms.netmgt.snmp.SnmpValue;
@@ -144,7 +144,8 @@ public void setUp() throws Exception {
 
 		FileUtils.deleteDirectory(new File(TEST_SNMP_DIR));
 
-		RrdUtils.setStrategy(RrdUtils.getSpecificStrategy(StrategyName.basicRrdStrategy));
+		// These tests rely on JRobin to verify the values
+		RrdUtils.setStrategy(new JRobinRrdStrategy());
 
 		OnmsIpInterface iface = null;
 		OnmsNode testNode = null;
@@ -257,7 +258,7 @@ public void testCollector() throws Exception {
 		collectionSet.visit(persister);
 
 		// Validate Persisted Data
-		RrdDb jrb = new RrdDb(TEST_SNMP_DIR + "/1/" + TcaCollectionResource.RESOURCE_TYPE_NAME + "/171.19.37.60/" + TcaCollectionSet.INBOUND_DELAY + ".jrb");
+		RrdDb jrb = new RrdDb(TEST_SNMP_DIR + "/1/" + TcaCollectionResource.RESOURCE_TYPE_NAME + "/171.19.37.60/" + TcaCollectionSet.INBOUND_DELAY + RrdUtils.getExtension());
 
 		// According with the Fixed Step
 		Assert.assertEquals(1, jrb.getArchive(0).getArcStep());

diff --git a/features/poller/remote/pom.xml b/features/poller/remote/pom.xml
@@ -110,5 +110,10 @@
       <artifactId>opennms-rrd-jrobin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/features/remote-poller/pom.xml b/features/remote-poller/pom.xml
@@ -263,6 +263,11 @@ groovy.compiler.output.path=target/classes
       <artifactId>opennms-rrd-jrobin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.opennms.features</groupId>
       <artifactId>org.opennms.features.springframework-security</artifactId>

diff --git a/features/reporting/availability/pom.xml b/features/reporting/availability/pom.xml
@@ -155,6 +155,11 @@
       <artifactId>opennms-rrd-jrobin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.opennms.tests</groupId>
       <artifactId>org.opennms.tests.mock-elements</artifactId>

diff --git a/features/springframework-security/pom.xml b/features/springframework-security/pom.xml
@@ -78,6 +78,11 @@
       <artifactId>opennms-rrd-jrobin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.opennms.dependencies</groupId>
       <artifactId>spring-test-dependencies</artifactId>

diff --git a/features/system-report/pom.xml b/features/system-report/pom.xml
@@ -43,6 +43,10 @@
       <groupId>org.opennms</groupId>
       <artifactId>opennms-rrd-jrobin</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+    </dependency>
     <!-- test dependencies -->
     <dependency>
       <groupId>org.opennms.core.test-api</groupId>

diff --git a/integration-tests/remote-poller-18/pom.xml b/integration-tests/remote-poller-18/pom.xml
@@ -84,6 +84,11 @@
       <artifactId>opennms-rrd-jrobin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.opennms</groupId>
       <artifactId>opennms-icmp-jna</artifactId>

diff --git a/integrations/opennms-dns-provisioning-adapter/pom.xml b/integrations/opennms-dns-provisioning-adapter/pom.xml
@@ -91,6 +91,11 @@
       <artifactId>opennms-rrd-jrobin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.opennms.tests</groupId>
       <artifactId>org.opennms.tests.mock-elements</artifactId>

diff --git a/integrations/opennms-link-provisioning-adapter/pom.xml b/integrations/opennms-link-provisioning-adapter/pom.xml
@@ -210,6 +210,11 @@
       <artifactId>opennms-rrd-jrobin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>xmlunit</groupId>
       <artifactId>xmlunit</artifactId>

diff --git a/integrations/opennms-puppet-provisioning-adapter/pom.xml b/integrations/opennms-puppet-provisioning-adapter/pom.xml
@@ -50,5 +50,10 @@
       <artifactId>opennms-rrd-jrobin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/integrations/opennms-rancid-provisioning-adapter/pom.xml b/integrations/opennms-rancid-provisioning-adapter/pom.xml
@@ -66,6 +66,11 @@
       <artifactId>opennms-rrd-jrobin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.opennms.tests</groupId>
       <artifactId>org.opennms.tests.mock-elements</artifactId>

diff --git a/integrations/opennms-reverse-dns-provisioning-adapter/pom.xml b/integrations/opennms-reverse-dns-provisioning-adapter/pom.xml
@@ -44,5 +44,10 @@
       <artifactId>opennms-rrd-jrobin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/integrations/opennms-snmp-asset-provisioning-adapter/pom.xml b/integrations/opennms-snmp-asset-provisioning-adapter/pom.xml
@@ -57,6 +57,11 @@
       <artifactId>opennms-rrd-jrobin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.opennms.core.test-api</groupId>
       <artifactId>org.opennms.core.test-api.db</artifactId>

diff --git a/integrations/opennms-snmp-hardware-inventory-provisioning-adapter/pom.xml b/integrations/opennms-snmp-hardware-inventory-provisioning-adapter/pom.xml
@@ -73,5 +73,10 @@
       <artifactId>opennms-rrd-jrobin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/integrations/opennms-vmware/pom.xml b/integrations/opennms-vmware/pom.xml
@@ -123,6 +123,11 @@
             <artifactId>opennms-rrd-jrobin</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.opennms</groupId>
+            <artifactId>opennms-rrdtool-api</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <repositories>

diff --git a/integrations/opennms-vtdxml-collector-handler/pom.xml b/integrations/opennms-vtdxml-collector-handler/pom.xml
@@ -55,6 +55,11 @@
       <artifactId>opennms-rrd-jrobin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.opennms.protocols</groupId>
       <artifactId>org.opennms.protocols.xml</artifactId>

diff --git a/opennms-ackd/pom.xml b/opennms-ackd/pom.xml
@@ -87,6 +87,11 @@
       <artifactId>opennms-rrd-jrobin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.opennms.core.test-api</groupId>
       <artifactId>org.opennms.core.test-api.db</artifactId>

diff --git a/opennms-alarms/daemon/pom.xml b/opennms-alarms/daemon/pom.xml
@@ -76,6 +76,11 @@
       <artifactId>opennms-rrd-jrobin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.opennms.core.test-api</groupId>
       <artifactId>org.opennms.core.test-api.db</artifactId>

diff --git a/opennms-assemblies/http-remoting/pom.xml b/opennms-assemblies/http-remoting/pom.xml
@@ -233,6 +233,11 @@
       <artifactId>opennms-icmp-jna</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <repositories>

diff --git a/opennms-correlation/drools-correlation-engine/pom.xml b/opennms-correlation/drools-correlation-engine/pom.xml
@@ -181,6 +181,11 @@
       <artifactId>opennms-rrd-jrobin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.opennms</groupId>
       <artifactId>opennms-rrd-api</artifactId>

diff --git a/opennms-correlation/opennms-correlator/pom.xml b/opennms-correlation/opennms-correlator/pom.xml
@@ -91,6 +91,11 @@
       <artifactId>opennms-rrd-jrobin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.opennms.tests</groupId>
       <artifactId>org.opennms.tests.mock-elements</artifactId>

diff --git a/opennms-dao/pom.xml b/opennms-dao/pom.xml
@@ -118,12 +118,16 @@
       <groupId>org.opennms.features.collection</groupId>
       <artifactId>org.opennms.features.collection.api</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.opennms</groupId>
       <artifactId>opennms-rrd-jrobin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.opennms.dependencies</groupId>
       <artifactId>spring-dependencies</artifactId>

diff --git a/opennms-install/src/main/java/org/opennms/install/Installer.java b/opennms-install/src/main/java/org/opennms/install/Installer.java
@@ -198,6 +198,22 @@ public void install(final String[] argv) throws Exception {
 
         checkIPv6();
 
+        /*
+         * Make sure we can execute the rrdtool binary when the
+         * JniRrdStrategy is enabled.
+         */
+
+        boolean using_jni_rrd_strategy = System.getProperty("org.opennms.rrd.strategyClass", "")
+                .contains("JniRrdStrategy");
+
+        if (using_jni_rrd_strategy) {
+            File rrd_binary = new File(System.getProperty("rrd.binary"));
+            if (!rrd_binary.canExecute()) {
+                throw new Exception("Cannot execute the rrdtool binary '" + rrd_binary.getAbsolutePath()
+                        + "' required by the current RRD strategy. Update the rrd.binary field in opennms.properties appropriately.");
+            }
+        }
+
         /*
          * make sure we can load the ICMP library before we go any farther
          */
@@ -397,6 +413,8 @@ public void loadProperties() throws Exception {
 
         loadEtcPropertiesFile("opennms.properties");
         loadEtcPropertiesFile("model-importer.properties");
+        // Used to retrieve 'org.opennms.rrd.strategyClass'
+        loadEtcPropertiesFile("rrd-configuration.properties");
 
         m_install_servletdir = fetchProperty("install.servlet.dir");
         m_import_dir = fetchProperty("importer.requisition.dir");

diff --git a/opennms-provision/opennms-detector-datagram/pom.xml b/opennms-provision/opennms-detector-datagram/pom.xml
@@ -61,6 +61,11 @@
       <artifactId>opennms-rrd-jrobin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.opennms</groupId>
       <artifactId>opennms-mock-simpleserver</artifactId>

diff --git a/opennms-provision/opennms-detector-jdbc/pom.xml b/opennms-provision/opennms-detector-jdbc/pom.xml
@@ -77,5 +77,10 @@
       <artifactId>opennms-rrd-jrobin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/opennms-provision/opennms-provision-persistence/pom.xml b/opennms-provision/opennms-provision-persistence/pom.xml
@@ -161,6 +161,11 @@
       <artifactId>opennms-rrd-jrobin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.opennms</groupId>
       <artifactId>opennms-test</artifactId>

diff --git a/opennms-provision/opennms-provisiond/pom.xml b/opennms-provision/opennms-provisiond/pom.xml
@@ -105,6 +105,11 @@
       <artifactId>opennms-rrd-jrobin</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opennms</groupId>
+      <artifactId>opennms-rrdtool-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.opennms.core.test-api</groupId>
       <artifactId>org.opennms.core.test-api.db</artifactId>