Commits

Anonymous committed d8cd06d

Revert "Splitting poller-configuration in different files using XML entity type definition. Regarding to NMS-5692"

I CapsdIntegrationTests failed. They try load the relativ path of the entity types from opennm-services/etc. I tried to give absolute path as ${install.dir.etc} but the variable will not be resolved during the test.

This reverts commit ee7001954d67f2bdb89cc9c280e89dd737e422a9.

Comments (0)

Files changed (14)

opennms-base-assembly/src/main/filtered/etc/poller-configuration.d/pkg_Default-DNS.xml

-  <package name="Default-Network-Connectivity">
-    <filter>IPADDR != '0.0.0.0'</filter>
-    <include-range begin="1.1.1.1" end="254.254.254.254" />
-    <include-range begin="::1" end="ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff" />
-    <rrd step="300">
-      <rra>RRA:AVERAGE:0.5:1:2016</rra>
-      <rra>RRA:AVERAGE:0.5:12:1488</rra>
-      <rra>RRA:AVERAGE:0.5:288:366</rra>
-      <rra>RRA:MAX:0.5:288:366</rra>
-      <rra>RRA:MIN:0.5:288:366</rra>
-    </rrd>
-    <service name="DNS" interval="300000" user-defined="false" status="on">
-      <parameter key="retry" value="2" />
-      <parameter key="timeout" value="5000" />
-      <parameter key="port" value="53" />
-      <parameter key="lookup" value="localhost" />
-      <parameter key="fatal-response-codes" value="2,3,5" /><!-- ServFail, NXDomain, Refused -->
-      <parameter key="rrd-repository" value="/opt/opennms/share/rrd/response" />
-      <parameter key="rrd-base-name" value="dns" />
-      <parameter key="ds-name" value="dns" />
-    </service>
-    
-    <downtime interval="30000" begin="0" end="300000" />
-    <!-- 30s, 0, 5m -->
-    
-    <downtime interval="300000" begin="300000" end="43200000" />
-    <!-- 5m, 5m, 12h -->
-    
-    <downtime interval="600000" begin="43200000" end="432000000" />
-    <!-- 10m, 12h, 5d -->
-    
-    <downtime begin="432000000" delete="true" />
-    <!-- anything after 5 days delete -->
-  </package>

opennms-base-assembly/src/main/filtered/etc/poller-configuration.d/pkg_Default-Database.xml

-  <package name="Default-Database">
-    <filter>IPADDR != '0.0.0.0'</filter>
-    <include-range begin="1.1.1.1" end="254.254.254.254" />
-    <include-range begin="::1" end="ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff" />
-    <rrd step="300">
-      <rra>RRA:AVERAGE:0.5:1:2016</rra>
-      <rra>RRA:AVERAGE:0.5:12:1488</rra>
-      <rra>RRA:AVERAGE:0.5:288:366</rra>
-      <rra>RRA:MAX:0.5:288:366</rra>
-      <rra>RRA:MIN:0.5:288:366</rra>
-    </rrd>
-    
-    <!-- Generic database tests. Establish TCP connection against database
-         specific ports 
-    -->
-    <service name="MySQL" interval="300000" user-defined="false" status="on">
-      <parameter key="retry" value="1" />
-      <parameter key="timeout" value="3000" />
-      <parameter key="port" value="3306" />
-      <parameter key="banner" value="*" />
-    </service>
-    <service name="SQLServer" interval="300000" user-defined="false" status="on">
-      <parameter key="retry" value="1" />
-      <parameter key="timeout" value="3000" />
-      <parameter key="port" value="1433" />
-      <parameter key="banner" value="*" />
-    </service>
-    <service name="Oracle" interval="300000" user-defined="false" status="on">
-      <parameter key="retry" value="1" />
-      <parameter key="timeout" value="3000" />
-      <parameter key="port" value="1521" />
-      <parameter key="banner" value="*" />
-    </service>
-    <service name="Postgres" interval="300000" user-defined="false" status="on">
-      <parameter key="retry" value="1" />
-      <parameter key="banner" value="*" />
-      <parameter key="port" value="5432" />
-      <parameter key="timeout" value="3000" />
-    </service>
- 
-    <downtime interval="30000" begin="0" end="300000" />
-    <!-- 30s, 0, 5m -->
-    
-    <downtime interval="300000" begin="300000" end="43200000" />
-    <!-- 5m, 5m, 12h -->
-    
-    <downtime interval="600000" begin="43200000" end="432000000" />
-    <!-- 10m, 12h, 5d -->
-    
-    <downtime begin="432000000" delete="true" />
-    <!-- anything after 5 days delete -->
-  </package>

opennms-base-assembly/src/main/filtered/etc/poller-configuration.d/pkg_Default-Fileservices.xml

-  <package name="Default-Fileservices">
-    <filter>IPADDR != '0.0.0.0'</filter>
-    <include-range begin="1.1.1.1" end="254.254.254.254" />
-    <include-range begin="::1" end="ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff" />
-    <rrd step="300">
-      <rra>RRA:AVERAGE:0.5:1:2016</rra>
-      <rra>RRA:AVERAGE:0.5:12:1488</rra>
-      <rra>RRA:AVERAGE:0.5:288:366</rra>
-      <rra>RRA:MAX:0.5:288:366</rra>
-      <rra>RRA:MIN:0.5:288:366</rra>
-    </rrd>
-    <service name="FTP" interval="300000" user-defined="false" status="on">
-      <parameter key="retry" value="1" />
-      <parameter key="timeout" value="3000" />
-      <parameter key="port" value="21" />
-      <parameter key="userid" value="" />
-      <parameter key="password" value="" />
-    </service>
-    <downtime interval="30000" begin="0" end="300000" />
-    <!-- 30s, 0, 5m -->
-    
-    <downtime interval="300000" begin="300000" end="43200000" />
-    <!-- 5m, 5m, 12h -->
-    
-    <downtime interval="600000" begin="43200000" end="432000000" />
-    <!-- 10m, 12h, 5d -->
-    
-    <downtime begin="432000000" delete="true" />
-    <!-- anything after 5 days delete -->
-  </package>

opennms-base-assembly/src/main/filtered/etc/poller-configuration.d/pkg_Default-Hyperic.xml

-  <package name="Default-Hyperic">
-    <filter>IPADDR != '0.0.0.0'</filter>
-    <include-range begin="1.1.1.1" end="254.254.254.254" />
-    <include-range begin="::1" end="ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff" />
-    <rrd step="300">
-      <rra>RRA:AVERAGE:0.5:1:2016</rra>
-      <rra>RRA:AVERAGE:0.5:12:1488</rra>
-      <rra>RRA:AVERAGE:0.5:288:366</rra>
-      <rra>RRA:MAX:0.5:288:366</rra>
-      <rra>RRA:MIN:0.5:288:366</rra>
-    </rrd>
-    <service name="HypericAgent" interval="300000" user-defined="false" status="on">
-      <parameter key="retry" value="1" />
-      <parameter key="timeout" value="2200" />
-      <parameter key="port" value="2144" />
-    </service>
-    <service name="HypericHQ" interval="300000" user-defined="false" status="on">
-      <parameter key="retry" value="1" />
-      <parameter key="timeout" value="3000" />
-      <parameter key="rrd-repository" value="/opt/opennms/share/rrd/response" />
-      <parameter key="rrd-base-name" value="hyperic-hq" />
-      <parameter key="ds-name" value="hyperic-hq" />
-      <parameter key="page-sequence">
-        <page-sequence>
-          <page path="/Login.do" port="7080" successMatch="(HQ Login)|(Sign in to Hyperic HQ)" />
-          <page path="/j_security_check.do" port="7080" method="POST"
-            failureMatch="(?s)(The username or password provided does not match our records)|(You are not signed in)" failureMessage="HQ Login in Failed"
-            successMatch="HQ Dashboard">
-            <parameter key="j_username" value="hqadmin" />
-            <parameter key="j_password" value="hqadmin" />
-          </page>
-          <page path="/Logout.do" port="7080" successMatch="HQ Login" />
-        </page-sequence>
-      </parameter>
-    </service>
-    <downtime interval="30000" begin="0" end="300000" />
-    <!-- 30s, 0, 5m -->
-    
-    <downtime interval="300000" begin="300000" end="43200000" />
-    <!-- 5m, 5m, 12h -->
-    
-    <downtime interval="600000" begin="43200000" end="432000000" />
-    <!-- 10m, 12h, 5d -->
-    
-    <downtime begin="432000000" delete="true" />
-    <!-- anything after 5 days delete -->
-  </package>

opennms-base-assembly/src/main/filtered/etc/poller-configuration.d/pkg_Default-Mail.xml

-  <package name="Default-Mail">
-    <filter>IPADDR != '0.0.0.0'</filter>
-    <include-range begin="1.1.1.1" end="254.254.254.254" />
-    <include-range begin="::1" end="ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff" />
-    <rrd step="300">
-      <rra>RRA:AVERAGE:0.5:1:2016</rra>
-      <rra>RRA:AVERAGE:0.5:12:1488</rra>
-      <rra>RRA:AVERAGE:0.5:288:366</rra>
-      <rra>RRA:MAX:0.5:288:366</rra>
-      <rra>RRA:MIN:0.5:288:366</rra>
-    </rrd>
-    <service name="SMTP" interval="300000" user-defined="false" status="on">
-      <parameter key="retry" value="1" />
-      <parameter key="timeout" value="3000" />
-      <parameter key="port" value="25" />
-      <parameter key="rrd-repository" value="/opt/opennms/share/rrd/response" />
-      <parameter key="rrd-base-name" value="smtp" />
-      <parameter key="ds-name" value="smtp" />
-    </service>
-    <service name="IMAP" interval="300000" user-defined="false" status="on">
-      <parameter key="retry" value="1" />
-      <parameter key="port" value="143" />
-      <parameter key="timeout" value="3000" />
-    </service>
-    <service name="POP3" interval="300000" user-defined="false" status="on">
-      <parameter key="retry" value="1" />
-      <parameter key="port" value="110" />
-      <parameter key="timeout" value="3000" />
-      <parameter key="rrd-repository" value="/opt/opennms/share/rrd/response" />
-      <parameter key="rrd-base-name" value="pop3" />
-      <parameter key="ds-name" value="pop3" />
-    </service>
-    <downtime interval="30000" begin="0" end="300000" />
-    <!-- 30s, 0, 5m -->
-    
-    <downtime interval="300000" begin="300000" end="43200000" />
-    <!-- 5m, 5m, 12h -->
-    
-    <downtime interval="600000" begin="43200000" end="432000000" />
-    <!-- 10m, 12h, 5d -->
-    
-    <downtime begin="432000000" delete="true" />
-    <!-- anything after 5 days delete -->
-  </package>

opennms-base-assembly/src/main/filtered/etc/poller-configuration.d/pkg_Default-Management.xml

-  <package name="Default-Management">
-    <filter>IPADDR != '0.0.0.0'</filter>
-    <include-range begin="1.1.1.1" end="254.254.254.254" />
-    <include-range begin="::1" end="ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff" />
-    <rrd step="300">
-      <rra>RRA:AVERAGE:0.5:1:2016</rra>
-      <rra>RRA:AVERAGE:0.5:12:1488</rra>
-      <rra>RRA:AVERAGE:0.5:288:366</rra>
-      <rra>RRA:MAX:0.5:288:366</rra>
-      <rra>RRA:MIN:0.5:288:366</rra>
-    </rrd>
-    <service name="SNMP" interval="300000" user-defined="false" status="on">
-      <parameter key="oid" value=".1.3.6.1.2.1.1.2.0" />
-    </service>
-    <service name="OpenNMS-JVM" interval="300000" user-defined="false" status="on">
-      <parameter key="port" value="18980"/>
-      <parameter key="factory" value="PASSWORD-CLEAR"/>
-      <parameter key="username" value="admin"/>
-      <parameter key="password" value="admin"/>
-      <parameter key="retry" value="2"/>
-      <parameter key="timeout" value="3000"/>
-      <parameter key="rrd-repository" value="/opt/opennms/share/rrd/response" />
-      <parameter key="ds-name" value="opennms-jvm"/>
-      <parameter key="friendly-name" value="opennms-jvm"/>
-    </service>
-    <downtime interval="30000" begin="0" end="300000" />
-    <!-- 30s, 0, 5m -->
-    
-    <downtime interval="300000" begin="300000" end="43200000" />
-    <!-- 5m, 5m, 12h -->
-    
-    <downtime interval="600000" begin="43200000" end="432000000" />
-    <!-- 10m, 12h, 5d -->
-    
-    <downtime begin="432000000" delete="true" />
-    <!-- anything after 5 days delete -->
-  </package>

opennms-base-assembly/src/main/filtered/etc/poller-configuration.d/pkg_Default-Nagios-NRPE.xml

-  <package name="Default-Nagios-NRPE">
-    <filter>IPADDR != '0.0.0.0'</filter>
-    <include-range begin="1.1.1.1" end="254.254.254.254" />
-    <include-range begin="::1" end="ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff" />
-    <rrd step="300">
-      <rra>RRA:AVERAGE:0.5:1:2016</rra>
-      <rra>RRA:AVERAGE:0.5:12:1488</rra>
-      <rra>RRA:AVERAGE:0.5:288:366</rra>
-      <rra>RRA:MAX:0.5:288:366</rra>
-      <rra>RRA:MIN:0.5:288:366</rra>
-    </rrd>
-    <service name="NRPE" interval="300000" user-defined="false" status="on">
-      <parameter key="retry" value="3" />
-      <parameter key="timeout" value="3000" />
-      <parameter key="port" value="5666" />
-      <parameter key="command" value="_NRPE_CHECK" />
-      <parameter key="padding" value="2" />
-      <parameter key="rrd-repository" value="/opt/opennms/share/rrd/response" />
-      <parameter key="ds-name" value="nrpe" />
-    </service>
-    <service name="NRPE-NoSSL" interval="300000" user-defined="false" status="on">
-      <parameter key="retry" value="3" />
-      <parameter key="timeout" value="3000" />
-      <parameter key="port" value="5666" />
-      <parameter key="command" value="_NRPE_CHECK" />
-      <parameter key="usessl" value="false" />
-      <parameter key="padding" value="2" />
-      <parameter key="rrd-repository" value="/opt/opennms/share/rrd/response" />
-      <parameter key="ds-name" value="nrpe" />
-    </service>
-    <downtime interval="30000" begin="0" end="300000" />
-    <!-- 30s, 0, 5m -->
-    
-    <downtime interval="300000" begin="300000" end="43200000" />
-    <!-- 5m, 5m, 12h -->
-    
-    <downtime interval="600000" begin="43200000" end="432000000" />
-    <!-- 10m, 12h, 5d -->
-    
-    <downtime begin="432000000" delete="true" />
-    <!-- anything after 5 days delete -->
-  </package>

opennms-base-assembly/src/main/filtered/etc/poller-configuration.d/pkg_Default-Network-Connectivity.xml

-  <package name="Default-Network-Connectivity">
-    <filter>IPADDR != '0.0.0.0'</filter>
-    <include-range begin="1.1.1.1" end="254.254.254.254" />
-    <include-range begin="::1" end="ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff" />
-    <rrd step="300">
-      <rra>RRA:AVERAGE:0.5:1:2016</rra>
-      <rra>RRA:AVERAGE:0.5:12:1488</rra>
-      <rra>RRA:AVERAGE:0.5:288:366</rra>
-      <rra>RRA:MAX:0.5:288:366</rra>
-      <rra>RRA:MIN:0.5:288:366</rra>
-    </rrd>
-    <service name="ICMP" interval="300000" user-defined="false" status="on">
-      <parameter key="retry" value="2" />
-      <parameter key="timeout" value="3000" />
-      <parameter key="rrd-repository" value="/opt/opennms/share/rrd/response" />
-      <parameter key="rrd-base-name" value="icmp" />
-      <parameter key="ds-name" value="icmp" />
-    </service>
-    
-    <downtime interval="30000" begin="0" end="300000" />
-    <!-- 30s, 0, 5m -->
-    
-    <downtime interval="300000" begin="300000" end="43200000" />
-    <!-- 5m, 5m, 12h -->
-    
-    <downtime interval="600000" begin="43200000" end="432000000" />
-    <!-- 10m, 12h, 5d -->
-    
-    <downtime begin="432000000" delete="true" />
-    <!-- anything after 5 days delete -->
-  </package>

opennms-base-assembly/src/main/filtered/etc/poller-configuration.d/pkg_Default-Network-Latency.xml

-  <!-- Moved StrafePing to its own package.  This allows for more flexible configuration of which interfaces
-    will have StrafePing statistical analysis rather than being on for or off for all interfaces.  Change
-    this package's filter / ranges for directing the StrafePinger to choice interfaces.  Note: Strafing all
-    of your network interface may create high loads on the NMS file system.  -->
-  <package name="Default-Network-Latency">
-    <filter>IPADDR != '0.0.0.0'</filter>
-    <include-range begin="10.1.1.1" end="10.1.1.10" />
-    <!-- <include-range begin="::1" end="ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff" /> -->
-    <rrd step="300">
-      <rra>RRA:AVERAGE:0.5:1:2016</rra>
-      <rra>RRA:AVERAGE:0.5:12:1488</rra>
-      <rra>RRA:AVERAGE:0.5:288:366</rra>
-      <rra>RRA:MAX:0.5:288:366</rra>
-      <rra>RRA:MIN:0.5:288:366</rra>
-    </rrd>
-    <service name="StrafePing" interval="300000" user-defined="false" status="on">
-      <parameter key="retry" value="0" />
-      <parameter key="timeout" value="3000" />
-      <parameter key="ping-count" value="20" />
-      <parameter key="failure-ping-count" value="20" />
-      <parameter key="wait-interval" value="50" />
-      <parameter key="rrd-repository" value="/opt/opennms/share/rrd/response" />
-      <parameter key="rrd-base-name" value="strafeping" />
-    </service>
-    <downtime interval="300000" begin="0" end="432000000"/>
-    <!-- 5m, 0, 5d -->
-    
-    <downtime begin="432000000" delete="true" />
-    <!-- anything after 5 days delete -->
-  </package>

opennms-base-assembly/src/main/filtered/etc/poller-configuration.d/pkg_Default-Remote-Access.xml

-  <package name="Default-Remote-Access">
-    <filter>IPADDR != '0.0.0.0'</filter>
-    <include-range begin="1.1.1.1" end="254.254.254.254" />
-    <include-range begin="::1" end="ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff" />
-    <rrd step="300">
-      <rra>RRA:AVERAGE:0.5:1:2016</rra>
-      <rra>RRA:AVERAGE:0.5:12:1488</rra>
-      <rra>RRA:AVERAGE:0.5:288:366</rra>
-      <rra>RRA:MAX:0.5:288:366</rra>
-      <rra>RRA:MIN:0.5:288:366</rra>
-    </rrd>
-    <service name="SSH" interval="300000" user-defined="false" status="on">
-      <parameter key="retry" value="1" />
-      <parameter key="banner" value="SSH" />
-      <parameter key="port" value="22" />
-      <parameter key="timeout" value="3000" />
-      <parameter key="rrd-repository" value="/opt/opennms/share/rrd/response" />
-      <parameter key="rrd-base-name" value="ssh" />
-      <parameter key="ds-name" value="ssh" />
-    </service>
-    <downtime interval="30000" begin="0" end="300000" />
-    <!-- 30s, 0, 5m -->
-    
-    <downtime interval="300000" begin="300000" end="43200000" />
-    <!-- 5m, 5m, 12h -->
-    
-    <downtime interval="600000" begin="43200000" end="432000000" />
-    <!-- 10m, 12h, 5d -->
-    
-    <downtime begin="432000000" delete="true" />
-    <!-- anything after 5 days delete -->
-  </package>

opennms-base-assembly/src/main/filtered/etc/poller-configuration.d/pkg_Default-VMware.xml

-  <package name="Default-VMware">
-    <filter>IPADDR != '0.0.0.0'</filter>
-    <include-range begin="1.1.1.1" end="254.254.254.254" />
-    <include-range begin="::1" end="ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff" />
-    <rrd step="300">
-      <rra>RRA:AVERAGE:0.5:1:2016</rra>
-      <rra>RRA:AVERAGE:0.5:12:1488</rra>
-      <rra>RRA:AVERAGE:0.5:288:366</rra>
-      <rra>RRA:MAX:0.5:288:366</rra>
-      <rra>RRA:MIN:0.5:288:366</rra>
-    </rrd>
-    <service name="VMwareCim-HostSystem" interval="300000" user-defined="false" status="on">
-      <parameter key="retry" value="2"/>
-      <parameter key="timeout" value="3000"/>
-    </service>
-    <service name="VMware-ManagedEntity" interval="300000" user-defined="false" status="on">
-      <parameter key="retry" value="2"/>
-      <parameter key="timeout" value="3000"/>
-    </service>
-    <downtime interval="30000" begin="0" end="300000" />
-    <!-- 30s, 0, 5m -->
-    
-    <downtime interval="300000" begin="300000" end="43200000" />
-    <!-- 5m, 5m, 12h -->
-    
-    <downtime interval="600000" begin="43200000" end="432000000" />
-    <!-- 10m, 12h, 5d -->
-    
-    <downtime begin="432000000" delete="true" />
-    <!-- anything after 5 days delete -->
-  </package>

opennms-base-assembly/src/main/filtered/etc/poller-configuration.d/pkg_Default-Web.xml

-  <package name="Default-Web">
-    <filter>IPADDR != '0.0.0.0'</filter>
-    <include-range begin="1.1.1.1" end="254.254.254.254" />
-    <include-range begin="::1" end="ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff" />
-    <rrd step="300">
-      <rra>RRA:AVERAGE:0.5:1:2016</rra>
-      <rra>RRA:AVERAGE:0.5:12:1488</rra>
-      <rra>RRA:AVERAGE:0.5:288:366</rra>
-      <rra>RRA:MAX:0.5:288:366</rra>
-      <rra>RRA:MIN:0.5:288:366</rra>
-    </rrd>
-    <service name="HTTP" interval="300000" user-defined="false" status="on">
-      <parameter key="retry" value="1" />
-      <parameter key="timeout" value="3000" />
-      <parameter key="port" value="80" />
-      <parameter key="url" value="/" />
-      <parameter key="rrd-repository" value="/opt/opennms/share/rrd/response" />
-      <parameter key="rrd-base-name" value="http" />
-      <parameter key="ds-name" value="http" />
-    </service>
-    <service name="HTTP-8080" interval="300000" user-defined="false" status="on">
-      <parameter key="retry" value="1" />
-      <parameter key="timeout" value="3000" />
-      <parameter key="port" value="8080" />
-      <parameter key="url" value="/" />
-      <parameter key="rrd-repository" value="/opt/opennms/share/rrd/response" />
-      <parameter key="rrd-base-name" value="http-8080" />
-      <parameter key="ds-name" value="http-8080" />
-    </service>
-    <service name="HTTP-8000" interval="300000" user-defined="false" status="on">
-      <parameter key="retry" value="1" />
-      <parameter key="timeout" value="3000" />
-      <parameter key="port" value="8000" />
-      <parameter key="url" value="/" />
-      <parameter key="rrd-repository" value="/opt/opennms/share/rrd/response" />
-      <parameter key="rrd-base-name" value="http-8000" />
-      <parameter key="ds-name" value="http-8000" />
-    </service>
-    <service name="HTTPS" interval="300000" user-defined="false" status="on">
-      <parameter key="retry" value="1" />
-      <parameter key="timeout" value="5000" />
-      <parameter key="port" value="443" />
-      <parameter key="url" value="/" />
-    </service>
-    <downtime interval="30000" begin="0" end="300000" />
-    <!-- 30s, 0, 5m -->
-    
-    <downtime interval="300000" begin="300000" end="43200000" />
-    <!-- 5m, 5m, 12h -->
-    
-    <downtime interval="600000" begin="43200000" end="432000000" />
-    <!-- 10m, 12h, 5d -->
-    
-    <downtime begin="432000000" delete="true" />
-    <!-- anything after 5 days delete -->
-  </package>

opennms-base-assembly/src/main/filtered/etc/poller-configuration.d/pkg_Default-Win32-Services.xml

-  <package name="Default-Win32-Services">
-    <filter>IPADDR != '0.0.0.0'</filter>
-    <include-range begin="1.1.1.1" end="254.254.254.254" />
-    <include-range begin="::1" end="ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff" />
-    <rrd step="300">
-      <rra>RRA:AVERAGE:0.5:1:2016</rra>
-      <rra>RRA:AVERAGE:0.5:12:1488</rra>
-      <rra>RRA:AVERAGE:0.5:288:366</rra>
-      <rra>RRA:MAX:0.5:288:366</rra>
-      <rra>RRA:MIN:0.5:288:366</rra>
-    </rrd>
-    <service name="Windows-Task-Scheduler" interval="300000" user-defined="false" status="on">
-      <parameter key="service-name" value="Task Scheduler" />
-    </service>
-    <downtime interval="30000" begin="0" end="300000" />
-    <!-- 30s, 0, 5m -->
-    
-    <downtime interval="300000" begin="300000" end="43200000" />
-    <!-- 5m, 5m, 12h -->
-    
-    <downtime interval="600000" begin="43200000" end="432000000" />
-    <!-- 10m, 12h, 5d -->
-    
-    <downtime begin="432000000" delete="true" />
-    <!-- anything after 5 days delete -->
-  </package>

opennms-base-assembly/src/main/filtered/etc/poller-configuration.xml

 <?xml version="1.0"?>
 <?castor class-name="org.opennms.netmgt.poller.PollerConfiguration"?>
-<!DOCTYPE root [
-  <!ENTITY pkg_Default-Network-Connectivity SYSTEM "./etc/poller-configuration.d/pkg_Default-Network-Connectivity.xml" >
-  <!ENTITY pkg_Default-Network-Latency      SYSTEM "./etc/poller-configuration.d/pkg_Default-Network-Latency.xml" >
-  <!ENTITY pkg_Default-Management           SYSTEM "./etc/poller-configuration.d/pkg_Default-Management.xml" >
-  <!ENTITY pkg_Default-Remote-Access        SYSTEM "./etc/poller-configuration.d/pkg_Default-Remote-Access.xml" >
-  <!ENTITY pkg_Default-Web                  SYSTEM "./etc/poller-configuration.d/pkg_Default-Web.xml" >
-  <!ENTITY pkg_Default-DNS                  SYSTEM "./etc/poller-configuration.d/pkg_Default-DNS.xml" >
-  <!ENTITY pkg_Default-Mail                 SYSTEM "./etc/poller-configuration.d/pkg_Default-Mail.xml" >
-  <!ENTITY pkg_Default-Fileservices         SYSTEM "./etc/poller-configuration.d/pkg_Default-Fileservices.xml" >
-  <!ENTITY pkg_Default-Database             SYSTEM "./etc/poller-configuration.d/pkg_Default-Database.xml" >
-  <!ENTITY pkg_Default-Win32-Services       SYSTEM "./etc/poller-configuration.d/pkg_Default-Win32-Services.xml" >
-  <!ENTITY pkg_Default-VMware               SYSTEM "./etc/poller-configuration.d/pkg_Default-VMware.xml" >
-  <!ENTITY pkg_Default-Hyperic              SYSTEM "./etc/poller-configuration.d/pkg_Default-Hyperic.xml" >
-  <!ENTITY pkg_Default-Nagios-NRPE          SYSTEM "./etc/poller-configuration.d/pkg_Default-Nagios-NRPE.xml" >
-]>
-<poller-configuration threads="30"
+<poller-configuration threads="30" 
                       serviceUnresponsiveEnabled="false"> 
   <node-outage status="on">
     <critical-service name="ICMP" />
   </node-outage>
+  <package name="example1">
+    <filter>IPADDR != '0.0.0.0'</filter>
+    <include-range begin="1.1.1.1" end="254.254.254.254" />
+    <include-range begin="::1" end="ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff" />
+    <rrd step="300">
+      <rra>RRA:AVERAGE:0.5:1:2016</rra>
+      <rra>RRA:AVERAGE:0.5:12:1488</rra>
+      <rra>RRA:AVERAGE:0.5:288:366</rra>
+      <rra>RRA:MAX:0.5:288:366</rra>
+      <rra>RRA:MIN:0.5:288:366</rra>
+    </rrd>
+    <service name="ICMP" interval="300000" user-defined="false" status="on">
+      <parameter key="retry" value="2" />
+      <parameter key="timeout" value="3000" />
+      <parameter key="rrd-repository" value="${install.share.dir}/rrd/response" />
+      <parameter key="rrd-base-name" value="icmp" />
+      <parameter key="ds-name" value="icmp" />
+    </service>
+    <service name="DNS" interval="300000" user-defined="false" status="on">
+      <parameter key="retry" value="2" />
+      <parameter key="timeout" value="5000" />
+      <parameter key="port" value="53" />
+      <parameter key="lookup" value="localhost" />
+      <parameter key="fatal-response-codes" value="2,3,5" /><!-- ServFail, NXDomain, Refused -->
+      <parameter key="rrd-repository" value="${install.share.dir}/rrd/response" />
+      <parameter key="rrd-base-name" value="dns" />
+      <parameter key="ds-name" value="dns" />
+    </service>
+    <service name="SMTP" interval="300000" user-defined="false" status="on">
+      <parameter key="retry" value="1" />
+      <parameter key="timeout" value="3000" />
+      <parameter key="port" value="25" />
+      <parameter key="rrd-repository" value="${install.share.dir}/rrd/response" />
+      <parameter key="rrd-base-name" value="smtp" />
+      <parameter key="ds-name" value="smtp" />
+    </service>
+    <service name="FTP" interval="300000" user-defined="false" status="on">
+      <parameter key="retry" value="1" />
+      <parameter key="timeout" value="3000" />
+      <parameter key="port" value="21" />
+      <parameter key="userid" value="" />
+      <parameter key="password" value="" />
+    </service>
+    <service name="SNMP" interval="300000" user-defined="false" status="on">
+      <parameter key="oid" value=".1.3.6.1.2.1.1.2.0" />
+    </service>
+    <service name="HTTP" interval="300000" user-defined="false" status="on">
+      <parameter key="retry" value="1" />
+      <parameter key="timeout" value="3000" />
+      <parameter key="port" value="80" />
+      <parameter key="url" value="/" />
+      <parameter key="rrd-repository" value="${install.share.dir}/rrd/response" />
+      <parameter key="rrd-base-name" value="http" />
+      <parameter key="ds-name" value="http" />
+    </service>
+    <service name="HTTP-8080" interval="300000" user-defined="false" status="on">
+      <parameter key="retry" value="1" />
+      <parameter key="timeout" value="3000" />
+      <parameter key="port" value="8080" />
+      <parameter key="url" value="/" />
+      <parameter key="rrd-repository" value="${install.share.dir}/rrd/response" />
+      <parameter key="rrd-base-name" value="http-8080" />
+      <parameter key="ds-name" value="http-8080" />
+    </service>
+    <service name="HTTP-8000" interval="300000" user-defined="false" status="on">
+      <parameter key="retry" value="1" />
+      <parameter key="timeout" value="3000" />
+      <parameter key="port" value="8000" />
+      <parameter key="url" value="/" />
+      <parameter key="rrd-repository" value="${install.share.dir}/rrd/response" />
+      <parameter key="rrd-base-name" value="http-8000" />
+      <parameter key="ds-name" value="http-8000" />
+    </service>
+    <service name="HTTPS" interval="300000" user-defined="false" status="on">
+      <parameter key="retry" value="1" />
+      <parameter key="timeout" value="5000" />
+      <parameter key="port" value="443" />
+      <parameter key="url" value="/" />
+    </service>
+    <service name="HypericAgent" interval="300000" user-defined="false" status="on">
+      <parameter key="retry" value="1" />
+      <parameter key="timeout" value="2200" />
+      <parameter key="port" value="2144" />
+    </service>
+    <service name="HypericHQ" interval="300000" user-defined="false" status="on">
+      <parameter key="retry" value="1" />
+      <parameter key="timeout" value="3000" />
+      <parameter key="rrd-repository" value="${install.share.dir}/rrd/response" />
+      <parameter key="rrd-base-name" value="hyperic-hq" />
+      <parameter key="ds-name" value="hyperic-hq" />
+      <parameter key="page-sequence">
+        <page-sequence>
+          <page path="/Login.do" port="7080" successMatch="(HQ Login)|(Sign in to Hyperic HQ)" />
+          <page path="/j_security_check.do" port="7080" method="POST"
+            failureMatch="(?s)(The username or password provided does not match our records)|(You are not signed in)" failureMessage="HQ Login in Failed"
+            successMatch="HQ Dashboard">
+            <parameter key="j_username" value="hqadmin" />
+            <parameter key="j_password" value="hqadmin" />
+          </page>
+          <page path="/Logout.do" port="7080" successMatch="HQ Login" />
+        </page-sequence>
+      </parameter>
+    </service>
+    <service name="MySQL" interval="300000" user-defined="false" status="on">
+      <parameter key="retry" value="1" />
+      <parameter key="timeout" value="3000" />
+      <parameter key="port" value="3306" />
+      <parameter key="banner" value="*" />
+    </service>
+    <service name="SQLServer" interval="300000" user-defined="false" status="on">
+      <parameter key="retry" value="1" />
+      <parameter key="timeout" value="3000" />
+      <parameter key="port" value="1433" />
+      <parameter key="banner" value="*" />
+    </service>
+    <service name="Oracle" interval="300000" user-defined="false" status="on">
+      <parameter key="retry" value="1" />
+      <parameter key="timeout" value="3000" />
+      <parameter key="port" value="1521" />
+      <parameter key="banner" value="*" />
+    </service>
+    <service name="Postgres" interval="300000" user-defined="false" status="on">
+      <parameter key="retry" value="1" />
+      <parameter key="banner" value="*" />
+      <parameter key="port" value="5432" />
+      <parameter key="timeout" value="3000" />
+    </service>
+    <service name="SSH" interval="300000" user-defined="false" status="on">
+      <parameter key="retry" value="1" />
+      <parameter key="banner" value="SSH" />
+      <parameter key="port" value="22" />
+      <parameter key="timeout" value="3000" />
+      <parameter key="rrd-repository" value="${install.share.dir}/rrd/response" />
+      <parameter key="rrd-base-name" value="ssh" />
+      <parameter key="ds-name" value="ssh" />
+    </service>
+    <service name="IMAP" interval="300000" user-defined="false" status="on">
+      <parameter key="retry" value="1" />
+      <parameter key="port" value="143" />
+      <parameter key="timeout" value="3000" />
+    </service>
+    <service name="POP3" interval="300000" user-defined="false" status="on">
+      <parameter key="retry" value="1" />
+      <parameter key="port" value="110" />
+      <parameter key="timeout" value="3000" />
+      <parameter key="rrd-repository" value="${install.share.dir}/rrd/response" />
+      <parameter key="rrd-base-name" value="pop3" />
+      <parameter key="ds-name" value="pop3" />
+    </service>
+    <service name="NRPE" interval="300000" user-defined="false" status="on">
+      <parameter key="retry" value="3" />
+      <parameter key="timeout" value="3000" />
+      <parameter key="port" value="5666" />
+      <parameter key="command" value="_NRPE_CHECK" />
+      <parameter key="padding" value="2" />
+      <parameter key="rrd-repository" value="${install.share.dir}/rrd/response" />
+      <parameter key="ds-name" value="nrpe" />
+    </service>
+    <service name="NRPE-NoSSL" interval="300000" user-defined="false" status="on">
+      <parameter key="retry" value="3" />
+      <parameter key="timeout" value="3000" />
+      <parameter key="port" value="5666" />
+      <parameter key="command" value="_NRPE_CHECK" />
+      <parameter key="usessl" value="false" />
+      <parameter key="padding" value="2" />
+      <parameter key="rrd-repository" value="${install.share.dir}/rrd/response" />
+      <parameter key="ds-name" value="nrpe" />
+    </service>
+    <service name="Windows-Task-Scheduler" interval="300000" user-defined="false" status="on">
+      <parameter key="service-name" value="Task Scheduler" />
+    </service>
+    <service name="OpenNMS-JVM" interval="300000" user-defined="false" status="on">
+      <parameter key="port" value="18980"/>
+      <parameter key="factory" value="PASSWORD-CLEAR"/>
+      <parameter key="username" value="admin"/>
+      <parameter key="password" value="admin"/>
+      <parameter key="retry" value="2"/>
+      <parameter key="timeout" value="3000"/>
+      <parameter key="rrd-repository" value="${install.share.dir}/rrd/response" />
+      <parameter key="ds-name" value="opennms-jvm"/>
+      <parameter key="friendly-name" value="opennms-jvm"/>
+    </service>
+    <service name="VMwareCim-HostSystem" interval="300000" user-defined="false" status="on">
+      <parameter key="retry" value="2"/>
+      <parameter key="timeout" value="3000"/>
+    </service>
+    <service name="VMware-ManagedEntity" interval="300000" user-defined="false" status="on">
+      <parameter key="retry" value="2"/>
+      <parameter key="timeout" value="3000"/>
+    </service>
 
-  <!-- Layer 3 network connectivity ICMP -->
-  &pkg_Default-Network-Connectivity;
+    <downtime interval="30000" begin="0" end="300000" /><!-- 30s, 0, 5m -->
+    <downtime interval="300000" begin="300000" end="43200000" /><!-- 5m, 5m, 12h -->
+    <downtime interval="600000" begin="43200000" end="432000000" /><!-- 10m, 12h, 5d -->
+    <downtime begin="432000000" delete="true" /><!-- anything after 5 days delete -->
 
-  <!-- Layer 3 network latency diagnostics with StrafePing -->
-  &pkg_Default-Network-Latency;
+  </package>
 
-  <!-- Monitor for management agents -->
-  &pkg_Default-Management;
+  <!-- Moved StrafePing to its own package.  This allows for more flexible configuration of which interfaces
+    will have StrafePing statistical analysis rather than being on for or off for all interfaces.  Change
+    this package's filter / ranges for directing the StrafePinger to choice interfaces.  Note: Strafing all
+    of your network interface may create high loads on the NMS file system.  -->
 
-  <!-- Remote access and adminitration services -->
-  &pkg_Default-Remote-Access;
+  <package name="strafer">
+    <filter>IPADDR != '0.0.0.0'</filter>
+    <include-range begin="10.1.1.1" end="10.1.1.10" />
+    <!-- <include-range begin="::1" end="ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff" /> -->
+    <rrd step="300">
+      <rra>RRA:AVERAGE:0.5:1:2016</rra>
+      <rra>RRA:AVERAGE:0.5:12:1488</rra>
+      <rra>RRA:AVERAGE:0.5:288:366</rra>
+      <rra>RRA:MAX:0.5:288:366</rra>
+      <rra>RRA:MIN:0.5:288:366</rra>
+    </rrd>
+    <service name="StrafePing" interval="300000" user-defined="false" status="on">
+      <parameter key="retry" value="0" />
+      <parameter key="timeout" value="3000" />
+      <parameter key="ping-count" value="20" />
+      <parameter key="failure-ping-count" value="20" />
+      <parameter key="wait-interval" value="50" />
+      <parameter key="rrd-repository" value="${install.share.dir}/rrd/response" />
+      <parameter key="rrd-base-name" value="strafeping" />
+    </service>
+    <downtime interval="300000" begin="0" end="432000000"/><!-- 5m, 0, 5d -->
+    <downtime begin="432000000" delete="true" /><!-- anything after 5 days delete -->
+  </package>
 
-  <!-- Default polling package for HTTP services -->
-  &pkg_Default-Web;
-
-  <!-- Default DNS servicer monitoring -->
-  &pkg_Default-DNS;
-
-  <!-- Test mail server with establishing TCP connection.
-       To test specific functionality for mail server
-       placing your package after pkg_Generic-Mail
-  -->
-  &pkg_Default-Mail;
-
-  <!-- Test database server with establishing TCP connection.
-       To test specific functionality for mail server
-       placing your package after pkg_Generic-Database
-  -->
-  &pkg_Default-Database;
-
-  <!-- Test file services establishing connection.
-       To test specific functionality for file services
-       placing your package after pkg_Generic-Fileservices
-  -->
-  &pkg_Default-Fileservices;
-
-  <!-- Default package for monitoring Microsoft Windows Services -->
-  &pkg_Default-Win32-Services;
-
-  <!-- Default package for monitoring VMware infrastructure -->
-  &pkg_Default-VMware;
-
-  <!-- Default package for Hyperic agents -->
-  &pkg_Default-Hyperic;
-
-  <!-- Default package for Nagios remote plugin executor agents -->
-  &pkg_Default-Nagios-NRPE;
-
-  <!--
-    ################################################################################
-    ### START - Place your customized packages here
-    ######################################################################
-  -->
-
-  <!--
-    ######################################################################
-    ### E N D - Place your customized packages here
-    ################################################################################
-  -->
-
-  <!-- pkg_Default-Network-Connectivity -->
   <monitor service="ICMP" class-name="org.opennms.netmgt.poller.monitors.IcmpMonitor" />
-
-  <!-- pkg_Default-Network-Latency -->
   <monitor service="StrafePing" class-name="org.opennms.netmgt.poller.monitors.StrafePingMonitor" />
-
-  <!-- pkg_Default-Web -->
   <monitor service="HTTP" class-name="org.opennms.netmgt.poller.monitors.HttpMonitor" />
   <monitor service="HTTP-8080" class-name="org.opennms.netmgt.poller.monitors.HttpMonitor" />
   <monitor service="HTTP-8000" class-name="org.opennms.netmgt.poller.monitors.HttpMonitor" />
   <monitor service="HTTPS" class-name="org.opennms.netmgt.poller.monitors.HttpsMonitor" />
-
-  <!-- pkg_Default-Hyperic -->
   <monitor service="HypericAgent" class-name="org.opennms.netmgt.poller.monitors.TcpMonitor" />
   <monitor service="HypericHQ" class-name="org.opennms.netmgt.poller.monitors.PageSequenceMonitor" />
-
-  <!-- pkg_Default-Mail -->
   <monitor service="SMTP" class-name="org.opennms.netmgt.poller.monitors.SmtpMonitor" />
-  <monitor service="IMAP" class-name="org.opennms.netmgt.poller.monitors.ImapMonitor" />
-  <monitor service="POP3" class-name="org.opennms.netmgt.poller.monitors.Pop3Monitor" />
-
-  <!-- pkg_Default-DNS -->
   <monitor service="DNS" class-name="org.opennms.netmgt.poller.monitors.DnsMonitor" />
-
-  <!-- pkg_Default-Fileservices -->
   <monitor service="FTP" class-name="org.opennms.netmgt.poller.monitors.FtpMonitor" />
-
-  <!-- pkg_Default-Management -->
   <monitor service="SNMP" class-name="org.opennms.netmgt.poller.monitors.SnmpMonitor" />
-  <monitor service="OpenNMS-JVM" class-name="org.opennms.netmgt.poller.monitors.Jsr160Monitor" />
-
-  <!-- pkg_Default-Database -->
   <monitor service="Oracle" class-name="org.opennms.netmgt.poller.monitors.TcpMonitor" />
   <monitor service="Postgres" class-name="org.opennms.netmgt.poller.monitors.TcpMonitor" />
   <monitor service="MySQL" class-name="org.opennms.netmgt.poller.monitors.TcpMonitor" />
   <monitor service="SQLServer" class-name="org.opennms.netmgt.poller.monitors.TcpMonitor" />
-
-  <!-- pkg_Default-Remote-Access -->
   <monitor service="SSH" class-name="org.opennms.netmgt.poller.monitors.SshMonitor" />
-
-  <!-- pkg_Default-Nagios-NRPE -->
+  <monitor service="IMAP" class-name="org.opennms.netmgt.poller.monitors.ImapMonitor" />
+  <monitor service="POP3" class-name="org.opennms.netmgt.poller.monitors.Pop3Monitor" />
   <monitor service="NRPE" class-name="org.opennms.netmgt.poller.monitors.NrpeMonitor" />
   <monitor service="NRPE-NoSSL" class-name="org.opennms.netmgt.poller.monitors.NrpeMonitor" />
-
-  <!-- pkg_Default-Win32-Services -->
   <monitor service="Windows-Task-Scheduler" class-name="org.opennms.netmgt.poller.monitors.Win32ServiceMonitor" />
-
-  <!-- pkg_Default-VMware -->
+  <monitor service="OpenNMS-JVM" class-name="org.opennms.netmgt.poller.monitors.Jsr160Monitor" />
   <monitor service="VMwareCim-HostSystem" class-name="org.opennms.netmgt.poller.monitors.VmwareCimMonitor"/>
   <monitor service="VMware-ManagedEntity" class-name="org.opennms.netmgt.poller.monitors.VmwareMonitor"/>
 </poller-configuration>