diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml index 93920054f638..78c699521715 100644 --- a/checkstyle/pom.xml +++ b/checkstyle/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.opennms org.opennms.checkstyle - 22.0.1 + 22.0.2-SNAPSHOT OpenNMS :: Checkstyle diff --git a/container/branding/pom.xml b/container/branding/pom.xml index c54cf30127ae..aabcbb475333 100644 --- a/container/branding/pom.xml +++ b/container/branding/pom.xml @@ -6,7 +6,7 @@ org.opennms org.opennms.container - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.container diff --git a/container/bridge/pom.xml b/container/bridge/pom.xml index 8ecfc74bdc7d..96a320f7c7b8 100644 --- a/container/bridge/pom.xml +++ b/container/bridge/pom.xml @@ -6,7 +6,7 @@ org.opennms org.opennms.container - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.container diff --git a/container/features/pom.xml b/container/features/pom.xml index 39f8e9fa0b13..bccb147c130d 100644 --- a/container/features/pom.xml +++ b/container/features/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.container - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.karaf diff --git a/container/jaas-login-module/pom.xml b/container/jaas-login-module/pom.xml index bf212ce4826f..c6614db5a54a 100644 --- a/container/jaas-login-module/pom.xml +++ b/container/jaas-login-module/pom.xml @@ -7,7 +7,7 @@ org.opennms org.opennms.container - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.container diff --git a/container/karaf/pom.xml b/container/karaf/pom.xml index 004b571eb64b..caeb4d96fcce 100644 --- a/container/karaf/pom.xml +++ b/container/karaf/pom.xml @@ -6,7 +6,7 @@ org.opennms org.opennms.container - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.container diff --git a/container/karaf/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg b/container/karaf/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg index 5f7d2cb2ec3b..fb9187fde555 100644 --- a/container/karaf/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg +++ b/container/karaf/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg @@ -49,9 +49,9 @@ log4j2.logger.audit.appenderRef.AuditRollingFile.ref = AuditRollingFile log4j2.logger.opennmsTopology.name = org.opennms.features.topology log4j2.logger.opennmsTopology.level = WARN -# OPENNMS: Display all WARN logs for our code +# OPENNMS: Display all DEBUG logs for our code log4j2.logger.opennms.name = org.opennms -log4j2.logger.opennms.level = WARN +log4j2.logger.opennms.level = DEBUG # Appenders configuration @@ -100,6 +100,6 @@ log4j2.appender.osgi.filter = * #log4j2.logger.aether.name = shaded.org.eclipse.aether #log4j2.logger.aether.level = TRACE #log4j2.logger.http-headers.name = shaded.org.apache.http.headers -#log4j2.logger.http-headers.level = WARN +#log4j2.logger.http-headers.level = DEBUG #log4j2.logger.maven.name = org.ops4j.pax.url.mvn #log4j2.logger.maven.level = TRACE diff --git a/container/pom.xml b/container/pom.xml index 3d85b074afae..32eff0409046 100644 --- a/container/pom.xml +++ b/container/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.container diff --git a/container/servlet/pom.xml b/container/servlet/pom.xml index 367380a1ffd4..269d6ccddfc7 100644 --- a/container/servlet/pom.xml +++ b/container/servlet/pom.xml @@ -6,7 +6,7 @@ org.opennms org.opennms.container - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.container diff --git a/container/web/pom.xml b/container/web/pom.xml index bf301f124691..bcdb65c35c75 100644 --- a/container/web/pom.xml +++ b/container/web/pom.xml @@ -7,7 +7,7 @@ org.opennms org.opennms.container - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.container diff --git a/core/api/pom.xml b/core/api/pom.xml index 4bc920dfb33e..251e7466b952 100644 --- a/core/api/pom.xml +++ b/core/api/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/build/keystore/pom.xml b/core/build/keystore/pom.xml index 7b7375382b81..51bde55a9f3e 100644 --- a/core/build/keystore/pom.xml +++ b/core/build/keystore/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.build - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.build diff --git a/core/build/pom.xml b/core/build/pom.xml index 5ee4d1e93a4e..4a959467987d 100644 --- a/core/build/pom.xml +++ b/core/build/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/cache/pom.xml b/core/cache/pom.xml index 3e11c38e716a..b9184760a275 100644 --- a/core/cache/pom.xml +++ b/core/cache/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/camel/pom.xml b/core/camel/pom.xml index a75dc77ae884..751c3c4d5b57 100644 --- a/core/camel/pom.xml +++ b/core/camel/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/config/pom.xml b/core/config/pom.xml index 332cc500c90b..3d51879a16cd 100644 --- a/core/config/pom.xml +++ b/core/config/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/criteria/pom.xml b/core/criteria/pom.xml index 2e468dc243be..869ea16cdfc0 100644 --- a/core/criteria/pom.xml +++ b/core/criteria/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/daemon/pom.xml b/core/daemon/pom.xml index 1ecab4276ae1..e2fc1be30b34 100644 --- a/core/daemon/pom.xml +++ b/core/daemon/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/db-install/pom.xml b/core/db-install/pom.xml index cbddbf4d021b..130d2341ac6b 100644 --- a/core/db-install/pom.xml +++ b/core/db-install/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/db-install/src/main/resources/org/opennms/core/db/install/iplike.sql b/core/db-install/src/main/resources/org/opennms/core/db/install/iplike.sql index 633f1888ffcc..06ce1e942be9 100644 --- a/core/db-install/src/main/resources/org/opennms/core/db/install/iplike.sql +++ b/core/db-install/src/main/resources/org/opennms/core/db/install/iplike.sql @@ -8,6 +8,7 @@ create or replace function iplike(i_ipaddress text, i_rule text) returns boolean c_rulework text; c_ruletemp text; c_scopeid text; + c_rulescope text; i integer; @@ -47,7 +48,7 @@ create or replace function iplike(i_ipaddress text, i_rule text) returns boolean c_r := c_rulework; end if; - if not check_rule(c_i, c_r) then + if check_rule(c_i, c_r) is not true then return 'f'; end if; @@ -56,12 +57,10 @@ create or replace function iplike(i_ipaddress text, i_rule text) returns boolean i := i + 1; end loop; -- IPv6 - elsif i_ipaddress ~ E'^[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+(%[0-9]+)?$' and i_rule ~ E'^[0-9a-f*,-]+:[0-9a-f*,-]+:[0-9a-f*,-]+:[0-9a-f*,-]+:[0-9a-f*,-]+:[0-9a-f*,-]+:[0-9a-f*,-]+:[0-9a-f*,-]+(%[0-9*,-]+)?$' then + elsif i_ipaddress ~ E'^[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+(%.+)?$' and i_rule ~ E'^[0-9a-f*,-]+:[0-9a-f*,-]+:[0-9a-f*,-]+:[0-9a-f*,-]+:[0-9a-f*,-]+:[0-9a-f*,-]+:[0-9a-f*,-]+:[0-9a-f*,-]+(%.+)?$' then c_addrwork := i_ipaddress; c_rulework := i_rule; - -- TODO Add support for scope identifiers - i := 0; while i < 8 loop if (strpos(c_addrwork, ':') > 0) then @@ -87,11 +86,17 @@ create or replace function iplike(i_ipaddress text, i_rule text) returns boolean if (strpos(c_rulework, ':') > 0) then c_r := substr(c_rulework, 0, strpos(c_rulework, ':')); + elsif (strpos(c_rulework, '%') > 0) then + c_rulescope := substr(c_rulework, strpos(c_rulework, '%') + 1); + c_r := substr(c_rulework, 0, strpos(c_rulework, '%')); else c_r := c_rulework; end if; - if not check_hex_rule(c_i, c_r) then + if check_hex_rule(c_i, c_r) is not true then + return 'f'; + end if; + if (c_rulescope is not null) and ((c_scopeid = c_rulescope) is not true) then return 'f'; end if; @@ -101,7 +106,7 @@ create or replace function iplike(i_ipaddress text, i_rule text) returns boolean end loop; else return 'f'; - end if; + end if; return 't'; end; @@ -149,7 +154,7 @@ $$ language plpgsql; create or replace function check_rule (i_octet integer, i_rule text) returns boolean as $$ declare c_element text; - c_work text; + c_work text; begin if i_rule = '*' then -- * matches anything! return 't'; @@ -171,7 +176,9 @@ begin return 't'; end if; else - if i_octet = to_number(c_element, '99999') then + if c_element = '*' then + return 't'; + elsif i_octet = to_number(c_element, '99999') then return 't'; end if; end if; diff --git a/core/db/pom.xml b/core/db/pom.xml index 8de382612e8e..b98e1905dab4 100644 --- a/core/db/pom.xml +++ b/core/db/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/doc/pom.xml b/core/doc/pom.xml index 272730d25c00..7f274cf13471 100644 --- a/core/doc/pom.xml +++ b/core/doc/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/icmp-jna/pom.xml b/core/icmp-jna/pom.xml index 856f2916d94d..99a94670f52e 100644 --- a/core/icmp-jna/pom.xml +++ b/core/icmp-jna/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/ipc/common/aws-sqs/pom.xml b/core/ipc/common/aws-sqs/pom.xml index 0b7b09604764..11e2bf78504b 100644 --- a/core/ipc/common/aws-sqs/pom.xml +++ b/core/ipc/common/aws-sqs/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.common - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.ipc.common diff --git a/core/ipc/common/pom.xml b/core/ipc/common/pom.xml index aee923cc202a..02b8f348603e 100644 --- a/core/ipc/common/pom.xml +++ b/core/ipc/common/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.ipc - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.ipc diff --git a/core/ipc/pom.xml b/core/ipc/pom.xml index 3c6ddcd32235..51f1abfa8513 100644 --- a/core/ipc/pom.xml +++ b/core/ipc/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/ipc/rpc/api/pom.xml b/core/ipc/rpc/api/pom.xml index faf097de16d8..93f4df93899b 100644 --- a/core/ipc/rpc/api/pom.xml +++ b/core/ipc/rpc/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.rpc - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.ipc.rpc diff --git a/core/ipc/rpc/aws-sqs-impl/pom.xml b/core/ipc/rpc/aws-sqs-impl/pom.xml index 45e57fe3835e..32a528b0c8fa 100644 --- a/core/ipc/rpc/aws-sqs-impl/pom.xml +++ b/core/ipc/rpc/aws-sqs-impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.rpc - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.ipc.rpc diff --git a/core/ipc/rpc/camel/pom.xml b/core/ipc/rpc/camel/pom.xml index 3c2a3b8b86c5..e18f5a67416f 100644 --- a/core/ipc/rpc/camel/pom.xml +++ b/core/ipc/rpc/camel/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.rpc - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.ipc.rpc diff --git a/core/ipc/rpc/common/pom.xml b/core/ipc/rpc/common/pom.xml index 5af67a607ea7..d23d521ced6f 100644 --- a/core/ipc/rpc/common/pom.xml +++ b/core/ipc/rpc/common/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.rpc - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.ipc.rpc diff --git a/core/ipc/rpc/jms-impl/pom.xml b/core/ipc/rpc/jms-impl/pom.xml index 62525ffe0370..16f0b9f0b02a 100644 --- a/core/ipc/rpc/jms-impl/pom.xml +++ b/core/ipc/rpc/jms-impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.rpc - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.ipc.rpc diff --git a/core/ipc/rpc/mock-impl/pom.xml b/core/ipc/rpc/mock-impl/pom.xml index 55f2ae24f662..f0f14088d23f 100644 --- a/core/ipc/rpc/mock-impl/pom.xml +++ b/core/ipc/rpc/mock-impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.rpc - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.ipc.rpc diff --git a/core/ipc/rpc/pom.xml b/core/ipc/rpc/pom.xml index 96c7178ec0fb..a794c04dd466 100644 --- a/core/ipc/rpc/pom.xml +++ b/core/ipc/rpc/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.ipc - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.ipc diff --git a/core/ipc/rpc/shell-commands/pom.xml b/core/ipc/rpc/shell-commands/pom.xml index 19a8a3c7be1b..a96beee250e5 100644 --- a/core/ipc/rpc/shell-commands/pom.xml +++ b/core/ipc/rpc/shell-commands/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.rpc - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.ipc.rpc diff --git a/core/ipc/rpc/utils/pom.xml b/core/ipc/rpc/utils/pom.xml index d88e7344009c..4e4866854df2 100644 --- a/core/ipc/rpc/utils/pom.xml +++ b/core/ipc/rpc/utils/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.rpc - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.ipc.rpc diff --git a/core/ipc/rpc/xml/pom.xml b/core/ipc/rpc/xml/pom.xml index f7e1b6c369d2..a95fb370ced8 100644 --- a/core/ipc/rpc/xml/pom.xml +++ b/core/ipc/rpc/xml/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.rpc - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.ipc.rpc diff --git a/core/ipc/sink/api/pom.xml b/core/ipc/sink/api/pom.xml index 5b745bf49055..526676d0fa57 100644 --- a/core/ipc/sink/api/pom.xml +++ b/core/ipc/sink/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.sink - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.ipc.sink diff --git a/core/ipc/sink/aws-sqs-impl/pom.xml b/core/ipc/sink/aws-sqs-impl/pom.xml index 3f7348f64c78..2f7b39a2237c 100644 --- a/core/ipc/sink/aws-sqs-impl/pom.xml +++ b/core/ipc/sink/aws-sqs-impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.sink - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.ipc.sink diff --git a/core/ipc/sink/camel-impl/pom.xml b/core/ipc/sink/camel-impl/pom.xml index 8c436018aa46..169e9d305637 100644 --- a/core/ipc/sink/camel-impl/pom.xml +++ b/core/ipc/sink/camel-impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.sink - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.ipc.sink diff --git a/core/ipc/sink/common/pom.xml b/core/ipc/sink/common/pom.xml index dc08258cec02..8113f4d668e3 100644 --- a/core/ipc/sink/common/pom.xml +++ b/core/ipc/sink/common/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.sink - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.ipc.sink diff --git a/core/ipc/sink/kafka-impl/pom.xml b/core/ipc/sink/kafka-impl/pom.xml index 7a99bdf7fa54..1e7a5d57772a 100644 --- a/core/ipc/sink/kafka-impl/pom.xml +++ b/core/ipc/sink/kafka-impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.sink - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.ipc.sink diff --git a/core/ipc/sink/mock-impl/pom.xml b/core/ipc/sink/mock-impl/pom.xml index de6ae20e7d8c..bddf1bda8ad5 100644 --- a/core/ipc/sink/mock-impl/pom.xml +++ b/core/ipc/sink/mock-impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.sink - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.ipc.sink diff --git a/core/ipc/sink/pom.xml b/core/ipc/sink/pom.xml index 7fc66016cf5e..9f203407abf4 100644 --- a/core/ipc/sink/pom.xml +++ b/core/ipc/sink/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.ipc - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.ipc diff --git a/core/ipc/sink/xml/pom.xml b/core/ipc/sink/xml/pom.xml index ffbb2698dace..9eb9385cb65a 100644 --- a/core/ipc/sink/xml/pom.xml +++ b/core/ipc/sink/xml/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.ipc org.opennms.core.ipc.sink - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.ipc.sink diff --git a/core/jmx/api/pom.xml b/core/jmx/api/pom.xml index 373aa78beae1..d25be86a6977 100644 --- a/core/jmx/api/pom.xml +++ b/core/jmx/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.jmx - 22.0.1 + 22.0.2-SNAPSHOT .. 4.0.0 diff --git a/core/jmx/impl/pom.xml b/core/jmx/impl/pom.xml index eb1560286e6c..1294ecf39a3b 100644 --- a/core/jmx/impl/pom.xml +++ b/core/jmx/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.jmx - 22.0.1 + 22.0.2-SNAPSHOT .. 4.0.0 diff --git a/core/jmx/pom.xml b/core/jmx/pom.xml index 2daaba820f1e..df0be51c5812 100644 --- a/core/jmx/pom.xml +++ b/core/jmx/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/jstl-support/pom.xml b/core/jstl-support/pom.xml index 832d4850db4d..20fba0578f44 100644 --- a/core/jstl-support/pom.xml +++ b/core/jstl-support/pom.xml @@ -2,7 +2,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/lib/pom.xml b/core/lib/pom.xml index 65489effd9d2..76ea509c69b6 100644 --- a/core/lib/pom.xml +++ b/core/lib/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/logging-api/pom.xml b/core/logging-api/pom.xml index f4794b6f3e32..e8389e333ff8 100644 --- a/core/logging-api/pom.xml +++ b/core/logging-api/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/pom.xml b/core/pom.xml index 5ee4169b23aa..cb7e815f78eb 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/profiler/pom.xml b/core/profiler/pom.xml index 4f95258b8f8b..a91cea3ab28a 100644 --- a/core/profiler/pom.xml +++ b/core/profiler/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml index 198dea0f00e3..b94c33e9fda8 100644 --- a/core/runtime/pom.xml +++ b/core/runtime/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/schema/pom.xml b/core/schema/pom.xml index 6d8e9069dc37..31e338ea13da 100644 --- a/core/schema/pom.xml +++ b/core/schema/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/snmp/api/pom.xml b/core/snmp/api/pom.xml index 361c404261d6..39010dc77b10 100644 --- a/core/snmp/api/pom.xml +++ b/core/snmp/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.snmp - 22.0.1 + 22.0.2-SNAPSHOT .. 4.0.0 diff --git a/core/snmp/commands/pom.xml b/core/snmp/commands/pom.xml index f9cbea34732f..14b2d05e667b 100644 --- a/core/snmp/commands/pom.xml +++ b/core/snmp/commands/pom.xml @@ -4,7 +4,7 @@ org.opennms.core org.opennms.core.snmp - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/core/snmp/impl-joesnmp/pom.xml b/core/snmp/impl-joesnmp/pom.xml index 8e25837dba47..fdb483aad2c2 100644 --- a/core/snmp/impl-joesnmp/pom.xml +++ b/core/snmp/impl-joesnmp/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.snmp - 22.0.1 + 22.0.2-SNAPSHOT .. 4.0.0 diff --git a/core/snmp/impl-mock/pom.xml b/core/snmp/impl-mock/pom.xml index 191673ff80e3..a3d704489e9b 100644 --- a/core/snmp/impl-mock/pom.xml +++ b/core/snmp/impl-mock/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.snmp - 22.0.1 + 22.0.2-SNAPSHOT .. 4.0.0 diff --git a/core/snmp/impl-snmp4j/pom.xml b/core/snmp/impl-snmp4j/pom.xml index 1056ecd737e2..77bd535953ad 100644 --- a/core/snmp/impl-snmp4j/pom.xml +++ b/core/snmp/impl-snmp4j/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.snmp - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.snmp diff --git a/core/snmp/integration-tests/pom.xml b/core/snmp/integration-tests/pom.xml index bf3532d42fb5..658d6dbfaa13 100644 --- a/core/snmp/integration-tests/pom.xml +++ b/core/snmp/integration-tests/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.snmp - 22.0.1 + 22.0.2-SNAPSHOT .. 4.0.0 diff --git a/core/snmp/joesnmp/pom.xml b/core/snmp/joesnmp/pom.xml index b03410df600a..d1edc4f58cec 100644 --- a/core/snmp/joesnmp/pom.xml +++ b/core/snmp/joesnmp/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.snmp - 22.0.1 + 22.0.2-SNAPSHOT .. 4.0.0 diff --git a/core/snmp/pom.xml b/core/snmp/pom.xml index 3eaa02e223c3..adf52cd5a528 100644 --- a/core/snmp/pom.xml +++ b/core/snmp/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/snmp/proxy-rpc-impl/pom.xml b/core/snmp/proxy-rpc-impl/pom.xml index 0771d3d728a9..dcb9b482f8bd 100644 --- a/core/snmp/proxy-rpc-impl/pom.xml +++ b/core/snmp/proxy-rpc-impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.snmp - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.snmp diff --git a/core/snmp/proxy-rpc-tests/pom.xml b/core/snmp/proxy-rpc-tests/pom.xml index 10e80a50553c..5f6a73d9779a 100644 --- a/core/snmp/proxy-rpc-tests/pom.xml +++ b/core/snmp/proxy-rpc-tests/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.snmp - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.snmp diff --git a/core/soa/pom.xml b/core/soa/pom.xml index 92e686388b38..25c99e8d6f9f 100644 --- a/core/soa/pom.xml +++ b/core/soa/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/spring-web/pom.xml b/core/spring-web/pom.xml index 58596aeecd13..c0e954fc3a25 100644 --- a/core/spring-web/pom.xml +++ b/core/spring-web/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/spring/pom.xml b/core/spring/pom.xml index d79eb8125db3..66bb2e4fefd3 100644 --- a/core/spring/pom.xml +++ b/core/spring/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/tasks/pom.xml b/core/tasks/pom.xml index 08ed1af032db..6d2b022f39dc 100644 --- a/core/tasks/pom.xml +++ b/core/tasks/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/test-api/activemq/pom.xml b/core/test-api/activemq/pom.xml index fb712e9b0232..4a7ad3f85708 100644 --- a/core/test-api/activemq/pom.xml +++ b/core/test-api/activemq/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/camel/pom.xml b/core/test-api/camel/pom.xml index 530bb5eb8452..db43396507bf 100644 --- a/core/test-api/camel/pom.xml +++ b/core/test-api/camel/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/collection/pom.xml b/core/test-api/collection/pom.xml index 44d416f6187d..36200b62bbf1 100644 --- a/core/test-api/collection/pom.xml +++ b/core/test-api/collection/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/db/pom.xml b/core/test-api/db/pom.xml index 6a37399a622a..56b4ac125586 100644 --- a/core/test-api/db/pom.xml +++ b/core/test-api/db/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/db/src/test/java/org/opennms/core/test/db/IPLikeCoverageIT.java b/core/test-api/db/src/test/java/org/opennms/core/test/db/IPLikeCoverageIT.java new file mode 100644 index 000000000000..a513a2166244 --- /dev/null +++ b/core/test-api/db/src/test/java/org/opennms/core/test/db/IPLikeCoverageIT.java @@ -0,0 +1,133 @@ +/******************************************************************************* + * This file is part of OpenNMS(R). + * + * Copyright (C) 2018 The OpenNMS Group, Inc. + * OpenNMS(R) is Copyright (C) 1999-2018 The OpenNMS Group, Inc. + * + * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. + * + * OpenNMS(R) is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. + * + * OpenNMS(R) is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenNMS(R). If not, see: + * http://www.gnu.org/licenses/ + * + * For more information contact: + * OpenNMS(R) Licensing + * http://www.opennms.org/ + * http://www.opennms.com/ + *******************************************************************************/ + +package org.opennms.core.test.db; + +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class IPLikeCoverageIT extends InstallerDbITCase { + + /* + * This set of coverage data matches that in https://github.com/OpenNMS/iplike/blob/master/tests.dat + */ + @Test + public void testIplikeCoverage() throws Exception { + getInstallerDb().updatePlPgsql(); + getInstallerDb().setPostgresIpLikeLocation(null); // Ensure that we don't try to load the C version + getInstallerDb().updateIplike(); + + // IPv4 basic matches + checkIplikeRule("1.2.3.4","1.2.3.4",true); + checkIplikeRule("1.2.3.4","1.2.3.5",false); + checkIplikeRule("1.2.3.4","1.2.3.*",true); + checkIplikeRule("1.2.3.4","1.*.3.4",true); + checkIplikeRule("1.2.3.4","1.*.3.5",false); + + // IPv4 range matches + checkIplikeRule("192.168.10.11","192.168.10.10-11",true); + checkIplikeRule("192.168.10.12","192.168.10.10-11",false); + checkIplikeRule("192.168.223.9","192.168.216-223.*",true); + checkIplikeRule("192.168.224.9","192.168.216-223.*",false); + + // IPv4 list matches + checkIplikeRule("192.168.1.9","192.168.0,1,2.*",true); + checkIplikeRule("192.168.1.9","192.168.1,2,0.*",true); + checkIplikeRule("192.168.1.9","192.168.2,0,1.*",true); + checkIplikeRule("192.168.3.9","192.168.0,1,2.*",false); + checkIplikeRule("192.168.3.9","192.168.1,2,0.*",false); + checkIplikeRule("192.168.3.9","192.168.2,0,1.*",false); + checkIplikeRule("192.168.3.9","192.168.*,1,2.*",true); + checkIplikeRule("192.168.3.9","192.168.0,*,2.*",true); + checkIplikeRule("192.168.3.9","192.168.0,1,*.*",true); + + // IPv4 list and range in separate octet + checkIplikeRule("192.168.1.9","192.168.0,1,2.0-20",true); + checkIplikeRule("192.168.1.21","192.168.0,1,2.0-20",false); + + // IPv4 list and range in same octet + checkIplikeRule("192.168.1.9","192.168.0,1,2-4.0-20",true); + checkIplikeRule("192.168.3.9","192.168.0,1,2-4.0-20",true); + checkIplikeRule("192.168.5.9","192.168.0,1,2-4.0-20",false); + checkIplikeRule("192.168.1.21","192.168.0,1,2,3-4.0-20",false); + checkIplikeRule("192.168.0.1","192.168.1-2,5.*",false); + + // IPv6 tests + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd","*:*:*:*:*:*:*:*",true); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd%4","*:*:*:*:*:*:*:*",true); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd%4","*:*:*:*:*:*:*:*%4",true); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd","*:*:*:*:*:*:*:*%4",false); + + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd","fe80:*:*:*:*:*:*:*",true); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd%45","fe80:*:*:*:*:*:*:*",true); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd%45","fe80:*:*:*:*:*:*:*%45",true); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd","fe80:*:*:*:*:*:*:*%45",false); + + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd","*:*:*:0:*:*:*:*",true); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd%4","*:*:*:0:*:*:*:*",true); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd%4","*:*:*:0:*:*:*:*%4",true); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd","*:*:*:0:*:*:*:*%4",false); + + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd","*:*:*:*:*:bbbb:*:*",true); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd%4","*:*:*:*:*:bbbb:*:*",true); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd%4","*:*:*:*:*:bbbb:*:*%4",true); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd%4","*:*:*:*:*:bbbb:*:*%5",false); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd","*:*:*:*:*:bbbb:*:*%4",false); + + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd","*:*:*:*:*:bbb0-bbbf:*:*",true); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd%4","*:*:*:*:*:bbb0-bbbf:*:*",true); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd%4","*:*:*:*:*:bbb0-bbbf:*:*%4",true); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd","*:*:*:*:*:bbb0-bbbf:*:*%4",false); + + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd","fe80:0000:0000:0000:aaaa:bbb0-bbbf:cccc:dddd",true); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd%4","fe80:0000:0000:0000:aaaa:bbb0-bbbf:cccc:dddd",true); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd%4","fe80:0000:0000:0000:aaaa:bbb0-bbbf:cccc:dddd%4",true); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd","fe80:0000:0000:0000:aaaa:bbb0-bbbf:cccc:dddd%4",false); + + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd","fe20,fe70-fe90:0000:0000:0000:*:bbb0,bbb1,bbb2,bbb3,bbb4,bbbb,bbbc:cccc:dddd",true); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd%4","fe20,fe70-fe90:0000:0000:0000:*:bbb0,bbb1,bbb2,bbb3,bbb4,bbbb,bbbc:cccc:dddd",true); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd%4","fe20,fe70-fe90:0000:0000:0000:*:bbb0,bbb1,bbb2,bbb3,bbb4,bbbb,bbbc:cccc:dddd%4",true); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd","fe20,fe70-fe90:0000:0000:0000:*:bbb0,bbb1,bbb2,bbb3,bbb4,bbbb,bbbc:cccc:dddd%4",false); + + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd","fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd",true); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd%4","fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd",true); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd%4","fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd%4",true); + checkIplikeRule("fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd","fe80:0000:0000:0000:aaaa:bbbb:cccc:dddd%4",false); + + getInstallerDb().closeConnection(); + } + + private void checkIplikeRule(final String value, final String rule, final boolean expected) throws Exception { + final Boolean result = getJdbcTemplate().queryForObject("SELECT iplike(CAST(? AS TEXT),CAST(? AS TEXT))", new String[] { value, rule }, Boolean.class); + if (expected) { + assertTrue("SELECT iplike(" + value + "," + rule + ") === " + expected, result); + } + } + +} diff --git a/core/test-api/db/src/test/java/org/opennms/core/test/db/InstallerDbIT.java b/core/test-api/db/src/test/java/org/opennms/core/test/db/InstallerDbIT.java index 9f8d2c970cec..84b197975df2 100644 --- a/core/test-api/db/src/test/java/org/opennms/core/test/db/InstallerDbIT.java +++ b/core/test-api/db/src/test/java/org/opennms/core/test/db/InstallerDbIT.java @@ -1,8 +1,8 @@ /******************************************************************************* * This file is part of OpenNMS(R). * - * Copyright (C) 2005-2014 The OpenNMS Group, Inc. - * OpenNMS(R) is Copyright (C) 1999-2014 The OpenNMS Group, Inc. + * Copyright (C) 2005-2018 The OpenNMS Group, Inc. + * OpenNMS(R) is Copyright (C) 1999-2018 The OpenNMS Group, Inc. * * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. * @@ -35,14 +35,11 @@ import java.io.BufferedReader; import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStreamReader; -import java.io.PrintStream; import java.io.StringReader; import java.net.URL; import java.nio.charset.StandardCharsets; -import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; @@ -53,63 +50,21 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.junit.After; -import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.opennms.core.db.install.Column; import org.opennms.core.db.install.Constraint; -import org.opennms.core.db.install.InstallerDb; import org.opennms.core.db.install.Table; import org.opennms.core.db.install.Trigger; -import org.opennms.core.test.db.TemporaryDatabaseITCase; import org.opennms.test.ThrowableAnticipator; import org.springframework.util.StringUtils; -public class InstallerDbIT extends TemporaryDatabaseITCase { - private InstallerDb m_installerDb; - private Connection m_connection; - - private ByteArrayOutputStream m_outputStream; - - @Before - public void setUp() throws Exception { - super.setUp(); - - m_installerDb = new InstallerDb(); - - resetOutputStream(); - getInstallerDb().setDatabaseName(getTestDatabase()); - m_installerDb.setPostgresOpennmsUser("opennms"); - - getInstallerDb().setCreateSqlLocation("../../../opennms-base-assembly/src/main/filtered/etc/create.sql"); - - getInstallerDb().setStoredProcedureDirectory("../../../opennms-base-assembly/src/main/filtered/etc"); - - getInstallerDb().setDebug(true); - - getInstallerDb().readTables(); - - getInstallerDb().setDataSource(getDataSource()); - - m_connection = getDataSource().getConnection(); - } - - @After - public void tearDown() throws Exception { - m_connection.close(); - getInstallerDb().closeConnection(); - - super.tearDown(); - } - - // XXX this should be an integration test +public class InstallerDbIT extends InstallerDbITCase { @Test public void testCreateSequences() throws Exception { getInstallerDb().createSequences(); } - // XXX this should be an integration test @Test public void testCreateTables() throws Exception { getInstallerDb().createSequences(); @@ -119,7 +74,6 @@ public void testCreateTables() throws Exception { getInstallerDb().createTables(); } - // XXX this should be an integration test @Test public void testCreateTablesTwice() throws Exception { // First pass. @@ -812,7 +766,7 @@ public void testSetEventSourceOnUpgrade() throws Exception { getInstallerDb().createTables(); - Statement st = m_connection.createStatement(); + Statement st = getConnection().createStatement(); ResultSet rs = st.executeQuery("SELECT eventsource from events"); int count = 0; while (rs.next()) { @@ -856,7 +810,7 @@ public void testSetOutageIdOnUpgrade() throws Exception { getInstallerDb().createTables(); - Statement st = m_connection.createStatement(); + Statement st = getConnection().createStatement(); ResultSet rs = st.executeQuery("SELECT outageid from outages"); int count = 0; for (int expected = 1; rs.next(); expected++) { @@ -893,7 +847,7 @@ public void testSomethingUnknown() throws Exception { getInstallerDb().createTables(); - Statement st = m_connection.createStatement(); + Statement st = getConnection().createStatement(); ResultSet rs = st.executeQuery("SELECT svcregainedeventid from outages"); int count = 0; while (rs.next()) { @@ -934,7 +888,7 @@ public void testSetUsersNotifiedIdOnUpgrade() throws Exception { getInstallerDb().createTables(); - Statement st = m_connection.createStatement(); + Statement st = getConnection().createStatement(); ResultSet rs = st.executeQuery("SELECT id from usersnotified"); int count = 0; for (int expected = 1; rs.next(); expected++) { @@ -969,7 +923,7 @@ public void testSetSnmpInterfaceIdOnUpgrade() throws Exception { getInstallerDb().createTables(); - Statement st = m_connection.createStatement(); + Statement st = getConnection().createStatement(); ResultSet rs = st.executeQuery("SELECT id from snmpInterface"); int count = 0; for (int expected = 1; rs.next(); expected++) { @@ -1001,7 +955,7 @@ public void testCatchSnmpInterfaceNullNodeIdColumnOnUpgrade() getInstallerDb().createTables(); - Statement st = m_connection.createStatement(); + Statement st = getConnection().createStatement(); ResultSet rs = st.executeQuery("SELECT id from snmpInterface"); assertTrue("Could not ResultSet.next() to first result entry", @@ -1125,7 +1079,7 @@ public void testAssetsIdOnUpgrade() throws Exception { getInstallerDb().createTables(); - Statement st = m_connection.createStatement(); + Statement st = getConnection().createStatement(); ResultSet rs = st.executeQuery("SELECT id from assets"); assertTrue("Could not ResultSet.next() to first result entry", @@ -1190,7 +1144,7 @@ public void testIpInterfaceForeignKeySnmpInterfaceIdOnUpgrade() Statement st; ResultSet rs; - st = m_connection.createStatement(); + st = getConnection().createStatement(); rs = st.executeQuery("SELECT id from snmpInterface ORDER BY nodeId"); assertTrue("Could not ResultSet.next() to first result entry", @@ -1203,7 +1157,7 @@ public void testIpInterfaceForeignKeySnmpInterfaceIdOnUpgrade() assertFalse("Too many entries", rs.next()); - st = m_connection.createStatement(); + st = getConnection().createStatement(); rs = st.executeQuery("SELECT id, snmpInterfaceID from ipInterface ORDER BY nodeId"); assertTrue("Could not ResultSet.next() to first result entry", @@ -1280,7 +1234,7 @@ public void testIfServicesForeignKeyIpInterfaceIdOnUpgrade() getInstallerDb().createTables(); - Statement st = m_connection.createStatement(); + Statement st = getConnection().createStatement(); ResultSet rs = st.executeQuery("SELECT id from ipInterface"); assertTrue("could not advance results to first row", rs.next()); @@ -1362,7 +1316,7 @@ public void testOutagesForeignKeyIfServiceIdOnUpgrade() throws Exception { getInstallerDb().createTables(); - Statement st = m_connection.createStatement(); + Statement st = getConnection().createStatement(); ResultSet rs = st.executeQuery("SELECT id from ifServices"); int count = 0; for (int expected = 1; rs.next(); expected++) { @@ -1787,20 +1741,11 @@ public void assertTriggerExists(Trigger trigger) + "' does not exist on table '" + trigger.getTable() + "' to execute '" + trigger.getStoredProcedure() + "' function", - trigger.isOnDatabase(m_connection)); - } - - public InstallerDb getInstallerDb() { - return m_installerDb; - } - - public void resetOutputStream() { - m_outputStream = new ByteArrayOutputStream(); - getInstallerDb().setOutputStream(new PrintStream(m_outputStream)); + trigger.isOnDatabase(getConnection())); } private void assertNoTablesHaveChanged() throws IOException { - ByteArrayInputStream in = new ByteArrayInputStream(m_outputStream.toByteArray()); + ByteArrayInputStream in = new ByteArrayInputStream(getOutputStream().toByteArray()); BufferedReader reader = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8)); String line; @@ -1832,7 +1777,7 @@ private void assertNoTablesHaveChanged() throws IOException { } if (unanticipatedOutput.size() > 0) { - org.junit.Assert.fail(unanticipatedOutput.size() + "unexpected line(s) output by createTables(): \n\t" + StringUtils.collectionToDelimitedString(unanticipatedOutput, "\n\t") + "\nAll output:\n" + m_outputStream); + org.junit.Assert.fail(unanticipatedOutput.size() + "unexpected line(s) output by createTables(): \n\t" + StringUtils.collectionToDelimitedString(unanticipatedOutput, "\n\t") + "\nAll output:\n" + getOutputStream()); } } diff --git a/core/test-api/db/src/test/java/org/opennms/core/test/db/InstallerDbITCase.java b/core/test-api/db/src/test/java/org/opennms/core/test/db/InstallerDbITCase.java new file mode 100644 index 000000000000..6243da8871a2 --- /dev/null +++ b/core/test-api/db/src/test/java/org/opennms/core/test/db/InstallerDbITCase.java @@ -0,0 +1,83 @@ +/******************************************************************************* + * This file is part of OpenNMS(R). + * + * Copyright (C) 2018 The OpenNMS Group, Inc. + * OpenNMS(R) is Copyright (C) 1999-2018 The OpenNMS Group, Inc. + * + * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. + * + * OpenNMS(R) is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. + * + * OpenNMS(R) is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenNMS(R). If not, see: + * http://www.gnu.org/licenses/ + * + * For more information contact: + * OpenNMS(R) Licensing + * http://www.opennms.org/ + * http://www.opennms.com/ + *******************************************************************************/ + +package org.opennms.core.test.db; + +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; + +import org.junit.After; +import org.junit.Before; +import org.opennms.core.db.install.InstallerDb; + +public class InstallerDbITCase extends TemporaryDatabaseITCase { + private InstallerDb m_installerDb; + private ByteArrayOutputStream m_outputStream; + + @Before + public void setUp() throws Exception { + super.setUp(); + + m_installerDb = new InstallerDb(); + + resetOutputStream(); + getInstallerDb().setDatabaseName(getTestDatabase()); + m_installerDb.setPostgresOpennmsUser("opennms"); + + getInstallerDb().setCreateSqlLocation("../../../opennms-base-assembly/src/main/filtered/etc/create.sql"); + + getInstallerDb().setStoredProcedureDirectory("../../../opennms-base-assembly/src/main/filtered/etc"); + + getInstallerDb().setDebug(true); + + getInstallerDb().readTables(); + + getInstallerDb().setDataSource(getDataSource()); + } + + @After + public void tearDown() throws Exception { + getConnection().close(); + getInstallerDb().closeConnection(); + + super.tearDown(); + } + + public InstallerDb getInstallerDb() { + return m_installerDb; + } + + public ByteArrayOutputStream getOutputStream() { + return m_outputStream; + } + + public void resetOutputStream() { + m_outputStream = new ByteArrayOutputStream(); + getInstallerDb().setOutputStream(new PrintStream(m_outputStream)); + } +} diff --git a/core/test-api/dns/pom.xml b/core/test-api/dns/pom.xml index e80aec074f62..2e26961b7474 100644 --- a/core/test-api/dns/pom.xml +++ b/core/test-api/dns/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/elasticsearch/pom.xml b/core/test-api/elasticsearch/pom.xml index 6ef27fc78565..8aa398d739ed 100644 --- a/core/test-api/elasticsearch/pom.xml +++ b/core/test-api/elasticsearch/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/http/pom.xml b/core/test-api/http/pom.xml index d353f43dd745..3454659fee98 100644 --- a/core/test-api/http/pom.xml +++ b/core/test-api/http/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/kafka/pom.xml b/core/test-api/kafka/pom.xml index b0bde1eb8472..ddc0c044adbf 100644 --- a/core/test-api/kafka/pom.xml +++ b/core/test-api/kafka/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/karaf/pom.xml b/core/test-api/karaf/pom.xml index 809777a0fac6..d3b573203a52 100644 --- a/core/test-api/karaf/pom.xml +++ b/core/test-api/karaf/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/lib/pom.xml b/core/test-api/lib/pom.xml index 85a0d05af838..831d505366da 100644 --- a/core/test-api/lib/pom.xml +++ b/core/test-api/lib/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/pom.xml b/core/test-api/pom.xml index a79c100f9265..5d8f71ccefaf 100644 --- a/core/test-api/pom.xml +++ b/core/test-api/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/test-api/rest/pom.xml b/core/test-api/rest/pom.xml index 4fbc7904f295..c71a9a29e5e6 100644 --- a/core/test-api/rest/pom.xml +++ b/core/test-api/rest/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/schema/a/pom.xml b/core/test-api/schema/a/pom.xml index 98424b017109..47150fd437bb 100644 --- a/core/test-api/schema/a/pom.xml +++ b/core/test-api/schema/a/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.test-api org.opennms.core.test-api.schema - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.test-api.schema diff --git a/core/test-api/schema/b/pom.xml b/core/test-api/schema/b/pom.xml index b546cfbbea2c..52ea4b44f6c7 100644 --- a/core/test-api/schema/b/pom.xml +++ b/core/test-api/schema/b/pom.xml @@ -3,7 +3,7 @@ org.opennms.core.test-api org.opennms.core.test-api.schema - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.test-api.schema diff --git a/core/test-api/schema/pom.xml b/core/test-api/schema/pom.xml index 254d0c5731a3..9b48949b9547 100644 --- a/core/test-api/schema/pom.xml +++ b/core/test-api/schema/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/services/pom.xml b/core/test-api/services/pom.xml index 6a325b95183a..a35a8a77a274 100644 --- a/core/test-api/services/pom.xml +++ b/core/test-api/services/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/snmp/pom.xml b/core/test-api/snmp/pom.xml index 57e33fef7e0e..48b19c160302 100644 --- a/core/test-api/snmp/pom.xml +++ b/core/test-api/snmp/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/test-api/xml/pom.xml b/core/test-api/xml/pom.xml index ebd2c5d2cf38..ee5f7b274738 100644 --- a/core/test-api/xml/pom.xml +++ b/core/test-api/xml/pom.xml @@ -3,7 +3,7 @@ org.opennms.core org.opennms.core.test-api - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core.test-api diff --git a/core/upgrade/pom.xml b/core/upgrade/pom.xml index 2766075f6200..0aa75a7a47b8 100644 --- a/core/upgrade/pom.xml +++ b/core/upgrade/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/web-assets/package.json b/core/web-assets/package.json index b56e1d892c65..2ab03840d501 100644 --- a/core/web-assets/package.json +++ b/core/web-assets/package.json @@ -1,6 +1,6 @@ { "name": "opennms-core-web-assets", - "version": "22.0.1", + "version": "22.0.2-SNAPSHOT", "description": "JavaScript Web Components for OpenNMS", "license": "AGPL-3.0", "repository": { @@ -10,27 +10,27 @@ "devDependencies": { "@types/lodash": "^4.14.104", "angular-mocks": "1.5.11", - "assets-webpack-plugin": "^3.5.1", + "assets-webpack-plugin": "^3.8.4", "babel-cli": "^6.26.0", - "babel-eslint": "^8.2.2", - "babel-jest": "^22.4.3", + "babel-eslint": "^8.2.3", + "babel-jest": "^23.0.1", "babel-loader": "^7.1.4", - "babel-plugin-angularjs-annotate": "^0.8.2", + "babel-plugin-angularjs-annotate": "^0.9.0", "babel-plugin-resolver": "^1.1.0", "babel-plugin-syntax-async-functions": "^6.13.0", "babel-plugin-transform-class-properties": "^6.24.1", "babel-plugin-transform-es2015-destructuring": "^6.23.0", "babel-plugin-transform-es2015-for-of": "^6.23.0", - "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0", + "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2", "babel-plugin-transform-object-rest-spread": "^6.26.0", "babel-plugin-transform-regenerator": "^6.26.0", "babel-plugin-transform-runtime": "^6.23.0", "babel-polyfill": "^6.26.0", - "babel-preset-env": "^1.6.1", + "babel-preset-env": "^1.7.0", "babel-preset-es2015-nostrict": "^6.6.2", "babel-preset-latest": "^6.24.1", "cache-loader": "^1.2.2", - "copy-webpack-plugin": "^4.5.1", + "copy-webpack-plugin": "^4.5.2", "css-loader": "^0.28.11", "eslint": "^4.19.1", "eslint-loader": "^2.0.0", @@ -42,26 +42,26 @@ "identity-obj-proxy": "^3.0.0", "imports-loader": "^0.8.0", "jasmine-core": "^3.1.0", - "jest": "^22.4.3", + "jest": "^23.1.0", "lodash.clonedeep": "^4.5.0", "main-bower-files": "^2.13.1", "ngtemplate-loader": "^2.0.1", - "node-sass": "^4.8.3", + "node-sass": "^4.9.0", "parallel-webpack": "^2.3.0", "phantomjs-prebuilt": "^2.1.16", "regenerator-runtime": "^0.11.1", "sass-loader": "^6.0.7", "script-loader": "^0.7.2", "string-replace-webpack-plugin": "^0.1.3", - "style-loader": "^0.20.3", + "style-loader": "^0.21.0", "ts-loader": "^4.1.0", "tslint": "^5.9.1", "tslint-loader": "https://github.com/wbuchwalter/tslint-loader.git#093230076f3b453c4f8b7aa2ee074932aa109e84", "typescript": "^2.8.1", - "uglifyjs-webpack-plugin": "^1.2.4", - "webpack": "^4.3.0", - "webpack-bundle-analyzer": "^2.11.1", - "webpack-cli": "^2.0.13", + "uglifyjs-webpack-plugin": "^1.2.7", + "webpack": "^4.12.1", + "webpack-bundle-analyzer": "^2.13.1", + "webpack-cli": "^2.1.5", "webpack-md5-hash": "^0.0.6", "yargs": "^11.0.0" }, diff --git a/core/web-assets/pom.xml b/core/web-assets/pom.xml index 6c31a55f324f..4a694c3bf8bf 100644 --- a/core/web-assets/pom.xml +++ b/core/web-assets/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/web-assets/src/main/assets/js/apps/add-to-ksc/index.js b/core/web-assets/src/main/assets/js/apps/add-to-ksc/index.js index e3ee83cf13f4..1ce37c2f5b1c 100644 --- a/core/web-assets/src/main/assets/js/apps/add-to-ksc/index.js +++ b/core/web-assets/src/main/assets/js/apps/add-to-ksc/index.js @@ -144,7 +144,7 @@ angular.module('onms-ksc', [ $scope.hasFlows = false; $scope.flowGraphUrl = ''; $scope.getFlowInfo = function(nodeId, ifIndex , start, end) { - if (nodeId == 0 || ifIndex == 0) { + if (nodeId === 0 || ifIndex === 0) { return; } flowsRestFactory.getFlowGraphUrl(nodeId, ifIndex, start, end) diff --git a/core/web-assets/src/main/assets/js/apps/onms-classifications/index.js b/core/web-assets/src/main/assets/js/apps/onms-classifications/index.js index 10fdfcd7c3d1..bd16d08426ba 100644 --- a/core/web-assets/src/main/assets/js/apps/onms-classifications/index.js +++ b/core/web-assets/src/main/assets/js/apps/onms-classifications/index.js @@ -411,7 +411,7 @@ const exportModalTemplate = require('./views/modals/export-modal.html'); function($scope, $http, $uibModalInstance, group, $window) { $scope.group = group; $scope.export = {}; - $scope.export.requestedFileName = group.id + "_rules.csv"; + $scope.export.requestedFileName = group.id + '_rules.csv'; $scope.exportGroup = function() { var requestedFileName = $scope.export.requestedFileName.trim(); $window.location = 'rest/classifications/groups/' + $scope.group.id +'?filename=' diff --git a/core/web-assets/src/main/assets/js/apps/onms-resources/index.js b/core/web-assets/src/main/assets/js/apps/onms-resources/index.js index 657c2cf5417f..38a43834fe25 100644 --- a/core/web-assets/src/main/assets/js/apps/onms-resources/index.js +++ b/core/web-assets/src/main/assets/js/apps/onms-resources/index.js @@ -60,7 +60,7 @@ angular.module('onms-resources', [ $scope.update(); }, function errorCallback(response) { $scope.loaded = true; - growl.error("There was a problem in retrieving resources through ReST", {ttl: 10000}); + growl.error('There was a problem in retrieving resources through ReST', {ttl: 10000}); }); $scope.$watch('resourceFilter', function() { @@ -110,7 +110,7 @@ angular.module('onms-resources', [ angular.copy($scope.resources, $scope.filteredResources); }, function errorCallback(response) { $scope.loaded = true; - growl.error("There was a problem in retrieving resources through ReST", {ttl: 10000}); + growl.error('There was a problem in retrieving resources through ReST', {ttl: 10000}); }); }; diff --git a/core/web-assets/src/main/assets/js/vendor/angular-js.js b/core/web-assets/src/main/assets/js/vendor/angular-js.js index 32c9c44fecaf..af3e025c8888 100644 --- a/core/web-assets/src/main/assets/js/vendor/angular-js.js +++ b/core/web-assets/src/main/assets/js/vendor/angular-js.js @@ -14,7 +14,7 @@ require('angular-growl-v2/build/angular-growl.css'); require('angular-loading-bar/build/loading-bar.css'); /* Bootstrap UI */ -require('./bootstrap-js'); +require('vendor/bootstrap-js'); require('angular-bootstrap-checkbox'); require('angular-ui-bootstrap'); diff --git a/core/web-assets/src/main/assets/js/vendor/bootstrap-js.js b/core/web-assets/src/main/assets/js/vendor/bootstrap-js.js index 14d59440e287..acaee6a5a117 100644 --- a/core/web-assets/src/main/assets/js/vendor/bootstrap-js.js +++ b/core/web-assets/src/main/assets/js/vendor/bootstrap-js.js @@ -1,6 +1,6 @@ -const jQuery = require('vendor/jquery-js'); -require('bootstrap/dist/js/bootstrap'); - console.log('init: bootstrap-js'); // eslint-disable-line no-console +const jQuery = require('vendor/jquery-js'); +require('bootstrap/dist/js/npm'); + module.exports = jQuery; diff --git a/core/web-assets/src/main/assets/js/vendor/jquery-js.js b/core/web-assets/src/main/assets/js/vendor/jquery-js.js index f09882f4219f..c83d8015533a 100644 --- a/core/web-assets/src/main/assets/js/vendor/jquery-js.js +++ b/core/web-assets/src/main/assets/js/vendor/jquery-js.js @@ -1,11 +1,4 @@ -if (!window.jQuery) { - console.log('init: jquery-js'); // eslint-disable-line no-console +console.log('init: jquery-js'); // eslint-disable-line no-console - const jQuery = require('jquery'); - window.jQuery = jQuery; - window.$ = jQuery; -} else { - window.$ = window.jQuery; -} - -module.exports = window.jQuery; \ No newline at end of file +const jQuery = require('jquery'); +module.exports = jQuery; diff --git a/core/web-assets/src/main/java/org/opennms/web/assets/impl/AssetLocatorImpl.java b/core/web-assets/src/main/java/org/opennms/web/assets/impl/AssetLocatorImpl.java index 9ed873aa9e07..10d5439237c4 100644 --- a/core/web-assets/src/main/java/org/opennms/web/assets/impl/AssetLocatorImpl.java +++ b/core/web-assets/src/main/java/org/opennms/web/assets/impl/AssetLocatorImpl.java @@ -233,12 +233,21 @@ private Map> loadAssets(final boolean minified) { final JSONObject assetObj = assetsObj.getJSONObject(assetName); final List assets = new ArrayList<>(assetObj.length()); final JSONArray keys = assetObj.names(); + int count = 0; for (int j=0; j < keys.length(); j++) { final String type = keys.getString(j); - final String path = assetObj.getString(type); - assets.add(new AssetResource(assetName, type, path)); + if (!assetObj.isNull(type)) { + final Object item = assetObj.get(type); + if (item instanceof JSONArray) { + LOG.debug("{} is an anonymous type resource; skipping indexing", type); + } else { + final String path = assetObj.getString(type); + assets.add(new AssetResource(assetName, type, path)); + count++; + } + } } - if (assetObj.length() > 0) { + if (count > 0) { newAssets.put(assetName, assets); } } diff --git a/core/web-assets/src/test/resources/assets/assets.json b/core/web-assets/src/test/resources/assets/assets.json index 1ef355efca72..63c1d776ad19 100644 --- a/core/web-assets/src/test/resources/assets/assets.json +++ b/core/web-assets/src/test/resources/assets/assets.json @@ -1,5 +1,11 @@ { - "test-asset": { - "js": "assets/test.js" - } -} \ No newline at end of file + "test-asset": { + "js": "assets/test.js" + }, + "": { + "js": [ + "assets/foo.js", + "assets/bar.js" + ] + } +} diff --git a/core/web-assets/src/test/resources/assets/assets.min.json b/core/web-assets/src/test/resources/assets/assets.min.json index 6e336be6aeed..bbcea1608691 100644 --- a/core/web-assets/src/test/resources/assets/assets.min.json +++ b/core/web-assets/src/test/resources/assets/assets.min.json @@ -1,5 +1 @@ -{ - "test-asset": { - "js": "assets/test.min.js" - } -} +{"test-asset":{"js":"assets/test.min.js"},"":{"js":["assets/foo.js","assets/bar.js"]}} diff --git a/core/web-assets/webpack.config.js b/core/web-assets/webpack.config.js index 0d62fce60fd9..31647cffdb02 100644 --- a/core/web-assets/webpack.config.js +++ b/core/web-assets/webpack.config.js @@ -135,9 +135,6 @@ doWalk('vendor', scanUtils); /* scan vendor roll-ups */ doWalk('vaadin', scanUtils); -/* special case, make sure jQuery gets included as an endpoint */ -//vendorEntries['jquery'] = 'jquery'; - const dotPrint = (entry) => { console.log('* ' + entry); }; @@ -382,21 +379,12 @@ var config = { extensions: ['.tsx', '.ts', '.jsx', '.js'] }, plugins: [ + /* new webpack.ProvidePlugin({ jQuery: 'vendor/jquery-js', $: 'vendor/jquery-js' - /*, - angular: 'angular', - Backshift: 'backshift/dist/backshift.onms', - bootbox: 'bootbox', - c3: 'c3', - d3: 'd3', - Holder: 'holderjs', - holder: 'holderjs', - L: 'leaflet', - _: 'underscore' - */ }), + */ new WebpackMd5Hash(), new StringReplacePlugin() ] @@ -465,7 +453,9 @@ function createConfig(options) { }); myconf.optimization = { - runtimeChunk: false, + runtimeChunk: { + name: 'vendor' + }, splitChunks: { chunks: 'all', minSize: 1, diff --git a/core/web-assets/yarn.lock b/core/web-assets/yarn.lock index acd5d106aef5..678c8d37b8c3 100644 --- a/core/web-assets/yarn.lock +++ b/core/web-assets/yarn.lock @@ -2,35 +2,47 @@ # yarn lockfile v1 -"@babel/code-frame@7.0.0-beta.40", "@babel/code-frame@^7.0.0-beta.35", "@babel/code-frame@^7.0.0-beta.40": +"@babel/code-frame@7.0.0-beta.44": + version "7.0.0-beta.44" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz#2a02643368de80916162be70865c97774f3adbd9" + dependencies: + "@babel/highlight" "7.0.0-beta.44" + +"@babel/code-frame@^7.0.0-beta.35": version "7.0.0-beta.40" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.40.tgz#37e2b0cf7c56026b4b21d3927cadf81adec32ac6" dependencies: "@babel/highlight" "7.0.0-beta.40" -"@babel/generator@7.0.0-beta.40": - version "7.0.0-beta.40" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.40.tgz#ab61f9556f4f71dbd1138949c795bb9a21e302ea" +"@babel/generator@7.0.0-beta.44": + version "7.0.0-beta.44" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.44.tgz#c7e67b9b5284afcf69b309b50d7d37f3e5033d42" dependencies: - "@babel/types" "7.0.0-beta.40" + "@babel/types" "7.0.0-beta.44" jsesc "^2.5.1" lodash "^4.2.0" source-map "^0.5.0" trim-right "^1.0.1" -"@babel/helper-function-name@7.0.0-beta.40": - version "7.0.0-beta.40" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.40.tgz#9d033341ab16517f40d43a73f2d81fc431ccd7b6" +"@babel/helper-function-name@7.0.0-beta.44": + version "7.0.0-beta.44" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.44.tgz#e18552aaae2231100a6e485e03854bc3532d44dd" dependencies: - "@babel/helper-get-function-arity" "7.0.0-beta.40" - "@babel/template" "7.0.0-beta.40" - "@babel/types" "7.0.0-beta.40" + "@babel/helper-get-function-arity" "7.0.0-beta.44" + "@babel/template" "7.0.0-beta.44" + "@babel/types" "7.0.0-beta.44" -"@babel/helper-get-function-arity@7.0.0-beta.40": - version "7.0.0-beta.40" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.40.tgz#ac0419cf067b0ec16453e1274f03878195791c6e" +"@babel/helper-get-function-arity@7.0.0-beta.44": + version "7.0.0-beta.44" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.44.tgz#d03ca6dd2b9f7b0b1e6b32c56c72836140db3a15" dependencies: - "@babel/types" "7.0.0-beta.40" + "@babel/types" "7.0.0-beta.44" + +"@babel/helper-split-export-declaration@7.0.0-beta.44": + version "7.0.0-beta.44" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.44.tgz#c0b351735e0fbcb3822c8ad8db4e583b05ebd9dc" + dependencies: + "@babel/types" "7.0.0-beta.44" "@babel/highlight@7.0.0-beta.40": version "7.0.0-beta.40" @@ -40,37 +52,63 @@ esutils "^2.0.2" js-tokens "^3.0.0" -"@babel/template@7.0.0-beta.40": - version "7.0.0-beta.40" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.40.tgz#034988c6424eb5c3268fe6a608626de1f4410fc8" +"@babel/highlight@7.0.0-beta.44": + version "7.0.0-beta.44" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.44.tgz#18c94ce543916a80553edcdcf681890b200747d5" + dependencies: + chalk "^2.0.0" + esutils "^2.0.2" + js-tokens "^3.0.0" + +"@babel/template@7.0.0-beta.44": + version "7.0.0-beta.44" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.44.tgz#f8832f4fdcee5d59bf515e595fc5106c529b394f" dependencies: - "@babel/code-frame" "7.0.0-beta.40" - "@babel/types" "7.0.0-beta.40" - babylon "7.0.0-beta.40" + "@babel/code-frame" "7.0.0-beta.44" + "@babel/types" "7.0.0-beta.44" + babylon "7.0.0-beta.44" lodash "^4.2.0" -"@babel/traverse@^7.0.0-beta.40": - version "7.0.0-beta.40" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.40.tgz#d140e449b2e093ef9fe1a2eecc28421ffb4e521e" - dependencies: - "@babel/code-frame" "7.0.0-beta.40" - "@babel/generator" "7.0.0-beta.40" - "@babel/helper-function-name" "7.0.0-beta.40" - "@babel/types" "7.0.0-beta.40" - babylon "7.0.0-beta.40" - debug "^3.0.1" +"@babel/traverse@7.0.0-beta.44": + version "7.0.0-beta.44" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.44.tgz#a970a2c45477ad18017e2e465a0606feee0d2966" + dependencies: + "@babel/code-frame" "7.0.0-beta.44" + "@babel/generator" "7.0.0-beta.44" + "@babel/helper-function-name" "7.0.0-beta.44" + "@babel/helper-split-export-declaration" "7.0.0-beta.44" + "@babel/types" "7.0.0-beta.44" + babylon "7.0.0-beta.44" + debug "^3.1.0" globals "^11.1.0" invariant "^2.2.0" lodash "^4.2.0" -"@babel/types@7.0.0-beta.40", "@babel/types@^7.0.0-beta.40": - version "7.0.0-beta.40" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.40.tgz#25c3d7aae14126abe05fcb098c65a66b6d6b8c14" +"@babel/types@7.0.0-beta.44": + version "7.0.0-beta.44" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.44.tgz#6b1b164591f77dec0a0342aca995f2d046b3a757" dependencies: esutils "^2.0.2" lodash "^4.2.0" to-fast-properties "^2.0.0" +"@mrmlnc/readdir-enhanced@^2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" + dependencies: + call-me-maybe "^1.0.1" + glob-to-regexp "^0.3.0" + +"@nodelib/fs.stat@^1.0.1": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.0.tgz#50c1e2260ac0ed9439a181de3725a0168d59c48a" + +"@samverschueren/stream-to-observable@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f" + dependencies: + any-observable "^0.3.0" + "@sindresorhus/is@^0.7.0": version "0.7.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd" @@ -83,6 +121,142 @@ version "5.0.3" resolved "https://registry.yarnpkg.com/@uirouter/core/-/core-5.0.3.tgz#e2b5b1e45190e20c67ba4e15c013de5d4e0ccab3" +"@webassemblyjs/ast@1.5.12": + version "1.5.12" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.12.tgz#a9acbcb3f25333c4edfa1fdf3186b1ccf64e6664" + dependencies: + "@webassemblyjs/helper-module-context" "1.5.12" + "@webassemblyjs/helper-wasm-bytecode" "1.5.12" + "@webassemblyjs/wast-parser" "1.5.12" + debug "^3.1.0" + mamacro "^0.0.3" + +"@webassemblyjs/floating-point-hex-parser@1.5.12": + version "1.5.12" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.12.tgz#0f36044ffe9652468ce7ae5a08716a4eeff9cd9c" + +"@webassemblyjs/helper-api-error@1.5.12": + version "1.5.12" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.12.tgz#05466833ff2f9d8953a1a327746e1d112ea62aaf" + +"@webassemblyjs/helper-buffer@1.5.12": + version "1.5.12" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.12.tgz#1f0de5aaabefef89aec314f7f970009cd159c73d" + dependencies: + debug "^3.1.0" + +"@webassemblyjs/helper-code-frame@1.5.12": + version "1.5.12" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.12.tgz#3cdc1953093760d1c0f0caf745ccd62bdb6627c7" + dependencies: + "@webassemblyjs/wast-printer" "1.5.12" + +"@webassemblyjs/helper-fsm@1.5.12": + version "1.5.12" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.12.tgz#6bc1442b037f8e30f2e57b987cee5c806dd15027" + +"@webassemblyjs/helper-module-context@1.5.12": + version "1.5.12" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.12.tgz#b5588ca78b33b8a0da75f9ab8c769a3707baa861" + dependencies: + debug "^3.1.0" + mamacro "^0.0.3" + +"@webassemblyjs/helper-wasm-bytecode@1.5.12": + version "1.5.12" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.12.tgz#d12a3859db882a448891a866a05d0be63785b616" + +"@webassemblyjs/helper-wasm-section@1.5.12": + version "1.5.12" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.12.tgz#ff9fe1507d368ad437e7969d25e8c1693dac1884" + dependencies: + "@webassemblyjs/ast" "1.5.12" + "@webassemblyjs/helper-buffer" "1.5.12" + "@webassemblyjs/helper-wasm-bytecode" "1.5.12" + "@webassemblyjs/wasm-gen" "1.5.12" + debug "^3.1.0" + +"@webassemblyjs/ieee754@1.5.12": + version "1.5.12" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.5.12.tgz#ee9574bc558888f13097ce3e7900dff234ea19a4" + dependencies: + ieee754 "^1.1.11" + +"@webassemblyjs/leb128@1.5.12": + version "1.5.12" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.12.tgz#0308eec652765ee567d8a5fa108b4f0b25b458e1" + dependencies: + leb "^0.3.0" + +"@webassemblyjs/utf8@1.5.12": + version "1.5.12" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.5.12.tgz#d5916222ef314bf60d6806ed5ac045989bfd92ce" + +"@webassemblyjs/wasm-edit@1.5.12": + version "1.5.12" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.12.tgz#821c9358e644a166f2c910e5af1b46ce795a17aa" + dependencies: + "@webassemblyjs/ast" "1.5.12" + "@webassemblyjs/helper-buffer" "1.5.12" + "@webassemblyjs/helper-wasm-bytecode" "1.5.12" + "@webassemblyjs/helper-wasm-section" "1.5.12" + "@webassemblyjs/wasm-gen" "1.5.12" + "@webassemblyjs/wasm-opt" "1.5.12" + "@webassemblyjs/wasm-parser" "1.5.12" + "@webassemblyjs/wast-printer" "1.5.12" + debug "^3.1.0" + +"@webassemblyjs/wasm-gen@1.5.12": + version "1.5.12" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.12.tgz#0b7ccfdb93dab902cc0251014e2e18bae3139bcb" + dependencies: + "@webassemblyjs/ast" "1.5.12" + "@webassemblyjs/helper-wasm-bytecode" "1.5.12" + "@webassemblyjs/ieee754" "1.5.12" + "@webassemblyjs/leb128" "1.5.12" + "@webassemblyjs/utf8" "1.5.12" + +"@webassemblyjs/wasm-opt@1.5.12": + version "1.5.12" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.12.tgz#bd758a8bc670f585ff1ae85f84095a9e0229cbc9" + dependencies: + "@webassemblyjs/ast" "1.5.12" + "@webassemblyjs/helper-buffer" "1.5.12" + "@webassemblyjs/wasm-gen" "1.5.12" + "@webassemblyjs/wasm-parser" "1.5.12" + debug "^3.1.0" + +"@webassemblyjs/wasm-parser@1.5.12": + version "1.5.12" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.12.tgz#7b10b4388ecf98bd7a22e702aa62ec2f46d0c75e" + dependencies: + "@webassemblyjs/ast" "1.5.12" + "@webassemblyjs/helper-api-error" "1.5.12" + "@webassemblyjs/helper-wasm-bytecode" "1.5.12" + "@webassemblyjs/ieee754" "1.5.12" + "@webassemblyjs/leb128" "1.5.12" + "@webassemblyjs/utf8" "1.5.12" + +"@webassemblyjs/wast-parser@1.5.12": + version "1.5.12" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.12.tgz#9cf5ae600ecae0640437b5d4de5dd6b6088d0d8b" + dependencies: + "@webassemblyjs/ast" "1.5.12" + "@webassemblyjs/floating-point-hex-parser" "1.5.12" + "@webassemblyjs/helper-api-error" "1.5.12" + "@webassemblyjs/helper-code-frame" "1.5.12" + "@webassemblyjs/helper-fsm" "1.5.12" + long "^3.2.0" + mamacro "^0.0.3" + +"@webassemblyjs/wast-printer@1.5.12": + version "1.5.12" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.12.tgz#563ca4d01b22d21640b2463dc5e3d7f7d9dac520" + dependencies: + "@webassemblyjs/ast" "1.5.12" + "@webassemblyjs/wast-parser" "1.5.12" + long "^3.2.0" + abab@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e" @@ -128,6 +302,10 @@ acorn@^5.5.0: version "5.5.3" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9" +acorn@^5.6.2: + version "5.7.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.1.tgz#f095829297706a7c9776958c0afc8930a9b9d9d8" + ajv-keywords@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762" @@ -270,9 +448,9 @@ ansi-styles@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178" -any-observable@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.2.0.tgz#c67870058003579009083f54ac0abafb5c33d242" +any-observable@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b" anymatch@^1.3.0: version "1.3.2" @@ -288,11 +466,11 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -append-transform@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991" +append-transform@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab" dependencies: - default-require-extensions "^1.0.0" + default-require-extensions "^2.0.0" aproba@^1.0.3, aproba@^1.1.1: version "1.2.0" @@ -393,14 +571,14 @@ assert@^1.1.1: dependencies: util "0.10.3" -assets-webpack-plugin@^3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/assets-webpack-plugin/-/assets-webpack-plugin-3.5.1.tgz#931ce0d66d42e88ed5e7f18d65522943c57a387d" +assets-webpack-plugin@^3.8.4: + version "3.8.4" + resolved "https://registry.yarnpkg.com/assets-webpack-plugin/-/assets-webpack-plugin-3.8.4.tgz#4b96a69850563ab36b54206741ef372901569597" dependencies: - camelcase "^1.2.1" + camelcase "^5.0.0" escape-string-regexp "^1.0.3" - lodash.assign "^3.2.0" - lodash.merge "^3.3.2" + lodash.assign "^4.2.0" + lodash.merge "^4.6.1" mkdirp "^0.5.1" assign-symbols@^1.0.0: @@ -533,14 +711,14 @@ babel-core@^6.0.0, babel-core@^6.26.0: slash "^1.0.0" source-map "^0.5.6" -babel-eslint@^8.2.2: - version "8.2.2" - resolved "http://registry.npmjs.org/babel-eslint/-/babel-eslint-8.2.2.tgz#1102273354c6f0b29b4ea28a65f97d122296b68b" +babel-eslint@^8.2.3: + version "8.2.3" + resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.3.tgz#1a2e6681cc9bc4473c32899e59915e19cd6733cf" dependencies: - "@babel/code-frame" "^7.0.0-beta.40" - "@babel/traverse" "^7.0.0-beta.40" - "@babel/types" "^7.0.0-beta.40" - babylon "^7.0.0-beta.40" + "@babel/code-frame" "7.0.0-beta.44" + "@babel/traverse" "7.0.0-beta.44" + "@babel/types" "7.0.0-beta.44" + babylon "7.0.0-beta.44" eslint-scope "~3.7.1" eslint-visitor-keys "^1.0.0" @@ -675,12 +853,12 @@ babel-helpers@^6.24.1: babel-runtime "^6.22.0" babel-template "^6.24.1" -babel-jest@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-22.4.3.tgz#4b7a0b6041691bbd422ab49b3b73654a49a6627a" +babel-jest@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-23.0.1.tgz#bbad3bf523fb202da05ed0a6540b48c84eed13a6" dependencies: - babel-plugin-istanbul "^4.1.5" - babel-preset-jest "^22.4.3" + babel-plugin-istanbul "^4.1.6" + babel-preset-jest "^23.0.1" babel-loader@^7.1.4: version "7.1.4" @@ -696,9 +874,9 @@ babel-messages@^6.23.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-angularjs-annotate@^0.8.2: - version "0.8.2" - resolved "https://registry.yarnpkg.com/babel-plugin-angularjs-annotate/-/babel-plugin-angularjs-annotate-0.8.2.tgz#7f9a37fbb7511668e836cb91a2e43e98e12f9ed9" +babel-plugin-angularjs-annotate@^0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/babel-plugin-angularjs-annotate/-/babel-plugin-angularjs-annotate-0.9.0.tgz#5c499bb04d9ae5802b31e1068aedb8b2286a83af" dependencies: babel-code-frame "^6.26.0" babel-types "^6.26.0" @@ -710,17 +888,18 @@ babel-plugin-check-es2015-constants@^6.22.0, babel-plugin-check-es2015-constants dependencies: babel-runtime "^6.22.0" -babel-plugin-istanbul@^4.1.5: - version "4.1.5" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.5.tgz#6760cdd977f411d3e175bb064f2bc327d99b2b6e" +babel-plugin-istanbul@^4.1.6: + version "4.1.6" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45" dependencies: + babel-plugin-syntax-object-rest-spread "^6.13.0" find-up "^2.1.0" - istanbul-lib-instrument "^1.7.5" - test-exclude "^4.1.1" + istanbul-lib-instrument "^1.10.1" + test-exclude "^4.2.1" -babel-plugin-jest-hoist@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.4.3.tgz#7d8bcccadc2667f96a0dcc6afe1891875ee6c14a" +babel-plugin-jest-hoist@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.0.1.tgz#eaa11c964563aea9c21becef2bdf7853f7f3c148" babel-plugin-resolver@^1.1.0: version "1.1.0" @@ -900,7 +1079,7 @@ babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015 babel-runtime "^6.22.0" babel-template "^6.24.1" -babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1, babel-plugin-transform-es2015-modules-commonjs@^6.26.0, babel-plugin-transform-es2015-modules-commonjs@^6.6.0: +babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1, babel-plugin-transform-es2015-modules-commonjs@^6.6.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a" dependencies: @@ -909,6 +1088,15 @@ babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-e babel-template "^6.26.0" babel-types "^6.26.0" +babel-plugin-transform-es2015-modules-commonjs@^6.26.2: + version "6.26.2" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3" + dependencies: + babel-plugin-transform-strict-mode "^6.24.1" + babel-runtime "^6.26.0" + babel-template "^6.26.0" + babel-types "^6.26.0" + babel-plugin-transform-es2015-modules-systemjs@^6.23.0, babel-plugin-transform-es2015-modules-systemjs@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23" @@ -1040,9 +1228,9 @@ babel-polyfill@^6.26.0: core-js "^2.5.0" regenerator-runtime "^0.10.5" -babel-preset-env@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.1.tgz#a18b564cc9b9afdf4aae57ae3c1b0d99188e6f48" +babel-preset-env@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a" dependencies: babel-plugin-check-es2015-constants "^6.22.0" babel-plugin-syntax-trailing-function-commas "^6.22.0" @@ -1071,7 +1259,7 @@ babel-preset-env@^1.6.1: babel-plugin-transform-es2015-unicode-regex "^6.22.0" babel-plugin-transform-exponentiation-operator "^6.22.0" babel-plugin-transform-regenerator "^6.22.0" - browserslist "^2.1.2" + browserslist "^3.2.6" invariant "^2.2.2" semver "^5.3.0" @@ -1143,11 +1331,11 @@ babel-preset-es2017@^6.24.1: babel-plugin-syntax-trailing-function-commas "^6.22.0" babel-plugin-transform-async-to-generator "^6.24.1" -babel-preset-jest@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-22.4.3.tgz#e92eef9813b7026ab4ca675799f37419b5a44156" +babel-preset-jest@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-23.0.1.tgz#631cc545c6cf021943013bcaf22f45d87fe62198" dependencies: - babel-plugin-jest-hoist "^22.4.3" + babel-plugin-jest-hoist "^23.0.1" babel-plugin-syntax-object-rest-spread "^6.13.0" babel-preset-latest@^6.24.1: @@ -1241,9 +1429,9 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26 lodash "^4.17.4" to-fast-properties "^1.0.3" -babylon@7.0.0-beta.40, babylon@^7.0.0-beta.40: - version "7.0.0-beta.40" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.40.tgz#91fc8cd56d5eb98b28e6fde41045f2957779940a" +babylon@7.0.0-beta.44: + version "7.0.0-beta.44" + resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.44.tgz#89159e15e6e30c5096e22d738d8c0af8a0e8ca1d" babylon@^6.17.3, babylon@^6.18.0: version "6.18.0" @@ -1475,12 +1663,12 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: caniuse-db "^1.0.30000639" electron-to-chromium "^1.2.7" -browserslist@^2.1.2: - version "2.9.1" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.9.1.tgz#b72d3982ab01b5cd24da62ff6d45573886aff275" +browserslist@^3.2.6: + version "3.2.8" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6" dependencies: - caniuse-lite "^1.0.30000770" - electron-to-chromium "^1.3.27" + caniuse-lite "^1.0.30000844" + electron-to-chromium "^1.3.47" bser@^2.0.0: version "2.0.0" @@ -1575,6 +1763,10 @@ cacheable-request@^2.1.1: normalize-url "2.0.1" responselike "1.0.2" +call-me-maybe@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b" + caller-path@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f" @@ -1603,7 +1795,7 @@ camelcase-keys@^2.0.0: camelcase "^2.0.0" map-obj "^1.0.0" -camelcase@^1.0.2, camelcase@^1.2.1: +camelcase@^1.0.2: version "1.2.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39" @@ -1619,6 +1811,10 @@ camelcase@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" +camelcase@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42" + caniuse-api@^1.5.2: version "1.6.1" resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c" @@ -1632,9 +1828,9 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: version "1.0.30000810" resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000810.tgz#bd25830c41efab64339a2e381f49677343c84509" -caniuse-lite@^1.0.30000770: - version "1.0.30000775" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000775.tgz#74d27feddc47f3c84cfbcb130c3092a35ebc2de2" +caniuse-lite@^1.0.30000844: + version "1.0.30000856" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000856.tgz#ecc16978135a6f219b138991eb62009d25ee8daa" caseless@~0.11.0: version "0.11.0" @@ -1669,9 +1865,9 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1: escape-string-regexp "^1.0.5" supports-color "^5.2.0" -chalk@^2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65" +chalk@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" dependencies: ansi-styles "^3.2.1" escape-string-regexp "^1.0.5" @@ -1734,9 +1930,11 @@ chownr@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181" -chrome-trace-event@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-0.1.2.tgz#90f36885d5345a50621332f0717b595883d5d982" +chrome-trace-event@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48" + dependencies: + tslib "^1.9.0" ci-info@^1.0.0: version "1.1.2" @@ -1957,6 +2155,10 @@ commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" +compare-versions@^3.1.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.3.0.tgz#af93ea705a96943f622ab309578b9b90586f39c3" + component-emitter@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" @@ -2035,9 +2237,9 @@ copy-descriptor@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" -copy-webpack-plugin@^4.5.1: - version "4.5.1" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.1.tgz#fc4f68f4add837cc5e13d111b20715793225d29c" +copy-webpack-plugin@^4.5.2: + version "4.5.2" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.2.tgz#d53444a8fea2912d806e78937390ddd7e632ee5c" dependencies: cacache "^10.0.4" find-cache-dir "^1.0.0" @@ -2273,7 +2475,7 @@ date-now@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" -dateformat@^3.0.2: +dateformat@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" @@ -2283,7 +2485,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8: dependencies: ms "2.0.0" -debug@^3.0.1, debug@^3.1.0: +debug@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" dependencies: @@ -2303,7 +2505,11 @@ decompress-response@^3.2.0, decompress-response@^3.3.0: dependencies: mimic-response "^1.0.0" -deep-extend@^0.4.0, deep-extend@~0.4.0: +deep-extend@^0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.1.tgz#b894a9dd90d3023fbf1c55a394fb858eb2066f1f" + +deep-extend@~0.4.0: version "0.4.2" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" @@ -2311,11 +2517,11 @@ deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" -default-require-extensions@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8" +default-require-extensions@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7" dependencies: - strip-bom "^2.0.0" + strip-bom "^3.0.0" define-properties@^1.1.2: version "1.1.2" @@ -2487,17 +2693,21 @@ ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" -ejs@^2.3.1, ejs@^2.5.7: +ejs@^2.5.7: version "2.5.7" resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a" +ejs@^2.5.9: + version "2.6.1" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0" + electron-to-chromium@^1.2.7: version "1.3.34" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.34.tgz#d93498f40391bb0c16a603d8241b9951404157ed" -electron-to-chromium@^1.3.27: - version "1.3.27" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz#78ecb8a399066187bb374eede35d9c70565a803d" +electron-to-chromium@^1.3.47: + version "1.3.50" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.50.tgz#7438b76f92b41b919f3fbdd350fbd0757dacddf7" elegant-spinner@^1.0.1: version "1.0.1" @@ -2537,6 +2747,10 @@ enhanced-resolve@^4.0.0: memory-fs "^0.4.0" tapable "^1.0.0" +envinfo@^5.7.0: + version "5.10.0" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-5.10.0.tgz#503a9774ae15b93ea68bdfae2ccd6306624ea6df" + errno@^0.1.3, errno@~0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" @@ -2782,16 +2996,16 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" -expect@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/expect/-/expect-22.4.3.tgz#d5a29d0a0e1fb2153557caef2674d4547e914674" +expect@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/expect/-/expect-23.1.0.tgz#bfdfd57a2a20170d875999ee9787cc71f01c205f" dependencies: ansi-styles "^3.2.0" - jest-diff "^22.4.3" - jest-get-type "^22.4.3" - jest-matcher-utils "^22.4.3" - jest-message-util "^22.4.3" - jest-regex-util "^22.4.3" + jest-diff "^23.0.1" + jest-get-type "^22.1.0" + jest-matcher-utils "^23.0.1" + jest-message-util "^23.1.0" + jest-regex-util "^23.0.0" expose-loader@^0.7.5: version "0.7.5" @@ -2910,6 +3124,17 @@ fast-deep-equal@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614" +fast-glob@^2.0.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.2.tgz#71723338ac9b4e0e2fff1d6748a2a13d5ed352bf" + dependencies: + "@mrmlnc/readdir-enhanced" "^2.2.1" + "@nodelib/fs.stat" "^1.0.1" + glob-parent "^3.1.0" + is-glob "^4.0.0" + merge2 "^1.2.1" + micromatch "^3.1.10" + fast-json-stable-stringify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" @@ -3334,6 +3559,10 @@ glob-stream@^5.3.2: to-absolute-glob "^0.1.1" unique-stream "^2.0.2" +glob-to-regexp@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" + glob@^5.0.3: version "5.0.15" resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" @@ -3436,6 +3665,18 @@ globby@^7.1.1: pify "^3.0.0" slash "^1.0.0" +globby@^8.0.0, globby@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.1.tgz#b5ad48b8aa80b35b814fc1281ecc851f1d2b5b50" + dependencies: + array-union "^1.0.1" + dir-glob "^2.0.0" + fast-glob "^2.0.2" + glob "^7.1.2" + ignore "^3.3.5" + pify "^3.0.0" + slash "^1.0.0" + globule@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09" @@ -3463,9 +3704,9 @@ got@^7.0.0: url-parse-lax "^1.0.0" url-to-options "^1.0.1" -got@^8.2.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/got/-/got-8.3.0.tgz#6ba26e75f8a6cc4c6b3eb1fe7ce4fec7abac8533" +got@^8.3.1: + version "8.3.1" + resolved "https://registry.yarnpkg.com/got/-/got-8.3.1.tgz#093324403d4d955f5a16a7a8d39955d055ae10ed" dependencies: "@sindresorhus/is" "^0.7.0" cacheable-request "^2.1.1" @@ -3800,6 +4041,10 @@ identity-obj-proxy@^3.0.0: dependencies: harmony-reflect "^1.4.6" +ieee754@^1.1.11: + version "1.1.12" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b" + ieee754@^1.1.4: version "1.1.8" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4" @@ -3890,7 +4135,7 @@ inquirer@^3.0.6, inquirer@^3.3.0: strip-ansi "^4.0.0" through "^2.3.6" -inquirer@^5.1.0: +inquirer@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-5.2.0.tgz#db350c2b73daca77ff1243962e9f22f099685726" dependencies: @@ -3908,7 +4153,7 @@ inquirer@^5.1.0: strip-ansi "^4.0.0" through "^2.3.6" -interpret@^1.0.0, interpret@^1.0.1, interpret@^1.0.4: +interpret@^1.0.0, interpret@^1.0.1, interpret@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614" @@ -4122,11 +4367,11 @@ is-object@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470" -is-observable@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-0.2.0.tgz#b361311d83c6e5d726cabf5e250b0237106f5ae2" +is-observable@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e" dependencies: - symbol-observable "^0.2.2" + symbol-observable "^1.1.0" is-odd@^2.0.0: version "2.0.0" @@ -4236,6 +4481,10 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" +isbinaryfile@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.2.tgz#4a3e974ec0cba9004d3fc6cde7209ea69368a621" + isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -4254,70 +4503,71 @@ isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" -istanbul-api@^1.1.14: - version "1.2.2" - resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.2.2.tgz#e17cd519dd5ec4141197f246fdf380b75487f3b1" +istanbul-api@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.1.tgz#4c3b05d18c0016d1022e079b98dc82c40f488954" dependencies: async "^2.1.4" + compare-versions "^3.1.0" fileset "^2.0.2" - istanbul-lib-coverage "^1.1.2" - istanbul-lib-hook "^1.1.0" - istanbul-lib-instrument "^1.9.2" - istanbul-lib-report "^1.1.3" - istanbul-lib-source-maps "^1.2.3" - istanbul-reports "^1.1.4" + istanbul-lib-coverage "^1.2.0" + istanbul-lib-hook "^1.2.0" + istanbul-lib-instrument "^1.10.1" + istanbul-lib-report "^1.1.4" + istanbul-lib-source-maps "^1.2.4" + istanbul-reports "^1.3.0" js-yaml "^3.7.0" mkdirp "^0.5.1" once "^1.4.0" -istanbul-lib-coverage@^1.1.1, istanbul-lib-coverage@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.2.tgz#4113c8ff6b7a40a1ef7350b01016331f63afde14" +istanbul-lib-coverage@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341" -istanbul-lib-hook@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz#8538d970372cb3716d53e55523dd54b557a8d89b" +istanbul-lib-hook@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.1.tgz#f614ec45287b2a8fc4f07f5660af787575601805" dependencies: - append-transform "^0.4.0" + append-transform "^1.0.0" -istanbul-lib-instrument@^1.7.5, istanbul-lib-instrument@^1.8.0, istanbul-lib-instrument@^1.9.2: - version "1.9.2" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.2.tgz#84905bf47f7e0b401d6b840da7bad67086b4aab6" +istanbul-lib-instrument@^1.10.1: + version "1.10.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz#724b4b6caceba8692d3f1f9d0727e279c401af7b" dependencies: babel-generator "^6.18.0" babel-template "^6.16.0" babel-traverse "^6.18.0" babel-types "^6.18.0" babylon "^6.18.0" - istanbul-lib-coverage "^1.1.2" + istanbul-lib-coverage "^1.2.0" semver "^5.3.0" -istanbul-lib-report@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.3.tgz#2df12188c0fa77990c0d2176d2d0ba3394188259" +istanbul-lib-report@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.4.tgz#e886cdf505c4ebbd8e099e4396a90d0a28e2acb5" dependencies: - istanbul-lib-coverage "^1.1.2" + istanbul-lib-coverage "^1.2.0" mkdirp "^0.5.1" path-parse "^1.0.5" supports-color "^3.1.2" -istanbul-lib-source-maps@^1.2.1, istanbul-lib-source-maps@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.3.tgz#20fb54b14e14b3fb6edb6aca3571fd2143db44e6" +istanbul-lib-source-maps@^1.2.4: + version "1.2.5" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.5.tgz#ffe6be4e7ab86d3603e4290d54990b14506fc9b1" dependencies: debug "^3.1.0" - istanbul-lib-coverage "^1.1.2" + istanbul-lib-coverage "^1.2.0" mkdirp "^0.5.1" rimraf "^2.6.1" source-map "^0.5.3" -istanbul-reports@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.1.4.tgz#5ccba5e22b7b5a5d91d5e0a830f89be334bf97bd" +istanbul-reports@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.3.0.tgz#2f322e81e1d9520767597dca3c20a0cce89a3554" dependencies: handlebars "^4.0.3" -istextorbinary@^2.1.0: +istextorbinary@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.2.1.tgz#a5231a08ef6dd22b268d0895084cf8d58b5bec53" dependencies: @@ -4336,15 +4586,15 @@ jasmine-core@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.1.0.tgz#a4785e135d5df65024dfc9224953df585bd2766c" -jest-changed-files@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-22.4.3.tgz#8882181e022c38bd46a2e4d18d44d19d90a90fb2" +jest-changed-files@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-23.0.1.tgz#f79572d0720844ea5df84c2a448e862c2254f60c" dependencies: throat "^4.0.0" -jest-cli@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-22.4.3.tgz#bf16c4a5fb7edc3fa5b9bb7819e34139e88a72c7" +jest-cli@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.1.0.tgz#eb8bdd4ce0d15250892e31ad9b69bc99d2a8f6bf" dependencies: ansi-escapes "^3.0.0" chalk "^2.0.1" @@ -4353,24 +4603,25 @@ jest-cli@^22.4.3: graceful-fs "^4.1.11" import-local "^1.0.0" is-ci "^1.0.10" - istanbul-api "^1.1.14" - istanbul-lib-coverage "^1.1.1" - istanbul-lib-instrument "^1.8.0" - istanbul-lib-source-maps "^1.2.1" - jest-changed-files "^22.4.3" - jest-config "^22.4.3" - jest-environment-jsdom "^22.4.3" - jest-get-type "^22.4.3" - jest-haste-map "^22.4.3" - jest-message-util "^22.4.3" - jest-regex-util "^22.4.3" - jest-resolve-dependencies "^22.4.3" - jest-runner "^22.4.3" - jest-runtime "^22.4.3" - jest-snapshot "^22.4.3" - jest-util "^22.4.3" - jest-validate "^22.4.3" - jest-worker "^22.4.3" + istanbul-api "^1.3.1" + istanbul-lib-coverage "^1.2.0" + istanbul-lib-instrument "^1.10.1" + istanbul-lib-source-maps "^1.2.4" + jest-changed-files "^23.0.1" + jest-config "^23.1.0" + jest-environment-jsdom "^23.1.0" + jest-get-type "^22.1.0" + jest-haste-map "^23.1.0" + jest-message-util "^23.1.0" + jest-regex-util "^23.0.0" + jest-resolve-dependencies "^23.0.1" + jest-runner "^23.1.0" + jest-runtime "^23.1.0" + jest-snapshot "^23.0.1" + jest-util "^23.1.0" + jest-validate "^23.0.1" + jest-watcher "^23.1.0" + jest-worker "^23.0.1" micromatch "^2.3.11" node-notifier "^5.2.1" realpath-native "^1.0.0" @@ -4379,103 +4630,112 @@ jest-cli@^22.4.3: string-length "^2.0.0" strip-ansi "^4.0.0" which "^1.2.12" - yargs "^10.0.3" + yargs "^11.0.0" -jest-config@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-22.4.3.tgz#0e9d57db267839ea31309119b41dc2fa31b76403" +jest-config@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.1.0.tgz#708ca0f431d356ee424fb4895d3308006bdd8241" dependencies: + babel-core "^6.0.0" + babel-jest "^23.0.1" chalk "^2.0.1" glob "^7.1.1" - jest-environment-jsdom "^22.4.3" - jest-environment-node "^22.4.3" - jest-get-type "^22.4.3" - jest-jasmine2 "^22.4.3" - jest-regex-util "^22.4.3" - jest-resolve "^22.4.3" - jest-util "^22.4.3" - jest-validate "^22.4.3" - pretty-format "^22.4.3" - -jest-diff@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-22.4.3.tgz#e18cc3feff0aeef159d02310f2686d4065378030" + jest-environment-jsdom "^23.1.0" + jest-environment-node "^23.1.0" + jest-get-type "^22.1.0" + jest-jasmine2 "^23.1.0" + jest-regex-util "^23.0.0" + jest-resolve "^23.1.0" + jest-util "^23.1.0" + jest-validate "^23.0.1" + pretty-format "^23.0.1" + +jest-diff@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.0.1.tgz#3d49137cee12c320a4b4d2b4a6fa6e82d491a16a" dependencies: chalk "^2.0.1" diff "^3.2.0" - jest-get-type "^22.4.3" - pretty-format "^22.4.3" + jest-get-type "^22.1.0" + pretty-format "^23.0.1" -jest-docblock@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-22.4.3.tgz#50886f132b42b280c903c592373bb6e93bb68b19" +jest-docblock@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-23.0.1.tgz#deddd18333be5dc2415260a04ef3fce9276b5725" dependencies: detect-newline "^2.1.0" -jest-environment-jsdom@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-22.4.3.tgz#d67daa4155e33516aecdd35afd82d4abf0fa8a1e" +jest-each@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-23.1.0.tgz#16146b592c354867a5ae5e13cdf15c6c65b696c6" + dependencies: + chalk "^2.0.1" + pretty-format "^23.0.1" + +jest-environment-jsdom@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-23.1.0.tgz#85929914e23bed3577dac9755f4106d0697c479c" dependencies: - jest-mock "^22.4.3" - jest-util "^22.4.3" + jest-mock "^23.1.0" + jest-util "^23.1.0" jsdom "^11.5.1" -jest-environment-node@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-22.4.3.tgz#54c4eaa374c83dd52a9da8759be14ebe1d0b9129" +jest-environment-node@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-23.1.0.tgz#452c0bf949cfcbbacda1e1762eeed70bc784c7d5" dependencies: - jest-mock "^22.4.3" - jest-util "^22.4.3" + jest-mock "^23.1.0" + jest-util "^23.1.0" -jest-get-type@^22.4.3: +jest-get-type@^22.1.0: version "22.4.3" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4" -jest-haste-map@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-22.4.3.tgz#25842fa2ba350200767ac27f658d58b9d5c2e20b" +jest-haste-map@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.1.0.tgz#18e6c7d5a8d27136f91b7d9852f85de0c7074c49" dependencies: fb-watchman "^2.0.0" graceful-fs "^4.1.11" - jest-docblock "^22.4.3" - jest-serializer "^22.4.3" - jest-worker "^22.4.3" + jest-docblock "^23.0.1" + jest-serializer "^23.0.1" + jest-worker "^23.0.1" micromatch "^2.3.11" sane "^2.0.0" -jest-jasmine2@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-22.4.3.tgz#4daf64cd14c793da9db34a7c7b8dcfe52a745965" +jest-jasmine2@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.1.0.tgz#4afab31729b654ddcd2b074add849396f13b30b8" dependencies: chalk "^2.0.1" co "^4.6.0" - expect "^22.4.3" - graceful-fs "^4.1.11" + expect "^23.1.0" is-generator-fn "^1.0.0" - jest-diff "^22.4.3" - jest-matcher-utils "^22.4.3" - jest-message-util "^22.4.3" - jest-snapshot "^22.4.3" - jest-util "^22.4.3" - source-map-support "^0.5.0" - -jest-leak-detector@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-22.4.3.tgz#2b7b263103afae8c52b6b91241a2de40117e5b35" + jest-diff "^23.0.1" + jest-each "^23.1.0" + jest-matcher-utils "^23.0.1" + jest-message-util "^23.1.0" + jest-snapshot "^23.0.1" + jest-util "^23.1.0" + pretty-format "^23.0.1" + +jest-leak-detector@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.0.1.tgz#9dba07505ac3495c39d3ec09ac1e564599e861a0" dependencies: - pretty-format "^22.4.3" + pretty-format "^23.0.1" -jest-matcher-utils@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-22.4.3.tgz#4632fe428ebc73ebc194d3c7b65d37b161f710ff" +jest-matcher-utils@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.0.1.tgz#0c6c0daedf9833c2a7f36236069efecb4c3f6e5f" dependencies: chalk "^2.0.1" - jest-get-type "^22.4.3" - pretty-format "^22.4.3" + jest-get-type "^22.1.0" + pretty-format "^23.0.1" -jest-message-util@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-22.4.3.tgz#cf3d38aafe4befddbfc455e57d65d5239e399eb7" +jest-message-util@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.1.0.tgz#9a809ba487ecac5ce511d4e698ee3b5ee2461ea9" dependencies: "@babel/code-frame" "^7.0.0-beta.35" chalk "^2.0.1" @@ -4483,117 +4743,130 @@ jest-message-util@^22.4.3: slash "^1.0.0" stack-utils "^1.0.1" -jest-mock@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-22.4.3.tgz#f63ba2f07a1511772cdc7979733397df770aabc7" +jest-mock@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-23.1.0.tgz#a381c31b121ab1f60c462a2dadb7b86dcccac487" -jest-regex-util@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-22.4.3.tgz#a826eb191cdf22502198c5401a1fc04de9cef5af" +jest-regex-util@^23.0.0: + version "23.0.0" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.0.0.tgz#dd5c1fde0c46f4371314cf10f7a751a23f4e8f76" -jest-resolve-dependencies@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-22.4.3.tgz#e2256a5a846732dc3969cb72f3c9ad7725a8195e" +jest-resolve-dependencies@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.0.1.tgz#d01a10ddad9152c4cecdf5eac2b88571c4b6a64d" dependencies: - jest-regex-util "^22.4.3" + jest-regex-util "^23.0.0" + jest-snapshot "^23.0.1" -jest-resolve@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-22.4.3.tgz#0ce9d438c8438229aa9b916968ec6b05c1abb4ea" +jest-resolve@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.1.0.tgz#b9e316eecebd6f00bc50a3960d1527bae65792d2" dependencies: browser-resolve "^1.11.2" chalk "^2.0.1" + realpath-native "^1.0.0" -jest-runner@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-22.4.3.tgz#298ddd6a22b992c64401b4667702b325e50610c3" +jest-runner@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.1.0.tgz#fa20a933fff731a5432b3561e7f6426594fa29b5" dependencies: exit "^0.1.2" - jest-config "^22.4.3" - jest-docblock "^22.4.3" - jest-haste-map "^22.4.3" - jest-jasmine2 "^22.4.3" - jest-leak-detector "^22.4.3" - jest-message-util "^22.4.3" - jest-runtime "^22.4.3" - jest-util "^22.4.3" - jest-worker "^22.4.3" + graceful-fs "^4.1.11" + jest-config "^23.1.0" + jest-docblock "^23.0.1" + jest-haste-map "^23.1.0" + jest-jasmine2 "^23.1.0" + jest-leak-detector "^23.0.1" + jest-message-util "^23.1.0" + jest-runtime "^23.1.0" + jest-util "^23.1.0" + jest-worker "^23.0.1" + source-map-support "^0.5.6" throat "^4.0.0" -jest-runtime@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-22.4.3.tgz#b69926c34b851b920f666c93e86ba2912087e3d0" +jest-runtime@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.1.0.tgz#b4ae0e87259ecacfd4a884b639db07cf4dd620af" dependencies: babel-core "^6.0.0" - babel-jest "^22.4.3" - babel-plugin-istanbul "^4.1.5" + babel-plugin-istanbul "^4.1.6" chalk "^2.0.1" convert-source-map "^1.4.0" exit "^0.1.2" + fast-json-stable-stringify "^2.0.0" graceful-fs "^4.1.11" - jest-config "^22.4.3" - jest-haste-map "^22.4.3" - jest-regex-util "^22.4.3" - jest-resolve "^22.4.3" - jest-util "^22.4.3" - jest-validate "^22.4.3" - json-stable-stringify "^1.0.1" + jest-config "^23.1.0" + jest-haste-map "^23.1.0" + jest-message-util "^23.1.0" + jest-regex-util "^23.0.0" + jest-resolve "^23.1.0" + jest-snapshot "^23.0.1" + jest-util "^23.1.0" + jest-validate "^23.0.1" micromatch "^2.3.11" realpath-native "^1.0.0" slash "^1.0.0" strip-bom "3.0.0" write-file-atomic "^2.1.0" - yargs "^10.0.3" + yargs "^11.0.0" -jest-serializer@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-22.4.3.tgz#a679b81a7f111e4766235f4f0c46d230ee0f7436" +jest-serializer@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-23.0.1.tgz#a3776aeb311e90fe83fab9e533e85102bd164165" -jest-snapshot@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-22.4.3.tgz#b5c9b42846ffb9faccb76b841315ba67887362d2" +jest-snapshot@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.0.1.tgz#6674fa19b9eb69a99cabecd415bddc42d6af3e7e" dependencies: chalk "^2.0.1" - jest-diff "^22.4.3" - jest-matcher-utils "^22.4.3" + jest-diff "^23.0.1" + jest-matcher-utils "^23.0.1" mkdirp "^0.5.1" natural-compare "^1.4.0" - pretty-format "^22.4.3" + pretty-format "^23.0.1" -jest-util@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-22.4.3.tgz#c70fec8eec487c37b10b0809dc064a7ecf6aafac" +jest-util@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.1.0.tgz#c0251baf34644c6dd2fea78a962f4263ac55772d" dependencies: callsites "^2.0.0" chalk "^2.0.1" graceful-fs "^4.1.11" is-ci "^1.0.10" - jest-message-util "^22.4.3" + jest-message-util "^23.1.0" mkdirp "^0.5.1" + slash "^1.0.0" source-map "^0.6.0" -jest-validate@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-22.4.3.tgz#0780954a5a7daaeec8d3c10834b9280865976b30" +jest-validate@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.0.1.tgz#cd9f01a89d26bb885f12a8667715e9c865a5754f" dependencies: chalk "^2.0.1" - jest-config "^22.4.3" - jest-get-type "^22.4.3" + jest-get-type "^22.1.0" leven "^2.1.0" - pretty-format "^22.4.3" + pretty-format "^23.0.1" -jest-worker@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-22.4.3.tgz#5c421417cba1c0abf64bf56bd5fb7968d79dd40b" +jest-watcher@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-23.1.0.tgz#a8d5842e38d9fb4afff823df6abb42a58ae6cdbd" + dependencies: + ansi-escapes "^3.0.0" + chalk "^2.0.1" + string-length "^2.0.0" + +jest-worker@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-23.0.1.tgz#9e649dd963ff4046026f91c4017f039a6aa4a7bc" dependencies: merge-stream "^1.0.1" -jest@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest/-/jest-22.4.3.tgz#2261f4b117dc46d9a4a1a673d2150958dee92f16" +jest@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest/-/jest-23.1.0.tgz#bbb7f893100a11a742dd8bd0d047a54b0968ad1a" dependencies: import-local "^1.0.0" - jest-cli "^22.4.3" + jest-cli "^23.1.0" "jquery-sparkline@https://github.com/kapusta/jquery.sparkline#2.1.3": version "2.1.3" @@ -4766,6 +5039,10 @@ json-parse-better-errors@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz#50183cd1b2d25275de069e9e71b467ac9eab973a" +json-parse-better-errors@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" + json-schema-traverse@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" @@ -4881,6 +5158,10 @@ leaflet@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.0.2.tgz#fa4fbcb7844944fc2bfb0bcf9ca0dea13463ca21" +leb@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/leb/-/leb-0.3.0.tgz#32bee9fad168328d6aea8522d833f4180eed1da3" + left-pad@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.2.0.tgz#d30a73c6b8201d8f7d8e7956ba9616087a68e0ee" @@ -4922,15 +5203,15 @@ listr-verbose-renderer@^0.4.0: date-fns "^1.27.2" figures "^1.7.0" -listr@^0.13.0: - version "0.13.0" - resolved "https://registry.yarnpkg.com/listr/-/listr-0.13.0.tgz#20bb0ba30bae660ee84cc0503df4be3d5623887d" +listr@^0.14.1: + version "0.14.1" + resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.1.tgz#8a7afa4a7135cee4c921d128e0b7dfc6e522d43d" dependencies: - chalk "^1.1.3" + "@samverschueren/stream-to-observable" "^0.3.0" cli-truncate "^0.2.1" figures "^1.7.0" indent-string "^2.1.0" - is-observable "^0.2.0" + is-observable "^1.1.0" is-promise "^2.1.0" is-stream "^1.1.0" listr-silent-renderer "^1.1.1" @@ -4940,8 +5221,7 @@ listr@^0.13.0: log-update "^1.0.2" ora "^0.2.3" p-map "^1.1.1" - rxjs "^5.4.2" - stream-to-observable "^0.2.0" + rxjs "^6.1.0" strip-ansi "^3.0.1" load-json-file@^1.0.0: @@ -4998,57 +5278,6 @@ locate-path@^2.0.0: p-locate "^2.0.0" path-exists "^3.0.0" -lodash._arraycopy@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz#76e7b7c1f1fb92547374878a562ed06a3e50f6e1" - -lodash._arrayeach@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz#bab156b2a90d3f1bbd5c653403349e5e5933ef9e" - -lodash._baseassign@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e" - dependencies: - lodash._basecopy "^3.0.0" - lodash.keys "^3.0.0" - -lodash._basecopy@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36" - -lodash._basefor@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/lodash._basefor/-/lodash._basefor-3.0.3.tgz#7550b4e9218ef09fad24343b612021c79b4c20c2" - -lodash._bindcallback@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" - -lodash._createassigner@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11" - dependencies: - lodash._bindcallback "^3.0.0" - lodash._isiterateecall "^3.0.0" - lodash.restparam "^3.0.0" - -lodash._getnative@^3.0.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - -lodash._isiterateecall@^3.0.0: - version "3.0.9" - resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c" - -lodash.assign@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-3.2.0.tgz#3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa" - dependencies: - lodash._baseassign "^3.0.0" - lodash._createassigner "^3.0.0" - lodash.keys "^3.0.0" - lodash.assign@^4.0.8, lodash.assign@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" @@ -5073,45 +5302,10 @@ lodash.flatten@^4.2.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" -lodash.isarguments@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" - -lodash.isarray@^3.0.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" - lodash.isequal@^4.0.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" -lodash.isplainobject@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz#9a8238ae16b200432960cd7346512d0123fbf4c5" - dependencies: - lodash._basefor "^3.0.0" - lodash.isarguments "^3.0.0" - lodash.keysin "^3.0.0" - -lodash.istypedarray@^3.0.0: - version "3.0.6" - resolved "https://registry.yarnpkg.com/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz#c9a477498607501d8e8494d283b87c39281cef62" - -lodash.keys@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" - dependencies: - lodash._getnative "^3.0.0" - lodash.isarguments "^3.0.0" - lodash.isarray "^3.0.0" - -lodash.keysin@^3.0.0: - version "3.0.8" - resolved "https://registry.yarnpkg.com/lodash.keysin/-/lodash.keysin-3.0.8.tgz#22c4493ebbedb1427962a54b445b2c8a767fb47f" - dependencies: - lodash.isarguments "^3.0.0" - lodash.isarray "^3.0.0" - lodash.max@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/lodash.max/-/lodash.max-4.0.1.tgz#8735566c618b35a9f760520b487ae79658af136a" @@ -5120,26 +5314,14 @@ lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" -lodash.merge@^3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-3.3.2.tgz#0d90d93ed637b1878437bb3e21601260d7afe994" - dependencies: - lodash._arraycopy "^3.0.0" - lodash._arrayeach "^3.0.0" - lodash._createassigner "^3.0.0" - lodash._getnative "^3.0.0" - lodash.isarguments "^3.0.0" - lodash.isarray "^3.0.0" - lodash.isplainobject "^3.0.0" - lodash.istypedarray "^3.0.0" - lodash.keys "^3.0.0" - lodash.keysin "^3.0.0" - lodash.toplainobject "^3.0.0" - lodash.merge@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5" +lodash.merge@^4.6.1: + version "4.6.1" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54" + lodash.mergewith@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55" @@ -5152,10 +5334,6 @@ lodash.repeat@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/lodash.repeat/-/lodash.repeat-4.1.0.tgz#fc7de8131d8c8ac07e4b49f74ffe829d1f2bec44" -lodash.restparam@^3.0.0: - version "3.6.1" - resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" - lodash.sortby@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" @@ -5164,13 +5342,6 @@ lodash.tail@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664" -lodash.toplainobject@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash.toplainobject/-/lodash.toplainobject-3.0.0.tgz#28790ad942d293d78aa663a07ecf7f52ca04198d" - dependencies: - lodash._basecopy "^3.0.0" - lodash.keysin "^3.0.0" - lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" @@ -5179,10 +5350,14 @@ lodash@^4.0.0, lodash@^4.6.0, lodash@~4.17.4: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" -lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0: +lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0: version "4.17.5" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" +lodash@^4.17.10: + version "4.17.10" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" + log-symbols@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18" @@ -5202,6 +5377,10 @@ log-update@^1.0.2: ansi-escapes "^1.0.0" cli-cursor "^1.0.2" +long@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b" + longest@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" @@ -5262,6 +5441,10 @@ makeerror@1.0.x: dependencies: tmpl "1.0.x" +mamacro@^0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4" + map-cache@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" @@ -5299,15 +5482,16 @@ media-typer@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" -mem-fs-editor@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/mem-fs-editor/-/mem-fs-editor-3.0.2.tgz#dd0a6eaf2bb8a6b37740067aa549eb530105af9f" +mem-fs-editor@^4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/mem-fs-editor/-/mem-fs-editor-4.0.2.tgz#55a79b1e824da631254c4c95ba6366602c77af90" dependencies: commondir "^1.0.1" - deep-extend "^0.4.0" - ejs "^2.3.1" + deep-extend "^0.5.1" + ejs "^2.5.9" glob "^7.0.3" - globby "^6.1.0" + globby "^8.0.0" + isbinaryfile "^3.0.2" mkdirp "^0.5.0" multimatch "^2.0.0" rimraf "^2.2.8" @@ -5360,6 +5544,10 @@ merge-stream@^1.0.0, merge-stream@^1.0.1: dependencies: readable-stream "^2.0.1" +merge2@^1.2.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.2.tgz#03212e3da8d86c4d8523cebd6318193414f94e34" + merge@^1.1.3: version "1.2.0" resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da" @@ -5386,6 +5574,24 @@ micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7: parse-glob "^3.0.4" regex-cache "^0.4.2" +micromatch@^3.1.10: + version "3.1.10" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + braces "^2.3.1" + define-property "^2.0.2" + extend-shallow "^3.0.2" + extglob "^2.0.4" + fragment-cache "^0.2.1" + kind-of "^6.0.2" + nanomatch "^1.2.9" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.2" + micromatch@^3.1.4, micromatch@^3.1.8: version "3.1.9" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.9.tgz#15dc93175ae39e52e93087847096effc73efcf89" @@ -5679,9 +5885,9 @@ node-pre-gyp@^0.6.39: tar "^2.2.1" tar-pack "^3.4.0" -node-sass@^4.8.3: - version "4.8.3" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.8.3.tgz#d077cc20a08ac06f661ca44fb6f19cd2ed41debb" +node-sass@^4.9.0: + version "4.9.0" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.0.tgz#d1b8aa855d98ed684d6848db929a20771cc2ae52" dependencies: async-foreach "^0.1.3" chalk "^1.1.1" @@ -6493,17 +6699,17 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -prettier@^1.5.3: - version "1.11.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.11.0.tgz#c024f70cab158c993f50fc0c25ffe738cb8b0f85" +prettier@^1.12.1: + version "1.13.5" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.5.tgz#7ae2076998c8edce79d63834e9b7b09fead6bfd0" pretty-bytes@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9" -pretty-format@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-22.4.3.tgz#f873d780839a9c02e9664c8a082e9ee79eaac16f" +pretty-format@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.0.1.tgz#d61d065268e4c759083bccbca27a01ad7c7601f4" dependencies: ansi-regex "^3.0.0" ansi-styles "^3.2.0" @@ -7124,12 +7330,18 @@ rx-lite@*, rx-lite@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444" -rxjs@^5.4.2, rxjs@^5.5.2: +rxjs@^5.5.2: version "5.5.8" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.8.tgz#b2b0809a57614ad6254c03d7446dea0d83ca3791" dependencies: symbol-observable "1.0.1" +rxjs@^6.1.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.1.tgz#246cebec189a6cbc143a3ef9f62d6f4c91813ca1" + dependencies: + tslib "^1.9.0" + safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" @@ -7177,7 +7389,7 @@ sax@^1.2.4, sax@~1.2.1: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" -schema-utils@^0.4.2, schema-utils@^0.4.5: +schema-utils@^0.4.2, schema-utils@^0.4.4, schema-utils@^0.4.5: version "0.4.5" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e" dependencies: @@ -7424,10 +7636,11 @@ source-map-support@^0.4.15: dependencies: source-map "^0.5.6" -source-map-support@^0.5.0: - version "0.5.3" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76" +source-map-support@^0.5.6: + version "0.5.6" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.6.tgz#4435cee46b1aab62b8e8610ce60f788091c51c13" dependencies: + buffer-from "^1.0.0" source-map "^0.6.0" source-map-url@^0.4.0: @@ -7567,12 +7780,6 @@ stream-shift@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952" -stream-to-observable@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/stream-to-observable/-/stream-to-observable-0.2.0.tgz#59d6ea393d87c2c0ddac10aa0d561bc6ba6f0e10" - dependencies: - any-observable "^0.2.0" - strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" @@ -7686,9 +7893,9 @@ strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" -style-loader@^0.20.3: - version "0.20.3" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.20.3.tgz#ebef06b89dec491bcb1fdb3452e913a6fd1c10c4" +style-loader@^0.21.0: + version "0.21.0" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.21.0.tgz#68c52e5eb2afc9ca92b6274be277ee59aea3a852" dependencies: loader-utils "^1.1.0" schema-utils "^0.4.5" @@ -7721,6 +7928,12 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" +supports-color@^5.4.0: + version "5.4.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" + dependencies: + has-flag "^3.0.0" + svgo@^0.7.0: version "0.7.2" resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5" @@ -7737,9 +7950,9 @@ symbol-observable@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" -symbol-observable@^0.2.2: - version "0.2.4" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40" +symbol-observable@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" symbol-tree@^3.2.2: version "3.2.2" @@ -7788,12 +8001,12 @@ temp@^0.8.1: os-tmpdir "^1.0.0" rimraf "~2.2.6" -test-exclude@^4.1.1: - version "4.2.0" - resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.0.tgz#07e3613609a362c74516a717515e13322ab45b3c" +test-exclude@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.1.tgz#dfa222f03480bca69207ca728b37d74b45f724fa" dependencies: arrify "^1.0.1" - micromatch "^2.3.11" + micromatch "^3.1.8" object-assign "^4.1.0" read-pkg-up "^1.0.1" require-main-filename "^1.0.1" @@ -7890,7 +8103,7 @@ to-regex-range@^2.1.0: is-number "^3.0.0" repeat-string "^1.6.1" -to-regex@^3.0.1: +to-regex@^3.0.1, to-regex@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" dependencies: @@ -7947,6 +8160,10 @@ tslib@^1.8.0, tslib@^1.8.1: version "1.9.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8" +tslib@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" + "tslint-loader@https://github.com/wbuchwalter/tslint-loader.git#093230076f3b453c4f8b7aa2ee074932aa109e84": version "3.5.3" resolved "https://github.com/wbuchwalter/tslint-loader.git#093230076f3b453c4f8b7aa2ee074932aa109e84" @@ -8059,6 +8276,19 @@ uglifyjs-webpack-plugin@^1.2.4: webpack-sources "^1.1.0" worker-farm "^1.5.2" +uglifyjs-webpack-plugin@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.7.tgz#57638dd99c853a1ebfe9d97b42160a8a507f9d00" + dependencies: + cacache "^10.0.4" + find-cache-dir "^1.0.0" + schema-utils "^0.4.5" + serialize-javascript "^1.4.0" + source-map "^0.6.1" + uglify-es "^3.3.4" + webpack-sources "^1.1.0" + worker-farm "^1.5.2" + uid-number@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" @@ -8200,9 +8430,9 @@ uuid@^3.0.0, uuid@^3.1.0: version "3.2.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" -v8-compile-cache@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-1.1.2.tgz#8d32e4f16974654657e676e0e467a348e89b0dc4" +v8-compile-cache@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.0.tgz#526492e35fc616864284700b7043e01baee09f0a" v8flags@^2.1.1: version "2.1.1" @@ -8332,9 +8562,9 @@ webpack-addons@^1.1.5: dependencies: jscodeshift "^0.4.0" -webpack-bundle-analyzer@^2.11.1: - version "2.11.1" - resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.11.1.tgz#b9fbfb6a32c0a8c1c3237223e90890796b950ab9" +webpack-bundle-analyzer@^2.13.1: + version "2.13.1" + resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz#07d2176c6e86c3cdce4c23e56fae2a7b6b4ad526" dependencies: acorn "^5.3.0" bfj-node4 "^5.2.0" @@ -8349,35 +8579,36 @@ webpack-bundle-analyzer@^2.11.1: opener "^1.4.3" ws "^4.0.0" -webpack-cli@^2.0.13: - version "2.0.13" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-2.0.13.tgz#6e2bd9ef91345344737217e22e29001ad8537518" +webpack-cli@^2.1.5: + version "2.1.5" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-2.1.5.tgz#3081fdeb2f205f0a54aa397986880b0c20a71f7a" dependencies: - chalk "^2.3.2" + chalk "^2.4.1" cross-spawn "^6.0.5" diff "^3.5.0" enhanced-resolve "^4.0.0" + envinfo "^5.7.0" glob-all "^3.1.0" global-modules "^1.0.0" - got "^8.2.0" - inquirer "^5.1.0" - interpret "^1.0.4" + got "^8.3.1" + import-local "^1.0.0" + inquirer "^5.2.0" + interpret "^1.1.0" jscodeshift "^0.5.0" - listr "^0.13.0" + listr "^0.14.1" loader-utils "^1.1.0" - lodash "^4.17.5" + lodash "^4.17.10" log-symbols "^2.2.0" mkdirp "^0.5.1" p-each-series "^1.0.0" p-lazy "^1.0.0" - prettier "^1.5.3" - resolve-cwd "^2.0.0" - supports-color "^5.3.0" - v8-compile-cache "^1.1.2" + prettier "^1.12.1" + supports-color "^5.4.0" + v8-compile-cache "^2.0.0" webpack-addons "^1.1.5" - yargs "^11.0.0" - yeoman-environment "^2.0.0" - yeoman-generator "^2.0.3" + yargs "^11.1.0" + yeoman-environment "^2.1.1" + yeoman-generator "^2.0.5" webpack-md5-hash@^0.0.6: version "0.0.6" @@ -8392,17 +8623,23 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0: source-list-map "^2.0.0" source-map "~0.6.1" -webpack@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.3.0.tgz#0b0c1e211311b3995dd25aed47ab46ea658be070" +webpack@^4.12.1: + version "4.12.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.12.1.tgz#9108078c67fdd72c2609cea22af87d7aed2acb08" dependencies: - acorn "^5.0.0" + "@webassemblyjs/ast" "1.5.12" + "@webassemblyjs/helper-module-context" "1.5.12" + "@webassemblyjs/wasm-edit" "1.5.12" + "@webassemblyjs/wasm-opt" "1.5.12" + "@webassemblyjs/wasm-parser" "1.5.12" + acorn "^5.6.2" acorn-dynamic-import "^3.0.0" ajv "^6.1.0" ajv-keywords "^3.1.0" - chrome-trace-event "^0.1.1" + chrome-trace-event "^1.0.0" enhanced-resolve "^4.0.0" eslint-scope "^3.7.1" + json-parse-better-errors "^1.0.2" loader-runner "^2.3.0" loader-utils "^1.1.0" memory-fs "~0.4.1" @@ -8410,7 +8647,7 @@ webpack@^4.3.0: mkdirp "~0.5.0" neo-async "^2.5.0" node-libs-browser "^2.0.0" - schema-utils "^0.4.2" + schema-utils "^0.4.4" tapable "^1.0.0" uglifyjs-webpack-plugin "^1.2.4" watchpack "^1.5.0" @@ -8547,21 +8784,15 @@ yargs-parser@^5.0.0: dependencies: camelcase "^3.0.0" -yargs-parser@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950" - dependencies: - camelcase "^4.1.0" - yargs-parser@^9.0.2: version "9.0.2" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077" dependencies: camelcase "^4.1.0" -yargs@^10.0.3: - version "10.1.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.1.2.tgz#454d074c2b16a51a43e2fb7807e4f9de69ccb5c5" +yargs@^11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.0.0.tgz#c052931006c5eee74610e5fc0354bedfd08a201b" dependencies: cliui "^4.0.0" decamelize "^1.1.1" @@ -8574,11 +8805,11 @@ yargs@^10.0.3: string-width "^2.0.0" which-module "^2.0.0" y18n "^3.2.1" - yargs-parser "^8.1.0" + yargs-parser "^9.0.2" -yargs@^11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.0.0.tgz#c052931006c5eee74610e5fc0354bedfd08a201b" +yargs@^11.1.0: + version "11.1.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77" dependencies: cliui "^4.0.0" decamelize "^1.1.1" @@ -8632,7 +8863,7 @@ yauzl@2.4.1: dependencies: fd-slicer "~1.0.1" -yeoman-environment@^2.0.0, yeoman-environment@^2.0.5: +yeoman-environment@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/yeoman-environment/-/yeoman-environment-2.0.5.tgz#84f22bafa84088971fe99ea85f654a3a3dd2b693" dependencies: @@ -8650,25 +8881,45 @@ yeoman-environment@^2.0.0, yeoman-environment@^2.0.5: text-table "^0.2.0" untildify "^3.0.2" -yeoman-generator@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/yeoman-generator/-/yeoman-generator-2.0.3.tgz#19426ed22687ffe05d31526c3f1c2cf67ba768f3" +yeoman-environment@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/yeoman-environment/-/yeoman-environment-2.2.0.tgz#6c0ee93a8d962a9f6dbc5ad4e90ae7ab34875393" + dependencies: + chalk "^2.1.0" + cross-spawn "^6.0.5" + debug "^3.1.0" + diff "^3.3.1" + escape-string-regexp "^1.0.2" + globby "^8.0.1" + grouped-queue "^0.3.3" + inquirer "^5.2.0" + is-scoped "^1.0.0" + lodash "^4.17.10" + log-symbols "^2.1.0" + mem-fs "^1.1.0" + strip-ansi "^4.0.0" + text-table "^0.2.0" + untildify "^3.0.2" + +yeoman-generator@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/yeoman-generator/-/yeoman-generator-2.0.5.tgz#57b0b3474701293cc9ec965288f3400b00887c81" dependencies: async "^2.6.0" chalk "^2.3.0" cli-table "^0.3.1" - cross-spawn "^5.1.0" + cross-spawn "^6.0.5" dargs "^5.1.0" - dateformat "^3.0.2" + dateformat "^3.0.3" debug "^3.1.0" detect-conflict "^1.0.0" error "^7.0.2" find-up "^2.1.0" github-username "^4.0.0" - istextorbinary "^2.1.0" - lodash "^4.17.4" + istextorbinary "^2.2.1" + lodash "^4.17.10" make-dir "^1.1.0" - mem-fs-editor "^3.0.2" + mem-fs-editor "^4.0.0" minimist "^1.2.0" pretty-bytes "^4.0.2" read-chunk "^2.1.0" diff --git a/core/web/pom.xml b/core/web/pom.xml index ea33ba64094f..a3e4b1d12d9f 100644 --- a/core/web/pom.xml +++ b/core/web/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/core/xml/pom.xml b/core/xml/pom.xml index 216dac4d04c0..4bd87acdb08f 100644 --- a/core/xml/pom.xml +++ b/core/xml/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.core - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.core diff --git a/debian/changelog b/debian/changelog index f82787d65458..ab581a78720d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +opennms (22.0.2-1) stable; urgency=low + + * New stable release. It contains a number of bug fixes and enhancements, + including partial support for custom date formatting in the web UI. + + For details on what has changed, see: + http://docs.opennms.org/opennms/releases/22.0.2/releasenotes/releasenotes.html + + -- OpenNMS Release Manager Thu, 19 Jul 2018 15:10:00 -0500 + opennms (22.0.1-1) stable; urgency=low * New stable release. It contains a number of bug fixes and enhancements, diff --git a/dependencies/activemq-web/pom.xml b/dependencies/activemq-web/pom.xml index ac61a6a38412..56fdc64ad9f4 100644 --- a/dependencies/activemq-web/pom.xml +++ b/dependencies/activemq-web/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/activemq/pom.xml b/dependencies/activemq/pom.xml index 6454d1985add..4bdef8b3c448 100644 --- a/dependencies/activemq/pom.xml +++ b/dependencies/activemq/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/asterisk/pom.xml b/dependencies/asterisk/pom.xml index b0e0ff9d85bf..847283cadfbe 100644 --- a/dependencies/asterisk/pom.xml +++ b/dependencies/asterisk/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/atomikos/pom.xml b/dependencies/atomikos/pom.xml index 2a252b28c400..8a739f8e15a8 100644 --- a/dependencies/atomikos/pom.xml +++ b/dependencies/atomikos/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/aws/pom.xml b/dependencies/aws/pom.xml index 17f2bdda201a..772af5abd4ef 100644 --- a/dependencies/aws/pom.xml +++ b/dependencies/aws/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/camel-test/pom.xml b/dependencies/camel-test/pom.xml index 4d3742f92d32..bd7678ff93c7 100644 --- a/dependencies/camel-test/pom.xml +++ b/dependencies/camel-test/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/camel/pom.xml b/dependencies/camel/pom.xml index 1708698c838b..1cfc6c5068f4 100644 --- a/dependencies/camel/pom.xml +++ b/dependencies/camel/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/cxf/pom.xml b/dependencies/cxf/pom.xml index 96a9fba19397..9acea2b792ea 100644 --- a/dependencies/cxf/pom.xml +++ b/dependencies/cxf/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/dnsjava/pom.xml b/dependencies/dnsjava/pom.xml index bac493f9d48b..6e2cc6c98234 100644 --- a/dependencies/dnsjava/pom.xml +++ b/dependencies/dnsjava/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/drools/pom.xml b/dependencies/drools/pom.xml index d5edb742d861..30f8fe5fccf6 100644 --- a/dependencies/drools/pom.xml +++ b/dependencies/drools/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/felix/pom.xml b/dependencies/felix/pom.xml index 43155d0c8cff..c0a0c0044f49 100644 --- a/dependencies/felix/pom.xml +++ b/dependencies/felix/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/gwt/pom.xml b/dependencies/gwt/pom.xml index 6e7cdf82ef52..3e602311ed71 100644 --- a/dependencies/gwt/pom.xml +++ b/dependencies/gwt/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/hibernate/pom.xml b/dependencies/hibernate/pom.xml index 8fe43ec38617..ce9236f42179 100644 --- a/dependencies/hibernate/pom.xml +++ b/dependencies/hibernate/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jasper/pom.xml b/dependencies/jasper/pom.xml index 32535dae274e..08cb38e21a55 100644 --- a/dependencies/jasper/pom.xml +++ b/dependencies/jasper/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jasypt/pom.xml b/dependencies/jasypt/pom.xml index 3356435a807f..37bee36ec211 100644 --- a/dependencies/jasypt/pom.xml +++ b/dependencies/jasypt/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/javamail/pom.xml b/dependencies/javamail/pom.xml index 865e786990d9..2fe4a5f511b4 100644 --- a/dependencies/javamail/pom.xml +++ b/dependencies/javamail/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jaxb/pom.xml b/dependencies/jaxb/pom.xml index 9b9733ac1023..7262c8704e91 100644 --- a/dependencies/jaxb/pom.xml +++ b/dependencies/jaxb/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jcifs/pom.xml b/dependencies/jcifs/pom.xml index 2289bd21e154..2c43637c11ea 100644 --- a/dependencies/jcifs/pom.xml +++ b/dependencies/jcifs/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jfreechart/pom.xml b/dependencies/jfreechart/pom.xml index 37ce51ca80f6..dff7adc0267f 100644 --- a/dependencies/jfreechart/pom.xml +++ b/dependencies/jfreechart/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jinterop/pom.xml b/dependencies/jinterop/pom.xml index 48ed5cb0ed97..a0e9f3b37f68 100644 --- a/dependencies/jinterop/pom.xml +++ b/dependencies/jinterop/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jmx/pom.xml b/dependencies/jmx/pom.xml index da95d9e56140..a23c5a35fe6c 100644 --- a/dependencies/jmx/pom.xml +++ b/dependencies/jmx/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT ../pom.xml 4.0.0 diff --git a/dependencies/jna/pom.xml b/dependencies/jna/pom.xml index 8705af925fbf..55bd0e38a6e6 100644 --- a/dependencies/jna/pom.xml +++ b/dependencies/jna/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jnlp/pom.xml b/dependencies/jnlp/pom.xml index ceb22a5ee98e..4d605cfa6352 100644 --- a/dependencies/jnlp/pom.xml +++ b/dependencies/jnlp/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jradius-extended/pom.xml b/dependencies/jradius-extended/pom.xml index 04b163bd86fe..89a10b099cbd 100644 --- a/dependencies/jradius-extended/pom.xml +++ b/dependencies/jradius-extended/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jradius/pom.xml b/dependencies/jradius/pom.xml index ae125dc08659..0eb22258529a 100644 --- a/dependencies/jradius/pom.xml +++ b/dependencies/jradius/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jrobin/pom.xml b/dependencies/jrobin/pom.xml index 2b9f56a579ff..427c3c6973db 100644 --- a/dependencies/jrobin/pom.xml +++ b/dependencies/jrobin/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jrrd/pom.xml b/dependencies/jrrd/pom.xml index ff8a447a661e..cc93b8ee65eb 100644 --- a/dependencies/jrrd/pom.xml +++ b/dependencies/jrrd/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jrrd2/pom.xml b/dependencies/jrrd2/pom.xml index 0bc89266fc2c..34ae6a072a52 100644 --- a/dependencies/jrrd2/pom.xml +++ b/dependencies/jrrd2/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/jstl/pom.xml b/dependencies/jstl/pom.xml index 11fb8fb819d9..6bee11f95fba 100644 --- a/dependencies/jstl/pom.xml +++ b/dependencies/jstl/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/liquibase/pom.xml b/dependencies/liquibase/pom.xml index cec79c7406a6..1ee4908f8c3d 100644 --- a/dependencies/liquibase/pom.xml +++ b/dependencies/liquibase/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/mina/pom.xml b/dependencies/mina/pom.xml index fe640a5ff522..6e048116f569 100644 --- a/dependencies/mina/pom.xml +++ b/dependencies/mina/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/netty/pom.xml b/dependencies/netty/pom.xml index d1aad1cbc418..fefaaed80e5c 100644 --- a/dependencies/netty/pom.xml +++ b/dependencies/netty/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/newts/pom.xml b/dependencies/newts/pom.xml index ddc47a431f97..fa72063a16d5 100644 --- a/dependencies/newts/pom.xml +++ b/dependencies/newts/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/owasp/pom.xml b/dependencies/owasp/pom.xml index 772e40e2e5e8..a3ea02b49260 100644 --- a/dependencies/owasp/pom.xml +++ b/dependencies/owasp/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/pax-exam/pom.xml b/dependencies/pax-exam/pom.xml index a483b45d219a..96d0de155204 100644 --- a/dependencies/pax-exam/pom.xml +++ b/dependencies/pax-exam/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 55a2b403ce22..2f021c70f38b 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 dependencies diff --git a/dependencies/quartz/pom.xml b/dependencies/quartz/pom.xml index fe980ca8d448..04810a38b93a 100644 --- a/dependencies/quartz/pom.xml +++ b/dependencies/quartz/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/rancid/pom.xml b/dependencies/rancid/pom.xml index f7beb985daf3..e3ddfdb696cb 100644 --- a/dependencies/rancid/pom.xml +++ b/dependencies/rancid/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/servlet/pom.xml b/dependencies/servlet/pom.xml index a2c3e5361c6b..90adedfa1dc3 100644 --- a/dependencies/servlet/pom.xml +++ b/dependencies/servlet/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/smack/pom.xml b/dependencies/smack/pom.xml index 70862b37a032..949e1e81a2ac 100644 --- a/dependencies/smack/pom.xml +++ b/dependencies/smack/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/smslib/pom.xml b/dependencies/smslib/pom.xml index f5e0a3ab53a0..c3cd126345e8 100644 --- a/dependencies/smslib/pom.xml +++ b/dependencies/smslib/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/snmp-test/pom.xml b/dependencies/snmp-test/pom.xml index 7fd73dad8380..35089d76e7d0 100644 --- a/dependencies/snmp-test/pom.xml +++ b/dependencies/snmp-test/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/snmp/pom.xml b/dependencies/snmp/pom.xml index 7185df315d71..5666c1d0d3fd 100644 --- a/dependencies/snmp/pom.xml +++ b/dependencies/snmp/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/snmp4j-agent/pom.xml b/dependencies/snmp4j-agent/pom.xml index a6aac32c25d7..e9be7fbc3cff 100644 --- a/dependencies/snmp4j-agent/pom.xml +++ b/dependencies/snmp4j-agent/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/snmp4j/pom.xml b/dependencies/snmp4j/pom.xml index 5445716fc3fd..d63423101909 100644 --- a/dependencies/snmp4j/pom.xml +++ b/dependencies/snmp4j/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/spring-security-core/pom.xml b/dependencies/spring-security-core/pom.xml index 9069db5428ee..b181605c9eef 100644 --- a/dependencies/spring-security-core/pom.xml +++ b/dependencies/spring-security-core/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/spring-security/pom.xml b/dependencies/spring-security/pom.xml index e8023aec3e84..c2e9d6ccfdce 100644 --- a/dependencies/spring-security/pom.xml +++ b/dependencies/spring-security/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/spring-test/pom.xml b/dependencies/spring-test/pom.xml index dd95a16ff7ca..4f2c1f2d7741 100644 --- a/dependencies/spring-test/pom.xml +++ b/dependencies/spring-test/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/spring-web/pom.xml b/dependencies/spring-web/pom.xml index 5a04f9d1d84e..aa5bb5bd68e2 100644 --- a/dependencies/spring-web/pom.xml +++ b/dependencies/spring-web/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/spring/pom.xml b/dependencies/spring/pom.xml index e093697d5513..614d0909981b 100644 --- a/dependencies/spring/pom.xml +++ b/dependencies/spring/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/tracker/pom.xml b/dependencies/tracker/pom.xml index b74a4563e56e..df10efaf3bf6 100644 --- a/dependencies/tracker/pom.xml +++ b/dependencies/tracker/pom.xml @@ -3,7 +3,7 @@ dependencies org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/dependencies/twitter4j/pom.xml b/dependencies/twitter4j/pom.xml index 52a0f3d97b66..b541bf32de3b 100644 --- a/dependencies/twitter4j/pom.xml +++ b/dependencies/twitter4j/pom.xml @@ -3,7 +3,7 @@ org.opennms dependencies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.dependencies diff --git a/features/activemq/broker/pom.xml b/features/activemq/broker/pom.xml index 3f5840f99801..fbe6496aa443 100644 --- a/features/activemq/broker/pom.xml +++ b/features/activemq/broker/pom.xml @@ -8,7 +8,7 @@ org.opennms.features org.opennms.features.activemq - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/activemq/component/pom.xml b/features/activemq/component/pom.xml index 36e27ceed7fd..822583d4e8bc 100644 --- a/features/activemq/component/pom.xml +++ b/features/activemq/component/pom.xml @@ -5,7 +5,7 @@ org.opennms.features org.opennms.features.activemq - 22.0.1 + 22.0.2-SNAPSHOT bundle org.opennms.features.activemq diff --git a/features/activemq/pom.xml b/features/activemq/pom.xml index 74f00cba3674..a8118e9223c2 100644 --- a/features/activemq/pom.xml +++ b/features/activemq/pom.xml @@ -7,7 +7,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/activemq/pool/pom.xml b/features/activemq/pool/pom.xml index f37818246c6f..2447a6ad861c 100644 --- a/features/activemq/pool/pom.xml +++ b/features/activemq/pool/pom.xml @@ -5,7 +5,7 @@ org.opennms.features org.opennms.features.activemq - 22.0.1 + 22.0.2-SNAPSHOT bundle org.opennms.features.activemq diff --git a/features/alarm-change-notifier/README.md b/features/alarm-change-notifier/README.md index d5cb45e7873e..9896ba692269 100644 --- a/features/alarm-change-notifier/README.md +++ b/features/alarm-change-notifier/README.md @@ -5,7 +5,7 @@ ~~~~ project groupId: org.opennms.plugins project name: alarm-change-notifier -version: 22.0.1 +version: 22.0.2-SNAPSHOT ~~~~ ## Description @@ -77,10 +77,10 @@ ssh -p 8101 admin@localhost to install the feature in karaf use ~~~~ -karaf@root> feature:addurl mvn:org.opennms.plugins/alarm-change-notifier/22.0.1/xml/features +karaf@root> feature:addurl mvn:org.opennms.plugins/alarm-change-notifier/22.0.2-SNAPSHOT/xml/features karaf@root> feature:install alarm-change-notifier -(or feature:install alarm-change-notifier/22.0.1 for a specific version of the feature) +(or feature:install alarm-change-notifier/22.0.2-SNAPSHOT for a specific version of the feature) ~~~~ diff --git a/features/alarm-change-notifier/feature/pom.xml b/features/alarm-change-notifier/feature/pom.xml index 76cc439f8a4e..5317d9207fc7 100644 --- a/features/alarm-change-notifier/feature/pom.xml +++ b/features/alarm-change-notifier/feature/pom.xml @@ -3,7 +3,7 @@ org.opennms.plugins alarm-change-notifier.parent - 22.0.1 + 22.0.2-SNAPSHOT diff --git a/features/alarm-change-notifier/main-module/pom.xml b/features/alarm-change-notifier/main-module/pom.xml index d5771931403c..999ced8df85b 100644 --- a/features/alarm-change-notifier/main-module/pom.xml +++ b/features/alarm-change-notifier/main-module/pom.xml @@ -2,7 +2,7 @@ org.opennms.plugins alarm-change-notifier.parent - 22.0.1 + 22.0.2-SNAPSHOT diff --git a/features/alarm-change-notifier/pg-jdbc-utils/pom.xml b/features/alarm-change-notifier/pg-jdbc-utils/pom.xml index bc9b6c47e8ad..98ed1d83c198 100644 --- a/features/alarm-change-notifier/pg-jdbc-utils/pom.xml +++ b/features/alarm-change-notifier/pg-jdbc-utils/pom.xml @@ -3,7 +3,7 @@ org.opennms.plugins alarm-change-notifier.parent - 22.0.1 + 22.0.2-SNAPSHOT diff --git a/features/alarm-change-notifier/pom.xml b/features/alarm-change-notifier/pom.xml index e719910e229c..b821e5c9627c 100644 --- a/features/alarm-change-notifier/pom.xml +++ b/features/alarm-change-notifier/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/alarm-change-notifier/product-descriptor/pom.xml b/features/alarm-change-notifier/product-descriptor/pom.xml index 542832a7bacd..dea0a5a449f3 100644 --- a/features/alarm-change-notifier/product-descriptor/pom.xml +++ b/features/alarm-change-notifier/product-descriptor/pom.xml @@ -3,7 +3,7 @@ org.opennms.plugins alarm-change-notifier.parent - 22.0.1 + 22.0.2-SNAPSHOT diff --git a/features/amqp/alarm-northbounder/pom.xml b/features/amqp/alarm-northbounder/pom.xml index 4b774dfbe79d..62f3cd7c28d0 100644 --- a/features/amqp/alarm-northbounder/pom.xml +++ b/features/amqp/alarm-northbounder/pom.xml @@ -9,7 +9,7 @@ org.opennms.features org.opennms.features.amqp - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/amqp/common/pom.xml b/features/amqp/common/pom.xml index 457aaee8999b..705102aaa0fd 100644 --- a/features/amqp/common/pom.xml +++ b/features/amqp/common/pom.xml @@ -9,7 +9,7 @@ org.opennms.features org.opennms.features.amqp - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/amqp/event-forwarder/pom.xml b/features/amqp/event-forwarder/pom.xml index dcc0e150a25d..554862bc178c 100644 --- a/features/amqp/event-forwarder/pom.xml +++ b/features/amqp/event-forwarder/pom.xml @@ -9,7 +9,7 @@ org.opennms.features org.opennms.features.amqp - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/amqp/event-receiver/pom.xml b/features/amqp/event-receiver/pom.xml index cb32e4d40882..311a32e21572 100644 --- a/features/amqp/event-receiver/pom.xml +++ b/features/amqp/event-receiver/pom.xml @@ -9,7 +9,7 @@ org.opennms.features org.opennms.features.amqp - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/amqp/pom.xml b/features/amqp/pom.xml index 556d0683bea4..fb162755308f 100644 --- a/features/amqp/pom.xml +++ b/features/amqp/pom.xml @@ -7,7 +7,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/bsm/daemon/pom.xml b/features/bsm/daemon/pom.xml index 47b22acac765..9d5c3f47be28 100644 --- a/features/bsm/daemon/pom.xml +++ b/features/bsm/daemon/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.bsm - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.bsm diff --git a/features/bsm/persistence/api/pom.xml b/features/bsm/persistence/api/pom.xml index 8a0a8fb08f75..115c76cd9a09 100644 --- a/features/bsm/persistence/api/pom.xml +++ b/features/bsm/persistence/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.bsm org.opennms.features.bsm.persistence - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.bsm.persistence.api diff --git a/features/bsm/persistence/impl/pom.xml b/features/bsm/persistence/impl/pom.xml index 7e3dd1cacdb5..4b7d35852386 100644 --- a/features/bsm/persistence/impl/pom.xml +++ b/features/bsm/persistence/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.bsm org.opennms.features.bsm.persistence - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.bsm.persistence.impl diff --git a/features/bsm/persistence/pom.xml b/features/bsm/persistence/pom.xml index ad608e2628c3..ef99247072d0 100644 --- a/features/bsm/persistence/pom.xml +++ b/features/bsm/persistence/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.bsm - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.bsm diff --git a/features/bsm/pom.xml b/features/bsm/pom.xml index d4751cd0525a..2d7bbd3add0d 100644 --- a/features/bsm/pom.xml +++ b/features/bsm/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/bsm/rest/api/pom.xml b/features/bsm/rest/api/pom.xml index 1c2234dbc9d3..9c8925f411bb 100644 --- a/features/bsm/rest/api/pom.xml +++ b/features/bsm/rest/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.bsm org.opennms.features.bsm.rest - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.bsm.rest.api diff --git a/features/bsm/rest/impl/pom.xml b/features/bsm/rest/impl/pom.xml index c1f98501b591..51b63db8fd3a 100644 --- a/features/bsm/rest/impl/pom.xml +++ b/features/bsm/rest/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.bsm org.opennms.features.bsm.rest - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.bsm.rest.impl diff --git a/features/bsm/rest/pom.xml b/features/bsm/rest/pom.xml index ce9653706986..850d2adaa3ac 100644 --- a/features/bsm/rest/pom.xml +++ b/features/bsm/rest/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.bsm - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.bsm diff --git a/features/bsm/service/api/pom.xml b/features/bsm/service/api/pom.xml index 4810946dcfa1..52c2e5e2f148 100644 --- a/features/bsm/service/api/pom.xml +++ b/features/bsm/service/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.bsm org.opennms.features.bsm.service - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.bsm.service.api diff --git a/features/bsm/service/impl/pom.xml b/features/bsm/service/impl/pom.xml index 4f6c69b58e65..cbadf58e2acb 100644 --- a/features/bsm/service/impl/pom.xml +++ b/features/bsm/service/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.bsm org.opennms.features.bsm.service - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.bsm.service.impl diff --git a/features/bsm/service/pom.xml b/features/bsm/service/pom.xml index c7027eedc756..7a4613adea55 100644 --- a/features/bsm/service/pom.xml +++ b/features/bsm/service/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.bsm - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.bsm diff --git a/features/bsm/shell-commands/pom.xml b/features/bsm/shell-commands/pom.xml index afd2d462a989..4aa0c7f6617e 100644 --- a/features/bsm/shell-commands/pom.xml +++ b/features/bsm/shell-commands/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.bsm - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.bsm diff --git a/features/bsm/test-util/pom.xml b/features/bsm/test-util/pom.xml index 8c129db9e4b4..fdb9cb01a331 100644 --- a/features/bsm/test-util/pom.xml +++ b/features/bsm/test-util/pom.xml @@ -5,7 +5,7 @@ org.opennms.features org.opennms.features.bsm - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.bsm test-util diff --git a/features/bsm/vaadin-adminpage/pom.xml b/features/bsm/vaadin-adminpage/pom.xml index fb6b9c4159ae..a8ca98436f13 100644 --- a/features/bsm/vaadin-adminpage/pom.xml +++ b/features/bsm/vaadin-adminpage/pom.xml @@ -5,7 +5,7 @@ org.opennms.features org.opennms.features.bsm - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.bsm vaadin-adminpage diff --git a/features/collection/api/pom.xml b/features/collection/api/pom.xml index fe84bd8465da..d0bd68a15fe5 100644 --- a/features/collection/api/pom.xml +++ b/features/collection/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.collection - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.collection diff --git a/features/collection/client-rpc/pom.xml b/features/collection/client-rpc/pom.xml index bfdf30cf2094..678d4b335336 100644 --- a/features/collection/client-rpc/pom.xml +++ b/features/collection/client-rpc/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.collection - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.collection diff --git a/features/collection/collectors/pom.xml b/features/collection/collectors/pom.xml index c075b4c69803..cdcb581f7617 100644 --- a/features/collection/collectors/pom.xml +++ b/features/collection/collectors/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.collection - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.collection diff --git a/features/collection/core/pom.xml b/features/collection/core/pom.xml index b4613c052bc8..3176d3ba855f 100644 --- a/features/collection/core/pom.xml +++ b/features/collection/core/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.collection - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.collection diff --git a/features/collection/persistence-rrd/pom.xml b/features/collection/persistence-rrd/pom.xml index cc991cfec9fb..e1d09d418429 100644 --- a/features/collection/persistence-rrd/pom.xml +++ b/features/collection/persistence-rrd/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.collection - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.collection diff --git a/features/collection/persistence-tcp/pom.xml b/features/collection/persistence-tcp/pom.xml index 6b260d823fcb..ac15ef0e9e12 100644 --- a/features/collection/persistence-tcp/pom.xml +++ b/features/collection/persistence-tcp/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.collection - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.collection diff --git a/features/collection/pom.xml b/features/collection/pom.xml index 1d146ccd8201..ace1267eb375 100644 --- a/features/collection/pom.xml +++ b/features/collection/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/collection/sampler/pom.xml b/features/collection/sampler/pom.xml index 4ecd18a3001d..9914f6bac98f 100644 --- a/features/collection/sampler/pom.xml +++ b/features/collection/sampler/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.collection - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.collection diff --git a/features/collection/shell-commands/pom.xml b/features/collection/shell-commands/pom.xml index 6a2afe9c151c..65ebc23d1eee 100644 --- a/features/collection/shell-commands/pom.xml +++ b/features/collection/shell-commands/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.collection - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.collection diff --git a/features/collection/shell-commands/src/main/java/org/opennms/netmgt/collection/commands/CollectCommand.java b/features/collection/shell-commands/src/main/java/org/opennms/netmgt/collection/commands/CollectCommand.java index 52e4db2eb689..9ba86fd1c736 100644 --- a/features/collection/shell-commands/src/main/java/org/opennms/netmgt/collection/commands/CollectCommand.java +++ b/features/collection/shell-commands/src/main/java/org/opennms/netmgt/collection/commands/CollectCommand.java @@ -29,6 +29,8 @@ package org.opennms.netmgt.collection.commands; import java.net.InetAddress; +import java.nio.file.Paths; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -55,17 +57,32 @@ import org.opennms.netmgt.collection.api.CollectionStatus; import org.opennms.netmgt.collection.api.InvalidCollectionAgentException; import org.opennms.netmgt.collection.api.LocationAwareCollectorClient; +import org.opennms.netmgt.collection.api.Persister; +import org.opennms.netmgt.collection.api.PersisterFactory; import org.opennms.netmgt.collection.api.ServiceCollector; import org.opennms.netmgt.collection.api.ServiceCollectorRegistry; +import org.opennms.netmgt.collection.api.ServiceParameters; import org.opennms.netmgt.collection.dto.CollectionAgentDTO; import org.opennms.netmgt.collection.support.AbstractCollectionSetVisitor; import org.opennms.netmgt.model.ResourcePath; +import org.opennms.netmgt.rrd.RrdRepository; import org.opennms.netmgt.snmp.InetAddrUtils; +import com.google.common.collect.Lists; + @Command(scope = "collection", name = "collect", description="Invokes a collector against a host at a specified location.") @Service public class CollectCommand implements Action { + public static final List DEFAULT_RRA = Lists.newArrayList( + // Use the default list of RRAs we provide in our stock + // configuration files + "RRA:AVERAGE:0.5:1:2016", + "RRA:AVERAGE:0.5:12:1488", + "RRA:AVERAGE:0.5:288:366", + "RRA:MAX:0.5:288:366", + "RRA:MIN:0.5:288:366"); + @Option(name = "-l", aliases = "--location", description = "Location", required = false, multiValued = false) String location; @@ -78,6 +95,9 @@ public class CollectCommand implements Action { @Option(name = "-n", aliases = "--node", description = "Node ID or FS:FID", required = false, multiValued = false) String nodeCriteria; + @Option(name = "-p", aliases = "--persist", description = "Persist collection") + boolean persist; + @Argument(index = 0, name = "collectorClass", description = "Collector class", required = true, multiValued = false) @Completion(CollectorClassNameCompleter.class) String className; @@ -88,6 +108,10 @@ public class CollectCommand implements Action { @Argument(index = 2, name = "attributes", description = "Collector specific attributes in key=value form", multiValued = true) List attributes; + @Option(name="-x", aliases="--rra", description="Round Robin Archives, defaults to the pristine content on datacollection-config.xml", required=false, multiValued=true) + List rras = null; + + @Reference public ServiceCollectorRegistry serviceCollectorRegistry; @@ -97,6 +121,10 @@ public class CollectCommand implements Action { @Reference public CollectionAgentFactory collectionAgentFactory; + @Reference + private PersisterFactory persisterFactory; + + @Override public Void execute() { final ServiceCollector collector = serviceCollectorRegistry.getCollectorByClassName(className); @@ -123,12 +151,28 @@ public Void execute() { .withAttributes(parse(attributes)) .execute(); + Persister persister = null; + if (persist) { + ServiceParameters params = new ServiceParameters(Collections.emptyMap()); + RrdRepository repository = new RrdRepository(); + persister = persisterFactory.createPersister(params, repository); + if (rras != null && rras.size() > 0) { + repository.setRraList(rras); + } else { + repository.setRraList(Lists.newArrayList(DEFAULT_RRA)); + } + repository.setRrdBaseDir(Paths.get(System.getProperty("opennms.home"), "share", "rrd", "snmp").toFile()); + } while (true) { try { try { CollectionSet collectionSet = future.get(1, TimeUnit.SECONDS); if (CollectionStatus.SUCCEEDED.equals(collectionSet.getStatus())) { printCollectionSet(collectionSet); + if (persist) { + collectionSet.visit(persister); + System.out.println("---- Persisted collection ----"); + } } else { System.out.printf("\nThe collector returned a collection set with status: %s\n", collectionSet.getStatus()); } diff --git a/features/collection/shell-commands/src/main/java/org/opennms/netmgt/collection/commands/StressCommand.java b/features/collection/shell-commands/src/main/java/org/opennms/netmgt/collection/commands/StressCommand.java index 082fa88bbf8a..ab215a277599 100644 --- a/features/collection/shell-commands/src/main/java/org/opennms/netmgt/collection/commands/StressCommand.java +++ b/features/collection/shell-commands/src/main/java/org/opennms/netmgt/collection/commands/StressCommand.java @@ -198,13 +198,7 @@ public Void execute() throws Exception { if (rras != null && rras.size() > 0) { repository.setRraList(rras); } else { - repository.setRraList(Lists.newArrayList( - // Use the default list of RRAs we provide in our stock configuration files - "RRA:AVERAGE:0.5:1:2016", - "RRA:AVERAGE:0.5:12:1488", - "RRA:AVERAGE:0.5:288:366", - "RRA:MAX:0.5:288:366", - "RRA:MIN:0.5:288:366")); + repository.setRraList(Lists.newArrayList(CollectCommand.DEFAULT_RRA)); } repository.setRrdBaseDir(Paths.get(System.getProperty("opennms.home"),"share","rrd","snmp").toFile()); diff --git a/features/collection/test-api/pom.xml b/features/collection/test-api/pom.xml index bf234d3a4517..8794378e578f 100644 --- a/features/collection/test-api/pom.xml +++ b/features/collection/test-api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.collection - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.collection diff --git a/features/datachoices/pom.xml b/features/datachoices/pom.xml index 21af55be9ce4..aa5141af0a3a 100644 --- a/features/datachoices/pom.xml +++ b/features/datachoices/pom.xml @@ -5,7 +5,7 @@ org.opennms.features org.opennms - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features datachoices diff --git a/features/discovery/pom.xml b/features/discovery/pom.xml index 04ef8810c479..1f1b97b3b6e4 100644 --- a/features/discovery/pom.xml +++ b/features/discovery/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/eif-adapter/pom.xml b/features/eif-adapter/pom.xml index 6e977576079b..2b06ac7a6105 100644 --- a/features/eif-adapter/pom.xml +++ b/features/eif-adapter/pom.xml @@ -9,7 +9,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/events/api/pom.xml b/features/events/api/pom.xml index f6310f5afbfe..244dcd138773 100644 --- a/features/events/api/pom.xml +++ b/features/events/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.events - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.events diff --git a/features/events/daemon/pom.xml b/features/events/daemon/pom.xml index b45aab00c3a0..1f3fd195708e 100644 --- a/features/events/daemon/pom.xml +++ b/features/events/daemon/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.events - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.events diff --git a/features/events/pom.xml b/features/events/pom.xml index 94f895992b48..7f504dc5b924 100644 --- a/features/events/pom.xml +++ b/features/events/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/events/shell-commands/pom.xml b/features/events/shell-commands/pom.xml index d99c72ff117a..0e7821627798 100644 --- a/features/events/shell-commands/pom.xml +++ b/features/events/shell-commands/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.events - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.events diff --git a/features/events/syslog/pom.xml b/features/events/syslog/pom.xml index 303cb216aecc..3e7a789707c5 100644 --- a/features/events/syslog/pom.xml +++ b/features/events/syslog/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.events - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.events diff --git a/features/events/traps/pom.xml b/features/events/traps/pom.xml index 935ece40c07c..8284ee49bc2f 100644 --- a/features/events/traps/pom.xml +++ b/features/events/traps/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.events - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.events diff --git a/features/executor-factory/cassandra/pom.xml b/features/executor-factory/cassandra/pom.xml index abd565f15998..ead215c93c8a 100644 --- a/features/executor-factory/cassandra/pom.xml +++ b/features/executor-factory/cassandra/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.executor-factory - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.executor-factory diff --git a/features/executor-factory/pom.xml b/features/executor-factory/pom.xml index e355327caa36..f4f5760b9c57 100644 --- a/features/executor-factory/pom.xml +++ b/features/executor-factory/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/flows/api/pom.xml b/features/flows/api/pom.xml index 4bec4dbb87c0..a7db935be248 100644 --- a/features/flows/api/pom.xml +++ b/features/flows/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.flows - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.flows diff --git a/features/flows/classification/engine/api/pom.xml b/features/flows/classification/engine/api/pom.xml index 7e3c77a16c32..b2c88ca7ecec 100644 --- a/features/flows/classification/engine/api/pom.xml +++ b/features/flows/classification/engine/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.flows.classification org.opennms.features.flows.classification.engine - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.flows.classification.engine diff --git a/features/flows/classification/engine/impl/pom.xml b/features/flows/classification/engine/impl/pom.xml index 1cd32bda015a..d0e72d51e6c9 100644 --- a/features/flows/classification/engine/impl/pom.xml +++ b/features/flows/classification/engine/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.flows.classification org.opennms.features.flows.classification.engine - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.flows.classification.engine diff --git a/features/flows/classification/engine/pom.xml b/features/flows/classification/engine/pom.xml index 8373889407fa..5f2bc9f5cbd1 100644 --- a/features/flows/classification/engine/pom.xml +++ b/features/flows/classification/engine/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.flows org.opennms.features.flows.classification - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.flows.classification diff --git a/features/flows/classification/persistence/api/pom.xml b/features/flows/classification/persistence/api/pom.xml index 5ee1fc4efcfc..844b736221c7 100644 --- a/features/flows/classification/persistence/api/pom.xml +++ b/features/flows/classification/persistence/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.flows.classification org.opennms.features.flows.classification.persistence - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.flows.classification.persistence diff --git a/features/flows/classification/persistence/impl/pom.xml b/features/flows/classification/persistence/impl/pom.xml index 913de299fde2..88204b6f66ec 100644 --- a/features/flows/classification/persistence/impl/pom.xml +++ b/features/flows/classification/persistence/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.flows.classification org.opennms.features.flows.classification.persistence - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.flows.classification.persistence diff --git a/features/flows/classification/persistence/pom.xml b/features/flows/classification/persistence/pom.xml index 76612cb753f5..8326023cdee1 100644 --- a/features/flows/classification/persistence/pom.xml +++ b/features/flows/classification/persistence/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.flows org.opennms.features.flows.classification - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.flows.classification diff --git a/features/flows/classification/pom.xml b/features/flows/classification/pom.xml index 3b9f179ec1dc..ebc1633553c4 100644 --- a/features/flows/classification/pom.xml +++ b/features/flows/classification/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.flows - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.flows diff --git a/features/flows/elastic/pom.xml b/features/flows/elastic/pom.xml index 53678c6bbe3f..a35697af51cd 100644 --- a/features/flows/elastic/pom.xml +++ b/features/flows/elastic/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.flows - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.flows diff --git a/features/flows/feature/pom.xml b/features/flows/feature/pom.xml index c8d311d7f469..763806ffa50d 100644 --- a/features/flows/feature/pom.xml +++ b/features/flows/feature/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.flows - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/flows/pom.xml b/features/flows/pom.xml index 340785f542cd..88e66031e27a 100644 --- a/features/flows/pom.xml +++ b/features/flows/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/flows/rest/api/pom.xml b/features/flows/rest/api/pom.xml index c16109cb0d77..b9452028c093 100644 --- a/features/flows/rest/api/pom.xml +++ b/features/flows/rest/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.flows org.opennms.features.flows.rest - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.flows.rest diff --git a/features/flows/rest/impl/pom.xml b/features/flows/rest/impl/pom.xml index a423ee69f96b..3651a000c88c 100644 --- a/features/flows/rest/impl/pom.xml +++ b/features/flows/rest/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.flows org.opennms.features.flows.rest - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.flows.rest diff --git a/features/flows/rest/pom.xml b/features/flows/rest/pom.xml index 043cf2b76ab2..182f766b6b7f 100644 --- a/features/flows/rest/pom.xml +++ b/features/flows/rest/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.flows - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.flows diff --git a/features/geocoder/api/pom.xml b/features/geocoder/api/pom.xml index c2357c1932c6..3bb96d565c0a 100644 --- a/features/geocoder/api/pom.xml +++ b/features/geocoder/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.geocoder - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.geocoder diff --git a/features/geocoder/google/pom.xml b/features/geocoder/google/pom.xml index 43f69f223467..1cbf246daca7 100644 --- a/features/geocoder/google/pom.xml +++ b/features/geocoder/google/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.geocoder - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.geocoder diff --git a/features/geocoder/nominatim/pom.xml b/features/geocoder/nominatim/pom.xml index 25d70d3a060e..b31054387864 100644 --- a/features/geocoder/nominatim/pom.xml +++ b/features/geocoder/nominatim/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.geocoder - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.geocoder diff --git a/features/geocoder/pom.xml b/features/geocoder/pom.xml index 88acc1cf5a37..31cf9eb6143a 100644 --- a/features/geocoder/pom.xml +++ b/features/geocoder/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/geolocation/api/pom.xml b/features/geolocation/api/pom.xml index b3d74cc8ad76..542f97cc14be 100644 --- a/features/geolocation/api/pom.xml +++ b/features/geolocation/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.geolocation - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.geolocation diff --git a/features/geolocation/feature/pom.xml b/features/geolocation/feature/pom.xml index 62432d27c007..fecded6a69b3 100644 --- a/features/geolocation/feature/pom.xml +++ b/features/geolocation/feature/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.geolocation - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.geolocation diff --git a/features/geolocation/pom.xml b/features/geolocation/pom.xml index b05cf4cf9609..0fe36bfcc270 100644 --- a/features/geolocation/pom.xml +++ b/features/geolocation/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/geolocation/rest/pom.xml b/features/geolocation/rest/pom.xml index e90e9d00f1a4..49a277751e63 100644 --- a/features/geolocation/rest/pom.xml +++ b/features/geolocation/rest/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.geolocation - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.geolocation diff --git a/features/geolocation/service/pom.xml b/features/geolocation/service/pom.xml index 3d72fca9414b..ec2ea6c1d374 100644 --- a/features/geolocation/service/pom.xml +++ b/features/geolocation/service/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.geolocation - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.geolocation diff --git a/features/graphml/pom.xml b/features/graphml/pom.xml index 14cf4cd37e63..9e81a6765fb2 100644 --- a/features/graphml/pom.xml +++ b/features/graphml/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.graphml diff --git a/features/ifttt/pom.xml b/features/ifttt/pom.xml index b474d8c530e8..18cdd69672da 100644 --- a/features/ifttt/pom.xml +++ b/features/ifttt/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/instrumentationLogReader/pom.xml b/features/instrumentationLogReader/pom.xml index 17df1fd77482..4d82fab90a00 100644 --- a/features/instrumentationLogReader/pom.xml +++ b/features/instrumentationLogReader/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features org.opennms.features.instrumentationLogReader diff --git a/features/internal-plugins-descriptor/pom.xml b/features/internal-plugins-descriptor/pom.xml index 8fe705e09f7e..3bc7bed86dc7 100644 --- a/features/internal-plugins-descriptor/pom.xml +++ b/features/internal-plugins-descriptor/pom.xml @@ -8,7 +8,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/jdbc-collector/pom.xml b/features/jdbc-collector/pom.xml index a039332c4b5f..9ff3f7f905d0 100644 --- a/features/jdbc-collector/pom.xml +++ b/features/jdbc-collector/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/jest/client/pom.xml b/features/jest/client/pom.xml index 2732ddccf18b..9d0a009dd836 100644 --- a/features/jest/client/pom.xml +++ b/features/jest/client/pom.xml @@ -2,7 +2,7 @@ org.opennms.features org.opennms.features.jest - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.jest diff --git a/features/jest/dependencies/pom.xml b/features/jest/dependencies/pom.xml index 603a205fe6b4..eb3a43a72c8d 100644 --- a/features/jest/dependencies/pom.xml +++ b/features/jest/dependencies/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.jest - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.jest diff --git a/features/jest/feature/pom.xml b/features/jest/feature/pom.xml index d4b812410e8a..217f866800f3 100644 --- a/features/jest/feature/pom.xml +++ b/features/jest/feature/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.jest - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.jest opennms-jest diff --git a/features/jest/jest-complete-osgi/pom.xml b/features/jest/jest-complete-osgi/pom.xml index 1febeb55e3ac..2439d591c363 100644 --- a/features/jest/jest-complete-osgi/pom.xml +++ b/features/jest/jest-complete-osgi/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.jest - 22.0.1 + 22.0.2-SNAPSHOT diff --git a/features/jest/pom.xml b/features/jest/pom.xml index e9c86846be1d..b0771abd5c49 100644 --- a/features/jest/pom.xml +++ b/features/jest/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features org.opennms.features.jest diff --git a/features/jmx-config-generator/pom.xml b/features/jmx-config-generator/pom.xml index c0cb7e2b660d..a8c43e55f159 100644 --- a/features/jmx-config-generator/pom.xml +++ b/features/jmx-config-generator/pom.xml @@ -6,7 +6,7 @@ org.opennms.features org.opennms - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features jmxconfiggenerator diff --git a/features/juniper-tca-collector/pom.xml b/features/juniper-tca-collector/pom.xml index bc8bdd4f2d5b..d4d32edbd85a 100644 --- a/features/juniper-tca-collector/pom.xml +++ b/features/juniper-tca-collector/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/kafka/pom.xml b/features/kafka/pom.xml index 32388dbb9af6..29ba65b7c6e4 100644 --- a/features/kafka/pom.xml +++ b/features/kafka/pom.xml @@ -7,7 +7,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/kafka/producer/pom.xml b/features/kafka/producer/pom.xml index d96fa0115d65..2353b4fbe227 100644 --- a/features/kafka/producer/pom.xml +++ b/features/kafka/producer/pom.xml @@ -9,7 +9,7 @@ org.opennms.features org.opennms.features.kafka - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/ProtobufMapper.java b/features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/ProtobufMapper.java index baa7e28a4b8c..e614c01c6ea6 100644 --- a/features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/ProtobufMapper.java +++ b/features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/ProtobufMapper.java @@ -30,11 +30,13 @@ import java.util.Date; import java.util.Objects; +import java.util.concurrent.ExecutionException; import java.util.function.Consumer; import org.opennms.core.utils.InetAddressUtils; import org.opennms.features.kafka.producer.model.OpennmsModelProtos; import org.opennms.netmgt.config.api.EventConfDao; +import org.opennms.netmgt.dao.api.NodeDao; import org.opennms.netmgt.model.OnmsAlarm; import org.opennms.netmgt.model.OnmsCategory; import org.opennms.netmgt.model.OnmsEvent; @@ -45,14 +47,48 @@ import org.opennms.netmgt.model.OnmsSnmpInterface; import org.opennms.netmgt.model.PrimaryType; import org.opennms.netmgt.xml.event.Event; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.transaction.support.TransactionOperations; + +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; public class ProtobufMapper { + private static final Logger LOG = LoggerFactory.getLogger(ProtobufMapper.class); private final EventConfDao eventConfDao; + private final TransactionOperations transactionOperations; + private final NodeDao nodeDao; + private final LoadingCache nodeIdToCriteriaCache; - - public ProtobufMapper(EventConfDao eventConfDao) { + public ProtobufMapper(EventConfDao eventConfDao, TransactionOperations transactionOperations, + NodeDao nodeDao, long nodeIdToCriteriaMaxCacheSize) { this.eventConfDao = Objects.requireNonNull(eventConfDao); + this.transactionOperations = Objects.requireNonNull(transactionOperations); + this.nodeDao = Objects.requireNonNull(nodeDao); + + nodeIdToCriteriaCache = CacheBuilder.newBuilder() + .maximumSize(nodeIdToCriteriaMaxCacheSize) + .build(new CacheLoader() { + public OpennmsModelProtos.NodeCriteria load(Long nodeId) { + return transactionOperations.execute(status -> { + final OnmsNode node = nodeDao.get(nodeId.intValue()); + if (node != null && node.getForeignId() != null && node.getForeignSource() != null) { + return OpennmsModelProtos.NodeCriteria.newBuilder() + .setId(nodeId) + .setForeignId(node.getForeignId()) + .setForeignSource(node.getForeignSource()) + .build(); + } else { + return OpennmsModelProtos.NodeCriteria.newBuilder() + .setId(nodeId) + .build(); + } + }); + } + }); } public OpennmsModelProtos.Node.Builder toNode(OnmsNode node) { @@ -114,11 +150,23 @@ public OpennmsModelProtos.Event.Builder toEvent(Event event) { builder.setLogMessage(event.getLogmsg().getContent()); } if (event.getNodeid() != null) { + try { + builder.setNodeCriteria(nodeIdToCriteriaCache.get(event.getNodeid())); + } catch (ExecutionException e) { + LOG.warn("An error occurred when building node criteria for node with id: {}." + + " The node foreign source and foreign id (if set) will be missing from the event with id: {}.", + event.getNodeid(), event.getDbid(), e); + builder.setNodeCriteria(OpennmsModelProtos.NodeCriteria.newBuilder() + .setId(event.getNodeid())); + } // We only include the node id in the node criteria in when forwarding events // since the event does not currently contain the fs:fid or a reference to the node object. builder.setNodeCriteria(OpennmsModelProtos.NodeCriteria.newBuilder() .setId(event.getNodeid())); } + if (event.getInterface() != null) { + builder.setIpAddress(event.getInterface()); + } setTimeIfNotNull(event.getTime(), builder::setTime); @@ -203,6 +251,12 @@ public OpennmsModelProtos.Alarm.Builder toAlarm(OnmsAlarm alarm) { if (alarm.getNodeId() != null) { builder.setNodeCriteria(toNodeCriteria(alarm.getNode())); } + if (alarm.getManagedObjectInstance() != null) { + builder.setManagedObjectInstance(alarm.getManagedObjectInstance()); + } + if (alarm.getManagedObjectType() != null) { + builder.setManagedObjectType(alarm.getManagedObjectType()); + } OpennmsModelProtos.Alarm.Type type = OpennmsModelProtos.Alarm.Type.UNRECOGNIZED; if (alarm.getAlarmType() != null) { diff --git a/features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/model/OpennmsModelProtos.java b/features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/model/OpennmsModelProtos.java index f368a1811737..b24fcca6f275 100644 --- a/features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/model/OpennmsModelProtos.java +++ b/features/kafka/producer/src/main/java/org/opennms/features/kafka/producer/model/OpennmsModelProtos.java @@ -27,7 +27,7 @@ *******************************************************************************/ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: opennms.proto +// source: opennms-kafka-producer.proto package org.opennms.features.kafka.producer.model; @@ -1839,6 +1839,16 @@ org.opennms.features.kafka.producer.model.OpennmsModelProtos.EventParameterOrBui * .NodeCriteria node_criteria = 13; */ org.opennms.features.kafka.producer.model.OpennmsModelProtos.NodeCriteriaOrBuilder getNodeCriteriaOrBuilder(); + + /** + * string ip_address = 14; + */ + java.lang.String getIpAddress(); + /** + * string ip_address = 14; + */ + com.google.protobuf.ByteString + getIpAddressBytes(); } /** * Protobuf type {@code Event} @@ -1865,6 +1875,7 @@ private Event() { severity_ = 0; log_ = false; display_ = false; + ipAddress_ = ""; } @java.lang.Override @@ -1981,6 +1992,12 @@ private Event( break; } + case 114: { + java.lang.String s = input.readStringRequireUtf8(); + + ipAddress_ = s; + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -2296,6 +2313,40 @@ public org.opennms.features.kafka.producer.model.OpennmsModelProtos.NodeCriteria return getNodeCriteria(); } + public static final int IP_ADDRESS_FIELD_NUMBER = 14; + private volatile java.lang.Object ipAddress_; + /** + * string ip_address = 14; + */ + public java.lang.String getIpAddress() { + java.lang.Object ref = ipAddress_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + ipAddress_ = s; + return s; + } + } + /** + * string ip_address = 14; + */ + public com.google.protobuf.ByteString + getIpAddressBytes() { + java.lang.Object ref = ipAddress_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + ipAddress_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; @@ -2347,6 +2398,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (nodeCriteria_ != null) { output.writeMessage(13, getNodeCriteria()); } + if (!getIpAddressBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 14, ipAddress_); + } unknownFields.writeTo(output); } @@ -2402,6 +2456,9 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(13, getNodeCriteria()); } + if (!getIpAddressBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, ipAddress_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -2446,6 +2503,8 @@ public boolean equals(final java.lang.Object obj) { result = result && getNodeCriteria() .equals(other.getNodeCriteria()); } + result = result && getIpAddress() + .equals(other.getIpAddress()); result = result && unknownFields.equals(other.unknownFields); return result; } @@ -2492,6 +2551,8 @@ public int hashCode() { hash = (37 * hash) + NODE_CRITERIA_FIELD_NUMBER; hash = (53 * hash) + getNodeCriteria().hashCode(); } + hash = (37 * hash) + IP_ADDRESS_FIELD_NUMBER; + hash = (53 * hash) + getIpAddress().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -2656,6 +2717,8 @@ public Builder clear() { nodeCriteria_ = null; nodeCriteriaBuilder_ = null; } + ipAddress_ = ""; + return this; } @@ -2705,6 +2768,7 @@ public org.opennms.features.kafka.producer.model.OpennmsModelProtos.Event buildP } else { result.nodeCriteria_ = nodeCriteriaBuilder_.build(); } + result.ipAddress_ = ipAddress_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -2814,6 +2878,10 @@ public Builder mergeFrom(org.opennms.features.kafka.producer.model.OpennmsModelP if (other.hasNodeCriteria()) { mergeNodeCriteria(other.getNodeCriteria()); } + if (!other.getIpAddress().isEmpty()) { + ipAddress_ = other.ipAddress_; + onChanged(); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -3717,6 +3785,75 @@ public org.opennms.features.kafka.producer.model.OpennmsModelProtos.NodeCriteria } return nodeCriteriaBuilder_; } + + private java.lang.Object ipAddress_ = ""; + /** + * string ip_address = 14; + */ + public java.lang.String getIpAddress() { + java.lang.Object ref = ipAddress_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + ipAddress_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string ip_address = 14; + */ + public com.google.protobuf.ByteString + getIpAddressBytes() { + java.lang.Object ref = ipAddress_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + ipAddress_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string ip_address = 14; + */ + public Builder setIpAddress( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + ipAddress_ = value; + onChanged(); + return this; + } + /** + * string ip_address = 14; + */ + public Builder clearIpAddress() { + + ipAddress_ = getDefaultInstance().getIpAddress(); + onChanged(); + return this; + } + /** + * string ip_address = 14; + */ + public Builder setIpAddressBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + ipAddress_ = value; + onChanged(); + return this; + } public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); @@ -3933,6 +4070,26 @@ public interface AlarmOrBuilder extends */ com.google.protobuf.ByteString getClearKeyBytes(); + + /** + * string managed_object_instance = 20; + */ + java.lang.String getManagedObjectInstance(); + /** + * string managed_object_instance = 20; + */ + com.google.protobuf.ByteString + getManagedObjectInstanceBytes(); + + /** + * string managed_object_type = 21; + */ + java.lang.String getManagedObjectType(); + /** + * string managed_object_type = 21; + */ + com.google.protobuf.ByteString + getManagedObjectTypeBytes(); } /** * Protobuf type {@code Alarm} @@ -3964,6 +4121,8 @@ private Alarm() { ifIndex_ = 0; operatorInstructions_ = ""; clearKey_ = ""; + managedObjectInstance_ = ""; + managedObjectType_ = ""; } @java.lang.Override @@ -4119,6 +4278,18 @@ private Alarm( clearKey_ = s; break; } + case 162: { + java.lang.String s = input.readStringRequireUtf8(); + + managedObjectInstance_ = s; + break; + } + case 170: { + java.lang.String s = input.readStringRequireUtf8(); + + managedObjectType_ = s; + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -4684,6 +4855,74 @@ public java.lang.String getClearKey() { } } + public static final int MANAGED_OBJECT_INSTANCE_FIELD_NUMBER = 20; + private volatile java.lang.Object managedObjectInstance_; + /** + * string managed_object_instance = 20; + */ + public java.lang.String getManagedObjectInstance() { + java.lang.Object ref = managedObjectInstance_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + managedObjectInstance_ = s; + return s; + } + } + /** + * string managed_object_instance = 20; + */ + public com.google.protobuf.ByteString + getManagedObjectInstanceBytes() { + java.lang.Object ref = managedObjectInstance_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + managedObjectInstance_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int MANAGED_OBJECT_TYPE_FIELD_NUMBER = 21; + private volatile java.lang.Object managedObjectType_; + /** + * string managed_object_type = 21; + */ + public java.lang.String getManagedObjectType() { + java.lang.Object ref = managedObjectType_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + managedObjectType_ = s; + return s; + } + } + /** + * string managed_object_type = 21; + */ + public com.google.protobuf.ByteString + getManagedObjectTypeBytes() { + java.lang.Object ref = managedObjectType_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + managedObjectType_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; @@ -4753,6 +4992,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (!getClearKeyBytes().isEmpty()) { com.google.protobuf.GeneratedMessageV3.writeString(output, 19, clearKey_); } + if (!getManagedObjectInstanceBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 20, managedObjectInstance_); + } + if (!getManagedObjectTypeBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 21, managedObjectType_); + } unknownFields.writeTo(output); } @@ -4828,6 +5073,12 @@ public int getSerializedSize() { if (!getClearKeyBytes().isEmpty()) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(19, clearKey_); } + if (!getManagedObjectInstanceBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(20, managedObjectInstance_); + } + if (!getManagedObjectTypeBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(21, managedObjectType_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -4886,6 +5137,10 @@ public boolean equals(final java.lang.Object obj) { .equals(other.getOperatorInstructions()); result = result && getClearKey() .equals(other.getClearKey()); + result = result && getManagedObjectInstance() + .equals(other.getManagedObjectInstance()); + result = result && getManagedObjectType() + .equals(other.getManagedObjectType()); result = result && unknownFields.equals(other.unknownFields); return result; } @@ -4944,6 +5199,10 @@ public int hashCode() { hash = (53 * hash) + getOperatorInstructions().hashCode(); hash = (37 * hash) + CLEAR_KEY_FIELD_NUMBER; hash = (53 * hash) + getClearKey().hashCode(); + hash = (37 * hash) + MANAGED_OBJECT_INSTANCE_FIELD_NUMBER; + hash = (53 * hash) + getManagedObjectInstance().hashCode(); + hash = (37 * hash) + MANAGED_OBJECT_TYPE_FIELD_NUMBER; + hash = (53 * hash) + getManagedObjectType().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -5119,6 +5378,10 @@ public Builder clear() { clearKey_ = ""; + managedObjectInstance_ = ""; + + managedObjectType_ = ""; + return this; } @@ -5168,6 +5431,8 @@ public org.opennms.features.kafka.producer.model.OpennmsModelProtos.Alarm buildP result.ifIndex_ = ifIndex_; result.operatorInstructions_ = operatorInstructions_; result.clearKey_ = clearKey_; + result.managedObjectInstance_ = managedObjectInstance_; + result.managedObjectType_ = managedObjectType_; onBuilt(); return result; } @@ -5275,6 +5540,14 @@ public Builder mergeFrom(org.opennms.features.kafka.producer.model.OpennmsModelP clearKey_ = other.clearKey_; onChanged(); } + if (!other.getManagedObjectInstance().isEmpty()) { + managedObjectInstance_ = other.managedObjectInstance_; + onChanged(); + } + if (!other.getManagedObjectType().isEmpty()) { + managedObjectType_ = other.managedObjectType_; + onChanged(); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -6400,6 +6673,144 @@ public Builder setClearKeyBytes( onChanged(); return this; } + + private java.lang.Object managedObjectInstance_ = ""; + /** + * string managed_object_instance = 20; + */ + public java.lang.String getManagedObjectInstance() { + java.lang.Object ref = managedObjectInstance_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + managedObjectInstance_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string managed_object_instance = 20; + */ + public com.google.protobuf.ByteString + getManagedObjectInstanceBytes() { + java.lang.Object ref = managedObjectInstance_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + managedObjectInstance_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string managed_object_instance = 20; + */ + public Builder setManagedObjectInstance( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + managedObjectInstance_ = value; + onChanged(); + return this; + } + /** + * string managed_object_instance = 20; + */ + public Builder clearManagedObjectInstance() { + + managedObjectInstance_ = getDefaultInstance().getManagedObjectInstance(); + onChanged(); + return this; + } + /** + * string managed_object_instance = 20; + */ + public Builder setManagedObjectInstanceBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + managedObjectInstance_ = value; + onChanged(); + return this; + } + + private java.lang.Object managedObjectType_ = ""; + /** + * string managed_object_type = 21; + */ + public java.lang.String getManagedObjectType() { + java.lang.Object ref = managedObjectType_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + managedObjectType_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string managed_object_type = 21; + */ + public com.google.protobuf.ByteString + getManagedObjectTypeBytes() { + java.lang.Object ref = managedObjectType_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + managedObjectType_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string managed_object_type = 21; + */ + public Builder setManagedObjectType( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + managedObjectType_ = value; + onChanged(); + return this; + } + /** + * string managed_object_type = 21; + */ + public Builder clearManagedObjectType() { + + managedObjectType_ = getDefaultInstance().getManagedObjectType(); + onChanged(); + return this; + } + /** + * string managed_object_type = 21; + */ + public Builder setManagedObjectTypeBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + managedObjectType_ = value; + onChanged(); + return this; + } public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); @@ -11257,51 +11668,54 @@ public org.opennms.features.kafka.producer.model.OpennmsModelProtos.Node getDefa descriptor; static { java.lang.String[] descriptorData = { - "\n\ropennms.proto\"F\n\014NodeCriteria\022\n\n\002id\030\001 " + - "\001(\004\022\026\n\016foreign_source\030\002 \001(\t\022\022\n\nforeign_i" + - "d\030\003 \001(\t\";\n\016EventParameter\022\014\n\004name\030\001 \001(\t\022" + - "\r\n\005value\030\002 \001(\t\022\014\n\004type\030\003 \001(\t\"\221\002\n\005Event\022\n" + - "\n\002id\030\001 \001(\004\022\013\n\003uei\030\002 \001(\t\022\r\n\005label\030\003 \001(\t\022\014" + - "\n\004time\030\004 \001(\004\022\016\n\006source\030\005 \001(\t\022\"\n\tparamete" + - "r\030\006 \003(\0132\017.EventParameter\022\023\n\013create_time\030" + - "\007 \001(\004\022\023\n\013description\030\010 \001(\t\022\023\n\013log_messag" + - "e\030\t \001(\t\022\033\n\010severity\030\n \001(\0162\t.Severity\022\013\n\003" + - "log\030\013 \001(\010\022\017\n\007display\030\014 \001(\010\022$\n\rnode_crite" + - "ria\030\r \001(\0132\r.NodeCriteria\"\365\003\n\005Alarm\022\n\n\002id" + - "\030\001 \001(\004\022\013\n\003uei\030\002 \001(\t\022$\n\rnode_criteria\030\003 \001" + - "(\0132\r.NodeCriteria\022\022\n\nip_address\030\004 \001(\t\022\024\n" + - "\014service_name\030\005 \001(\t\022\025\n\rreduction_key\030\006 \001" + - "(\t\022\031\n\004type\030\007 \001(\0162\013.Alarm.Type\022\r\n\005count\030\010" + - " \001(\004\022\033\n\010severity\030\t \001(\0162\t.Severity\022\030\n\020fir" + - "st_event_time\030\n \001(\004\022\023\n\013description\030\013 \001(\t" + - "\022\023\n\013log_message\030\014 \001(\t\022\020\n\010ack_user\030\r \001(\t\022" + - "\020\n\010ack_time\030\016 \001(\004\022\032\n\nlast_event\030\017 \001(\0132\006." + - "Event\022\027\n\017last_event_time\030\020 \001(\004\022\020\n\010if_ind" + - "ex\030\021 \001(\r\022\035\n\025operator_instructions\030\022 \001(\t\022" + - "\021\n\tclear_key\030\023 \001(\t\"D\n\004Type\022\026\n\022PROBLEM_WI" + - "TH_CLEAR\020\000\022\t\n\005CLEAR\020\001\022\031\n\025PROBLEM_WITHOUT" + - "_CLEAR\020\002\"\275\001\n\013IpInterface\022\n\n\002id\030\001 \001(\004\022\022\n\n" + - "ip_address\030\002 \001(\t\022\020\n\010if_index\030\003 \001(\r\022.\n\014pr" + - "imary_type\030\004 \001(\0162\030.IpInterface.PrimaryTy" + - "pe\022\017\n\007service\030\005 \003(\t\";\n\013PrimaryType\022\013\n\007PR" + - "IMARY\020\000\022\r\n\tSECONDARY\020\001\022\020\n\014NOT_ELIGIBLE\020\002" + - "\"\317\001\n\rSnmpInterface\022\n\n\002id\030\001 \001(\004\022\020\n\010if_ind" + - "ex\030\002 \001(\r\022\020\n\010if_descr\030\003 \001(\t\022\017\n\007if_type\030\004 " + - "\001(\r\022\017\n\007if_name\030\005 \001(\t\022\020\n\010if_speed\030\006 \001(\004\022\027" + - "\n\017if_phys_address\030\007 \001(\t\022\027\n\017if_admin_stat" + - "us\030\010 \001(\r\022\026\n\016if_oper_status\030\t \001(\r\022\020\n\010if_a" + - "lias\030\n \001(\t\"\227\002\n\004Node\022\n\n\002id\030\001 \001(\004\022\026\n\016forei" + - "gn_source\030\002 \001(\t\022\022\n\nforeign_id\030\003 \001(\t\022\020\n\010l" + - "ocation\030\004 \001(\t\022\020\n\010category\030\005 \003(\t\022\r\n\005label" + - "\030\006 \001(\t\022\023\n\013create_time\030\007 \001(\004\022\023\n\013sys_conta" + - "ct\030\010 \001(\t\022\027\n\017sys_description\030\t \001(\t\022\025\n\rsys" + - "_object_id\030\n \001(\t\022\"\n\014ip_interface\030\013 \003(\0132\014" + - ".IpInterface\022&\n\016snmp_interface\030\014 \003(\0132\016.S" + - "nmpInterface*g\n\010Severity\022\021\n\rINDETERMINAT" + - "E\020\000\022\013\n\007CLEARED\020\001\022\n\n\006NORMAL\020\002\022\013\n\007WARNING\020" + - "\003\022\t\n\005MINOR\020\004\022\t\n\005MAJOR\020\005\022\014\n\010CRITICAL\020\006B?\n" + - ")org.opennms.features.kafka.producer.mod" + - "elB\022OpennmsModelProtosb\006proto3" + "\n\034opennms-kafka-producer.proto\"F\n\014NodeCr" + + "iteria\022\n\n\002id\030\001 \001(\004\022\026\n\016foreign_source\030\002 \001" + + "(\t\022\022\n\nforeign_id\030\003 \001(\t\";\n\016EventParameter" + + "\022\014\n\004name\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\022\014\n\004type\030\003 " + + "\001(\t\"\245\002\n\005Event\022\n\n\002id\030\001 \001(\004\022\013\n\003uei\030\002 \001(\t\022\r" + + "\n\005label\030\003 \001(\t\022\014\n\004time\030\004 \001(\004\022\016\n\006source\030\005 " + + "\001(\t\022\"\n\tparameter\030\006 \003(\0132\017.EventParameter\022" + + "\023\n\013create_time\030\007 \001(\004\022\023\n\013description\030\010 \001(" + + "\t\022\023\n\013log_message\030\t \001(\t\022\033\n\010severity\030\n \001(\016" + + "2\t.Severity\022\013\n\003log\030\013 \001(\010\022\017\n\007display\030\014 \001(" + + "\010\022$\n\rnode_criteria\030\r \001(\0132\r.NodeCriteria\022" + + "\022\n\nip_address\030\016 \001(\t\"\263\004\n\005Alarm\022\n\n\002id\030\001 \001(" + + "\004\022\013\n\003uei\030\002 \001(\t\022$\n\rnode_criteria\030\003 \001(\0132\r." + + "NodeCriteria\022\022\n\nip_address\030\004 \001(\t\022\024\n\014serv" + + "ice_name\030\005 \001(\t\022\025\n\rreduction_key\030\006 \001(\t\022\031\n" + + "\004type\030\007 \001(\0162\013.Alarm.Type\022\r\n\005count\030\010 \001(\004\022" + + "\033\n\010severity\030\t \001(\0162\t.Severity\022\030\n\020first_ev" + + "ent_time\030\n \001(\004\022\023\n\013description\030\013 \001(\t\022\023\n\013l" + + "og_message\030\014 \001(\t\022\020\n\010ack_user\030\r \001(\t\022\020\n\010ac" + + "k_time\030\016 \001(\004\022\032\n\nlast_event\030\017 \001(\0132\006.Event" + + "\022\027\n\017last_event_time\030\020 \001(\004\022\020\n\010if_index\030\021 " + + "\001(\r\022\035\n\025operator_instructions\030\022 \001(\t\022\021\n\tcl" + + "ear_key\030\023 \001(\t\022\037\n\027managed_object_instance" + + "\030\024 \001(\t\022\033\n\023managed_object_type\030\025 \001(\t\"D\n\004T" + + "ype\022\026\n\022PROBLEM_WITH_CLEAR\020\000\022\t\n\005CLEAR\020\001\022\031" + + "\n\025PROBLEM_WITHOUT_CLEAR\020\002\"\275\001\n\013IpInterfac" + + "e\022\n\n\002id\030\001 \001(\004\022\022\n\nip_address\030\002 \001(\t\022\020\n\010if_" + + "index\030\003 \001(\r\022.\n\014primary_type\030\004 \001(\0162\030.IpIn" + + "terface.PrimaryType\022\017\n\007service\030\005 \003(\t\";\n\013" + + "PrimaryType\022\013\n\007PRIMARY\020\000\022\r\n\tSECONDARY\020\001\022" + + "\020\n\014NOT_ELIGIBLE\020\002\"\317\001\n\rSnmpInterface\022\n\n\002i" + + "d\030\001 \001(\004\022\020\n\010if_index\030\002 \001(\r\022\020\n\010if_descr\030\003 " + + "\001(\t\022\017\n\007if_type\030\004 \001(\r\022\017\n\007if_name\030\005 \001(\t\022\020\n" + + "\010if_speed\030\006 \001(\004\022\027\n\017if_phys_address\030\007 \001(\t" + + "\022\027\n\017if_admin_status\030\010 \001(\r\022\026\n\016if_oper_sta" + + "tus\030\t \001(\r\022\020\n\010if_alias\030\n \001(\t\"\227\002\n\004Node\022\n\n\002" + + "id\030\001 \001(\004\022\026\n\016foreign_source\030\002 \001(\t\022\022\n\nfore" + + "ign_id\030\003 \001(\t\022\020\n\010location\030\004 \001(\t\022\020\n\010catego" + + "ry\030\005 \003(\t\022\r\n\005label\030\006 \001(\t\022\023\n\013create_time\030\007" + + " \001(\004\022\023\n\013sys_contact\030\010 \001(\t\022\027\n\017sys_descrip" + + "tion\030\t \001(\t\022\025\n\rsys_object_id\030\n \001(\t\022\"\n\014ip_" + + "interface\030\013 \003(\0132\014.IpInterface\022&\n\016snmp_in" + + "terface\030\014 \003(\0132\016.SnmpInterface*g\n\010Severit" + + "y\022\021\n\rINDETERMINATE\020\000\022\013\n\007CLEARED\020\001\022\n\n\006NOR" + + "MAL\020\002\022\013\n\007WARNING\020\003\022\t\n\005MINOR\020\004\022\t\n\005MAJOR\020\005" + + "\022\014\n\010CRITICAL\020\006B?\n)org.opennms.features.k" + + "afka.producer.modelB\022OpennmsModelProtosb" + + "\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -11332,13 +11746,13 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_Event_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_Event_descriptor, - new java.lang.String[] { "Id", "Uei", "Label", "Time", "Source", "Parameter", "CreateTime", "Description", "LogMessage", "Severity", "Log", "Display", "NodeCriteria", }); + new java.lang.String[] { "Id", "Uei", "Label", "Time", "Source", "Parameter", "CreateTime", "Description", "LogMessage", "Severity", "Log", "Display", "NodeCriteria", "IpAddress", }); internal_static_Alarm_descriptor = getDescriptor().getMessageTypes().get(3); internal_static_Alarm_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_Alarm_descriptor, - new java.lang.String[] { "Id", "Uei", "NodeCriteria", "IpAddress", "ServiceName", "ReductionKey", "Type", "Count", "Severity", "FirstEventTime", "Description", "LogMessage", "AckUser", "AckTime", "LastEvent", "LastEventTime", "IfIndex", "OperatorInstructions", "ClearKey", }); + new java.lang.String[] { "Id", "Uei", "NodeCriteria", "IpAddress", "ServiceName", "ReductionKey", "Type", "Count", "Severity", "FirstEventTime", "Description", "LogMessage", "AckUser", "AckTime", "LastEvent", "LastEventTime", "IfIndex", "OperatorInstructions", "ClearKey", "ManagedObjectInstance", "ManagedObjectType", }); internal_static_IpInterface_descriptor = getDescriptor().getMessageTypes().get(4); internal_static_IpInterface_fieldAccessorTable = new diff --git a/features/kafka/producer/src/main/proto/opennms-kafka-producer.proto b/features/kafka/producer/src/main/proto/opennms-kafka-producer.proto index 5b864944f386..e60d2ca708ba 100644 --- a/features/kafka/producer/src/main/proto/opennms-kafka-producer.proto +++ b/features/kafka/producer/src/main/proto/opennms-kafka-producer.proto @@ -40,6 +40,7 @@ message Event { bool log = 11; bool display = 12; NodeCriteria node_criteria = 13; + string ip_address = 14; } message Alarm { @@ -67,6 +68,9 @@ message Alarm { uint32 if_index = 17; string operator_instructions = 18; string clear_key = 19; + string managed_object_instance = 20; + string managed_object_type = 21; + } message IpInterface { diff --git a/features/kafka/producer/src/main/resources/OSGI-INF/blueprint/blueprint-kafka-producer.xml b/features/kafka/producer/src/main/resources/OSGI-INF/blueprint/blueprint-kafka-producer.xml index cf3f7f457e4b..c1f9181c17bf 100644 --- a/features/kafka/producer/src/main/resources/OSGI-INF/blueprint/blueprint-kafka-producer.xml +++ b/features/kafka/producer/src/main/resources/OSGI-INF/blueprint/blueprint-kafka-producer.xml @@ -20,6 +20,7 @@ + @@ -33,6 +34,9 @@ + + + diff --git a/features/kafka/producer/src/test/java/org/opennms/features/kafka/producer/KafkaForwarderIT.java b/features/kafka/producer/src/test/java/org/opennms/features/kafka/producer/KafkaForwarderIT.java index 802b4df49f9c..f8659abd0e5f 100644 --- a/features/kafka/producer/src/test/java/org/opennms/features/kafka/producer/KafkaForwarderIT.java +++ b/features/kafka/producer/src/test/java/org/opennms/features/kafka/producer/KafkaForwarderIT.java @@ -31,8 +31,10 @@ import static com.jayway.awaitility.Awaitility.await; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.hasItems; +import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; @@ -249,6 +251,15 @@ public void canProducerAndConsumeMessages() throws Exception { // Events, nodes and alarms were forwarded and consumed! + // Ensure that we have some events with a fs:fid + + List eventsWithFsAndFid = kafkaConsumer.getEvents().stream() + .filter(e -> e.getNodeCriteria() != null + && e.getNodeCriteria().getForeignId() != null + && e.getNodeCriteria().getForeignSource() != null) + .collect(Collectors.toList()); + assertThat(eventsWithFsAndFid, hasSize(greaterThanOrEqualTo(2))); + // Verify the consumed alarm object assertThat(kafkaConsumer.getAlarmByReductionKey(alarmReductionKey).getDescription(), equalTo("node down")); diff --git a/features/kafka/producer/src/test/resources/applicationContext-test-kafka-producer.xml b/features/kafka/producer/src/test/resources/applicationContext-test-kafka-producer.xml index 439c171393c4..403a2eec0951 100644 --- a/features/kafka/producer/src/test/resources/applicationContext-test-kafka-producer.xml +++ b/features/kafka/producer/src/test/resources/applicationContext-test-kafka-producer.xml @@ -15,6 +15,9 @@ + + + diff --git a/features/measurements/api/pom.xml b/features/measurements/api/pom.xml index 1ed91c9bbfcd..3aa2eb8acee9 100644 --- a/features/measurements/api/pom.xml +++ b/features/measurements/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.measurements - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.measurements diff --git a/features/measurements/impl/pom.xml b/features/measurements/impl/pom.xml index 3bfecdbc8cd9..56df3c9b6d08 100644 --- a/features/measurements/impl/pom.xml +++ b/features/measurements/impl/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.measurements - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.measurements diff --git a/features/measurements/pom.xml b/features/measurements/pom.xml index e57f18bc56b6..eebecb76267a 100644 --- a/features/measurements/pom.xml +++ b/features/measurements/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/measurements/rest/pom.xml b/features/measurements/rest/pom.xml index 8f4c63348a1e..c0867a77528a 100644 --- a/features/measurements/rest/pom.xml +++ b/features/measurements/rest/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.measurements - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.measurements diff --git a/features/mib-compiler/pom.xml b/features/mib-compiler/pom.xml index 4a07ff69f226..2cab15a46deb 100644 --- a/features/mib-compiler/pom.xml +++ b/features/mib-compiler/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/minion/container/extender/pom.xml b/features/minion/container/extender/pom.xml index 9e00f0062d65..baa7057f0857 100644 --- a/features/minion/container/extender/pom.xml +++ b/features/minion/container/extender/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion container-parent - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.minion.container diff --git a/features/minion/container/features/pom.xml b/features/minion/container/features/pom.xml index 102a5ecc602f..ca2516b09a1c 100644 --- a/features/minion/container/features/pom.xml +++ b/features/minion/container/features/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion container-parent - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.minion.container diff --git a/features/minion/container/karaf/pom.xml b/features/minion/container/karaf/pom.xml index aded9bfd2086..673631d92e70 100644 --- a/features/minion/container/karaf/pom.xml +++ b/features/minion/container/karaf/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion container-parent - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.minion.container diff --git a/features/minion/container/pom.xml b/features/minion/container/pom.xml index 074f04cc87d6..d5b2453acd01 100644 --- a/features/minion/container/pom.xml +++ b/features/minion/container/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion minion-parent - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 container-parent diff --git a/features/minion/container/scv/pom.xml b/features/minion/container/scv/pom.xml index a0f508533627..a8e64d6d1381 100644 --- a/features/minion/container/scv/pom.xml +++ b/features/minion/container/scv/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion container-parent - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.minion.container diff --git a/features/minion/core/api/pom.xml b/features/minion/core/api/pom.xml index 1cb8c10d631b..ff58288f02cd 100644 --- a/features/minion/core/api/pom.xml +++ b/features/minion/core/api/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion core-parent - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 core-api diff --git a/features/minion/core/features/pom.xml b/features/minion/core/features/pom.xml index 793b55652f75..9b4094b799fa 100644 --- a/features/minion/core/features/pom.xml +++ b/features/minion/core/features/pom.xml @@ -8,7 +8,7 @@ org.opennms.features.minion core-parent - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/minion/core/impl/pom.xml b/features/minion/core/impl/pom.xml index e88a05243387..bee7d49f1f0c 100644 --- a/features/minion/core/impl/pom.xml +++ b/features/minion/core/impl/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion core-parent - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 core-impl diff --git a/features/minion/core/jms/pom.xml b/features/minion/core/jms/pom.xml index 92309cf9cb1f..3ef3ea042480 100644 --- a/features/minion/core/jms/pom.xml +++ b/features/minion/core/jms/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion core-parent - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 jms diff --git a/features/minion/core/pom.xml b/features/minion/core/pom.xml index 318c003655fa..dbe6a951ae78 100644 --- a/features/minion/core/pom.xml +++ b/features/minion/core/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion minion-parent - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 core-parent diff --git a/features/minion/core/repository/pom.xml b/features/minion/core/repository/pom.xml index 9010d4aff79a..799d640fa3b3 100644 --- a/features/minion/core/repository/pom.xml +++ b/features/minion/core/repository/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion core-parent - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 core-repository diff --git a/features/minion/core/shell/pom.xml b/features/minion/core/shell/pom.xml index af8cc02444e3..9821b5bd9e29 100644 --- a/features/minion/core/shell/pom.xml +++ b/features/minion/core/shell/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion core-parent - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 shell diff --git a/features/minion/heartbeat/common/pom.xml b/features/minion/heartbeat/common/pom.xml index 30f8f89d6246..2ad62a256333 100644 --- a/features/minion/heartbeat/common/pom.xml +++ b/features/minion/heartbeat/common/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion org.opennms.features.minion.heartbeat - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.minion.heartbeat diff --git a/features/minion/heartbeat/consumer/pom.xml b/features/minion/heartbeat/consumer/pom.xml index ce61e759e9e4..bdf014501c4c 100644 --- a/features/minion/heartbeat/consumer/pom.xml +++ b/features/minion/heartbeat/consumer/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion org.opennms.features.minion.heartbeat - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.minion.heartbeat diff --git a/features/minion/heartbeat/pom.xml b/features/minion/heartbeat/pom.xml index ea03d8a64fa3..952b054f80bb 100644 --- a/features/minion/heartbeat/pom.xml +++ b/features/minion/heartbeat/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion minion-parent - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.minion.heartbeat diff --git a/features/minion/heartbeat/producer/pom.xml b/features/minion/heartbeat/producer/pom.xml index dce0fc209872..d427238c00bf 100644 --- a/features/minion/heartbeat/producer/pom.xml +++ b/features/minion/heartbeat/producer/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion org.opennms.features.minion.heartbeat - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.minion.heartbeat diff --git a/features/minion/pom.xml b/features/minion/pom.xml index 69c19746448d..35c5f7497896 100644 --- a/features/minion/pom.xml +++ b/features/minion/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.minion diff --git a/features/minion/repository/pom.xml b/features/minion/repository/pom.xml index 9e9f44221442..294878c70735 100644 --- a/features/minion/repository/pom.xml +++ b/features/minion/repository/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.minion minion-parent - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 repository diff --git a/features/minion/shell/collection/pom.xml b/features/minion/shell/collection/pom.xml index d7fde1e90d3c..80be016517b0 100644 --- a/features/minion/shell/collection/pom.xml +++ b/features/minion/shell/collection/pom.xml @@ -6,7 +6,7 @@ org.opennms.features.minion org.opennms.features.minion.shell - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.minion.shell diff --git a/features/minion/shell/poller/pom.xml b/features/minion/shell/poller/pom.xml index 8de7da2dbfad..5895893d50fb 100644 --- a/features/minion/shell/poller/pom.xml +++ b/features/minion/shell/poller/pom.xml @@ -6,7 +6,7 @@ org.opennms.features.minion org.opennms.features.minion.shell - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.minion.shell diff --git a/features/minion/shell/pom.xml b/features/minion/shell/pom.xml index 113ae5a2ee48..56787c6089a4 100644 --- a/features/minion/shell/pom.xml +++ b/features/minion/shell/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.minion minion-parent - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.minion.shell diff --git a/features/minion/shell/provision/pom.xml b/features/minion/shell/provision/pom.xml index 5f0346b93b37..d6b7a0500425 100644 --- a/features/minion/shell/provision/pom.xml +++ b/features/minion/shell/provision/pom.xml @@ -6,7 +6,7 @@ org.opennms.features.minion org.opennms.features.minion.shell - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.minion.shell diff --git a/features/name-cutter/pom.xml b/features/name-cutter/pom.xml index 75e5ec741df7..2c70f66ff8d9 100644 --- a/features/name-cutter/pom.xml +++ b/features/name-cutter/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features org.opennms.features.name-cutter diff --git a/features/ncs/ncs-alarm-gui/pom.xml b/features/ncs/ncs-alarm-gui/pom.xml index 3efbd2addff0..1b8636fca2fa 100644 --- a/features/ncs/ncs-alarm-gui/pom.xml +++ b/features/ncs/ncs-alarm-gui/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.ncs - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.ncs @@ -108,6 +108,12 @@ jcl-over-slf4j provided + + org.opennms + opennms-taglib + ${project.version} + provided + junit junit diff --git a/features/ncs/ncs-alarm-gui/src/main/webapp/WEB-INF/jsp/alarm/ncs-alarms.jsp b/features/ncs/ncs-alarm-gui/src/main/webapp/WEB-INF/jsp/alarm/ncs-alarms.jsp index 4d5631c00dcf..87d0ce5d5a53 100644 --- a/features/ncs/ncs-alarm-gui/src/main/webapp/WEB-INF/jsp/alarm/ncs-alarms.jsp +++ b/features/ncs/ncs-alarm-gui/src/main/webapp/WEB-INF/jsp/alarm/ncs-alarms.jsp @@ -71,7 +71,7 @@ <%@ page import="org.opennms.netmgt.model.OnmsEventParameter" %> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@taglib uri="onms-taglib" prefix="onms" %> <%-- This page is written to be the display (view) portion of the AlarmQueryServlet @@ -488,14 +488,14 @@ -   + ${addAfterFilter} ${addBeforeFilter}
-   + ${addAfterFilter} ${addBeforeFilter} diff --git a/features/ncs/ncs-drools/pom.xml b/features/ncs/ncs-drools/pom.xml index 7b4cd94a1954..9c63b4b8604b 100644 --- a/features/ncs/ncs-drools/pom.xml +++ b/features/ncs/ncs-drools/pom.xml @@ -34,7 +34,7 @@ org.opennms.features org.opennms.features.ncs - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.ncs diff --git a/features/ncs/ncs-model/pom.xml b/features/ncs/ncs-model/pom.xml index f7a2c7a54324..2760245cc4cc 100644 --- a/features/ncs/ncs-model/pom.xml +++ b/features/ncs/ncs-model/pom.xml @@ -2,7 +2,7 @@ org.opennms.features org.opennms.features.ncs - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.ncs diff --git a/features/ncs/ncs-northbounder/pom.xml b/features/ncs/ncs-northbounder/pom.xml index 0d0ceaafe049..e6bf69a1e0b4 100644 --- a/features/ncs/ncs-northbounder/pom.xml +++ b/features/ncs/ncs-northbounder/pom.xml @@ -2,7 +2,7 @@ org.opennms.features org.opennms.features.ncs - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.ncs diff --git a/features/ncs/ncs-persistence/pom.xml b/features/ncs/ncs-persistence/pom.xml index 38c5881d1c0f..a8f62d6711b5 100644 --- a/features/ncs/ncs-persistence/pom.xml +++ b/features/ncs/ncs-persistence/pom.xml @@ -2,7 +2,7 @@ org.opennms.features org.opennms.features.ncs - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.ncs diff --git a/features/ncs/ncs-test/pom.xml b/features/ncs/ncs-test/pom.xml index 968f6fa18bcd..f92901526bea 100644 --- a/features/ncs/ncs-test/pom.xml +++ b/features/ncs/ncs-test/pom.xml @@ -2,7 +2,7 @@ org.opennms.features org.opennms.features.ncs - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.ncs diff --git a/features/ncs/pom.xml b/features/ncs/pom.xml index 81007f2a5f64..bef522319eb2 100644 --- a/features/ncs/pom.xml +++ b/features/ncs/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/newts-repository-converter/pom.xml b/features/newts-repository-converter/pom.xml index fc91f3196d23..bb9963f5a034 100644 --- a/features/newts-repository-converter/pom.xml +++ b/features/newts-repository-converter/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/newts/pom.xml b/features/newts/pom.xml index cb403a5dabe1..13dbef12b852 100644 --- a/features/newts/pom.xml +++ b/features/newts/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/notifications/api/pom.xml b/features/notifications/api/pom.xml index b5fbb96d7b81..f9c5df07baa4 100644 --- a/features/notifications/api/pom.xml +++ b/features/notifications/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.notifications - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.notifications diff --git a/features/notifications/pom.xml b/features/notifications/pom.xml index e21fedb22dfc..734273e82acd 100644 --- a/features/notifications/pom.xml +++ b/features/notifications/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/notifications/sms-strategy/pom.xml b/features/notifications/sms-strategy/pom.xml index 57d28b8cce5d..45a52ba88d22 100644 --- a/features/notifications/sms-strategy/pom.xml +++ b/features/notifications/sms-strategy/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.notifications - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms diff --git a/features/notifications/ticket-strategy/pom.xml b/features/notifications/ticket-strategy/pom.xml index e705bc351a2f..9a2f54034b9f 100644 --- a/features/notifications/ticket-strategy/pom.xml +++ b/features/notifications/ticket-strategy/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.notifications - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.notifications diff --git a/features/nrtg/api/pom.xml b/features/nrtg/api/pom.xml index a3e2566edbcb..b438da9fc706 100644 --- a/features/nrtg/api/pom.xml +++ b/features/nrtg/api/pom.xml @@ -4,7 +4,7 @@ org.opennms.features nrtg - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.nrtg nrtg-api diff --git a/features/nrtg/broker/pom.xml b/features/nrtg/broker/pom.xml index ae895e011968..94123ebe6e98 100644 --- a/features/nrtg/broker/pom.xml +++ b/features/nrtg/broker/pom.xml @@ -4,7 +4,7 @@ org.opennms.features nrtg - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.nrtg nrtg-broker diff --git a/features/nrtg/commander/pom.xml b/features/nrtg/commander/pom.xml index 4c96cfc14e34..94a425673bc1 100644 --- a/features/nrtg/commander/pom.xml +++ b/features/nrtg/commander/pom.xml @@ -4,7 +4,7 @@ org.opennms.features nrtg - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.nrtg nrtg-commander diff --git a/features/nrtg/features/all/pom.xml b/features/nrtg/features/all/pom.xml index 4f12ff9c54fb..f86a47ef4a84 100644 --- a/features/nrtg/features/all/pom.xml +++ b/features/nrtg/features/all/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.nrtg features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.osgi.features.nrtg diff --git a/features/nrtg/features/api/pom.xml b/features/nrtg/features/api/pom.xml index dcef545657f1..c691b0091fc4 100644 --- a/features/nrtg/features/api/pom.xml +++ b/features/nrtg/features/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.nrtg features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.osgi.features.nrtg diff --git a/features/nrtg/features/commander/pom.xml b/features/nrtg/features/commander/pom.xml index b65c765f1076..ad667b7a9890 100644 --- a/features/nrtg/features/commander/pom.xml +++ b/features/nrtg/features/commander/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.nrtg features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.osgi.features.nrtg diff --git a/features/nrtg/features/nrtg-base/pom.xml b/features/nrtg/features/nrtg-base/pom.xml index ada51add64e9..1ead1d71f282 100644 --- a/features/nrtg/features/nrtg-base/pom.xml +++ b/features/nrtg/features/nrtg-base/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.nrtg features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.osgi.features.nrtg diff --git a/features/nrtg/features/nrtg-jms/pom.xml b/features/nrtg/features/nrtg-jms/pom.xml index 30abc8fb411d..c13d428067c4 100644 --- a/features/nrtg/features/nrtg-jms/pom.xml +++ b/features/nrtg/features/nrtg-jms/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.nrtg features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.osgi.features.nrtg diff --git a/features/nrtg/features/nrtg-local/pom.xml b/features/nrtg/features/nrtg-local/pom.xml index 8ef4fa2d0fc6..90ea70e38b45 100644 --- a/features/nrtg/features/nrtg-local/pom.xml +++ b/features/nrtg/features/nrtg-local/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.nrtg features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.osgi.features.nrtg diff --git a/features/nrtg/features/pom.xml b/features/nrtg/features/pom.xml index ac0dc3a9ecd2..5cb32e09293b 100644 --- a/features/nrtg/features/pom.xml +++ b/features/nrtg/features/pom.xml @@ -3,7 +3,7 @@ org.opennms.features nrtg - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.nrtg diff --git a/features/nrtg/features/protocolcollector/pom.xml b/features/nrtg/features/protocolcollector/pom.xml index 3a587e28bb86..72496e0b3af6 100644 --- a/features/nrtg/features/protocolcollector/pom.xml +++ b/features/nrtg/features/protocolcollector/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.nrtg features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.osgi.features.nrtg diff --git a/features/nrtg/features/protocolcollector/snmp/pom.xml b/features/nrtg/features/protocolcollector/snmp/pom.xml index e9e0978dbddb..059344757d49 100644 --- a/features/nrtg/features/protocolcollector/snmp/pom.xml +++ b/features/nrtg/features/protocolcollector/snmp/pom.xml @@ -3,7 +3,7 @@ org.opennms.osgi.features.nrtg osgi-nrtg-protocolcollector - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.osgi.features.nrtg.protocolcollector diff --git a/features/nrtg/features/protocolcollector/tca/pom.xml b/features/nrtg/features/protocolcollector/tca/pom.xml index 5056c35d86c1..164a63a597ab 100644 --- a/features/nrtg/features/protocolcollector/tca/pom.xml +++ b/features/nrtg/features/protocolcollector/tca/pom.xml @@ -3,7 +3,7 @@ org.opennms.osgi.features.nrtg osgi-nrtg-protocolcollector - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.osgi.features.nrtg.protocolcollector diff --git a/features/nrtg/features/web/pom.xml b/features/nrtg/features/web/pom.xml index 699764fd1c39..adcc34d5f84d 100644 --- a/features/nrtg/features/web/pom.xml +++ b/features/nrtg/features/web/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.nrtg features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.osgi.features.nrtg diff --git a/features/nrtg/jar/nrtcollector/pom.xml b/features/nrtg/jar/nrtcollector/pom.xml index 578be976c562..5f3df2cf967a 100644 --- a/features/nrtg/jar/nrtcollector/pom.xml +++ b/features/nrtg/jar/nrtcollector/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.nrtg jar - 22.0.1 + 22.0.2-SNAPSHOT nrtg-collector-standalone OpenNMS :: Features :: NRTG :: NRTCollector JAR diff --git a/features/nrtg/jar/pom.xml b/features/nrtg/jar/pom.xml index b01d9839c2c3..f78e553984e5 100644 --- a/features/nrtg/jar/pom.xml +++ b/features/nrtg/jar/pom.xml @@ -3,7 +3,7 @@ org.opennms.features nrtg - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.nrtg diff --git a/features/nrtg/nrtbroker-jms/pom.xml b/features/nrtg/nrtbroker-jms/pom.xml index 2c1d08177fe2..07556b1c0730 100644 --- a/features/nrtg/nrtbroker-jms/pom.xml +++ b/features/nrtg/nrtbroker-jms/pom.xml @@ -4,7 +4,7 @@ org.opennms.features nrtg - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.nrtg nrtg-nrtbroker-jms diff --git a/features/nrtg/nrtbroker-local/pom.xml b/features/nrtg/nrtbroker-local/pom.xml index 041009cebbb9..2f37cc33dbd8 100644 --- a/features/nrtg/nrtbroker-local/pom.xml +++ b/features/nrtg/nrtbroker-local/pom.xml @@ -5,7 +5,7 @@ org.opennms.features nrtg - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.nrtg nrtg-nrtbroker-local diff --git a/features/nrtg/nrtcollector/pom.xml b/features/nrtg/nrtcollector/pom.xml index 778126e24e23..8654a6d84b86 100644 --- a/features/nrtg/nrtcollector/pom.xml +++ b/features/nrtg/nrtcollector/pom.xml @@ -4,7 +4,7 @@ org.opennms.features nrtg - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.nrtg nrtg-collector diff --git a/features/nrtg/pom.xml b/features/nrtg/pom.xml index 5701bb1b971a..cd79436b2ec7 100644 --- a/features/nrtg/pom.xml +++ b/features/nrtg/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/nrtg/protocolcollector/pom.xml b/features/nrtg/protocolcollector/pom.xml index a6354facd7ad..fd67a6dd4c38 100644 --- a/features/nrtg/protocolcollector/pom.xml +++ b/features/nrtg/protocolcollector/pom.xml @@ -4,7 +4,7 @@ org.opennms.features nrtg - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.nrtg protocol-collectors diff --git a/features/nrtg/protocolcollector/snmp/pom.xml b/features/nrtg/protocolcollector/snmp/pom.xml index 43d60dce4b56..27f9b3b7758d 100644 --- a/features/nrtg/protocolcollector/snmp/pom.xml +++ b/features/nrtg/protocolcollector/snmp/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.nrtg protocol-collectors - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.nrtg.protocolcollector nrtg-protocolcollector-snmp diff --git a/features/nrtg/protocolcollector/tca/pom.xml b/features/nrtg/protocolcollector/tca/pom.xml index 37bdc6b02cad..65483df12ec4 100644 --- a/features/nrtg/protocolcollector/tca/pom.xml +++ b/features/nrtg/protocolcollector/tca/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.nrtg protocol-collectors - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.nrtg.protocolcollector nrtg-protocolcollector-tca diff --git a/features/nrtg/system-exports/pom.xml b/features/nrtg/system-exports/pom.xml index 5afdb2ec56a1..474bebefeebe 100644 --- a/features/nrtg/system-exports/pom.xml +++ b/features/nrtg/system-exports/pom.xml @@ -4,7 +4,7 @@ org.opennms.features nrtg - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.nrtg nrtg-system-exports diff --git a/features/nrtg/web/pom.xml b/features/nrtg/web/pom.xml index 75dc2aa722de..ebdaf331c410 100644 --- a/features/nrtg/web/pom.xml +++ b/features/nrtg/web/pom.xml @@ -4,7 +4,7 @@ org.opennms.features nrtg - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.nrtg nrtg-web diff --git a/features/opennms-es-rest/README.md b/features/opennms-es-rest/README.md index b6debbbb4bc1..3e8cc8784bf9 100644 --- a/features/opennms-es-rest/README.md +++ b/features/opennms-es-rest/README.md @@ -4,7 +4,7 @@ ~~~~ project groupId: org.opennms.plugins project name: opennms-es-rest -version: 22.0.1 +version: 22.0.2-SNAPSHOT ~~~~ ### Description @@ -30,10 +30,10 @@ To install the feature in karaf use ~~~~ -karaf@root> feature:addurl mvn:org.opennms.features/org.opennms.features.opennms-es-rest/22.0.1/xml/features +karaf@root> feature:addurl mvn:org.opennms.features/org.opennms.features.opennms-es-rest/22.0.2-SNAPSHOT/xml/features karaf@root> feature:install opennms-es-rest -(or feature:install opennms-es-rest/22.0.1 for a specific version of the feature) +(or feature:install opennms-es-rest/22.0.2-SNAPSHOT for a specific version of the feature) ~~~~ Example searches to use in Kibana Sense diff --git a/features/opennms-es-rest/pom.xml b/features/opennms-es-rest/pom.xml index c59d63fe9d1f..cb0666c26611 100644 --- a/features/opennms-es-rest/pom.xml +++ b/features/opennms-es-rest/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/opennms-osgi-core-rest/pom.xml b/features/opennms-osgi-core-rest/pom.xml index e0ff9e4688cc..1136ad6faa62 100644 --- a/features/opennms-osgi-core-rest/pom.xml +++ b/features/opennms-osgi-core-rest/pom.xml @@ -5,7 +5,7 @@ ../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.osgi diff --git a/features/opennms-osgi-core/pom.xml b/features/opennms-osgi-core/pom.xml index 32965fadbc9a..601c800138c5 100644 --- a/features/opennms-osgi-core/pom.xml +++ b/features/opennms-osgi-core/pom.xml @@ -6,7 +6,7 @@ ../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT diff --git a/features/osgi-jsr223/pom.xml b/features/osgi-jsr223/pom.xml index 0cec7d86f809..c9d646534793 100644 --- a/features/osgi-jsr223/pom.xml +++ b/features/osgi-jsr223/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/poller/api/pom.xml b/features/poller/api/pom.xml index 45e1c23ea3e9..f45f56a7e31f 100644 --- a/features/poller/api/pom.xml +++ b/features/poller/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.poller - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.poller diff --git a/features/poller/client-rpc/pom.xml b/features/poller/client-rpc/pom.xml index fd062538793b..58b4e2d81d5f 100644 --- a/features/poller/client-rpc/pom.xml +++ b/features/poller/client-rpc/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.poller - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.poller diff --git a/features/poller/monitors/core/pom.xml b/features/poller/monitors/core/pom.xml index baec65b079b2..3e7f16dd2804 100644 --- a/features/poller/monitors/core/pom.xml +++ b/features/poller/monitors/core/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.poller org.opennms.features.poller.monitors - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.poller.monitors diff --git a/features/poller/monitors/pom.xml b/features/poller/monitors/pom.xml index 8f4bb6bd6554..ddc07e0f24d5 100644 --- a/features/poller/monitors/pom.xml +++ b/features/poller/monitors/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.poller - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.poller diff --git a/features/poller/pom.xml b/features/poller/pom.xml index 229d85115911..ee0c14aff1d0 100644 --- a/features/poller/pom.xml +++ b/features/poller/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/poller/remote/pom.xml b/features/poller/remote/pom.xml index 485080a9ce09..9ec17e174d80 100644 --- a/features/poller/remote/pom.xml +++ b/features/poller/remote/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.poller - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.poller diff --git a/features/poller/runtime/pom.xml b/features/poller/runtime/pom.xml index 1f6c42e8766f..e8f4b95c1fda 100644 --- a/features/poller/runtime/pom.xml +++ b/features/poller/runtime/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.poller - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.poller diff --git a/features/poller/shell/pom.xml b/features/poller/shell/pom.xml index 0968da65e763..caa93c23fa7b 100644 --- a/features/poller/shell/pom.xml +++ b/features/poller/shell/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.poller - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.poller diff --git a/features/pom.xml b/features/pom.xml index d1ddf5ef0912..6241972b9a71 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/provisioning/api/pom.xml b/features/provisioning/api/pom.xml index 3095a2f3d01b..ad8c7f9c58cb 100644 --- a/features/provisioning/api/pom.xml +++ b/features/provisioning/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.provisioning - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.provisioning diff --git a/features/provisioning/lib/pom.xml b/features/provisioning/lib/pom.xml index 0ef5bccb0b2a..f1a3c0a99626 100644 --- a/features/provisioning/lib/pom.xml +++ b/features/provisioning/lib/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.provisioning - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.provisioning diff --git a/features/provisioning/pom.xml b/features/provisioning/pom.xml index 4b1f3aaeceb4..0d5056b02bae 100644 --- a/features/provisioning/pom.xml +++ b/features/provisioning/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/remote-poller-gwt/pom.xml b/features/remote-poller-gwt/pom.xml index bad38db6fd4c..728e7eb7667b 100644 --- a/features/remote-poller-gwt/pom.xml +++ b/features/remote-poller-gwt/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/remote-poller-jnlp/pom.xml b/features/remote-poller-jnlp/pom.xml index 0da02a653045..220f850d92b6 100644 --- a/features/remote-poller-jnlp/pom.xml +++ b/features/remote-poller-jnlp/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/remote-poller/pom.xml b/features/remote-poller/pom.xml index da4f24712554..de52c82341b8 100644 --- a/features/remote-poller/pom.xml +++ b/features/remote-poller/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/reporting/api/pom.xml b/features/reporting/api/pom.xml index 8e279e4bad46..d86f3d66db43 100644 --- a/features/reporting/api/pom.xml +++ b/features/reporting/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.reporting - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.reporting diff --git a/features/reporting/availability/pom.xml b/features/reporting/availability/pom.xml index 4921648110f7..f2bc8964d95e 100644 --- a/features/reporting/availability/pom.xml +++ b/features/reporting/availability/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.reporting - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.reporting diff --git a/features/reporting/core/pom.xml b/features/reporting/core/pom.xml index 3887eb6fdee7..99d882780a78 100644 --- a/features/reporting/core/pom.xml +++ b/features/reporting/core/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.reporting - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.reporting diff --git a/features/reporting/dao/pom.xml b/features/reporting/dao/pom.xml index 81d84246646c..b006c09639cd 100644 --- a/features/reporting/dao/pom.xml +++ b/features/reporting/dao/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.reporting - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.reporting diff --git a/features/reporting/jasper-reports-compiler/pom.xml b/features/reporting/jasper-reports-compiler/pom.xml index 509da985140e..21159b025416 100644 --- a/features/reporting/jasper-reports-compiler/pom.xml +++ b/features/reporting/jasper-reports-compiler/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.reporting - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.reporting diff --git a/features/reporting/jasper-reports-filter/pom.xml b/features/reporting/jasper-reports-filter/pom.xml index d04f6006da84..ee6e22d285f9 100644 --- a/features/reporting/jasper-reports-filter/pom.xml +++ b/features/reporting/jasper-reports-filter/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.reporting - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.reporting diff --git a/features/reporting/jasper-reports/pom.xml b/features/reporting/jasper-reports/pom.xml index 8355849ddd91..b2bba2720193 100644 --- a/features/reporting/jasper-reports/pom.xml +++ b/features/reporting/jasper-reports/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.reporting - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.reporting diff --git a/features/reporting/model/pom.xml b/features/reporting/model/pom.xml index 89e70390b1ae..9d72e00d6c05 100644 --- a/features/reporting/model/pom.xml +++ b/features/reporting/model/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.reporting - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.reporting diff --git a/features/reporting/pom.xml b/features/reporting/pom.xml index 7f0d1a04ce19..b2ae7864bcb3 100644 --- a/features/reporting/pom.xml +++ b/features/reporting/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/reporting/repository/pom.xml b/features/reporting/repository/pom.xml index 184d0e60e6e9..0d490d02d4ca 100644 --- a/features/reporting/repository/pom.xml +++ b/features/reporting/repository/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.reporting - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.reporting diff --git a/features/reporting/sdo/pom.xml b/features/reporting/sdo/pom.xml index fb1c59e9f65f..4ff3e8d5bf4e 100644 --- a/features/reporting/sdo/pom.xml +++ b/features/reporting/sdo/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.reporting - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.reporting diff --git a/features/request-tracker/pom.xml b/features/request-tracker/pom.xml index 62b1a671d650..a8e010a51baf 100644 --- a/features/request-tracker/pom.xml +++ b/features/request-tracker/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/resource-cli/pom.xml b/features/resource-cli/pom.xml index df473ebb413e..1e1c0960b0fa 100644 --- a/features/resource-cli/pom.xml +++ b/features/resource-cli/pom.xml @@ -6,7 +6,7 @@ org.opennms.features org.opennms - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features resource-cli diff --git a/features/rest-provider/pom.xml b/features/rest-provider/pom.xml index c9c983e4457e..b56a3105153d 100644 --- a/features/rest-provider/pom.xml +++ b/features/rest-provider/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/rest/common/pom.xml b/features/rest/common/pom.xml index 0f61b668467f..c4796c77d65c 100644 --- a/features/rest/common/pom.xml +++ b/features/rest/common/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.rest - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.rest diff --git a/features/rest/mapper/pom.xml b/features/rest/mapper/pom.xml index b5d2f3067e71..b7d0f8344022 100644 --- a/features/rest/mapper/pom.xml +++ b/features/rest/mapper/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.rest - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.rest diff --git a/features/rest/model/pom.xml b/features/rest/model/pom.xml index 64303eaedc9e..a03f34791f26 100644 --- a/features/rest/model/pom.xml +++ b/features/rest/model/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.rest - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.rest diff --git a/features/rest/pom.xml b/features/rest/pom.xml index 0d05d2afbb71..4a817ad38422 100644 --- a/features/rest/pom.xml +++ b/features/rest/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/root-webapp/pom.xml b/features/root-webapp/pom.xml index 6a2f5290b6a5..91c9abcfcf2f 100644 --- a/features/root-webapp/pom.xml +++ b/features/root-webapp/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/scv/api/pom.xml b/features/scv/api/pom.xml index 1c8bee40efed..3ec313d679df 100644 --- a/features/scv/api/pom.xml +++ b/features/scv/api/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.scv - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.scv diff --git a/features/scv/jceks-impl/pom.xml b/features/scv/jceks-impl/pom.xml index 32550cb893ee..8c787eb1ab45 100644 --- a/features/scv/jceks-impl/pom.xml +++ b/features/scv/jceks-impl/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.scv - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.scv diff --git a/features/scv/pom.xml b/features/scv/pom.xml index 6ec3958303a6..ff8b71094c19 100644 --- a/features/scv/pom.xml +++ b/features/scv/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/scv/scvcli/pom.xml b/features/scv/scvcli/pom.xml index 079e8365261a..afa62b7de7b1 100644 --- a/features/scv/scvcli/pom.xml +++ b/features/scv/scvcli/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.scv - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.scv diff --git a/features/scv/shell/pom.xml b/features/scv/shell/pom.xml index c815dc9e5c27..e6763d103ae7 100644 --- a/features/scv/shell/pom.xml +++ b/features/scv/shell/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.scv - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.scv diff --git a/features/springframework-security/pom.xml b/features/springframework-security/pom.xml index 344967b8cd99..f2c8d1c76344 100644 --- a/features/springframework-security/pom.xml +++ b/features/springframework-security/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/status/api/pom.xml b/features/status/api/pom.xml index 3be228235d8c..4e6b862cd06e 100644 --- a/features/status/api/pom.xml +++ b/features/status/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.status - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.status diff --git a/features/status/pom.xml b/features/status/pom.xml index 82e08f6d8248..96174f9bff26 100644 --- a/features/status/pom.xml +++ b/features/status/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/status/rest/pom.xml b/features/status/rest/pom.xml index 1987b2976d09..67d8353034a4 100644 --- a/features/status/rest/pom.xml +++ b/features/status/rest/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.status - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.status diff --git a/features/system-report/pom.xml b/features/system-report/pom.xml index 1819a5f5a871..e1bcbfee1b47 100644 --- a/features/system-report/pom.xml +++ b/features/system-report/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features org.opennms.features.system-report diff --git a/features/telemetry/adapters/api/pom.xml b/features/telemetry/adapters/api/pom.xml index 4e7d86f830a7..df77212bb2ed 100644 --- a/features/telemetry/adapters/api/pom.xml +++ b/features/telemetry/adapters/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.adapters - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.telemetry.adapters diff --git a/features/telemetry/adapters/collection/pom.xml b/features/telemetry/adapters/collection/pom.xml index 8046f40155fd..6df0d7a63d7e 100644 --- a/features/telemetry/adapters/collection/pom.xml +++ b/features/telemetry/adapters/collection/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.adapters - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.telemetry.adapters diff --git a/features/telemetry/adapters/jti/pom.xml b/features/telemetry/adapters/jti/pom.xml index de2b1b99ad86..03fe5c7ab755 100644 --- a/features/telemetry/adapters/jti/pom.xml +++ b/features/telemetry/adapters/jti/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.adapters - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.telemetry.adapters diff --git a/features/telemetry/adapters/netflow/pom.xml b/features/telemetry/adapters/netflow/pom.xml index e6697be00239..841f77e47a96 100644 --- a/features/telemetry/adapters/netflow/pom.xml +++ b/features/telemetry/adapters/netflow/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.adapters - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.telemetry.adapters diff --git a/features/telemetry/adapters/netflow/src/main/java/org/opennms/netmgt/telemetry/adapters/netflow/AbstractAdapter.java b/features/telemetry/adapters/netflow/src/main/java/org/opennms/netmgt/telemetry/adapters/netflow/AbstractAdapter.java index 6bf3076141c8..d1ca57b5bdc0 100644 --- a/features/telemetry/adapters/netflow/src/main/java/org/opennms/netmgt/telemetry/adapters/netflow/AbstractAdapter.java +++ b/features/telemetry/adapters/netflow/src/main/java/org/opennms/netmgt/telemetry/adapters/netflow/AbstractAdapter.java @@ -92,6 +92,7 @@ public void handleMessageLog(TelemetryMessageLog messageLog) { LOG.trace("Parsing packet: {}", eachMessage); final P flowPacket = parse(eachMessage); if (flowPacket != null) { + flowPackets.add(flowPacket); flows.addAll(converter.convert(flowPacket)); } } @@ -99,7 +100,7 @@ public void handleMessageLog(TelemetryMessageLog messageLog) { } try { - LOG.debug("Persisting {} packets.", flowPackets.size()); + LOG.debug("Persisting {} packets, {} flows.", flowPackets.size(), flows.size()); final FlowSource source = new FlowSource(messageLog.getLocation(), messageLog.getSourceAddress()); flowRepository.persist(flows, source); } catch (FlowException ex) { diff --git a/features/telemetry/adapters/nxos/pom.xml b/features/telemetry/adapters/nxos/pom.xml index 158e3f56ec0e..2be59df53b5c 100644 --- a/features/telemetry/adapters/nxos/pom.xml +++ b/features/telemetry/adapters/nxos/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.adapters - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.telemetry.adapters diff --git a/features/telemetry/adapters/pom.xml b/features/telemetry/adapters/pom.xml index 27cfd83aba44..801fad0c11c2 100644 --- a/features/telemetry/adapters/pom.xml +++ b/features/telemetry/adapters/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.telemetry - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.telemetry diff --git a/features/telemetry/adapters/registry/pom.xml b/features/telemetry/adapters/registry/pom.xml index f0bbbea414ac..9dc6a51ebe20 100644 --- a/features/telemetry/adapters/registry/pom.xml +++ b/features/telemetry/adapters/registry/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.adapters - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.telemetry.adapters diff --git a/features/telemetry/common/pom.xml b/features/telemetry/common/pom.xml index ae085d400b2b..d76614d34163 100644 --- a/features/telemetry/common/pom.xml +++ b/features/telemetry/common/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.telemetry - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.telemetry diff --git a/features/telemetry/config/api/pom.xml b/features/telemetry/config/api/pom.xml index b8137f3bcfd0..63d2d1b372f2 100644 --- a/features/telemetry/config/api/pom.xml +++ b/features/telemetry/config/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.config - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.telemetry.config diff --git a/features/telemetry/config/jaxb/pom.xml b/features/telemetry/config/jaxb/pom.xml index 23a27d62d38c..d100a3e1e1e0 100644 --- a/features/telemetry/config/jaxb/pom.xml +++ b/features/telemetry/config/jaxb/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.config - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.telemetry.config diff --git a/features/telemetry/config/pom.xml b/features/telemetry/config/pom.xml index 832b492b8d1d..3af176b6f1fa 100644 --- a/features/telemetry/config/pom.xml +++ b/features/telemetry/config/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.telemetry - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.telemetry diff --git a/features/telemetry/daemon/pom.xml b/features/telemetry/daemon/pom.xml index 3a8bd4e70712..934833eb4bb9 100644 --- a/features/telemetry/daemon/pom.xml +++ b/features/telemetry/daemon/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.telemetry - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.telemetry diff --git a/features/telemetry/itests/pom.xml b/features/telemetry/itests/pom.xml index 4c7d08d9a4f6..79e115620715 100644 --- a/features/telemetry/itests/pom.xml +++ b/features/telemetry/itests/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.telemetry - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.telemetry diff --git a/features/telemetry/listeners/api/pom.xml b/features/telemetry/listeners/api/pom.xml index c593e4a0b012..2b6fbfb0464a 100644 --- a/features/telemetry/listeners/api/pom.xml +++ b/features/telemetry/listeners/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.listeners - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.telemetry.listeners diff --git a/features/telemetry/listeners/flow/pom.xml b/features/telemetry/listeners/flow/pom.xml index 11cdf9da0ebc..04a1388c243a 100644 --- a/features/telemetry/listeners/flow/pom.xml +++ b/features/telemetry/listeners/flow/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.listeners - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.telemetry.listeners diff --git a/features/telemetry/listeners/pom.xml b/features/telemetry/listeners/pom.xml index 64ff6bb584a5..38998faf898c 100644 --- a/features/telemetry/listeners/pom.xml +++ b/features/telemetry/listeners/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.telemetry - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.telemetry diff --git a/features/telemetry/listeners/sflow/pom.xml b/features/telemetry/listeners/sflow/pom.xml index 4df6af2d6ab4..b3013c6a952d 100644 --- a/features/telemetry/listeners/sflow/pom.xml +++ b/features/telemetry/listeners/sflow/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.listeners - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.telemetry.listeners diff --git a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/Actor.java b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/Actor.java index 4d2359e2bac1..1f643cc404f8 100644 --- a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/Actor.java +++ b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/Actor.java @@ -54,7 +54,7 @@ public String toString() { } public void writeBson(final BsonWriter bsonWriter) { - bsonWriter.writeStartArray(); + bsonWriter.writeStartArray("actor"); for(final Utf8string utf8string : this.actor) { utf8string.writeBson(bsonWriter); } diff --git a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/AppInitiator.java b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/AppInitiator.java index fce30fca40cc..a11c16749a74 100644 --- a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/AppInitiator.java +++ b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/AppInitiator.java @@ -55,6 +55,8 @@ public String toString() { @Override public void writeBson(final BsonWriter bsonWriter) { + bsonWriter.writeStartDocument(); this.actor.writeBson(bsonWriter); + bsonWriter.writeEndDocument(); } } diff --git a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/AppTarget.java b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/AppTarget.java index 3b3965784eee..95596d3cb349 100644 --- a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/AppTarget.java +++ b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/AppTarget.java @@ -55,6 +55,8 @@ public String toString() { @Override public void writeBson(final BsonWriter bsonWriter) { + bsonWriter.writeStartDocument(); this.actor.writeBson(bsonWriter); + bsonWriter.writeEndDocument(); } } diff --git a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/AsPathType.java b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/AsPathType.java index 997bd6344726..c27be92cf429 100644 --- a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/AsPathType.java +++ b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/AsPathType.java @@ -77,7 +77,6 @@ public String toString() { public void writeBson(final BsonWriter bsonWriter) { bsonWriter.writeStartDocument(); - bsonWriter.writeName("type"); this.type.writeBson(bsonWriter); switch (this.type) { diff --git a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/Context.java b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/Context.java index 6243d4eccf4a..0415703797a9 100644 --- a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/Context.java +++ b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/Context.java @@ -63,8 +63,11 @@ public String toString() { public void writeBson(final BsonWriter bsonWriter) { bsonWriter.writeStartDocument(); + bsonWriter.writeName("application"); this.application.writeBson(bsonWriter); + bsonWriter.writeName("operation"); this.operation.writeBson(bsonWriter); + bsonWriter.writeName("attributes"); this.attributes.writeBson(bsonWriter); bsonWriter.writeEndDocument(); } diff --git a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/CounterRecord.java b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/CounterRecord.java index 443c80e746cd..147a893e05c9 100644 --- a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/CounterRecord.java +++ b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/CounterRecord.java @@ -44,7 +44,7 @@ // }; public class CounterRecord extends Record { - private static Map> counterDataFormats = ImmutableMap.>builder() + protected static Map> counterDataFormats = ImmutableMap.>builder() .put(DataFormat.from(0, 1), IfCounters::new) .put(DataFormat.from(0, 2), EthernetCounters::new) .put(DataFormat.from(0, 3), TokenringCounters::new) diff --git a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/Extended80211Aggregation.java b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/Extended80211Aggregation.java index 971d2a530bd8..225037c1f388 100644 --- a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/Extended80211Aggregation.java +++ b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/Extended80211Aggregation.java @@ -57,12 +57,14 @@ public String toString() { @Override public void writeBson(final BsonWriter bsonWriter) { - bsonWriter.writeStartArray(); + bsonWriter.writeStartDocument(); + bsonWriter.writeStartArray("pdus"); for (final Pdu pdu : this.pdus) { pdu.writeBson(bsonWriter); } bsonWriter.writeEndArray(); + bsonWriter.writeEndDocument(); } } diff --git a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedBstEgressQueue.java b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedBstEgressQueue.java index d8424f566393..726744e4ff64 100644 --- a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedBstEgressQueue.java +++ b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedBstEgressQueue.java @@ -56,6 +56,8 @@ public String toString() { @Override public void writeBson(final BsonWriter bsonWriter) { - bsonWriter.writeInt64(this.queue); + bsonWriter.writeStartDocument(); + bsonWriter.writeInt64("queue", this.queue); + bsonWriter.writeEndDocument(); } } diff --git a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedDecapsulateEgress.java b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedDecapsulateEgress.java index 1d9719cef203..01ad07d4c08c 100644 --- a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedDecapsulateEgress.java +++ b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedDecapsulateEgress.java @@ -56,7 +56,9 @@ public String toString() { @Override public void writeBson(final BsonWriter bsonWriter) { - bsonWriter.writeInt64(this.inner_header_offset); + bsonWriter.writeStartDocument(); + bsonWriter.writeInt64("inner_header_offset", this.inner_header_offset); + bsonWriter.writeEndDocument(); } } diff --git a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedDecapsulateIngress.java b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedDecapsulateIngress.java index 0b674ef896da..c0033dbc381e 100644 --- a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedDecapsulateIngress.java +++ b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedDecapsulateIngress.java @@ -56,6 +56,8 @@ public String toString() { @Override public void writeBson(final BsonWriter bsonWriter) { - bsonWriter.writeInt64(this.inner_header_offset); + bsonWriter.writeStartDocument(); + bsonWriter.writeInt64("inner_header_offset", this.inner_header_offset); + bsonWriter.writeEndDocument(); } } diff --git a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedGateway.java b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedGateway.java index 970dbd648b57..7d46804455c3 100644 --- a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedGateway.java +++ b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedGateway.java @@ -56,7 +56,7 @@ public class ExtendedGateway implements FlowData { public final long src_as; public final long src_peer_as; public final Array dst_as_path; - public final Array communities; + public final Array communities; public final long localpref; public ExtendedGateway(final ByteBuffer buffer) throws InvalidPacketException { @@ -98,8 +98,8 @@ public void writeBson(final BsonWriter bsonWriter) { bsonWriter.writeEndArray(); bsonWriter.writeStartArray("communities"); - for (final UnsignedInteger unsignedInteger : this.communities) { - bsonWriter.writeInt64(unsignedInteger.longValue()); + for (final Long longValue : this.communities) { + bsonWriter.writeInt64(longValue); } bsonWriter.writeEndArray(); diff --git a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedMplsLdpFec.java b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedMplsLdpFec.java index 7bf00d096090..a3a4fe29444a 100644 --- a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedMplsLdpFec.java +++ b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedMplsLdpFec.java @@ -56,6 +56,8 @@ public String toString() { @Override public void writeBson(final BsonWriter bsonWriter) { - bsonWriter.writeInt64(this.mplsFecAddrPrefixLength); + bsonWriter.writeStartDocument(); + bsonWriter.writeInt64("mplsFecAddrPrefixLength", this.mplsFecAddrPrefixLength); + bsonWriter.writeEndDocument(); } } diff --git a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedVlantunnel.java b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedVlantunnel.java index 7fd69f65d573..80b23bf1bafd 100644 --- a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedVlantunnel.java +++ b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedVlantunnel.java @@ -47,7 +47,7 @@ // }; public class ExtendedVlantunnel implements FlowData { - public final Array stack; + public final Array stack; @Override public String toString() { @@ -62,10 +62,13 @@ public ExtendedVlantunnel(final ByteBuffer buffer) throws InvalidPacketException @Override public void writeBson(final BsonWriter bsonWriter) { - bsonWriter.writeStartArray(); - for (final UnsignedInteger unsignedInteger : stack) { - bsonWriter.writeInt64(unsignedInteger.longValue()); + bsonWriter.writeStartDocument(); + bsonWriter.writeStartArray("stack"); + for (final Long longValue : this.stack) { + bsonWriter.writeInt64(longValue); } + bsonWriter.writeEndArray(); + bsonWriter.writeEndDocument(); } } diff --git a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedVniEgress.java b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedVniEgress.java index 2cba5b98d696..debbe827a2c1 100644 --- a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedVniEgress.java +++ b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedVniEgress.java @@ -56,6 +56,8 @@ public ExtendedVniEgress(final ByteBuffer buffer) throws InvalidPacketException @Override public void writeBson(final BsonWriter bsonWriter) { - bsonWriter.writeInt64(this.vni); + bsonWriter.writeStartDocument(); + bsonWriter.writeInt64("vni", this.vni); + bsonWriter.writeEndDocument(); } } diff --git a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedVniIngress.java b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedVniIngress.java index f99ea7891b25..6ee1839e3447 100644 --- a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedVniIngress.java +++ b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/ExtendedVniIngress.java @@ -56,6 +56,8 @@ public ExtendedVniIngress(final ByteBuffer buffer) throws InvalidPacketException @Override public void writeBson(final BsonWriter bsonWriter) { - bsonWriter.writeInt64(this.vni); + bsonWriter.writeStartDocument(); + bsonWriter.writeInt64("vni", this.vni); + bsonWriter.writeEndDocument(); } } diff --git a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/FlowRecord.java b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/FlowRecord.java index ee4ac8f957bf..b8eebf99e138 100644 --- a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/FlowRecord.java +++ b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/FlowRecord.java @@ -44,7 +44,7 @@ // }; public class FlowRecord extends Record { - private static Map> flowDataFormats = ImmutableMap.>builder() + protected static Map> flowDataFormats = ImmutableMap.>builder() .put(DataFormat.from(0, 1), SampledHeader::new) .put(DataFormat.from(0, 2), SampledEthernet::new) .put(DataFormat.from(0, 3), SampledIpv4::new) diff --git a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/HostAdapter.java b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/HostAdapter.java index d3f776a3daea..ea5403d180fb 100644 --- a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/HostAdapter.java +++ b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/HostAdapter.java @@ -65,7 +65,7 @@ public String toString() { public void writeBson(final BsonWriter bsonWriter) { bsonWriter.writeStartDocument(); - bsonWriter.writeInt64(this.ifIndex); + bsonWriter.writeInt64("ifIndex", this.ifIndex); bsonWriter.writeStartArray("mac_address"); for (final Mac mac : this.mac_address) { mac.writeBson(bsonWriter); diff --git a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/HostAdapters.java b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/HostAdapters.java index f18192192ab8..e14ff23a78dc 100644 --- a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/HostAdapters.java +++ b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/HostAdapters.java @@ -57,10 +57,12 @@ public String toString() { @Override public void writeBson(final BsonWriter bsonWriter) { - bsonWriter.writeStartArray(); + bsonWriter.writeStartDocument(); + bsonWriter.writeStartArray("adapters"); for (final HostAdapter hostAdapter : this.adapters) { hostAdapter.writeBson(bsonWriter); } bsonWriter.writeEndArray(); + bsonWriter.writeEndDocument(); } } diff --git a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/PortName.java b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/PortName.java index 1020e8a08a5f..f15f5d6b6ca9 100644 --- a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/PortName.java +++ b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/PortName.java @@ -56,6 +56,8 @@ public String toString() { @Override public void writeBson(final BsonWriter bsonWriter) { - bsonWriter.writeString(this.name.value); + bsonWriter.writeStartDocument(); + bsonWriter.writeString("name", this.name.value); + bsonWriter.writeEndDocument(); } } diff --git a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/Record.java b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/Record.java index 7cdc61e69af9..867c5828fd19 100644 --- a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/Record.java +++ b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/Record.java @@ -60,15 +60,15 @@ public static class DataFormat { private final int enterpriseNumber; private final int formatNumber; - private DataFormat(final int enterpriseNumber, final int formatNumber) { + protected DataFormat(final int enterpriseNumber, final int formatNumber) { this.enterpriseNumber = enterpriseNumber; this.formatNumber = formatNumber; } public DataFormat(final ByteBuffer buffer) throws InvalidPacketException { final int dataFormat = (int) BufferUtils.uint32(buffer); - this.enterpriseNumber = (dataFormat >> 12 & (2 << 20) - 1); - this.formatNumber = (dataFormat & (2 << 12) - 1); + this.enterpriseNumber = (dataFormat >> 12 & 0x000FFFFF); + this.formatNumber = (dataFormat & 0xFFF); } @Override @@ -104,6 +104,11 @@ public String toString() { public String toId() { return String.format("%s:%s", this.enterpriseNumber, this.formatNumber); } + + protected byte[] toBytes() { + int dataFormat = (enterpriseNumber << 12) | (formatNumber & 0xFFF); + return ByteBuffer.allocate(4).putInt(0, dataFormat).array(); + } } public final DataFormat dataFormat; diff --git a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/SampleRecord.java b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/SampleRecord.java index 2bb7dfdb18be..50697d119375 100644 --- a/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/SampleRecord.java +++ b/features/telemetry/listeners/sflow/src/main/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/SampleRecord.java @@ -44,7 +44,7 @@ // }; public class SampleRecord extends Record { - private static Map> sampleDataFormats = ImmutableMap.>builder() + protected static Map> sampleDataFormats = ImmutableMap.>builder() .put(DataFormat.from(1), FlowSample::new) .put(DataFormat.from(2), CountersSample::new) .put(DataFormat.from(3), FlowSampleExpanded::new) diff --git a/features/telemetry/listeners/sflow/src/test/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/CounterRecordWriteTest.java b/features/telemetry/listeners/sflow/src/test/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/CounterRecordWriteTest.java new file mode 100644 index 000000000000..7d01b7efc108 --- /dev/null +++ b/features/telemetry/listeners/sflow/src/test/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/CounterRecordWriteTest.java @@ -0,0 +1,89 @@ +/******************************************************************************* + * This file is part of OpenNMS(R). + * + * Copyright (C) 2018 The OpenNMS Group, Inc. + * OpenNMS(R) is Copyright (C) 1999-2018 The OpenNMS Group, Inc. + * + * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. + * + * OpenNMS(R) is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. + * + * OpenNMS(R) is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenNMS(R). If not, see: + * http://www.gnu.org/licenses/ + * + * For more information contact: + * OpenNMS(R) Licensing + * http://www.opennms.org/ + * http://www.opennms.com/ + *******************************************************************************/ + +package org.opennms.netmgt.telemetry.listeners.sflow.proto.flows; + +import org.bson.BsonDocument; +import org.bson.BsonDocumentWriter; +import org.bson.BsonWriter; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.opennms.netmgt.telemetry.listeners.sflow.InvalidPacketException; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.Collection; + +@RunWith(Parameterized.class) +public class CounterRecordWriteTest { + private Record.DataFormat dataFormat; + + @Parameterized.Parameters(name = "dataFormat: {0}") + public static Collection data() throws IOException { + return CounterRecord.counterDataFormats.keySet(); + } + + public CounterRecordWriteTest(final Record.DataFormat dataFormat) { + this.dataFormat = dataFormat; + } + + public static ByteBuffer byteBufferForFormat(Record.DataFormat dataFormat) { + final ByteBuffer byteBuffer = ByteBuffer.allocate(1500); + byte[] dataFormatBytes = dataFormat.toBytes(); + + for (int i = 0; i < dataFormatBytes.length; i++) { + byteBuffer.put(dataFormatBytes[i]); + } + + // This combination seems to work with all the + // record types. + byteBuffer.putInt(768); + byteBuffer.putInt(2); + byteBuffer.putInt(1); + byteBuffer.putInt(0); + byteBuffer.putInt(16); + byteBuffer.putInt(1); + byteBuffer.putInt(1); + byteBuffer.putInt(1); + + for (int i = 0; i < (1500 - 33) / 4; i++) { + byteBuffer.putInt(0); + } + + byteBuffer.rewind(); + return byteBuffer; + } + + @Test + public void testBsonWrite() throws InvalidPacketException { + final CounterRecord counterRecord = new CounterRecord(byteBufferForFormat(this.dataFormat)); + final BsonWriter bsonWriter = new BsonDocumentWriter(new BsonDocument()); + counterRecord.writeBson(bsonWriter); + } +} diff --git a/features/telemetry/listeners/sflow/src/test/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/FlowRecordWriteTest.java b/features/telemetry/listeners/sflow/src/test/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/FlowRecordWriteTest.java new file mode 100644 index 000000000000..b2728e4786bb --- /dev/null +++ b/features/telemetry/listeners/sflow/src/test/java/org/opennms/netmgt/telemetry/listeners/sflow/proto/flows/FlowRecordWriteTest.java @@ -0,0 +1,60 @@ +/******************************************************************************* + * This file is part of OpenNMS(R). + * + * Copyright (C) 2018 The OpenNMS Group, Inc. + * OpenNMS(R) is Copyright (C) 1999-2018 The OpenNMS Group, Inc. + * + * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. + * + * OpenNMS(R) is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. + * + * OpenNMS(R) is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenNMS(R). If not, see: + * http://www.gnu.org/licenses/ + * + * For more information contact: + * OpenNMS(R) Licensing + * http://www.opennms.org/ + * http://www.opennms.com/ + *******************************************************************************/ + +package org.opennms.netmgt.telemetry.listeners.sflow.proto.flows; + +import org.bson.BsonDocument; +import org.bson.BsonDocumentWriter; +import org.bson.BsonWriter; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.opennms.netmgt.telemetry.listeners.sflow.InvalidPacketException; + +import java.util.Collection; + +@RunWith(Parameterized.class) +public class FlowRecordWriteTest { + private Record.DataFormat dataFormat; + + @Parameterized.Parameters(name = "dataFormat: {0}") + public static Collection data() { + return FlowRecord.flowDataFormats.keySet(); + } + + public FlowRecordWriteTest(final Record.DataFormat dataFormat) { + this.dataFormat = dataFormat; + } + + @Test + public void testBsonWrite() throws InvalidPacketException { + final FlowRecord flowRecord = new FlowRecord(CounterRecordWriteTest.byteBufferForFormat(this.dataFormat)); + final BsonWriter bsonWriter = new BsonDocumentWriter(new BsonDocument()); + flowRecord.writeBson(bsonWriter); + } +} diff --git a/features/telemetry/listeners/udp/pom.xml b/features/telemetry/listeners/udp/pom.xml index cb9e3fd39f04..00b560d72b50 100644 --- a/features/telemetry/listeners/udp/pom.xml +++ b/features/telemetry/listeners/udp/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.telemetry org.opennms.features.telemetry.listeners - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.telemetry.listeners diff --git a/features/telemetry/minion/pom.xml b/features/telemetry/minion/pom.xml index 3368700c3ebb..ecb03049b9a2 100644 --- a/features/telemetry/minion/pom.xml +++ b/features/telemetry/minion/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.telemetry - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.telemetry diff --git a/features/telemetry/pom.xml b/features/telemetry/pom.xml index 3e24baf4b33e..ccd16ea3617f 100644 --- a/features/telemetry/pom.xml +++ b/features/telemetry/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/themes/dashboard-theme/pom.xml b/features/themes/dashboard-theme/pom.xml index 34e2cb8cae32..c528037f586e 100644 --- a/features/themes/dashboard-theme/pom.xml +++ b/features/themes/dashboard-theme/pom.xml @@ -6,7 +6,7 @@ themes org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.themes diff --git a/features/themes/jmxconfiggenerator-theme/pom.xml b/features/themes/jmxconfiggenerator-theme/pom.xml index d91166a529ce..140d56cd4004 100644 --- a/features/themes/jmxconfiggenerator-theme/pom.xml +++ b/features/themes/jmxconfiggenerator-theme/pom.xml @@ -5,7 +5,7 @@ themes org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.themes jmxconfiggenerator-theme diff --git a/features/themes/onms-default-theme/pom.xml b/features/themes/onms-default-theme/pom.xml index 2c33e1bb09fa..d01df6c0516a 100644 --- a/features/themes/onms-default-theme/pom.xml +++ b/features/themes/onms-default-theme/pom.xml @@ -6,7 +6,7 @@ themes org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.themes diff --git a/features/themes/pom.xml b/features/themes/pom.xml index f4d0f58490e3..358e6ae68ace 100644 --- a/features/themes/pom.xml +++ b/features/themes/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/ticketing/api/pom.xml b/features/ticketing/api/pom.xml index c84811e30659..4efd190ef544 100644 --- a/features/ticketing/api/pom.xml +++ b/features/ticketing/api/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.ticketing - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.ticketing diff --git a/features/ticketing/daemon/pom.xml b/features/ticketing/daemon/pom.xml index 344588116e1d..46f473c1a04c 100644 --- a/features/ticketing/daemon/pom.xml +++ b/features/ticketing/daemon/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.ticketing - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.ticketing diff --git a/features/ticketing/drools-integration/pom.xml b/features/ticketing/drools-integration/pom.xml index 855b284f49f3..109a33c241fb 100644 --- a/features/ticketing/drools-integration/pom.xml +++ b/features/ticketing/drools-integration/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.ticketing - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.ticketing diff --git a/features/ticketing/jira-client/pom.xml b/features/ticketing/jira-client/pom.xml index 39af994f9eb5..0267bd93c193 100644 --- a/features/ticketing/jira-client/pom.xml +++ b/features/ticketing/jira-client/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.ticketing - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 bundle diff --git a/features/ticketing/jira-integration/pom.xml b/features/ticketing/jira-integration/pom.xml index ec2fbdc9fe4b..c8d5b7e6f2df 100644 --- a/features/ticketing/jira-integration/pom.xml +++ b/features/ticketing/jira-integration/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.ticketing - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 jira-troubleticketer diff --git a/features/ticketing/otrs-integration-31/pom.xml b/features/ticketing/otrs-integration-31/pom.xml index 451cbd2804d3..024a6e01df26 100644 --- a/features/ticketing/otrs-integration-31/pom.xml +++ b/features/ticketing/otrs-integration-31/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.ticketing - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-integration-otrs-31 diff --git a/features/ticketing/otrs-integration-common/pom.xml b/features/ticketing/otrs-integration-common/pom.xml index 2ddfc088205b..b57317e7fdc7 100644 --- a/features/ticketing/otrs-integration-common/pom.xml +++ b/features/ticketing/otrs-integration-common/pom.xml @@ -2,7 +2,7 @@ org.opennms.features org.opennms.features.ticketing - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.ticketing diff --git a/features/ticketing/otrs-integration/pom.xml b/features/ticketing/otrs-integration/pom.xml index 8300b9ff30be..724b511dd4c6 100644 --- a/features/ticketing/otrs-integration/pom.xml +++ b/features/ticketing/otrs-integration/pom.xml @@ -2,7 +2,7 @@ org.opennms.features org.opennms.features.ticketing - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-integration-otrs diff --git a/features/ticketing/pom.xml b/features/ticketing/pom.xml index e1810886bb63..cdd949589b68 100644 --- a/features/ticketing/pom.xml +++ b/features/ticketing/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/ticketing/remedy-integration/pom.xml b/features/ticketing/remedy-integration/pom.xml index 5611d0e89b27..77a7db636520 100644 --- a/features/ticketing/remedy-integration/pom.xml +++ b/features/ticketing/remedy-integration/pom.xml @@ -2,7 +2,7 @@ org.opennms.features org.opennms.features.ticketing - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-integration-remedy diff --git a/features/ticketing/rt-integration/pom.xml b/features/ticketing/rt-integration/pom.xml index 1f463858f627..f06cb0f7d316 100644 --- a/features/ticketing/rt-integration/pom.xml +++ b/features/ticketing/rt-integration/pom.xml @@ -2,7 +2,7 @@ org.opennms.features org.opennms.features.ticketing - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-integration-rt diff --git a/features/ticketing/tsrm-integration/pom.xml b/features/ticketing/tsrm-integration/pom.xml index 4a89cd4cd3b6..6b0d872cf0a7 100644 --- a/features/ticketing/tsrm-integration/pom.xml +++ b/features/ticketing/tsrm-integration/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.ticketing - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-integration-tsrm diff --git a/features/timeseries-evaluate/pom.xml b/features/timeseries-evaluate/pom.xml index 34cf504f39f2..072766fa90e4 100644 --- a/features/timeseries-evaluate/pom.xml +++ b/features/timeseries-evaluate/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/features/topology-map/features/api/pom.xml b/features/topology-map/features/api/pom.xml index 9d54bc35bdc6..af5d1c5a6930 100644 --- a/features/topology-map/features/api/pom.xml +++ b/features/topology-map/features/api/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.topology features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/topology-map/features/pom.xml b/features/topology-map/features/pom.xml index 13f669ddf595..01fde3410cec 100644 --- a/features/topology-map/features/pom.xml +++ b/features/topology-map/features/pom.xml @@ -5,7 +5,7 @@ ../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/topology-map/features/runtime-application/pom.xml b/features/topology-map/features/runtime-application/pom.xml index 8821e266f624..1791b9e75af6 100644 --- a/features/topology-map/features/runtime-application/pom.xml +++ b/features/topology-map/features/runtime-application/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.topology features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.osgi.features.topology diff --git a/features/topology-map/features/runtime-asset/pom.xml b/features/topology-map/features/runtime-asset/pom.xml index df04ccf05287..96c64daa202a 100644 --- a/features/topology-map/features/runtime-asset/pom.xml +++ b/features/topology-map/features/runtime-asset/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.topology features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.osgi.features.topology diff --git a/features/topology-map/features/runtime-base/pom.xml b/features/topology-map/features/runtime-base/pom.xml index 51400056d56f..6d8a57b5ced5 100644 --- a/features/topology-map/features/runtime-base/pom.xml +++ b/features/topology-map/features/runtime-base/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.topology features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/topology-map/features/runtime-browsers/pom.xml b/features/topology-map/features/runtime-browsers/pom.xml index 004ba075b4fb..4dc4470e8305 100644 --- a/features/topology-map/features/runtime-browsers/pom.xml +++ b/features/topology-map/features/runtime-browsers/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.topology features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/topology-map/features/runtime-bsm/pom.xml b/features/topology-map/features/runtime-bsm/pom.xml index aefa79190917..b14400ef35cb 100644 --- a/features/topology-map/features/runtime-bsm/pom.xml +++ b/features/topology-map/features/runtime-bsm/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.topology features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.osgi.features.topology diff --git a/features/topology-map/features/runtime-graphml/pom.xml b/features/topology-map/features/runtime-graphml/pom.xml index 0e2114b94ee9..f071562e1129 100644 --- a/features/topology-map/features/runtime-graphml/pom.xml +++ b/features/topology-map/features/runtime-graphml/pom.xml @@ -3,7 +3,7 @@ org.opennms.features.topology features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.osgi.features.topology diff --git a/features/topology-map/features/runtime-linkd/pom.xml b/features/topology-map/features/runtime-linkd/pom.xml index b9fd112da64d..bb9ec20dd1b8 100644 --- a/features/topology-map/features/runtime-linkd/pom.xml +++ b/features/topology-map/features/runtime-linkd/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.topology features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/topology-map/features/runtime-ncs/pom.xml b/features/topology-map/features/runtime-ncs/pom.xml index e20689427ec0..a42e14cce80b 100644 --- a/features/topology-map/features/runtime-ncs/pom.xml +++ b/features/topology-map/features/runtime-ncs/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.topology features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/topology-map/features/runtime-pathoutage/pom.xml b/features/topology-map/features/runtime-pathoutage/pom.xml index 045f06ba59f2..f719eef2f288 100644 --- a/features/topology-map/features/runtime-pathoutage/pom.xml +++ b/features/topology-map/features/runtime-pathoutage/pom.xml @@ -6,7 +6,7 @@ org.opennms.features.topology features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/topology-map/features/runtime-sfree/pom.xml b/features/topology-map/features/runtime-sfree/pom.xml index ca4ec6195740..b36e77879843 100644 --- a/features/topology-map/features/runtime-sfree/pom.xml +++ b/features/topology-map/features/runtime-sfree/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.topology features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/topology-map/features/runtime-vmware/pom.xml b/features/topology-map/features/runtime-vmware/pom.xml index 7027572eaadc..dfa02db79899 100644 --- a/features/topology-map/features/runtime-vmware/pom.xml +++ b/features/topology-map/features/runtime-vmware/pom.xml @@ -4,7 +4,7 @@ org.opennms.features.topology features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/topology-map/org.opennms.features.topology.api/pom.xml b/features/topology-map/org.opennms.features.topology.api/pom.xml index d4a8b1adc75d..46be4c1a8cb0 100644 --- a/features/topology-map/org.opennms.features.topology.api/pom.xml +++ b/features/topology-map/org.opennms.features.topology.api/pom.xml @@ -5,7 +5,7 @@ ../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT diff --git a/features/topology-map/org.opennms.features.topology.app/pom.xml b/features/topology-map/org.opennms.features.topology.app/pom.xml index 2723434044dd..b894bb1d0c01 100644 --- a/features/topology-map/org.opennms.features.topology.app/pom.xml +++ b/features/topology-map/org.opennms.features.topology.app/pom.xml @@ -6,7 +6,7 @@ ../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/topology-map/org.opennms.features.topology.link/pom.xml b/features/topology-map/org.opennms.features.topology.link/pom.xml index ff1edd6e53db..32d531c3dd77 100644 --- a/features/topology-map/org.opennms.features.topology.link/pom.xml +++ b/features/topology-map/org.opennms.features.topology.link/pom.xml @@ -4,7 +4,7 @@ ../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.topology.link diff --git a/features/topology-map/org.opennms.features.topology.persistence/org.opennms.features.topology.persistence.api/pom.xml b/features/topology-map/org.opennms.features.topology.persistence/org.opennms.features.topology.persistence.api/pom.xml index 93e428ee507d..1a31353056f1 100644 --- a/features/topology-map/org.opennms.features.topology.persistence/org.opennms.features.topology.persistence.api/pom.xml +++ b/features/topology-map/org.opennms.features.topology.persistence/org.opennms.features.topology.persistence.api/pom.xml @@ -4,7 +4,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.topology diff --git a/features/topology-map/org.opennms.features.topology.persistence/org.opennms.features.topology.persistence.impl/pom.xml b/features/topology-map/org.opennms.features.topology.persistence/org.opennms.features.topology.persistence.impl/pom.xml index ef9e8fdf81e1..da3fdba82c57 100644 --- a/features/topology-map/org.opennms.features.topology.persistence/org.opennms.features.topology.persistence.impl/pom.xml +++ b/features/topology-map/org.opennms.features.topology.persistence/org.opennms.features.topology.persistence.impl/pom.xml @@ -4,7 +4,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.topology diff --git a/features/topology-map/org.opennms.features.topology.persistence/pom.xml b/features/topology-map/org.opennms.features.topology.persistence/pom.xml index 036d46a79b05..1aa0e453a3a2 100644 --- a/features/topology-map/org.opennms.features.topology.persistence/pom.xml +++ b/features/topology-map/org.opennms.features.topology.persistence/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms.features.topology - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features.topology diff --git a/features/topology-map/org.opennms.features.topology.shell/pom.xml b/features/topology-map/org.opennms.features.topology.shell/pom.xml index 230a0744968e..af1ac1946098 100644 --- a/features/topology-map/org.opennms.features.topology.shell/pom.xml +++ b/features/topology-map/org.opennms.features.topology.shell/pom.xml @@ -5,7 +5,7 @@ ../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.topology.shell diff --git a/features/topology-map/org.opennms.features.topology.widgetset/pom.xml b/features/topology-map/org.opennms.features.topology.widgetset/pom.xml index c2c66f7a4d8c..62ae11b8e416 100644 --- a/features/topology-map/org.opennms.features.topology.widgetset/pom.xml +++ b/features/topology-map/org.opennms.features.topology.widgetset/pom.xml @@ -5,7 +5,7 @@ ../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/pom.xml index 652b29e56f4d..2eac64002438 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.browsers/pom.xml @@ -5,7 +5,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.topology.plugins.browsers diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.layout/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.layout/pom.xml index 9ab6eab35f91..2e66165d8e28 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.layout/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.layout/pom.xml @@ -5,7 +5,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.ncs/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.ncs/pom.xml index 06404dce634a..b8768d3c1218 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.ncs/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.ncs/pom.xml @@ -6,7 +6,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.netutils/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.netutils/pom.xml index 901a803fc582..f0631e2dc9bd 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.netutils/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.netutils/pom.xml @@ -7,7 +7,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.topology diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.ssh/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.ssh/pom.xml index 4f509a8d388a..01ecb143f1f8 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.ssh/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.ssh/pom.xml @@ -6,7 +6,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.topology org.opennms.features.topology.ssh diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.application/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.application/pom.xml index 2c4b48ed8cba..0db7703cb82f 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.application/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.application/pom.xml @@ -5,7 +5,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.topology.plugins.topo.application diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.asset/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.asset/pom.xml index 0652576f5205..f5148d91b396 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.asset/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.asset/pom.xml @@ -4,7 +4,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.topology.plugins.topo.asset diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.bsm/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.bsm/pom.xml index 91bc9f31471a..53b7797e4fdb 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.bsm/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.bsm/pom.xml @@ -5,7 +5,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.topology.plugins.topo.bsm diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.graphml/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.graphml/pom.xml index 80432408f4c8..a694bd53f69d 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.graphml/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.graphml/pom.xml @@ -4,7 +4,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.topology.plugins.topo.graphml diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.history/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.history/pom.xml index b86d208a88c1..87bfb5a5127d 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.history/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.history/pom.xml @@ -6,7 +6,7 @@ org.opennms.features.topology.plugins org.opennms.features.topology - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.topology.plugins.topo diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/pom.xml index 5a8a114f6133..246848504a27 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.linkd/pom.xml @@ -5,7 +5,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.pathoutage/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.pathoutage/pom.xml index 61071fd2e274..03a21e340d81 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.pathoutage/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.pathoutage/pom.xml @@ -7,7 +7,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.sfree/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.sfree/pom.xml index 40903608e4eb..93ff6ad95a6d 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.sfree/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.sfree/pom.xml @@ -5,7 +5,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT diff --git a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.vmware/pom.xml b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.vmware/pom.xml index 0c0f73895c88..2ebb6785155c 100644 --- a/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.vmware/pom.xml +++ b/features/topology-map/plugins/org.opennms.features.topology.plugins.topo.vmware/pom.xml @@ -4,7 +4,7 @@ ../../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.topology.plugins.topo.vmware diff --git a/features/topology-map/plugins/pom.xml b/features/topology-map/plugins/pom.xml index d646de6b5c18..4575081132fa 100644 --- a/features/topology-map/plugins/pom.xml +++ b/features/topology-map/plugins/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.topology - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/topology-map/pom.xml b/features/topology-map/pom.xml index 1ea359197b2c..92620f7a1869 100644 --- a/features/topology-map/pom.xml +++ b/features/topology-map/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/topology-map/poms/compiled/pom.xml b/features/topology-map/poms/compiled/pom.xml index 3a4160fab8fc..014d5df707f7 100644 --- a/features/topology-map/poms/compiled/pom.xml +++ b/features/topology-map/poms/compiled/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.topology.build shared-plugin-settings - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/topology-map/poms/pom.xml b/features/topology-map/poms/pom.xml index fbcb2bddf0e7..3928545a5f99 100644 --- a/features/topology-map/poms/pom.xml +++ b/features/topology-map/poms/pom.xml @@ -5,7 +5,7 @@ org.opennms.features org.opennms.features.topology - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/topology-map/poms/wrappers/pom.xml b/features/topology-map/poms/wrappers/pom.xml index a244bc345923..66fd65999578 100644 --- a/features/topology-map/poms/wrappers/pom.xml +++ b/features/topology-map/poms/wrappers/pom.xml @@ -5,7 +5,7 @@ org.opennms.features.topology.build shared-plugin-settings - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/topology-map/provision/pom.xml b/features/topology-map/provision/pom.xml index dfb32ef55310..d61dc5e97dec 100644 --- a/features/topology-map/provision/pom.xml +++ b/features/topology-map/provision/pom.xml @@ -5,7 +5,7 @@ ../poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/topology-map/themes/default-theme/pom.xml b/features/topology-map/themes/default-theme/pom.xml index 97cba2e8ab87..c7aab32e6a93 100644 --- a/features/topology-map/themes/default-theme/pom.xml +++ b/features/topology-map/themes/default-theme/pom.xml @@ -6,7 +6,7 @@ org.opennms.features.topology.themes org.opennms.features.topology - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.topology.themes diff --git a/features/topology-map/themes/pom.xml b/features/topology-map/themes/pom.xml index 1c290f9a79fd..6dc3dfba26a5 100644 --- a/features/topology-map/themes/pom.xml +++ b/features/topology-map/themes/pom.xml @@ -4,7 +4,7 @@ org.opennms.features org.opennms.features.topology - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/vaadin-components/bundle-refresher/pom.xml b/features/vaadin-components/bundle-refresher/pom.xml index b2f5152b1571..3f61e1b080e8 100644 --- a/features/vaadin-components/bundle-refresher/pom.xml +++ b/features/vaadin-components/bundle-refresher/pom.xml @@ -5,7 +5,7 @@ org.opennms.features vaadin-components - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.vaadin-components bundle-refresher diff --git a/features/vaadin-components/core/pom.xml b/features/vaadin-components/core/pom.xml index bd9b1b274c31..c1fe4109b149 100644 --- a/features/vaadin-components/core/pom.xml +++ b/features/vaadin-components/core/pom.xml @@ -5,7 +5,7 @@ org.opennms.features vaadin-components - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.vaadin-components core diff --git a/features/vaadin-components/extender-service/pom.xml b/features/vaadin-components/extender-service/pom.xml index 67d60b33b827..446234dfe552 100644 --- a/features/vaadin-components/extender-service/pom.xml +++ b/features/vaadin-components/extender-service/pom.xml @@ -4,7 +4,7 @@ org.opennms.features vaadin-components - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.vaadin-components extender-service diff --git a/features/vaadin-components/graph/pom.xml b/features/vaadin-components/graph/pom.xml index f5faf0e4996a..601e15db9701 100644 --- a/features/vaadin-components/graph/pom.xml +++ b/features/vaadin-components/graph/pom.xml @@ -7,7 +7,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.vaadin-components diff --git a/features/vaadin-components/pom.xml b/features/vaadin-components/pom.xml index 9c5d6d8151ee..9470791ec04d 100644 --- a/features/vaadin-components/pom.xml +++ b/features/vaadin-components/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/vaadin-dashboard/pom.xml b/features/vaadin-dashboard/pom.xml index f4e0cdbdf97c..ef0d314f4e20 100644 --- a/features/vaadin-dashboard/pom.xml +++ b/features/vaadin-dashboard/pom.xml @@ -6,7 +6,7 @@ ../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features vaadin-dashboard diff --git a/features/vaadin-dashlets/dashlet-alarms/pom.xml b/features/vaadin-dashlets/dashlet-alarms/pom.xml index 61494ac24283..e1c62931fea7 100644 --- a/features/vaadin-dashlets/dashlet-alarms/pom.xml +++ b/features/vaadin-dashlets/dashlet-alarms/pom.xml @@ -6,7 +6,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-bsm/pom.xml b/features/vaadin-dashlets/dashlet-bsm/pom.xml index 1e3bb7febcd5..e5ac5eb6cc46 100644 --- a/features/vaadin-dashlets/dashlet-bsm/pom.xml +++ b/features/vaadin-dashlets/dashlet-bsm/pom.xml @@ -6,7 +6,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-charts/pom.xml b/features/vaadin-dashlets/dashlet-charts/pom.xml index 733938de99c3..3a04c8680b2a 100644 --- a/features/vaadin-dashlets/dashlet-charts/pom.xml +++ b/features/vaadin-dashlets/dashlet-charts/pom.xml @@ -7,7 +7,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-features/pom.xml b/features/vaadin-dashlets/dashlet-features/pom.xml index ddde05491b51..0e9c98b2e355 100644 --- a/features/vaadin-dashlets/dashlet-features/pom.xml +++ b/features/vaadin-dashlets/dashlet-features/pom.xml @@ -7,7 +7,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-grafana/pom.xml b/features/vaadin-dashlets/dashlet-grafana/pom.xml index 0375a4d18bf7..2f8a0a9a612e 100644 --- a/features/vaadin-dashlets/dashlet-grafana/pom.xml +++ b/features/vaadin-dashlets/dashlet-grafana/pom.xml @@ -7,7 +7,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-image/pom.xml b/features/vaadin-dashlets/dashlet-image/pom.xml index e2dc1c928185..838fa65c7abb 100644 --- a/features/vaadin-dashlets/dashlet-image/pom.xml +++ b/features/vaadin-dashlets/dashlet-image/pom.xml @@ -7,7 +7,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-ksc/pom.xml b/features/vaadin-dashlets/dashlet-ksc/pom.xml index e31633e1d52e..acc6ad9de639 100644 --- a/features/vaadin-dashlets/dashlet-ksc/pom.xml +++ b/features/vaadin-dashlets/dashlet-ksc/pom.xml @@ -7,7 +7,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-map/pom.xml b/features/vaadin-dashlets/dashlet-map/pom.xml index 8953b27d4817..fbda6a33f3f5 100644 --- a/features/vaadin-dashlets/dashlet-map/pom.xml +++ b/features/vaadin-dashlets/dashlet-map/pom.xml @@ -7,7 +7,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-rrd/pom.xml b/features/vaadin-dashlets/dashlet-rrd/pom.xml index 7e3a7e78623c..e709904ef128 100644 --- a/features/vaadin-dashlets/dashlet-rrd/pom.xml +++ b/features/vaadin-dashlets/dashlet-rrd/pom.xml @@ -7,7 +7,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-rtc/pom.xml b/features/vaadin-dashlets/dashlet-rtc/pom.xml index 6b403db2cdc6..0c200c4af27b 100644 --- a/features/vaadin-dashlets/dashlet-rtc/pom.xml +++ b/features/vaadin-dashlets/dashlet-rtc/pom.xml @@ -7,7 +7,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-summary/pom.xml b/features/vaadin-dashlets/dashlet-summary/pom.xml index 592a4699474c..68960a372447 100644 --- a/features/vaadin-dashlets/dashlet-summary/pom.xml +++ b/features/vaadin-dashlets/dashlet-summary/pom.xml @@ -6,7 +6,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-surveillance/pom.xml b/features/vaadin-dashlets/dashlet-surveillance/pom.xml index 901c9f39471b..3fcca887b562 100644 --- a/features/vaadin-dashlets/dashlet-surveillance/pom.xml +++ b/features/vaadin-dashlets/dashlet-surveillance/pom.xml @@ -7,7 +7,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-topology/pom.xml b/features/vaadin-dashlets/dashlet-topology/pom.xml index 6a3a8d072838..55029026028a 100644 --- a/features/vaadin-dashlets/dashlet-topology/pom.xml +++ b/features/vaadin-dashlets/dashlet-topology/pom.xml @@ -7,7 +7,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/dashlet-url/pom.xml b/features/vaadin-dashlets/dashlet-url/pom.xml index 2662394ff47d..f6b107698fef 100644 --- a/features/vaadin-dashlets/dashlet-url/pom.xml +++ b/features/vaadin-dashlets/dashlet-url/pom.xml @@ -7,7 +7,7 @@ ../../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features.vaadin-dashlets diff --git a/features/vaadin-dashlets/pom.xml b/features/vaadin-dashlets/pom.xml index 03a8731a3a4c..c2013cdb0a2f 100644 --- a/features/vaadin-dashlets/pom.xml +++ b/features/vaadin-dashlets/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/vaadin-jmxconfiggenerator/pom.xml b/features/vaadin-jmxconfiggenerator/pom.xml index ade0d4f19b29..d8a24cf03961 100644 --- a/features/vaadin-jmxconfiggenerator/pom.xml +++ b/features/vaadin-jmxconfiggenerator/pom.xml @@ -5,7 +5,7 @@ org.opennms.features org.opennms - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features vaadin-jmxconfiggenerator diff --git a/features/vaadin-node-maps/pom.xml b/features/vaadin-node-maps/pom.xml index 83ad6b1e5aaf..65b5c8e02368 100644 --- a/features/vaadin-node-maps/pom.xml +++ b/features/vaadin-node-maps/pom.xml @@ -6,7 +6,7 @@ ../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features vaadin-node-maps diff --git a/features/vaadin-opennms-pluginmanager/pom.xml b/features/vaadin-opennms-pluginmanager/pom.xml index 0bfbbd283346..62439a9e8055 100644 --- a/features/vaadin-opennms-pluginmanager/pom.xml +++ b/features/vaadin-opennms-pluginmanager/pom.xml @@ -6,7 +6,7 @@ ../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.plugins diff --git a/features/vaadin-snmp-events-and-metrics/pom.xml b/features/vaadin-snmp-events-and-metrics/pom.xml index 43d3723bf4e1..e87c0685f0a6 100644 --- a/features/vaadin-snmp-events-and-metrics/pom.xml +++ b/features/vaadin-snmp-events-and-metrics/pom.xml @@ -6,7 +6,7 @@ ../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features vaadin-snmp-events-and-metrics diff --git a/features/vaadin-surveillance-views/pom.xml b/features/vaadin-surveillance-views/pom.xml index e5ac1adf4fd5..60976f6ee9f8 100644 --- a/features/vaadin-surveillance-views/pom.xml +++ b/features/vaadin-surveillance-views/pom.xml @@ -6,7 +6,7 @@ ../topology-map/poms/compiled/ org.opennms.features.topology.build compiled-bundle-settings - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.features vaadin-surveillance-views diff --git a/features/vaadin/pom.xml b/features/vaadin/pom.xml index c96efa83a63d..3aeb3e08bbda 100644 --- a/features/vaadin/pom.xml +++ b/features/vaadin/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/features/wsman/pom.xml b/features/wsman/pom.xml index 9db4ca6d4b10..3a0cca33d159 100644 --- a/features/wsman/pom.xml +++ b/features/wsman/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.features - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/integration-tests/config/pom.xml b/integration-tests/config/pom.xml index 8a72071e02a9..9b1b43096e5f 100644 --- a/integration-tests/config/pom.xml +++ b/integration-tests/config/pom.xml @@ -3,7 +3,7 @@ org.opennms integration-tests - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.integration-tests.config diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 0d0413754b16..0e297ca8108a 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 integration-tests diff --git a/integration-tests/remote-poller-18/pom.xml b/integration-tests/remote-poller-18/pom.xml index 82d4246ad164..cd41122121e7 100644 --- a/integration-tests/remote-poller-18/pom.xml +++ b/integration-tests/remote-poller-18/pom.xml @@ -4,7 +4,7 @@ org.opennms integration-tests - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.integration-tests.remote-poller-18 diff --git a/integration-tests/trend-configuration/pom.xml b/integration-tests/trend-configuration/pom.xml index ea0d98d82f09..b54d279bb446 100644 --- a/integration-tests/trend-configuration/pom.xml +++ b/integration-tests/trend-configuration/pom.xml @@ -3,7 +3,7 @@ org.opennms integration-tests - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.integration-tests.trend-configuration diff --git a/integrations/opennms-R/pom.xml b/integrations/opennms-R/pom.xml index b6bc60170040..2a3bd5fc95d7 100644 --- a/integrations/opennms-R/pom.xml +++ b/integrations/opennms-R/pom.xml @@ -4,7 +4,7 @@ org.opennms opennms-integrations - 22.0.1 + 22.0.2-SNAPSHOT opennms-R OpenNMS :: Integrations :: R Interface diff --git a/integrations/opennms-dns-provisioning-adapter/pom.xml b/integrations/opennms-dns-provisioning-adapter/pom.xml index f75b35122456..f7bba72533b8 100644 --- a/integrations/opennms-dns-provisioning-adapter/pom.xml +++ b/integrations/opennms-dns-provisioning-adapter/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-integrations - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-dns-provisioning-adapter diff --git a/integrations/opennms-jasper-extensions/pom.xml b/integrations/opennms-jasper-extensions/pom.xml index 3a70f1a36553..ba3244ab6ce7 100644 --- a/integrations/opennms-jasper-extensions/pom.xml +++ b/integrations/opennms-jasper-extensions/pom.xml @@ -4,7 +4,7 @@ org.opennms opennms-integrations - 22.0.1 + 22.0.2-SNAPSHOT jasper-extensions diff --git a/integrations/opennms-jasperstudio-extension/pom.xml b/integrations/opennms-jasperstudio-extension/pom.xml index 10a855893bea..f5c61b6f44f0 100644 --- a/integrations/opennms-jasperstudio-extension/pom.xml +++ b/integrations/opennms-jasperstudio-extension/pom.xml @@ -5,7 +5,7 @@ org.opennms opennms-integrations - 22.0.1 + 22.0.2-SNAPSHOT opennms-jasperstudio-extension OpenNMS Integration for Jaspersoft Studio diff --git a/integrations/opennms-puppet-provisioning-adapter/pom.xml b/integrations/opennms-puppet-provisioning-adapter/pom.xml index b6a3596de5c5..7813fb24a761 100644 --- a/integrations/opennms-puppet-provisioning-adapter/pom.xml +++ b/integrations/opennms-puppet-provisioning-adapter/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-integrations - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-puppet-provisioning-adapter diff --git a/integrations/opennms-rancid-provisioning-adapter/pom.xml b/integrations/opennms-rancid-provisioning-adapter/pom.xml index ceeda236f37e..ce3d43a0ab86 100644 --- a/integrations/opennms-rancid-provisioning-adapter/pom.xml +++ b/integrations/opennms-rancid-provisioning-adapter/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-integrations - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-rancid-provisioning-adapter diff --git a/integrations/opennms-reverse-dns-provisioning-adapter/pom.xml b/integrations/opennms-reverse-dns-provisioning-adapter/pom.xml index d87f92836ebd..3385d66f9bf6 100644 --- a/integrations/opennms-reverse-dns-provisioning-adapter/pom.xml +++ b/integrations/opennms-reverse-dns-provisioning-adapter/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-integrations - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-reverse-dns-provisioning-adapter diff --git a/integrations/opennms-rws/pom.xml b/integrations/opennms-rws/pom.xml index a12c43aad976..cbfd31146a64 100644 --- a/integrations/opennms-rws/pom.xml +++ b/integrations/opennms-rws/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-integrations - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-rws diff --git a/integrations/opennms-snmp-asset-provisioning-adapter/pom.xml b/integrations/opennms-snmp-asset-provisioning-adapter/pom.xml index 985093212fda..378aa2ffa815 100644 --- a/integrations/opennms-snmp-asset-provisioning-adapter/pom.xml +++ b/integrations/opennms-snmp-asset-provisioning-adapter/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-integrations - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-snmp-asset-provisioning-adapter diff --git a/integrations/opennms-snmp-hardware-inventory-provisioning-adapter/pom.xml b/integrations/opennms-snmp-hardware-inventory-provisioning-adapter/pom.xml index d807dfd33580..4fd455898a6d 100644 --- a/integrations/opennms-snmp-hardware-inventory-provisioning-adapter/pom.xml +++ b/integrations/opennms-snmp-hardware-inventory-provisioning-adapter/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-integrations - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-snmp-hardware-inventory-provisioning-adapter diff --git a/integrations/opennms-vmware/pom.xml b/integrations/opennms-vmware/pom.xml index 8e0d2c04134e..4a107782fb76 100644 --- a/integrations/opennms-vmware/pom.xml +++ b/integrations/opennms-vmware/pom.xml @@ -5,7 +5,7 @@ org.opennms opennms-integrations - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-vmware diff --git a/integrations/opennms-vtdxml-collector-handler/pom.xml b/integrations/opennms-vtdxml-collector-handler/pom.xml index 71a2b6025e36..d2a4cd40f0fe 100644 --- a/integrations/opennms-vtdxml-collector-handler/pom.xml +++ b/integrations/opennms-vtdxml-collector-handler/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-integrations - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-vtdxml-collector-handler diff --git a/integrations/pom.xml b/integrations/pom.xml index c05bbb1b7f80..efcb8237d99f 100644 --- a/integrations/pom.xml +++ b/integrations/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-integrations diff --git a/opennms-ackd/pom.xml b/opennms-ackd/pom.xml index 6a28e35b8728..75f16aa21493 100644 --- a/opennms-ackd/pom.xml +++ b/opennms-ackd/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-ackd diff --git a/opennms-alarms/api/pom.xml b/opennms-alarms/api/pom.xml index d22da3020f56..831575716a75 100644 --- a/opennms-alarms/api/pom.xml +++ b/opennms-alarms/api/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-alarms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-alarm-api diff --git a/opennms-alarms/bsf-northbounder/pom.xml b/opennms-alarms/bsf-northbounder/pom.xml index 47e95f226902..1fc8e97e7548 100644 --- a/opennms-alarms/bsf-northbounder/pom.xml +++ b/opennms-alarms/bsf-northbounder/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-alarms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-alarm-northbounder-bsf diff --git a/opennms-alarms/daemon/pom.xml b/opennms-alarms/daemon/pom.xml index 6cfa1255c596..f12bcd88c7bb 100644 --- a/opennms-alarms/daemon/pom.xml +++ b/opennms-alarms/daemon/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-alarms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-alarmd diff --git a/opennms-alarms/drools-northbounder/pom.xml b/opennms-alarms/drools-northbounder/pom.xml index 4f986a41d0fa..538bdf819611 100644 --- a/opennms-alarms/drools-northbounder/pom.xml +++ b/opennms-alarms/drools-northbounder/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-alarms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-alarm-northbounder-drools diff --git a/opennms-alarms/email-northbounder/pom.xml b/opennms-alarms/email-northbounder/pom.xml index 66cb6565cf2b..97124964d375 100644 --- a/opennms-alarms/email-northbounder/pom.xml +++ b/opennms-alarms/email-northbounder/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-alarms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-alarm-northbounder-email diff --git a/opennms-alarms/http-northbounder/pom.xml b/opennms-alarms/http-northbounder/pom.xml index d035e3563887..10660e7608df 100644 --- a/opennms-alarms/http-northbounder/pom.xml +++ b/opennms-alarms/http-northbounder/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-alarms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-alarm-northbounder-http diff --git a/opennms-alarms/jms-northbounder/pom.xml b/opennms-alarms/jms-northbounder/pom.xml index d1bd11993336..3c687cdde7d4 100644 --- a/opennms-alarms/jms-northbounder/pom.xml +++ b/opennms-alarms/jms-northbounder/pom.xml @@ -4,7 +4,7 @@ org.opennms opennms-alarms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-alarm-northbounder-jms diff --git a/opennms-alarms/pom.xml b/opennms-alarms/pom.xml index 3362a8869fc6..04dbc8da7b43 100644 --- a/opennms-alarms/pom.xml +++ b/opennms-alarms/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-alarms diff --git a/opennms-alarms/snmptrap-northbounder/pom.xml b/opennms-alarms/snmptrap-northbounder/pom.xml index d072cf2292cf..be02a6b6e479 100644 --- a/opennms-alarms/snmptrap-northbounder/pom.xml +++ b/opennms-alarms/snmptrap-northbounder/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-alarms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-alarm-northbounder-snmptrap diff --git a/opennms-alarms/syslog-northbounder/pom.xml b/opennms-alarms/syslog-northbounder/pom.xml index 80124fe31d8a..b23ab9f24238 100644 --- a/opennms-alarms/syslog-northbounder/pom.xml +++ b/opennms-alarms/syslog-northbounder/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-alarms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-alarm-northbounder-syslog diff --git a/opennms-assemblies/http-remoting/pom.xml b/opennms-assemblies/http-remoting/pom.xml index 1c31f20df116..b6b5813d8ed1 100644 --- a/opennms-assemblies/http-remoting/pom.xml +++ b/opennms-assemblies/http-remoting/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.assemblies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.assemblies diff --git a/opennms-assemblies/minion/pom.xml b/opennms-assemblies/minion/pom.xml index 0a38253b6890..c86383d36892 100644 --- a/opennms-assemblies/minion/pom.xml +++ b/opennms-assemblies/minion/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.assemblies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.assemblies diff --git a/opennms-assemblies/mock-snmp-agent-onejar/pom.xml b/opennms-assemblies/mock-snmp-agent-onejar/pom.xml index fbdb6a637fcc..4bd6ecf239dd 100644 --- a/opennms-assemblies/mock-snmp-agent-onejar/pom.xml +++ b/opennms-assemblies/mock-snmp-agent-onejar/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.assemblies - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.assemblies diff --git a/opennms-assemblies/pom.xml b/opennms-assemblies/pom.xml index 1729ce6c9941..ea5f4eb1738f 100644 --- a/opennms-assemblies/pom.xml +++ b/opennms-assemblies/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.assemblies diff --git a/opennms-assemblies/remote-poller-nsis/pom.xml b/opennms-assemblies/remote-poller-nsis/pom.xml index 5d515e966139..838092d6ae9c 100644 --- a/opennms-assemblies/remote-poller-nsis/pom.xml +++ b/opennms-assemblies/remote-poller-nsis/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.opennms.assemblies opennms-remote-poller-windows - 22.0.1 + 22.0.2-SNAPSHOT pom - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/opennms-base-assembly/src/main/filtered/etc/opennms.properties b/opennms-base-assembly/src/main/filtered/etc/opennms.properties index 785d4d489e0a..571289b8b231 100644 --- a/opennms-base-assembly/src/main/filtered/etc/opennms.properties +++ b/opennms-base-assembly/src/main/filtered/etc/opennms.properties @@ -363,6 +363,10 @@ org.eclipse.jetty.server.Request.maxFormKeys=2000 # #opennms.web.base-url = https://%x%c/ +# Choose the format how the date is displayed in the UI. It needs to follow the pattern in DateTimeFormatter: +# see https://docs.oracle.com/javase/8/docs/api/java/time/format/DateTimeFormatter.html +# org.opennms.ui.datettimeformat=yyyy-MM-dd'T'HH:mm:ssxxx + ###### ASTERISK AGI SUPPORT ###### # If you are using the built-in Asterisk Gateway Interface (AGI) server # to integrate with an external Asterisk server, you will need to set diff --git a/opennms-bootstrap/pom.xml b/opennms-bootstrap/pom.xml index fec3f537d618..40a85f2e9cc1 100644 --- a/opennms-bootstrap/pom.xml +++ b/opennms-bootstrap/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-bootstrap diff --git a/opennms-config-api/pom.xml b/opennms-config-api/pom.xml index b65dbaa900f8..232feee197fb 100644 --- a/opennms-config-api/pom.xml +++ b/opennms-config-api/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-config-api diff --git a/opennms-config-jaxb/pom.xml b/opennms-config-jaxb/pom.xml index 382c1c0f5283..80524227c2dd 100644 --- a/opennms-config-jaxb/pom.xml +++ b/opennms-config-jaxb/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-config-jaxb diff --git a/opennms-config-model/pom.xml b/opennms-config-model/pom.xml index d1131511de8a..b9dbc533327a 100644 --- a/opennms-config-model/pom.xml +++ b/opennms-config-model/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-config-model diff --git a/opennms-config-model/src/main/java/org/opennms/netmgt/config/enlinkd/EnlinkdConfiguration.java b/opennms-config-model/src/main/java/org/opennms/netmgt/config/enlinkd/EnlinkdConfiguration.java index 24f8aa353635..32fcac7a31b8 100644 --- a/opennms-config-model/src/main/java/org/opennms/netmgt/config/enlinkd/EnlinkdConfiguration.java +++ b/opennms-config-model/src/main/java/org/opennms/netmgt/config/enlinkd/EnlinkdConfiguration.java @@ -158,7 +158,7 @@ public void setBridgeTopologyInterval(Long bridgeTopologyInterval) { } public Integer getMaxBft() { - return m_maxBft != null ? m_maxBft : 10; + return m_maxBft != null ? m_maxBft : 100; } public void setMaxBft(final Integer maxBft) { diff --git a/opennms-config-model/src/main/resources/xsds/enlinkd-configuration.xsd b/opennms-config-model/src/main/resources/xsds/enlinkd-configuration.xsd index 3f899394ef54..57992ddf3553 100644 --- a/opennms-config-model/src/main/resources/xsds/enlinkd-configuration.xsd +++ b/opennms-config-model/src/main/resources/xsds/enlinkd-configuration.xsd @@ -60,7 +60,7 @@ + use="optional" default="100"> Max bridge forwarding table to hold in memory. diff --git a/opennms-config-model/src/main/resources/xsds/eventconf.xsd b/opennms-config-model/src/main/resources/xsds/eventconf.xsd index 95027e8fac18..ab6f73da4eb1 100644 --- a/opennms-config-model/src/main/resources/xsds/eventconf.xsd +++ b/opennms-config-model/src/main/resources/xsds/eventconf.xsd @@ -637,19 +637,19 @@ - - + + The varbind element number - + The varbind element value - + diff --git a/opennms-config-tester/pom.xml b/opennms-config-tester/pom.xml index de0dea1db921..2064851d773b 100644 --- a/opennms-config-tester/pom.xml +++ b/opennms-config-tester/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-config-tester diff --git a/opennms-config-tester/src/test/java/org/opennms/netmgt/config/tester/ConfigTesterTest.java b/opennms-config-tester/src/test/java/org/opennms/netmgt/config/tester/ConfigTesterTest.java index 1ae3ddf804b4..5b016e9af24c 100644 --- a/opennms-config-tester/src/test/java/org/opennms/netmgt/config/tester/ConfigTesterTest.java +++ b/opennms-config-tester/src/test/java/org/opennms/netmgt/config/tester/ConfigTesterTest.java @@ -34,9 +34,9 @@ import java.io.File; import java.io.FileOutputStream; -import java.io.FileWriter; import java.io.FilenameFilter; import java.io.IOException; +import java.io.OutputStream; import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.nio.file.Paths; @@ -675,7 +675,7 @@ public void testDetectionOfMalformedPropertiesFile() throws IOException { setUpOpennmsHomeInTmpDir(); // create broken properties file in opennms.properties.d: - File file = createPropertiesFileInPropertiesD("properties"); + File file = createFileInPropertiesD("properties"); String invalidCharacter="'\\u0zb9"; Files.write(invalidCharacter, file, StandardCharsets.UTF_8); @@ -696,16 +696,18 @@ public void testDetectionOfMalformedXmlFile() throws IOException { } private void saveXmlToPropertiesD(String xml) throws IOException{ - File file = createPropertiesFileInPropertiesD("xml"); + File file = createFileInPropertiesD("xml"); Files.write(xml, file, StandardCharsets.UTF_8); } private void savePropertiesToPropertiesD(Properties properties) throws IOException{ - File file = createPropertiesFileInPropertiesD("properties"); - properties.store(new FileOutputStream(file), ""); + File file = createFileInPropertiesD("properties"); + try(OutputStream out = new FileOutputStream(file)){ + properties.store(out, ""); + } } - private File createPropertiesFileInPropertiesD(String sufffix) throws IOException{ + private File createFileInPropertiesD(String sufffix) throws IOException{ Path etcDir = java.nio.file.Files.createDirectories(Paths.get(this.opennmsHomeDir.getPath(), "etc/opennms.properties.d")); File file = new File(etcDir.toFile(), this.getClass().getSimpleName() + "." + sufffix); file.createNewFile(); diff --git a/opennms-config-tester/src/test/java/org/opennms/netmgt/config/tester/ConfigTesterTest_testEventConf.java b/opennms-config-tester/src/test/java/org/opennms/netmgt/config/tester/ConfigTesterTest_testEventConf.java new file mode 100644 index 000000000000..06d60e105124 --- /dev/null +++ b/opennms-config-tester/src/test/java/org/opennms/netmgt/config/tester/ConfigTesterTest_testEventConf.java @@ -0,0 +1,80 @@ +/******************************************************************************* + * This file is part of OpenNMS(R). + * + * Copyright (C) 2011-2014 The OpenNMS Group, Inc. + * OpenNMS(R) is Copyright (C) 1999-2014 The OpenNMS Group, Inc. + * + * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. + * + * OpenNMS(R) is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. + * + * OpenNMS(R) is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenNMS(R). If not, see: + * http://www.gnu.org/licenses/ + * + * For more information contact: + * OpenNMS(R) Licensing + * http://www.opennms.org/ + * http://www.opennms.com/ + *******************************************************************************/ + +package org.opennms.netmgt.config.tester; + +import static org.junit.Assert.assertNotNull; + +import java.io.IOException; +import java.io.StringReader; + +import org.junit.Test; +import org.opennms.core.xml.JaxbUtils; +import org.opennms.core.xml.MarshallingResourceFailureException; +import org.opennms.netmgt.xml.eventconf.Events; + +public class ConfigTesterTest_testEventConf { + + @Test + public void testEventConfWithValidVbNumber() throws IOException { + assertNotNull(testEventConf("10")); + } + + @Test(expected = MarshallingResourceFailureException.class) + public void testEventConfWithMissingVbNumberButExistingVbValue() throws IOException { + testEventConf("0"); + } + + @Test + public void testEventConfWithMissingVbNumberAndExistingVbValue() throws IOException { + testEventConf(""); + } + + private Events testEventConf(String varbindContent) throws IOException { + // Tests NMS-9821 + String xml = String.format("%n" + + " %n" + + " %n" + + " %n" + + " id%n" + + " .1.3.6.1.4.1.4874.2.2.30%n" + + " %n" + + " %n" + + " %s%n" + + " %n" + + " %n" + + " uei.opennms.org/vendor/juniper/traps/juniCliSecurityAlertPriority0%n" + + " Juniper-CLI-MIB defined trap event: juniCliSecurityAlert%n" + + " blah%n" + + " Juniper CLI Security Alert.%n" + + " Major%n" + + " %n" + + "", varbindContent); + return JaxbUtils.unmarshal(Events.class, new StringReader(xml)); + } +} diff --git a/opennms-config/pom.xml b/opennms-config/pom.xml index 65016a62605f..fa17f12b0eb1 100644 --- a/opennms-config/pom.xml +++ b/opennms-config/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-config diff --git a/opennms-config/src/main/java/org/opennms/netmgt/config/EnhancedLinkdConfigManager.java b/opennms-config/src/main/java/org/opennms/netmgt/config/EnhancedLinkdConfigManager.java index 60df74d5a02c..814758416f85 100644 --- a/opennms-config/src/main/java/org/opennms/netmgt/config/EnhancedLinkdConfigManager.java +++ b/opennms-config/src/main/java/org/opennms/netmgt/config/EnhancedLinkdConfigManager.java @@ -162,7 +162,7 @@ public int getThreads() { public int getMaxBft() { if (m_config.getMaxBft() != null) return m_config.getMaxBft(); - return 1; + return 100; } public int getDiscoveryBridgeThreads() { diff --git a/opennms-correlation/drools-correlation-engine/pom.xml b/opennms-correlation/drools-correlation-engine/pom.xml index 94b720bbd68e..a11859535ee5 100644 --- a/opennms-correlation/drools-correlation-engine/pom.xml +++ b/opennms-correlation/drools-correlation-engine/pom.xml @@ -34,7 +34,7 @@ opennms-correlation org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 drools-correlation-engine diff --git a/opennms-correlation/opennms-correlator/pom.xml b/opennms-correlation/opennms-correlator/pom.xml index 054ab779520e..4de5ef1aad5f 100644 --- a/opennms-correlation/opennms-correlator/pom.xml +++ b/opennms-correlation/opennms-correlator/pom.xml @@ -34,7 +34,7 @@ opennms-correlation org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-correlator diff --git a/opennms-correlation/pom.xml b/opennms-correlation/pom.xml index 63ae26e9022c..e1f02d7423d0 100644 --- a/opennms-correlation/pom.xml +++ b/opennms-correlation/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-correlation diff --git a/opennms-dao-api/pom.xml b/opennms-dao-api/pom.xml index 7e9e7fdea644..459ee052e83d 100644 --- a/opennms-dao-api/pom.xml +++ b/opennms-dao-api/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-dao-api diff --git a/opennms-dao-minion/pom.xml b/opennms-dao-minion/pom.xml index b15a16cb839e..360d01f0f6a2 100644 --- a/opennms-dao-minion/pom.xml +++ b/opennms-dao-minion/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-dao-minion diff --git a/opennms-dao-mock/pom.xml b/opennms-dao-mock/pom.xml index 17dd739106ee..3a7b5e605c55 100644 --- a/opennms-dao-mock/pom.xml +++ b/opennms-dao-mock/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-dao-mock diff --git a/opennms-dao/pom.xml b/opennms-dao/pom.xml index 1c99a01b3cda..98027fb3777c 100644 --- a/opennms-dao/pom.xml +++ b/opennms-dao/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-dao diff --git a/opennms-dao/src/main/java/org/opennms/netmgt/dao/hibernate/BridgeTopologyDaoHibernate.java b/opennms-dao/src/main/java/org/opennms/netmgt/dao/hibernate/BridgeTopologyDaoHibernate.java index e9dad169c12e..decad28aa21d 100644 --- a/opennms-dao/src/main/java/org/opennms/netmgt/dao/hibernate/BridgeTopologyDaoHibernate.java +++ b/opennms-dao/src/main/java/org/opennms/netmgt/dao/hibernate/BridgeTopologyDaoHibernate.java @@ -36,6 +36,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; +import java.util.stream.Collectors; import org.opennms.netmgt.dao.api.BridgeBridgeLinkDao; import org.opennms.netmgt.dao.api.BridgeElementDao; @@ -317,61 +318,49 @@ public List getBridgeSharedSegments(int nodeid) @Override public SharedSegment getHostSharedSegment(String mac) { - List segments = new ArrayList(); + LOG.debug("getHostNodeSharedSegment: founding segment for mac:{}", mac); - List links = m_bridgeMacLinkDao.findByMacAddress(mac); + final List links = m_bridgeMacLinkDao.findByMacAddress(mac). + stream(). + filter(maclink -> maclink.getLinkType() == BridgeMacLinkType.BRIDGE_LINK). + collect(Collectors.toCollection(ArrayList::new)); + if (links.size() == 0 ) { + LOG.info("getHostNodeSharedSegment: no segment found for mac:{}", mac); return SharedSegment.create(); } - - Set designated = new HashSet(); - MACLINK: for (BridgeMacLink link: links) { - if (link.getLinkType() == BridgeMacLinkType.BRIDGE_FORWARDER) { - continue; - } - designated.add(BridgePort.getFromBridgeMacLink(link)); - for (SharedSegment segment : segments) { - if (segment.containsPort(BridgePort.getFromBridgeMacLink(link))) { - segment.getMacsOnSegment().add(link.getMacAddress()); - continue MACLINK; - } - } - try { - segments.add(SharedSegment.create(link)); - } catch (BridgeTopologyException e) { - LOG.error("getHostNodeSharedSegment: cannot create shared segment {}", e.getMessage(),e); - return SharedSegment.create(); - } + + if (links.size() > 1 ) { + LOG.error("getHostNodeSharedSegment: more then one segment for mac:{}", mac); + return SharedSegment.create(); } - for (BridgePort port: designated) { - SharedSegment shared = null; - for (SharedSegment segment : segments) { - if (segment.containsPort(port)) { - shared = segment; - break; + BridgeMacLink link = links.iterator().next(); + + SharedSegment segment = null; + + try { + for (BridgeBridgeLink bblink: m_bridgeBridgeLinkDao.getByDesignatedNodeIdBridgePort(link.getNode().getId(), link.getBridgePort())) { + if (segment == null) { + segment = SharedSegment.create(bblink); + } else { + segment.getBridgePortsOnSegment().add(BridgePort.getFromBridgeBridgeLink(bblink)); } } - if (shared == null) { - LOG.error("getHostNodeSharedSegment: cannot found shared segment for port {}", port.printTopology()); - return SharedSegment.create(); - } - for (BridgeBridgeLink link : m_bridgeBridgeLinkDao.getByDesignatedNodeIdBridgePort(port.getNodeId(), port.getBridgePort())) { - shared.getBridgePortsOnSegment().add(BridgePort.getFromBridgeBridgeLink(link)); + + for (BridgeMacLink maclink :m_bridgeMacLinkDao.findByNodeIdBridgePort(link.getNode().getId(), link.getBridgePort())) { + if (segment == null) { + segment = SharedSegment.create(maclink); + } else { + segment.getMacsOnSegment().add(maclink.getMacAddress()); + } } - } - - if (segments.size() == 0) { - return SharedSegment.create(); - } - - if (segments.size() > 1) { - LOG.error("getHostSharedSegment: found {} shared segment for mac {}", - segments.size(), - mac); + } catch (Exception e) { + LOG.error("getHostNodeSharedSegment: cannot create shared segment {} for mac {} ", e.getMessage(), mac,e); return SharedSegment.create(); } - return segments.iterator().next(); + + return segment; } public Set getAllPersisted() { diff --git a/opennms-doc/guide-admin/pom.xml b/opennms-doc/guide-admin/pom.xml index b97a6983869f..0b2f1dbfc9fd 100644 --- a/opennms-doc/guide-admin/pom.xml +++ b/opennms-doc/guide-admin/pom.xml @@ -5,7 +5,7 @@ org.opennms.doc parent - 22.0.1 + 22.0.2-SNAPSHOT guide-admin pom diff --git a/opennms-doc/guide-admin/src/asciidoc/text/performance-data-collection/shell/adhoc-collection.adoc b/opennms-doc/guide-admin/src/asciidoc/text/performance-data-collection/shell/adhoc-collection.adoc index 99d5bc10bfeb..65f653522ae1 100644 --- a/opennms-doc/guide-admin/src/asciidoc/text/performance-data-collection/shell/adhoc-collection.adoc +++ b/opennms-doc/guide-admin/src/asciidoc/text/performance-data-collection/shell/adhoc-collection.adoc @@ -45,6 +45,15 @@ collection:collect org.opennms.netmgt.collectd.JdbcCollector 127.0.0.1 collectio TIP: Some collectors, such as the `JdbcCollector`, can be invoked without specifying a node. +Persist a collection : + +[source] +---- +collection:collect -l MINION -n NODES=n1 -p org.opennms.netmgt.collectd.SnmpCollector 127.0.0.1 +---- + +NOTE: `-p/--persist` option will persist collection set there by introducing an extra datapoint other than data collected during already configured collection interval. + A complete list of options is available using: [source] diff --git a/opennms-doc/guide-admin/src/asciidoc/text/webui/jmx-config-generator/cli.adoc b/opennms-doc/guide-admin/src/asciidoc/text/webui/jmx-config-generator/cli.adoc index d86d80ff8798..2572b20d140c 100644 --- a/opennms-doc/guide-admin/src/asciidoc/text/webui/jmx-config-generator/cli.adoc +++ b/opennms-doc/guide-admin/src/asciidoc/text/webui/jmx-config-generator/cli.adoc @@ -40,7 +40,7 @@ This file can be invoked by: [source, shell] ---- -java -jar target/jmxconfiggenerator-22.0.1-onejar.jar +java -jar target/jmxconfiggenerator-22.0.2-SNAPSHOT-onejar.jar ---- ===== Usage diff --git a/opennms-doc/guide-all/pom.xml b/opennms-doc/guide-all/pom.xml index e34fefc58b78..4ab6191cc208 100644 --- a/opennms-doc/guide-all/pom.xml +++ b/opennms-doc/guide-all/pom.xml @@ -5,7 +5,7 @@ org.opennms.doc parent - 22.0.1 + 22.0.2-SNAPSHOT guide-all pom diff --git a/opennms-doc/guide-concepts/pom.xml b/opennms-doc/guide-concepts/pom.xml index 08404c14d625..131797d2f527 100644 --- a/opennms-doc/guide-concepts/pom.xml +++ b/opennms-doc/guide-concepts/pom.xml @@ -5,7 +5,7 @@ org.opennms.doc parent - 22.0.1 + 22.0.2-SNAPSHOT guide-concepts pom diff --git a/opennms-doc/guide-development/pom.xml b/opennms-doc/guide-development/pom.xml index 6b4fa03987d6..363a3c2e0fce 100644 --- a/opennms-doc/guide-development/pom.xml +++ b/opennms-doc/guide-development/pom.xml @@ -5,7 +5,7 @@ org.opennms.doc parent - 22.0.1 + 22.0.2-SNAPSHOT guide-development pom diff --git a/opennms-doc/guide-doc/pom.xml b/opennms-doc/guide-doc/pom.xml index 02a5f6d833e3..d27b68e71066 100644 --- a/opennms-doc/guide-doc/pom.xml +++ b/opennms-doc/guide-doc/pom.xml @@ -5,7 +5,7 @@ org.opennms.doc parent - 22.0.1 + 22.0.2-SNAPSHOT guide-doc pom diff --git a/opennms-doc/guide-install/pom.xml b/opennms-doc/guide-install/pom.xml index 7b22501b3e21..b30b96782228 100644 --- a/opennms-doc/guide-install/pom.xml +++ b/opennms-doc/guide-install/pom.xml @@ -5,7 +5,7 @@ org.opennms.doc parent - 22.0.1 + 22.0.2-SNAPSHOT guide-install pom diff --git a/opennms-doc/guide-user/pom.xml b/opennms-doc/guide-user/pom.xml index 7e9e6c05c609..4e2303d3cf37 100644 --- a/opennms-doc/guide-user/pom.xml +++ b/opennms-doc/guide-user/pom.xml @@ -5,7 +5,7 @@ org.opennms.doc parent - 22.0.1 + 22.0.2-SNAPSHOT guide-user pom diff --git a/opennms-doc/pom.xml b/opennms-doc/pom.xml index 54f58638f2ed..2cb0a2d4ba6d 100644 --- a/opennms-doc/pom.xml +++ b/opennms-doc/pom.xml @@ -5,7 +5,7 @@ org.opennms opennms - 22.0.1 + 22.0.2-SNAPSHOT org.opennms.doc parent diff --git a/opennms-doc/releasenotes/pom.xml b/opennms-doc/releasenotes/pom.xml index c120e2bc2891..7e542f13fbf0 100644 --- a/opennms-doc/releasenotes/pom.xml +++ b/opennms-doc/releasenotes/pom.xml @@ -5,7 +5,7 @@ org.opennms.doc parent - 22.0.1 + 22.0.2-SNAPSHOT releasenotes pom diff --git a/opennms-doc/releasenotes/src/asciidoc/releasenotes/changelog.adoc b/opennms-doc/releasenotes/src/asciidoc/releasenotes/changelog.adoc index 5dd1946b9cd5..a702010e3daf 100644 --- a/opennms-doc/releasenotes/src/asciidoc/releasenotes/changelog.adoc +++ b/opennms-doc/releasenotes/src/asciidoc/releasenotes/changelog.adoc @@ -2,6 +2,43 @@ === Changelog +[[releasenotes-changelog-22.0.2]] + +==== Release 22.0.2 + +Release 22.0.2 is the latest stable release of OpenNMS. +It contains a number of bug fixes and enhancements, including partial support for custom date formatting in the web UI. +This will be expanded to cover the entire web UI in an upcoming release. +For a high-level overview of what's changed in OpenNMS 22, see link:http://docs.opennms.org/opennms/releases/22.0.2/releasenotes/releasenotes.html#releasenotes-22[What's New in OpenNMS 22]. + +The codename for 22.0.2 is _link:http://marvelcinematicuniverse.wikia.com/wiki/Mind_Stone[Mind]_. + +===== Bug + +* bridge topology is wrong on nodelink.jsp (Issue http://issues.opennms.org/browse/NMS-8295[NMS-8295]) +* Config-tester not validating varbind matching in event files (Issue http://issues.opennms.org/browse/NMS-9821[NMS-9821]) +* IllegalStateException when restoring persisted sessions in Drools (Issue http://issues.opennms.org/browse/NMS-9907[NMS-9907]) +* Can't install OpenNMS on Ubuntu 18.04 (Issue http://issues.opennms.org/browse/NMS-9925[NMS-9925]) +* The KSC Dashlet for the Ops-Board is not working (Issue http://issues.opennms.org/browse/NMS-10191[NMS-10191]) +* MIB2 interface errors are missing (Issue http://issues.opennms.org/browse/NMS-10195[NMS-10195]) +* BsonInvalidOperationException on Telemetryd with Sflow (Issue http://issues.opennms.org/browse/NMS-10240[NMS-10240]) +* MIB2 SNMP Interface counters missing from Windows data collection (Issue http://issues.opennms.org/browse/NMS-10247[NMS-10247]) +* newSuspect events do not get processed when they reference a missing system id (aka distpoller) (Issue http://issues.opennms.org/browse/NMS-10261[NMS-10261]) +* Heatmap stopped working in centerUrl after upgrading to 22.0.0 (Issue http://issues.opennms.org/browse/HZN-1316[HZN-1316]) +* AbstractAdapter always logs 0 packets (Issue http://issues.opennms.org/browse/HZN-1336[HZN-1336]) + +===== Enhancement + +* Optionally persist the results when calling collectors:collect (Issue http://issues.opennms.org/browse/NMS-10173[NMS-10173]) +* write custom tag for date time formatting (Issue http://issues.opennms.org/browse/NMS-10229[NMS-10229]) +* repace current formatting in JSPs by custom tag (Issue http://issues.opennms.org/browse/NMS-10230[NMS-10230]) +* define a property in opnnms.properties for date formatting (Issue http://issues.opennms.org/browse/NMS-10231[NMS-10231]) +* plpgsql IPLIKE does not behave the same as the C version (Issue http://issues.opennms.org/browse/NMS-10238[NMS-10238]) +* apply custom tag to ncs-alarms.jsp (Issue http://issues.opennms.org/browse/NMS-10243[NMS-10243]) +* Add additional fields to the alarms and events generated by the Kafka Producer (Issue http://issues.opennms.org/browse/NMS-10263[NMS-10263]) + +=== Changelog + [[releasenotes-changelog-22.0.1]] ==== Release 22.0.1 diff --git a/opennms-enterprise-reporting/opennms-reportd/pom.xml b/opennms-enterprise-reporting/opennms-reportd/pom.xml index 4976ae668cf4..e8c9935d5a82 100644 --- a/opennms-enterprise-reporting/opennms-reportd/pom.xml +++ b/opennms-enterprise-reporting/opennms-reportd/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-enterprise-reporting - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-reportd diff --git a/opennms-enterprise-reporting/pom.xml b/opennms-enterprise-reporting/pom.xml index 62bafb709c37..0afdbc10a55b 100644 --- a/opennms-enterprise-reporting/pom.xml +++ b/opennms-enterprise-reporting/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-enterprise-reporting diff --git a/opennms-full-assembly/pom.xml b/opennms-full-assembly/pom.xml index 2fee2172afd3..6f68ea7e1109 100644 --- a/opennms-full-assembly/pom.xml +++ b/opennms-full-assembly/pom.xml @@ -4,7 +4,7 @@ org.opennms opennms - 22.0.1 + 22.0.2-SNAPSHOT ../pom.xml opennms-full-assembly diff --git a/opennms-full-assembly/src/test/java/org/opennms/assemblies/karaf/OnmsKarafTestCase.java b/opennms-full-assembly/src/test/java/org/opennms/assemblies/karaf/OnmsKarafTestCase.java index 4cde66c26b5f..2f7cb9eacdfb 100644 --- a/opennms-full-assembly/src/test/java/org/opennms/assemblies/karaf/OnmsKarafTestCase.java +++ b/opennms-full-assembly/src/test/java/org/opennms/assemblies/karaf/OnmsKarafTestCase.java @@ -59,7 +59,7 @@ protected MavenUrlReference getFrameworkUrl() { .groupId("org.opennms.container") .artifactId("org.opennms.container.karaf") .type("tar.gz") - .version("22.0.1"); + .version("22.0.2-SNAPSHOT"); } /** diff --git a/opennms-icmp/commands/pom.xml b/opennms-icmp/commands/pom.xml index 19b02812f3ff..7a84cce2e206 100644 --- a/opennms-icmp/commands/pom.xml +++ b/opennms-icmp/commands/pom.xml @@ -3,7 +3,7 @@ opennms-icmp org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-icmp-commands diff --git a/opennms-icmp/opennms-icmp-api/pom.xml b/opennms-icmp/opennms-icmp-api/pom.xml index ec47243b39ea..691219a36ff0 100644 --- a/opennms-icmp/opennms-icmp-api/pom.xml +++ b/opennms-icmp/opennms-icmp-api/pom.xml @@ -3,7 +3,7 @@ opennms-icmp org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-icmp-api diff --git a/opennms-icmp/opennms-icmp-best/pom.xml b/opennms-icmp/opennms-icmp-best/pom.xml index 5d3390d48efc..de15c1fb5b1f 100644 --- a/opennms-icmp/opennms-icmp-best/pom.xml +++ b/opennms-icmp/opennms-icmp-best/pom.xml @@ -3,7 +3,7 @@ opennms-icmp org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-icmp-best diff --git a/opennms-icmp/opennms-icmp-jna/pom.xml b/opennms-icmp/opennms-icmp-jna/pom.xml index 1cfcdcc60549..f4cf96c03509 100644 --- a/opennms-icmp/opennms-icmp-jna/pom.xml +++ b/opennms-icmp/opennms-icmp-jna/pom.xml @@ -3,7 +3,7 @@ opennms-icmp org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-icmp-jna diff --git a/opennms-icmp/opennms-icmp-jni/pom.xml b/opennms-icmp/opennms-icmp-jni/pom.xml index 7f488b30c7e4..dfdd4f772ffc 100644 --- a/opennms-icmp/opennms-icmp-jni/pom.xml +++ b/opennms-icmp/opennms-icmp-jni/pom.xml @@ -3,7 +3,7 @@ opennms-icmp org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-icmp-jni diff --git a/opennms-icmp/opennms-icmp-jni6/pom.xml b/opennms-icmp/opennms-icmp-jni6/pom.xml index 5ad7aa8ca3ca..162621120eb5 100644 --- a/opennms-icmp/opennms-icmp-jni6/pom.xml +++ b/opennms-icmp/opennms-icmp-jni6/pom.xml @@ -3,7 +3,7 @@ opennms-icmp org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-icmp-jni6 diff --git a/opennms-icmp/opennms-icmp-proxy-rpc-impl/pom.xml b/opennms-icmp/opennms-icmp-proxy-rpc-impl/pom.xml index b530f72091cc..d9f9ea4a833c 100644 --- a/opennms-icmp/opennms-icmp-proxy-rpc-impl/pom.xml +++ b/opennms-icmp/opennms-icmp-proxy-rpc-impl/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-icmp - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.icmp.proxy.rpc-impl diff --git a/opennms-icmp/pom.xml b/opennms-icmp/pom.xml index cf7d640a4c77..3085d4466219 100644 --- a/opennms-icmp/pom.xml +++ b/opennms-icmp/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-icmp diff --git a/opennms-install/pom.xml b/opennms-install/pom.xml index 29e290a04b4c..d7ce938ad39a 100644 --- a/opennms-install/pom.xml +++ b/opennms-install/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-install diff --git a/opennms-javamail/opennms-javamail-api/pom.xml b/opennms-javamail/opennms-javamail-api/pom.xml index c8b7da0e4e08..51b9cd347b40 100644 --- a/opennms-javamail/opennms-javamail-api/pom.xml +++ b/opennms-javamail/opennms-javamail-api/pom.xml @@ -3,7 +3,7 @@ opennms-javamail org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-javamail-api diff --git a/opennms-javamail/pom.xml b/opennms-javamail/pom.xml index fcf350bff10c..d0f828e4457f 100644 --- a/opennms-javamail/pom.xml +++ b/opennms-javamail/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-javamail diff --git a/opennms-jetty/pom.xml b/opennms-jetty/pom.xml index d74b7c227c5d..94d098d84d58 100644 --- a/opennms-jetty/pom.xml +++ b/opennms-jetty/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-jetty diff --git a/opennms-model/pom.xml b/opennms-model/pom.xml index 3f463b1f3e1f..ef3dfe84c8a4 100644 --- a/opennms-model/pom.xml +++ b/opennms-model/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-model diff --git a/opennms-model/src/main/java/org/opennms/netmgt/model/topology/BroadcastDomain.java b/opennms-model/src/main/java/org/opennms/netmgt/model/topology/BroadcastDomain.java index a4b048512de7..6bba69bde9cf 100644 --- a/opennms-model/src/main/java/org/opennms/netmgt/model/topology/BroadcastDomain.java +++ b/opennms-model/src/main/java/org/opennms/netmgt/model/topology/BroadcastDomain.java @@ -168,11 +168,9 @@ public static Set calculateBFT( List links = new ArrayList(domain.getForwarders(bridgeId)); - links.stream().forEach(link -> System.err.println("for:"+link.printTopology())); for (Integer bridgePort : bft.keySet()) { BridgePortWithMacs link = BridgePortWithMacs.create(portifindexmap.get(bridgePort), bft.get(bridgePort)); links.add(link); - System.err.println("bft:"+link.printTopology()); } Set entries=new HashSet(); @@ -434,7 +432,7 @@ public static void removeBridge(BroadcastDomain domain,int bridgeId) throws Brid private volatile Set m_bridges = new HashSet(); private volatile List m_topology = new ArrayList(); private volatile Set m_forwarding = new HashSet(); - + public void cleanForwarders() { cleanForwarders(getMacsOnSegments()); } diff --git a/opennms-model/src/main/java/org/opennms/netmgt/model/topology/SharedSegment.java b/opennms-model/src/main/java/org/opennms/netmgt/model/topology/SharedSegment.java index a72e51b3d4ac..0ced7265bfc0 100644 --- a/opennms-model/src/main/java/org/opennms/netmgt/model/topology/SharedSegment.java +++ b/opennms-model/src/main/java/org/opennms/netmgt/model/topology/SharedSegment.java @@ -28,6 +28,7 @@ package org.opennms.netmgt.model.topology; +import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -53,6 +54,8 @@ public static SharedSegment create(BridgeMacLink link) throws BridgeTopologyExce segment.getBridgePortsOnSegment().add(BridgePort.getFromBridgeMacLink(link)); segment.getMacsOnSegment().add(link.getMacAddress()); segment.setDesignatedBridge(link.getNode().getId()); + segment.setCreateTime(link.getBridgeMacLinkCreateTime()); + segment.setLastPollTime(link.getBridgeMacLinkLastPollTime()); return segment; } @@ -61,6 +64,8 @@ public static SharedSegment create(BridgeBridgeLink link) throws BridgeTopologyE segment.getBridgePortsOnSegment().add(BridgePort.getFromBridgeBridgeLink(link)); segment.getBridgePortsOnSegment().add(BridgePort.getFromDesignatedBridgeBridgeLink(link)); segment.setDesignatedBridge(link.getDesignatedNode().getId()); + segment.setCreateTime(link.getBridgeBridgeLinkCreateTime()); + segment.setLastPollTime(link.getBridgeBridgeLinkLastPollTime()); return segment; } @@ -143,7 +148,24 @@ public static SharedSegment create() { private Integer m_designatedBridgeId; private Set m_macsOnSegment = new HashSet(); private Set m_portsOnSegment = new HashSet(); + private Date m_createTime; + private Date m_lastPollTime; + public Date getCreateTime() { + return m_createTime; + } + + public void setCreateTime(Date createTime) { + m_createTime = createTime; + } + + public Date getLastPollTime() { + return m_lastPollTime; + } + + public void setLastPollTime(Date lastPollTime) { + m_lastPollTime = lastPollTime; + } public boolean setDesignatedBridge(Integer designatedBridge) { m_designatedBridgeId = designatedBridge; diff --git a/opennms-provision/opennms-detector-bsf/pom.xml b/opennms-provision/opennms-detector-bsf/pom.xml index 3beb531643e8..cfbb74f8cd4e 100644 --- a/opennms-provision/opennms-detector-bsf/pom.xml +++ b/opennms-provision/opennms-detector-bsf/pom.xml @@ -3,7 +3,7 @@ opennms-provision org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-detector-bsf diff --git a/opennms-provision/opennms-detector-datagram/pom.xml b/opennms-provision/opennms-detector-datagram/pom.xml index c761efdfdb6c..3a56d3e8107d 100644 --- a/opennms-provision/opennms-detector-datagram/pom.xml +++ b/opennms-provision/opennms-detector-datagram/pom.xml @@ -3,7 +3,7 @@ opennms-provision org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-detector-datagram diff --git a/opennms-provision/opennms-detector-generic/pom.xml b/opennms-provision/opennms-detector-generic/pom.xml index 569d8f5ba327..8f913f0efcbb 100644 --- a/opennms-provision/opennms-detector-generic/pom.xml +++ b/opennms-provision/opennms-detector-generic/pom.xml @@ -3,7 +3,7 @@ opennms-provision org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-detector-generic diff --git a/opennms-provision/opennms-detector-jdbc/pom.xml b/opennms-provision/opennms-detector-jdbc/pom.xml index f5749af98e17..0e0f4f8f0e10 100644 --- a/opennms-provision/opennms-detector-jdbc/pom.xml +++ b/opennms-provision/opennms-detector-jdbc/pom.xml @@ -3,7 +3,7 @@ opennms-provision org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-detector-jdbc diff --git a/opennms-provision/opennms-detector-jmx/pom.xml b/opennms-provision/opennms-detector-jmx/pom.xml index 89c337b81fa9..1f360c865ca2 100644 --- a/opennms-provision/opennms-detector-jmx/pom.xml +++ b/opennms-provision/opennms-detector-jmx/pom.xml @@ -3,7 +3,7 @@ opennms-provision org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-detector-jmx diff --git a/opennms-provision/opennms-detector-lineoriented/pom.xml b/opennms-provision/opennms-detector-lineoriented/pom.xml index 9f6a1d7e5176..64041a513fee 100644 --- a/opennms-provision/opennms-detector-lineoriented/pom.xml +++ b/opennms-provision/opennms-detector-lineoriented/pom.xml @@ -3,7 +3,7 @@ opennms-provision org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-detector-lineoriented diff --git a/opennms-provision/opennms-detector-registry/pom.xml b/opennms-provision/opennms-detector-registry/pom.xml index 83025c8764d5..b9b882f5579e 100644 --- a/opennms-provision/opennms-detector-registry/pom.xml +++ b/opennms-provision/opennms-detector-registry/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-provision - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-detector-registry diff --git a/opennms-provision/opennms-detector-simple/pom.xml b/opennms-provision/opennms-detector-simple/pom.xml index 2459fb5c0da1..ff794ce32c15 100644 --- a/opennms-provision/opennms-detector-simple/pom.xml +++ b/opennms-provision/opennms-detector-simple/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-provision - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-detector-simple diff --git a/opennms-provision/opennms-detector-ssh/pom.xml b/opennms-provision/opennms-detector-ssh/pom.xml index 44a57280e838..498b946ddf4a 100644 --- a/opennms-provision/opennms-detector-ssh/pom.xml +++ b/opennms-provision/opennms-detector-ssh/pom.xml @@ -3,7 +3,7 @@ opennms-provision org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-detector-ssh diff --git a/opennms-provision/opennms-detector-web/pom.xml b/opennms-provision/opennms-detector-web/pom.xml index 3468210dff15..75c9a4b764c5 100644 --- a/opennms-provision/opennms-detector-web/pom.xml +++ b/opennms-provision/opennms-detector-web/pom.xml @@ -3,7 +3,7 @@ opennms-provision org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-detector-web diff --git a/opennms-provision/opennms-detectorclient-rpc/pom.xml b/opennms-provision/opennms-detectorclient-rpc/pom.xml index 06a4a81b93ad..4375bd2926eb 100644 --- a/opennms-provision/opennms-detectorclient-rpc/pom.xml +++ b/opennms-provision/opennms-detectorclient-rpc/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-provision - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-detectorclient-rpc diff --git a/opennms-provision/opennms-mock-simpleserver/pom.xml b/opennms-provision/opennms-mock-simpleserver/pom.xml index 77b8b8a68893..33a6bfb96aec 100644 --- a/opennms-provision/opennms-mock-simpleserver/pom.xml +++ b/opennms-provision/opennms-mock-simpleserver/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-provision - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-mock-simpleserver diff --git a/opennms-provision/opennms-provision-api/pom.xml b/opennms-provision/opennms-provision-api/pom.xml index 415a715b1915..79d38c7e8f15 100644 --- a/opennms-provision/opennms-provision-api/pom.xml +++ b/opennms-provision/opennms-provision-api/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-provision - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-provision-api diff --git a/opennms-provision/opennms-provision-geolocation/pom.xml b/opennms-provision/opennms-provision-geolocation/pom.xml index cff64faf0e66..9a8e3d736f75 100644 --- a/opennms-provision/opennms-provision-geolocation/pom.xml +++ b/opennms-provision/opennms-provision-geolocation/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-provision - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-provision-geolocation diff --git a/opennms-provision/opennms-provision-persistence/pom.xml b/opennms-provision/opennms-provision-persistence/pom.xml index 432d2e631c80..86ca95abb15d 100644 --- a/opennms-provision/opennms-provision-persistence/pom.xml +++ b/opennms-provision/opennms-provision-persistence/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-provision - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-provision-persistence diff --git a/opennms-provision/opennms-provision-shell/pom.xml b/opennms-provision/opennms-provision-shell/pom.xml index 190db9c1365c..6cd198f1c601 100644 --- a/opennms-provision/opennms-provision-shell/pom.xml +++ b/opennms-provision/opennms-provision-shell/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-provision - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-provision-shell diff --git a/opennms-provision/opennms-provisiond/pom.xml b/opennms-provision/opennms-provisiond/pom.xml index ba49eec67905..8660141dc9f8 100644 --- a/opennms-provision/opennms-provisiond/pom.xml +++ b/opennms-provision/opennms-provisiond/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-provision - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-provisiond @@ -141,5 +141,10 @@ opennms-icmp-best test + + org.mockito + mockito-all + test + diff --git a/opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/Provisioner.java b/opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/Provisioner.java index 870fb7b0b181..c26bc57b9b35 100644 --- a/opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/Provisioner.java +++ b/opennms-provision/opennms-provisiond/src/main/java/org/opennms/netmgt/provision/service/Provisioner.java @@ -57,6 +57,7 @@ import org.opennms.netmgt.events.api.annotations.EventHandler; import org.opennms.netmgt.events.api.annotations.EventListener; import org.opennms.netmgt.model.OnmsIpInterface; +import org.opennms.netmgt.model.OnmsMonitoringSystem; import org.opennms.netmgt.model.OnmsNode; import org.opennms.netmgt.model.events.EventBuilder; import org.opennms.netmgt.model.events.EventUtils; @@ -195,8 +196,14 @@ public ImportScheduler getImportSchedule() { return m_importSchedule; } + public MonitoringSystemDao getMonitoringSystemDao() { + return monitoringSystemDao; + } + + public void setMonitoringSystemDao(MonitoringSystemDao monitoringSystemDao) { + this.monitoringSystemDao = monitoringSystemDao; + } - /** *

start

* @@ -611,28 +618,31 @@ public void run() { return; } - final String location; + String effectiveLocation = MonitoringLocationDao.DEFAULT_MONITORING_LOCATION_ID; if (paramMap.containsKey("location")) { - location = paramMap.get("location"); + effectiveLocation = paramMap.get("location"); } else if (event.getDistPoller() != null) { - location = monitoringSystemDao.get(event.getDistPoller()).getLocation(); - } else { - location = MonitoringLocationDao.DEFAULT_MONITORING_LOCATION_ID; + final OnmsMonitoringSystem monitoringSystem = monitoringSystemDao.get(event.getDistPoller()); + if (monitoringSystem != null) { + effectiveLocation = monitoringSystem.getLocation(); + } else { + LOG.info("newSuspect event references monitoring system with id {}, but this system was not found. Using the default location.", + event.getDistPoller()); + } } final String foreignSource = paramMap.get("foreignSource"); LOG.debug("Triggering new suspect scan for: {} at location: {} with foreign source: {}.", - addr, location, foreignSource); - final NewSuspectScan scan = createNewSuspectScan(addr, foreignSource, location); + addr, effectiveLocation, foreignSource); + final NewSuspectScan scan = createNewSuspectScan(addr, foreignSource, effectiveLocation); Task t = scan.createTask(); t.schedule(); t.waitFor(); } catch (InterruptedException ex) { - LOG.error("Task interrupted waiting for new suspect scan of {} to finish", ip, ex); - } catch (ExecutionException ex) { - LOG.error("An expected execution occurred waiting for new suspect scan of {} to finish", ip, ex); + LOG.error("Task interrupted waiting for new suspect scan of {} at location {} to finish", ip, ex); + } catch (Exception ex) { + LOG.error("An unexpected execution occurred waiting for new suspect scan of {} to finish", ip, ex); } - } }; diff --git a/opennms-provision/opennms-provisiond/src/test/java/org/opennms/netmgt/provision/service/ProvisionerTest.java b/opennms-provision/opennms-provisiond/src/test/java/org/opennms/netmgt/provision/service/ProvisionerTest.java new file mode 100644 index 000000000000..09ba70c7f5f4 --- /dev/null +++ b/opennms-provision/opennms-provisiond/src/test/java/org/opennms/netmgt/provision/service/ProvisionerTest.java @@ -0,0 +1,112 @@ +/******************************************************************************* + * This file is part of OpenNMS(R). + * + * Copyright (C) 2018 The OpenNMS Group, Inc. + * OpenNMS(R) is Copyright (C) 1999-2018 The OpenNMS Group, Inc. + * + * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. + * + * OpenNMS(R) is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. + * + * OpenNMS(R) is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenNMS(R). If not, see: + * http://www.gnu.org/licenses/ + * + * For more information contact: + * OpenNMS(R) Licensing + * http://www.opennms.org/ + * http://www.opennms.com/ + *******************************************************************************/ + +package org.opennms.netmgt.provision.service; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockito.Matchers.isNull; +import static org.mockito.Mockito.RETURNS_DEEP_STUBS; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.net.InetAddress; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; + +import org.junit.After; +import org.junit.Test; +import org.opennms.core.tasks.TaskCoordinator; +import org.opennms.core.test.MockLogAppender; +import org.opennms.core.utils.InetAddressUtils; +import org.opennms.netmgt.dao.api.MonitoringLocationDao; +import org.opennms.netmgt.dao.api.MonitoringSystemDao; +import org.opennms.netmgt.events.api.EventConstants; +import org.opennms.netmgt.model.events.EventBuilder; +import org.opennms.netmgt.xml.event.Event; + +public class ProvisionerTest { + + @After + public void tearDown() { + MockLogAppender.assertNoWarningsOrGreater(); + } + + @Test + public void canTriggerNewSuspectScanWhenMonitoringSystemIsNotFound() throws InterruptedException { + // Build a provisioner that overrides the 'createNewSuspectScan' call and saves the arguments from the last call + final AtomicReference ipAddressRef = new AtomicReference<>(); + final AtomicReference foreignSourceRef = new AtomicReference<>(); + final AtomicReference locationRef = new AtomicReference<>(); + final Provisioner provisioner = new Provisioner() { + @Override + public NewSuspectScan createNewSuspectScan(InetAddress ipAddress, String foreignSource, String location) { + ipAddressRef.set(ipAddress); + foreignSourceRef.set(foreignSource); + locationRef.set(location); + return mock(NewSuspectScan.class, RETURNS_DEEP_STUBS); + } + }; + + // Mock the necessary facilities + ProvisionService provisionService = mock(ProvisionService.class); + when(provisionService.isDiscoveryEnabled()).thenReturn(true); + provisioner.setProvisionService(provisionService); + + ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(1); + provisioner.setScheduledExecutor(scheduledExecutorService); + + MonitoringSystemDao monitoringSystemDao = mock(MonitoringSystemDao.class); + provisioner.setMonitoringSystemDao(monitoringSystemDao); + + // Create the newSuspect event + Event newSuspectEvent = new EventBuilder(EventConstants.NEW_SUSPECT_INTERFACE_EVENT_UEI, "test") + .setInterface(InetAddressUtils.ONE_TWENTY_SEVEN) + // Reference a dist poller (or monitoring system) which does not exist + // The MonitoringSystemDao we provide is a mock anyways, so it'll always return null + .setDistPoller("non-existent") + .getEvent(); + + // Trigger the newSuspect and wait for the runnable to complete + provisioner.handleNewSuspectEvent(newSuspectEvent); + scheduledExecutorService.shutdown(); + scheduledExecutorService.awaitTermination(1, TimeUnit.MINUTES); + + // Make sure we tried to lookup the monitoring system from the given id + verify(monitoringSystemDao, times(1)).get("non-existent"); + + // Validate the arguments passed to createNewSuspectScan call + assertThat(ipAddressRef.get(), equalTo(InetAddressUtils.ONE_TWENTY_SEVEN)); + assertThat(foreignSourceRef.get(), equalTo(null)); + assertThat(locationRef.get(), equalTo(MonitoringLocationDao.DEFAULT_MONITORING_LOCATION_ID)); + } +} diff --git a/opennms-provision/opennms-requisition-dns/pom.xml b/opennms-provision/opennms-requisition-dns/pom.xml index 4666085e0480..9e84fe619980 100644 --- a/opennms-provision/opennms-requisition-dns/pom.xml +++ b/opennms-provision/opennms-requisition-dns/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-provision - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-requisition-dns diff --git a/opennms-provision/opennms-requisition-service/pom.xml b/opennms-provision/opennms-requisition-service/pom.xml index b0814b3aacf9..348ae37ca899 100644 --- a/opennms-provision/opennms-requisition-service/pom.xml +++ b/opennms-provision/opennms-requisition-service/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-provision - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-requisition-service diff --git a/opennms-provision/opennms-snmp-scanners/pom.xml b/opennms-provision/opennms-snmp-scanners/pom.xml index 7cfdf5a582f5..1d30bfaf726a 100644 --- a/opennms-provision/opennms-snmp-scanners/pom.xml +++ b/opennms-provision/opennms-snmp-scanners/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-provision - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-snmp-scanners diff --git a/opennms-provision/pom.xml b/opennms-provision/pom.xml index e167de26d18f..541ce6892e6e 100644 --- a/opennms-provision/pom.xml +++ b/opennms-provision/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-provision diff --git a/opennms-reporting/pom.xml b/opennms-reporting/pom.xml index 63370db00d83..1214c6c697ca 100644 --- a/opennms-reporting/pom.xml +++ b/opennms-reporting/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-reporting diff --git a/opennms-rrd/opennms-rrd-api/pom.xml b/opennms-rrd/opennms-rrd-api/pom.xml index 274b2d71afcb..d4403340640a 100644 --- a/opennms-rrd/opennms-rrd-api/pom.xml +++ b/opennms-rrd/opennms-rrd-api/pom.xml @@ -3,7 +3,7 @@ opennms-rrd org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-rrd-api diff --git a/opennms-rrd/opennms-rrd-jrobin/pom.xml b/opennms-rrd/opennms-rrd-jrobin/pom.xml index c95eba775fb9..2a198d0bebe6 100644 --- a/opennms-rrd/opennms-rrd-jrobin/pom.xml +++ b/opennms-rrd/opennms-rrd-jrobin/pom.xml @@ -3,7 +3,7 @@ opennms-rrd org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-rrd-jrobin diff --git a/opennms-rrd/opennms-rrd-model/pom.xml b/opennms-rrd/opennms-rrd-model/pom.xml index 14c4d826fbf3..7a758795c73f 100644 --- a/opennms-rrd/opennms-rrd-model/pom.xml +++ b/opennms-rrd/opennms-rrd-model/pom.xml @@ -3,7 +3,7 @@ opennms-rrd org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-rrd-model diff --git a/opennms-rrd/opennms-rrd-rrdtool/opennms-rrdtool-api/pom.xml b/opennms-rrd/opennms-rrd-rrdtool/opennms-rrdtool-api/pom.xml index 8b2954f287ff..69c9c556cf18 100644 --- a/opennms-rrd/opennms-rrd-rrdtool/opennms-rrdtool-api/pom.xml +++ b/opennms-rrd/opennms-rrd-rrdtool/opennms-rrdtool-api/pom.xml @@ -3,7 +3,7 @@ opennms-rrd-rrdtool org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-rrdtool-api diff --git a/opennms-rrd/opennms-rrd-rrdtool/pom.xml b/opennms-rrd/opennms-rrd-rrdtool/pom.xml index 8221ad23d133..b093bd632ed3 100644 --- a/opennms-rrd/opennms-rrd-rrdtool/pom.xml +++ b/opennms-rrd/opennms-rrd-rrdtool/pom.xml @@ -3,7 +3,7 @@ opennms-rrd org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-rrd-rrdtool diff --git a/opennms-rrd/opennms-rrd-tcp/pom.xml b/opennms-rrd/opennms-rrd-tcp/pom.xml index 37af60ec799f..d88b17a8b613 100644 --- a/opennms-rrd/opennms-rrd-tcp/pom.xml +++ b/opennms-rrd/opennms-rrd-tcp/pom.xml @@ -3,7 +3,7 @@ opennms-rrd org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-rrd-tcp diff --git a/opennms-rrd/pom.xml b/opennms-rrd/pom.xml index cb9b41eefcc4..e01e66a32a23 100644 --- a/opennms-rrd/pom.xml +++ b/opennms-rrd/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-rrd diff --git a/opennms-services/pom.xml b/opennms-services/pom.xml index ea9a07202ec2..4c719227855b 100644 --- a/opennms-services/pom.xml +++ b/opennms-services/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-services diff --git a/opennms-services/src/test/java/org/opennms/netmgt/enlinkd/EnLinkdBuilderITCase.java b/opennms-services/src/test/java/org/opennms/netmgt/enlinkd/EnLinkdBuilderITCase.java index 3fc763749833..8cabe15baab7 100644 --- a/opennms-services/src/test/java/org/opennms/netmgt/enlinkd/EnLinkdBuilderITCase.java +++ b/opennms-services/src/test/java/org/opennms/netmgt/enlinkd/EnLinkdBuilderITCase.java @@ -42,6 +42,7 @@ import org.opennms.netmgt.dao.api.BridgeStpLinkDao; import org.opennms.netmgt.dao.api.BridgeTopologyDao; import org.opennms.netmgt.dao.api.CdpLinkDao; +import org.opennms.netmgt.dao.api.IpInterfaceDao; import org.opennms.netmgt.dao.api.IpNetToMediaDao; import org.opennms.netmgt.dao.api.NodeDao; import org.opennms.netmgt.dao.api.BridgeBridgeLinkDao; @@ -77,7 +78,10 @@ public abstract class EnLinkdBuilderITCase extends EnLinkdTestHelper implements @Autowired protected NodeDao m_nodeDao; - + + @Autowired + protected IpInterfaceDao m_ipInterfaceDao; + @Autowired protected CdpLinkDao m_cdpLinkDao; diff --git a/opennms-services/src/test/java/org/opennms/netmgt/enlinkd/EnLinkdIT.java b/opennms-services/src/test/java/org/opennms/netmgt/enlinkd/EnLinkdIT.java index dbea36ea3c6a..3583a36b9709 100644 --- a/opennms-services/src/test/java/org/opennms/netmgt/enlinkd/EnLinkdIT.java +++ b/opennms-services/src/test/java/org/opennms/netmgt/enlinkd/EnLinkdIT.java @@ -39,9 +39,13 @@ import static org.opennms.netmgt.nb.NmsNetworkBuilder.SWITCH1_IP; import static org.opennms.netmgt.nb.NmsNetworkBuilder.SWITCH1_NAME; import static org.opennms.netmgt.nb.NmsNetworkBuilder.SWITCH1_SYSOID; +import static org.opennms.core.utils.InetAddressUtils.str; import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; import org.junit.Test; @@ -50,13 +54,17 @@ import org.opennms.netmgt.model.BridgeBridgeLink; import org.opennms.netmgt.model.BridgeElement; import org.opennms.netmgt.model.BridgeMacLink; +import org.opennms.netmgt.model.OnmsIpInterface; import org.opennms.netmgt.model.BridgeMacLink.BridgeMacLinkType; +import org.opennms.netmgt.model.IpNetToMedia; +import org.opennms.netmgt.model.IpNetToMedia.IpNetToMediaType; import org.opennms.netmgt.model.topology.BridgeForwardingTableEntry.BridgeDot1qTpFdbStatus; import org.opennms.netmgt.model.NetworkBuilder; import org.opennms.netmgt.model.OnmsNode; import org.opennms.netmgt.model.OnmsNode.NodeType; import org.opennms.netmgt.model.monitoringLocations.OnmsMonitoringLocation; import org.opennms.netmgt.model.topology.BridgeForwardingTableEntry; +import org.opennms.netmgt.model.topology.BridgePort; import org.opennms.netmgt.model.topology.BridgeTopologyException; import org.opennms.netmgt.model.topology.BroadcastDomain; import org.opennms.netmgt.model.topology.SharedSegment; @@ -473,8 +481,6 @@ public void testLoadTopology() throws BridgeTopologyException { assertNotNull(m_bridgeTopologyDao); - //FIXME - // this test loading the topology...should be like this! m_linkd.getQueryManager().loadBridgeTopology(); for (BroadcastDomain bd:m_linkd.getQueryManager().getAllBroadcastDomains()) { @@ -845,6 +851,286 @@ public void testDeleteBridgeA() throws BridgeTopologyException { topology.checkBC(domain); } + + @Test + public void checkBridgeTopologyDao() throws BridgeTopologyException { + + NetworkBuilder nb = new NetworkBuilder(); + nb.addNode("pe01"). + setForeignSource("linkd"). + setForeignId("pe01"). + setSysObjectId(".1.3.6.1.4.1.9.1.1252"). + setSysName("pe01"). + setType(NodeType.ACTIVE); + nb.addInterface("10.25.39.1").setIsSnmpPrimary("P").setIsManaged("M"); + m_nodeDao.save(nb.getCurrentNode()); + + nb.addNode("asw01"). + setForeignSource("linkd"). + setForeignId("asw01"). + setSysObjectId(".1.3.6.1.4.1.6486.800.1.1.2.1.10.1.1"). + setSysName("asw01"). + setType(NodeType.ACTIVE); + nb.addInterface("10.25.39.1").setIsSnmpPrimary("P").setIsManaged("M"); + m_nodeDao.save(nb.getCurrentNode()); + + nb.addNode("ess01"). + setForeignSource("linkd"). + setForeignId("ess01"). + setSysObjectId(".1.3.6.1.4.1.8072.3.2.10"). + setSysName("ess01"). + setType(NodeType.ACTIVE); + nb.addInterface("10.25.39.34").setIsSnmpPrimary("P").setIsManaged("M"); + nb.addInterface("10.25.139.61").setIsSnmpPrimary("N").setIsManaged("M"); + m_nodeDao.save(nb.getCurrentNode()); + + OnmsNode pe01 = m_nodeDao.findByForeignId("linkd", "pe01"); + OnmsNode asw01 = m_nodeDao.findByForeignId("linkd", "asw01"); + OnmsNode ess01 = m_nodeDao.findByForeignId("linkd", "ess01"); + + String mac0="00176301092d"; //mac of ess01 + String mac1="54a050847462"; + String mac2="a0d3c1333de9"; + String mac3="e48d8c2e100c"; + String mac4="0012cf68d780"; + String mac5="e48d8cf17bcb"; //no ip address + String mac6="4c0082245938"; + String mac7="4c0082245937"; + IpNetToMedia ip1mac0 = new IpNetToMedia(); + ip1mac0.setSourceNode(pe01); + ip1mac0.setSourceIfIndex(25); + ip1mac0.setPhysAddress(mac0); + ip1mac0.setNetAddress(InetAddressUtils.addr("10.25.39.34")); + ip1mac0.setLastPollTime(ip1mac0.getCreateTime()); + + ip1mac0.setIpNetToMediaType(IpNetToMediaType.IPNETTOMEDIA_TYPE_DYNAMIC); + IpNetToMedia ip2mac0 = new IpNetToMedia(); + ip2mac0.setSourceNode(pe01); + ip2mac0.setSourceIfIndex(25); + ip2mac0.setPhysAddress(mac0); + ip2mac0.setNetAddress(InetAddressUtils.addr("10.25.139.61")); + ip2mac0.setIpNetToMediaType(IpNetToMediaType.IPNETTOMEDIA_TYPE_DYNAMIC); + ip2mac0.setLastPollTime(ip2mac0.getCreateTime()); + IpNetToMedia ip1mac1 = new IpNetToMedia(); + ip1mac1.setSourceNode(pe01); + ip1mac1.setSourceIfIndex(3001); + ip1mac1.setPhysAddress(mac1); + ip1mac1.setNetAddress(InetAddressUtils.addr("172.22.128.109")); + ip1mac1.setIpNetToMediaType(IpNetToMediaType.IPNETTOMEDIA_TYPE_DYNAMIC); + ip1mac1.setLastPollTime(ip1mac1.getCreateTime()); + + IpNetToMedia ip1mac2 = new IpNetToMedia(); + ip1mac2.setSourceNode(pe01); + ip1mac2.setSourceIfIndex(3001); + ip1mac2.setPhysAddress(mac2); + ip1mac2.setNetAddress(InetAddressUtils.addr("172.22.128.115")); + ip1mac2.setIpNetToMediaType(IpNetToMediaType.IPNETTOMEDIA_TYPE_DYNAMIC); + ip1mac2.setLastPollTime(ip1mac2.getCreateTime()); + IpNetToMedia ip1mac3 = new IpNetToMedia(); + ip1mac3.setSourceNode(pe01); + ip1mac3.setSourceIfIndex(3072); + ip1mac3.setPhysAddress(mac3); + ip1mac3.setNetAddress(InetAddressUtils.addr("10.125.39.18")); + ip1mac3.setIpNetToMediaType(IpNetToMediaType.IPNETTOMEDIA_TYPE_DYNAMIC); + ip1mac3.setLastPollTime(ip1mac3.getCreateTime()); + IpNetToMedia ip2mac3 = new IpNetToMedia(); + ip2mac3.setSourceNode(pe01); + ip2mac3.setSourceIfIndex(3072); + ip2mac3.setPhysAddress(mac3); + ip2mac3.setNetAddress(InetAddressUtils.addr("10.125.39.5")); + ip2mac3.setIpNetToMediaType(IpNetToMediaType.IPNETTOMEDIA_TYPE_DYNAMIC); + ip2mac3.setLastPollTime(ip2mac3.getCreateTime()); + IpNetToMedia ip3mac3 = new IpNetToMedia(); + ip3mac3.setSourceNode(pe01); + ip3mac3.setSourceIfIndex(3072); + ip3mac3.setPhysAddress(mac3); + ip3mac3.setNetAddress(InetAddressUtils.addr("10.125.39.133")); + ip3mac3.setIpNetToMediaType(IpNetToMediaType.IPNETTOMEDIA_TYPE_DYNAMIC); + ip3mac3.setLastPollTime(ip3mac3.getCreateTime()); + IpNetToMedia ip1mac4 = new IpNetToMedia(); + ip1mac4.setSourceNode(pe01); + ip1mac4.setSourceIfIndex(3072); + ip1mac4.setPhysAddress(mac4); + ip1mac4.setNetAddress(InetAddressUtils.addr("10.25.39.61")); + ip1mac4.setIpNetToMediaType(IpNetToMediaType.IPNETTOMEDIA_TYPE_DYNAMIC); + ip1mac4.setLastPollTime(ip1mac4.getCreateTime()); + IpNetToMedia ip1mac6 = new IpNetToMedia(); + ip1mac6.setSourceNode(pe01); + ip1mac6.setSourceIfIndex(8011); + ip1mac6.setPhysAddress(mac6); + ip1mac6.setNetAddress(InetAddressUtils.addr("10.101.39.2")); + ip1mac6.setIpNetToMediaType(IpNetToMediaType.IPNETTOMEDIA_TYPE_DYNAMIC); + ip1mac6.setLastPollTime(ip1mac6.getCreateTime()); + + m_ipNetToMediaDao.save(ip1mac0); + m_ipNetToMediaDao.save(ip2mac0); + m_ipNetToMediaDao.save(ip1mac1); + m_ipNetToMediaDao.save(ip1mac2); + m_ipNetToMediaDao.save(ip1mac3); + m_ipNetToMediaDao.save(ip2mac3); + m_ipNetToMediaDao.save(ip3mac3); + m_ipNetToMediaDao.save(ip1mac4); + m_ipNetToMediaDao.save(ip1mac6); + + BridgeBridgeLink asw01pe01link = new BridgeBridgeLink(); + asw01pe01link.setNode(asw01); + asw01pe01link.setBridgePort(24); + asw01pe01link.setBridgePort(1024); + asw01pe01link.setDesignatedNode(pe01); + asw01pe01link.setDesignatedPort(24); + asw01pe01link.setDesignatedPortIfIndex(10124); + asw01pe01link.setDesignatedVlan(25); + asw01pe01link.setBridgeBridgeLinkLastPollTime(asw01pe01link.getBridgeBridgeLinkCreateTime()); + BridgeMacLink pe01mac1port3 = new BridgeMacLink(); + pe01mac1port3.setNode(pe01); + pe01mac1port3.setBridgePort(3); + pe01mac1port3.setBridgePortIfIndex(10103); + pe01mac1port3.setVlan(3001); + pe01mac1port3.setMacAddress(mac1); + pe01mac1port3.setLinkType(BridgeMacLinkType.BRIDGE_LINK); + pe01mac1port3.setBridgeMacLinkLastPollTime(pe01mac1port3.getBridgeMacLinkCreateTime()); + BridgeMacLink pe01mac2port3 = new BridgeMacLink(); + pe01mac2port3.setNode(pe01); + pe01mac2port3.setBridgePort(3); + pe01mac2port3.setBridgePortIfIndex(10103); + pe01mac2port3.setVlan(3001); + pe01mac2port3.setMacAddress(mac2); + pe01mac2port3.setLinkType(BridgeMacLinkType.BRIDGE_LINK); + pe01mac2port3.setBridgeMacLinkLastPollTime(pe01mac2port3.getBridgeMacLinkCreateTime()); + BridgeMacLink pe01mac3port7 = new BridgeMacLink(); + pe01mac3port7.setNode(pe01); + pe01mac3port7.setBridgePort(7); + pe01mac3port7.setBridgePortIfIndex(10107); + pe01mac3port7.setVlan(3072); + pe01mac3port7.setMacAddress(mac3); + pe01mac3port7.setLinkType(BridgeMacLinkType.BRIDGE_LINK); + pe01mac3port7.setBridgeMacLinkLastPollTime(pe01mac3port7.getBridgeMacLinkCreateTime()); + BridgeMacLink asw01mac4port1 = new BridgeMacLink(); + asw01mac4port1.setNode(asw01); + asw01mac4port1.setBridgePort(1); + asw01mac4port1.setBridgePortIfIndex(1001); + asw01mac4port1.setMacAddress(mac4); + asw01mac4port1.setLinkType(BridgeMacLinkType.BRIDGE_LINK); + asw01mac4port1.setBridgeMacLinkLastPollTime(asw01mac4port1.getBridgeMacLinkCreateTime()); + BridgeMacLink asw01mac5port1 = new BridgeMacLink(); + asw01mac5port1.setNode(asw01); + asw01mac5port1.setBridgePort(1); + asw01mac5port1.setBridgePortIfIndex(1001); + asw01mac5port1.setMacAddress(mac5); + asw01mac5port1.setLinkType(BridgeMacLinkType.BRIDGE_LINK); + asw01mac5port1.setBridgeMacLinkLastPollTime(asw01mac5port1.getBridgeMacLinkCreateTime()); + BridgeMacLink asw01mac0port1 = new BridgeMacLink(); + asw01mac0port1.setNode(asw01); + asw01mac0port1.setBridgePort(1); + asw01mac0port1.setBridgePortIfIndex(1001); + asw01mac0port1.setMacAddress(mac0); + asw01mac0port1.setLinkType(BridgeMacLinkType.BRIDGE_LINK); + asw01mac0port1.setBridgeMacLinkLastPollTime(asw01mac0port1.getBridgeMacLinkCreateTime()); + BridgeMacLink asw01mac6port19 = new BridgeMacLink(); + asw01mac6port19.setNode(asw01); + asw01mac6port19.setBridgePort(19); + asw01mac6port19.setBridgePortIfIndex(1019); + asw01mac6port19.setMacAddress(mac6); + asw01mac6port19.setLinkType(BridgeMacLinkType.BRIDGE_LINK); + asw01mac6port19.setBridgeMacLinkLastPollTime(asw01mac6port19.getBridgeMacLinkCreateTime()); + + BridgeMacLink shared = new BridgeMacLink(); + shared.setNode(pe01); + shared.setBridgePort(24); + shared.setBridgePortIfIndex(10124); + shared.setMacAddress(mac7); + shared.setLinkType(BridgeMacLinkType.BRIDGE_LINK); + shared.setBridgeMacLinkLastPollTime(shared.getBridgeMacLinkCreateTime()); + + m_bridgeBridgeLinkDao.save(asw01pe01link); + m_bridgeMacLinkDao.save(shared); + m_bridgeMacLinkDao.save(pe01mac1port3); + m_bridgeMacLinkDao.save(pe01mac2port3); + m_bridgeMacLinkDao.save(pe01mac3port7); + m_bridgeMacLinkDao.save(asw01mac0port1); + m_bridgeMacLinkDao.save(asw01mac4port1); + m_bridgeMacLinkDao.save(asw01mac5port1); + m_bridgeMacLinkDao.save(asw01mac6port19); + + m_ipNetToMediaDao.flush(); + m_bridgeBridgeLinkDao.flush(); + m_bridgeMacLinkDao.flush(); + + assertEquals(1,m_bridgeTopologyDao.load().size()); + assertEquals(3,m_bridgeTopologyDao.getBridgeSharedSegments(pe01.getId()).size()); + assertEquals(3,m_bridgeTopologyDao.getBridgeSharedSegments(asw01.getId()).size()); + assertEquals(0,m_bridgeTopologyDao.getBridgeSharedSegments(ess01.getId()).size()); + + + SharedSegment asw01port1segment = m_bridgeTopologyDao.getHostSharedSegment(mac0); + assertEquals(3,asw01port1segment.getMacsOnSegment().size()); + assertTrue(asw01port1segment.containsMac(mac0)); + assertTrue(asw01port1segment.containsMac(mac4)); + assertTrue(asw01port1segment.containsMac(mac5)); + assertEquals(1, asw01port1segment.getBridgePortsOnSegment().size()); + BridgePort asw01port1 = asw01port1segment.getBridgePortsOnSegment().iterator().next(); + assertEquals(asw01.getId(), asw01port1.getNodeId()); + assertEquals(1, asw01port1.getBridgePort().intValue()); + assertEquals(1001, asw01port1.getBridgePortIfIndex().intValue()); + + SharedSegment pe01port3 = m_bridgeTopologyDao.getHostSharedSegment(mac1); + assertEquals(2,pe01port3.getMacsOnSegment().size()); + assertTrue(pe01port3.containsMac(mac1)); + assertTrue(pe01port3.containsMac(mac2)); + assertEquals(1, pe01port3.getBridgePortsOnSegment().size()); + + SharedSegment pe01port7 = m_bridgeTopologyDao.getHostSharedSegment(mac3); + assertEquals(1,pe01port7.getMacsOnSegment().size()); + assertTrue(pe01port7.containsMac(mac3)); + assertEquals(1, pe01port7.getBridgePortsOnSegment().size()); + + SharedSegment asw01port19segment = m_bridgeTopologyDao.getHostSharedSegment(mac6); + assertEquals(1,asw01port19segment.getMacsOnSegment().size()); + assertTrue(asw01port19segment.containsMac(mac6)); + assertEquals(1, asw01port19segment.getBridgePortsOnSegment().size()); + + SharedSegment pe01asw01segment = m_bridgeTopologyDao.getHostSharedSegment(mac7); + assertEquals(1,pe01asw01segment.getMacsOnSegment().size()); + assertTrue(pe01asw01segment.containsMac(mac7)); + assertEquals(2, pe01asw01segment.getBridgePortsOnSegment().size()); + + SharedSegment emptysegment = m_bridgeTopologyDao.getHostSharedSegment("001763010920"); + assertEquals(0, emptysegment.getBridgePortsOnSegment().size()); + assertEquals(0, emptysegment.getMacsOnSegment().size()); + + //This code is inherited from EnlinkElementFactory + Map> mactoIpNodeMap = new HashMap>(); + m_ipInterfaceDao.findByNodeId(ess01.getId()).stream().forEach( ip -> { + m_ipNetToMediaDao.findByNetAddress(ip.getIpAddress()).stream().forEach( ipnettomedia -> { + if (!mactoIpNodeMap.containsKey(ipnettomedia.getPhysAddress())) + mactoIpNodeMap.put(ipnettomedia.getPhysAddress(), + new ArrayList()); + mactoIpNodeMap.get(ipnettomedia.getPhysAddress()).add(ip); + }); + }); + + assertEquals(1, mactoIpNodeMap.size()); + assertEquals(mac0, mactoIpNodeMap.keySet().iterator().next()); + Set ipsonmap = new HashSet(); + mactoIpNodeMap.get(mac0).stream().forEach(onmsip -> ipsonmap.add(str(onmsip.getIpAddress()))); + assertEquals(2, ipsonmap.size()); + assertTrue(ipsonmap.contains("10.25.39.34")); + assertTrue(ipsonmap.contains("10.25.139.61")); + + Set nodelinks = new HashSet(); + for (String mac : mactoIpNodeMap.keySet()) { + SharedSegment segment = m_bridgeTopologyDao.getHostSharedSegment(mac); + if (segment.isEmpty()) { + continue; + } + nodelinks.add(segment.getDesignatedBridge()); + } + + assertEquals(1, nodelinks.size()); + assertEquals(asw01.getId(), nodelinks.iterator().next()); + + } + } diff --git a/opennms-services/src/test/resources/META-INF/opennms/applicationContext-enhancedLinkdTest.xml b/opennms-services/src/test/resources/META-INF/opennms/applicationContext-enhancedLinkdTest.xml index a36d732e6344..5e99bb0917e1 100644 --- a/opennms-services/src/test/resources/META-INF/opennms/applicationContext-enhancedLinkdTest.xml +++ b/opennms-services/src/test/resources/META-INF/opennms/applicationContext-enhancedLinkdTest.xml @@ -95,6 +95,10 @@ + + + + diff --git a/opennms-taglib/pom.xml b/opennms-taglib/pom.xml new file mode 100644 index 000000000000..129ad36f33c4 --- /dev/null +++ b/opennms-taglib/pom.xml @@ -0,0 +1,33 @@ + + + + opennms + org.opennms + 22.0.2-SNAPSHOT + + 4.0.0 + opennms-taglib + OpenNMS Taglib + jar + + + + + org.eclipse.jetty + apache-jsp + provided + + + + + junit + junit + test + + + org.mockito + mockito-all + test + + + diff --git a/opennms-taglib/src/main/java/org/opennms/web/tags/DateTimeTag.java b/opennms-taglib/src/main/java/org/opennms/web/tags/DateTimeTag.java new file mode 100644 index 000000000000..cde95b8db399 --- /dev/null +++ b/opennms-taglib/src/main/java/org/opennms/web/tags/DateTimeTag.java @@ -0,0 +1,116 @@ +/******************************************************************************* + * This file is part of OpenNMS(R). + * + * Copyright (C) 2018 The OpenNMS Group, Inc. + * OpenNMS(R) is Copyright (C) 1999-2018 The OpenNMS Group, Inc. + * + * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. + * + * OpenNMS(R) is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. + * + * OpenNMS(R) is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenNMS(R). If not, see: + * http://www.gnu.org/licenses/ + * + * For more information contact: + * OpenNMS(R) Licensing + * http://www.opennms.org/ + * http://www.opennms.com/ + *******************************************************************************/ + +package org.opennms.web.tags; + +import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE; +import static java.time.temporal.ChronoField.HOUR_OF_DAY; +import static java.time.temporal.ChronoField.MINUTE_OF_HOUR; +import static java.time.temporal.ChronoField.SECOND_OF_MINUTE; + +import java.io.IOException; +import java.time.Instant; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeFormatterBuilder; +import java.util.Date; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.servlet.jsp.tagext.SimpleTagSupport; + +/** + * This class replaces the <fmt:formatDate /> tag. + * Why do we need a new tag? + * => fmt can't be configured via a System Property (without side effects) + * => we want to support the new java.time classes + * + * It will output datetimes as ISO_8601 type style unless otherwise defined in opennms.properties. + * See also: + * https://en.wikipedia.org/wiki/ISO_8601 and + * https://docs.oracle.com/javase/8/docs/api/java/time/format/DateTimeFormatter.html + */ +public class DateTimeTag extends SimpleTagSupport { + + final static String SYSTEM_PROPERTY_DATE_FORMAT = "org.opennms.ui.datettimeformat"; + + private final static Logger LOG = Logger.getLogger(DateTimeTag.class.getName()); + + private final static DateTimeFormatter DEFAULT_FORMATTER = new DateTimeFormatterBuilder() + .parseCaseInsensitive() + .append(ISO_LOCAL_DATE) + .appendLiteral('T') + .appendValue(HOUR_OF_DAY, 2) + .appendLiteral(':') + .appendValue(MINUTE_OF_HOUR, 2) + .optionalStart() + .appendLiteral(':') + .appendValue(SECOND_OF_MINUTE, 2) + .appendOffsetId().toFormatter() + .withZone(ZoneId.systemDefault()); + + private Instant instant; + private DateTimeFormatter formatter; + + + public DateTimeTag(){ + String format = System.getProperty(SYSTEM_PROPERTY_DATE_FORMAT); + if(format == null) { + this.formatter = DEFAULT_FORMATTER; + } else { + try { + this.formatter = DateTimeFormatter.ofPattern(format).withZone(ZoneId.systemDefault()); + } catch (IllegalArgumentException e) { + LOG.log(Level.WARNING, + String.format("Can not use System Property %s=%s as dateformat, will fall back to default." + + " Please see also java.time.format.DateTimeFormatter for the correct syntax", + SYSTEM_PROPERTY_DATE_FORMAT, + format) + , e); + this.formatter = DEFAULT_FORMATTER; + } + } + } + + @Override + public void doTag() throws IOException { + String output = this.formatter.format(instant); + getJspContext().getOut().write(output); + } + + public void setInstant(Instant instant) { + this.instant = instant; + } + + @Deprecated // please try to use the new Java Date API when possible: setInstant(Instant instant) + public void setDate(Date date) { + if (date != null) { + this.instant = date.toInstant(); + } + } +} diff --git a/opennms-taglib/src/main/resources/META-INF/opennms-taglib.tld b/opennms-taglib/src/main/resources/META-INF/opennms-taglib.tld new file mode 100644 index 000000000000..8b16494bc40a --- /dev/null +++ b/opennms-taglib/src/main/resources/META-INF/opennms-taglib.tld @@ -0,0 +1,31 @@ + + + + + 1.0 + 2.0 + OpenNMS Default Taglib + onms-taglib + + + + datetime + org.opennms.web.tags.DateTimeTag + empty + + instant + false + true + java.time.Instant + + + date + false + true + java.util.Date + + + + \ No newline at end of file diff --git a/opennms-taglib/src/test/java/org/opennms/web/tags/DateTimeTagTest.java b/opennms-taglib/src/test/java/org/opennms/web/tags/DateTimeTagTest.java new file mode 100644 index 000000000000..48726f1b498c --- /dev/null +++ b/opennms-taglib/src/test/java/org/opennms/web/tags/DateTimeTagTest.java @@ -0,0 +1,109 @@ +/******************************************************************************* + * This file is part of OpenNMS(R). + * + * Copyright (C) 2018 The OpenNMS Group, Inc. + * OpenNMS(R) is Copyright (C) 1999-2018 The OpenNMS Group, Inc. + * + * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. + * + * OpenNMS(R) is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. + * + * OpenNMS(R) is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenNMS(R). If not, see: + * http://www.gnu.org/licenses/ + * + * For more information contact: + * OpenNMS(R) Licensing + * http://www.opennms.org/ + * http://www.opennms.com/ + *******************************************************************************/ + +package org.opennms.web.tags; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.time.Instant; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.util.Date; + +import javax.servlet.jsp.JspContext; +import javax.servlet.jsp.JspWriter; + +import org.junit.Test; +import org.mockito.ArgumentCaptor; +import org.mockito.Mockito; + +public class DateTimeTagTest { + + @Test + public void shouldOutputeDateTimeIncludingTimeZone() throws IOException { + test("yyyy-MM-dd'T'HH:mm:ssxxx"); + } + + @Test + public void shouldHonorSystemSettings() throws IOException { + String format = "yyy-MM-dd"; + System.setProperty(DateTimeTag.SYSTEM_PROPERTY_DATE_FORMAT, format); + test(format); + System.clearProperty(DateTimeTag.SYSTEM_PROPERTY_DATE_FORMAT); + } + + public void test(String expectedPattern) throws IOException { + Instant now = Instant.now(); + String output = new DateTimeTagInvoker() + .setInstant(now) + .invokeAndGet(); + DateTimeFormatter formatter = DateTimeFormatter + .ofPattern(expectedPattern) + .withZone(ZoneId.systemDefault()); + assertEquals(formatter.format(now), output); + } + + // Helper class to be able to test easier + private static class DateTimeTagInvoker { + + private DateTimeTag tag; + private JspWriter jspWriter; + + private DateTimeTagInvoker() throws IOException { + jspWriter = Mockito.mock(JspWriter.class); + JspContext jspContext = Mockito.mock(JspContext.class); + when(jspContext.getOut()).thenReturn(jspWriter); + tag = new DateTimeTag(){ + @Override + protected JspContext getJspContext() { + return jspContext; + } + }; + } + + DateTimeTagInvoker setDate(Date date){ + this.tag.setDate(date); + return this; + } + + DateTimeTagInvoker setInstant(Instant instant){ + this.tag.setInstant(instant); + return this; + } + + String invokeAndGet() throws IOException { + this.tag.doTag(); + ArgumentCaptor output = ArgumentCaptor.forClass(String.class); + verify(jspWriter).write(output.capture()); + return output.getValue(); + } + } +} diff --git a/opennms-tools/access-point-monitor/pom.xml b/opennms-tools/access-point-monitor/pom.xml index aa6dd2c44048..86fb2aed63e3 100644 --- a/opennms-tools/access-point-monitor/pom.xml +++ b/opennms-tools/access-point-monitor/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-tools - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/opennms-tools/centric-troubleticketer/pom.xml b/opennms-tools/centric-troubleticketer/pom.xml index 8e799e15b0d8..156267c3e8a7 100644 --- a/opennms-tools/centric-troubleticketer/pom.xml +++ b/opennms-tools/centric-troubleticketer/pom.xml @@ -3,7 +3,7 @@ opennms-tools org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 centric-troubleticketer diff --git a/opennms-tools/cli-pinger/pom.xml b/opennms-tools/cli-pinger/pom.xml index f4d087daf50a..f89fa66efbb0 100644 --- a/opennms-tools/cli-pinger/pom.xml +++ b/opennms-tools/cli-pinger/pom.xml @@ -3,7 +3,7 @@ opennms-tools org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.netmgt.clipinger diff --git a/opennms-tools/config-normalizer/pom.xml b/opennms-tools/config-normalizer/pom.xml index bde50394c019..a2b0e83e7842 100644 --- a/opennms-tools/config-normalizer/pom.xml +++ b/opennms-tools/config-normalizer/pom.xml @@ -3,7 +3,7 @@ opennms-tools org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.config-normalizer diff --git a/opennms-tools/csv-address/pom.xml b/opennms-tools/csv-address/pom.xml index 54e3c7b44214..5b9983ae1e30 100644 --- a/opennms-tools/csv-address/pom.xml +++ b/opennms-tools/csv-address/pom.xml @@ -4,7 +4,7 @@ org.opennms opennms-tools - 22.0.1 + 22.0.2-SNAPSHOT opennms-csv-assets jar diff --git a/opennms-tools/csv-requisitions/pom.xml b/opennms-tools/csv-requisitions/pom.xml index a84d51a6eb9f..f69cb268c462 100644 --- a/opennms-tools/csv-requisitions/pom.xml +++ b/opennms-tools/csv-requisitions/pom.xml @@ -4,7 +4,7 @@ org.opennms opennms-tools - 22.0.1 + 22.0.2-SNAPSHOT opennms-csv-requisition jar diff --git a/opennms-tools/groovy-tools/pom.xml b/opennms-tools/groovy-tools/pom.xml index 6aa3a32665a5..0cea77a8b1e3 100644 --- a/opennms-tools/groovy-tools/pom.xml +++ b/opennms-tools/groovy-tools/pom.xml @@ -3,7 +3,7 @@ opennms-tools org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 groovy-tools diff --git a/opennms-tools/ireport-jrobin-provider/pom.xml b/opennms-tools/ireport-jrobin-provider/pom.xml index 3d4714f1314d..14c2e3b397bc 100644 --- a/opennms-tools/ireport-jrobin-provider/pom.xml +++ b/opennms-tools/ireport-jrobin-provider/pom.xml @@ -4,7 +4,7 @@ org.opennms.jasper jrobin-provider jar - 22.0.1 + 22.0.2-SNAPSHOT JRobin iReport Fields Provider diff --git a/opennms-tools/isoc-ipv6-gui/pom.xml b/opennms-tools/isoc-ipv6-gui/pom.xml index 897f05e8e0d3..b4a7b7c17eb3 100644 --- a/opennms-tools/isoc-ipv6-gui/pom.xml +++ b/opennms-tools/isoc-ipv6-gui/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/opennms-tools/isoc-ipv6-participants/pom.xml b/opennms-tools/isoc-ipv6-participants/pom.xml index 7c608676ce5a..db4878c6c246 100644 --- a/opennms-tools/isoc-ipv6-participants/pom.xml +++ b/opennms-tools/isoc-ipv6-participants/pom.xml @@ -3,7 +3,7 @@ org.opennms.features org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 diff --git a/opennms-tools/jrb-to-rrd-converter/pom.xml b/opennms-tools/jrb-to-rrd-converter/pom.xml index b4c785310bb1..d35194522a32 100644 --- a/opennms-tools/jrb-to-rrd-converter/pom.xml +++ b/opennms-tools/jrb-to-rrd-converter/pom.xml @@ -3,7 +3,7 @@ opennms-tools org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 jrb-to-rrd-converter diff --git a/opennms-tools/jrobin-spike-hunter/pom.xml b/opennms-tools/jrobin-spike-hunter/pom.xml index febcec386753..5209e72f3465 100644 --- a/opennms-tools/jrobin-spike-hunter/pom.xml +++ b/opennms-tools/jrobin-spike-hunter/pom.xml @@ -3,7 +3,7 @@ opennms-tools org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 spike-hunter diff --git a/opennms-tools/mib2events/pom.xml b/opennms-tools/mib2events/pom.xml index 82ad69a41d65..6f90d7592828 100644 --- a/opennms-tools/mib2events/pom.xml +++ b/opennms-tools/mib2events/pom.xml @@ -3,7 +3,7 @@ opennms-tools org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.netmgt.mib2events diff --git a/opennms-tools/opennms-eventd-stresser/pom.xml b/opennms-tools/opennms-eventd-stresser/pom.xml index 9a09a8ad9b91..2d0de45ec1d1 100644 --- a/opennms-tools/opennms-eventd-stresser/pom.xml +++ b/opennms-tools/opennms-eventd-stresser/pom.xml @@ -4,7 +4,7 @@ org.opennms opennms-tools - 22.0.1 + 22.0.2-SNAPSHOT opennms-eventd-stresser jar diff --git a/opennms-tools/opennms-qosdaemon/pom.xml b/opennms-tools/opennms-qosdaemon/pom.xml index 08e852377353..bdd8edcb275b 100644 --- a/opennms-tools/opennms-qosdaemon/pom.xml +++ b/opennms-tools/opennms-qosdaemon/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-qosdaemon diff --git a/opennms-tools/opennms-rrd-converter/pom.xml b/opennms-tools/opennms-rrd-converter/pom.xml index 00f39f9ca8cd..a27dbbccaed3 100644 --- a/opennms-tools/opennms-rrd-converter/pom.xml +++ b/opennms-tools/opennms-rrd-converter/pom.xml @@ -3,7 +3,7 @@ opennms-tools org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-rrd-converter diff --git a/opennms-tools/opennms-tip/cxf-dependencies/pom.xml b/opennms-tools/opennms-tip/cxf-dependencies/pom.xml index fb1c494acb18..47f458c38225 100644 --- a/opennms-tools/opennms-tip/cxf-dependencies/pom.xml +++ b/opennms-tools/opennms-tip/cxf-dependencies/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-tip - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.tip diff --git a/opennms-tools/opennms-tip/openejb-dependencies/pom.xml b/opennms-tools/opennms-tip/openejb-dependencies/pom.xml index 60c22687ce07..ab8d645950a6 100644 --- a/opennms-tools/opennms-tip/openejb-dependencies/pom.xml +++ b/opennms-tools/opennms-tip/openejb-dependencies/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-tip - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.tip diff --git a/opennms-tools/opennms-tip/opennms-tip-ram/pom.xml b/opennms-tools/opennms-tip/opennms-tip-ram/pom.xml index ada22cf2dd99..1d3ce1d94b74 100644 --- a/opennms-tools/opennms-tip/opennms-tip-ram/pom.xml +++ b/opennms-tools/opennms-tip/opennms-tip-ram/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-tip - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.tip diff --git a/opennms-tools/opennms-tip/pom.xml b/opennms-tools/opennms-tip/pom.xml index 97845fa1e194..70b7e43f59db 100644 --- a/opennms-tools/opennms-tip/pom.xml +++ b/opennms-tools/opennms-tip/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-tools - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms diff --git a/opennms-tools/opennms-tip/tip-framework-dependencies/pom.xml b/opennms-tools/opennms-tip/tip-framework-dependencies/pom.xml index e3c3b2f4ed21..14bdcd7e4829 100644 --- a/opennms-tools/opennms-tip/tip-framework-dependencies/pom.xml +++ b/opennms-tools/opennms-tip/tip-framework-dependencies/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-tip - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.tip diff --git a/opennms-tools/perfdata-receiver/pom.xml b/opennms-tools/perfdata-receiver/pom.xml index 5b5b74ecbbbc..b4a5bcabf464 100644 --- a/opennms-tools/perfdata-receiver/pom.xml +++ b/opennms-tools/perfdata-receiver/pom.xml @@ -53,7 +53,7 @@ org.opennms opennms-rrd-tcp - 22.0.1 + 22.0.2-SNAPSHOT junit diff --git a/opennms-tools/phonebook/pom.xml b/opennms-tools/phonebook/pom.xml index a86639fd9fde..0c8749bb5293 100644 --- a/opennms-tools/phonebook/pom.xml +++ b/opennms-tools/phonebook/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-tools - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.features diff --git a/opennms-tools/pom.xml b/opennms-tools/pom.xml index 66e6cee55bbc..2abbb7d02acd 100644 --- a/opennms-tools/pom.xml +++ b/opennms-tools/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-tools diff --git a/opennms-tools/quickbase-troubleticketer/pom.xml b/opennms-tools/quickbase-troubleticketer/pom.xml index 4c58776b3f18..af6f5050cd24 100644 --- a/opennms-tools/quickbase-troubleticketer/pom.xml +++ b/opennms-tools/quickbase-troubleticketer/pom.xml @@ -3,7 +3,7 @@ opennms-tools org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 quickbase-troubleticketer diff --git a/opennms-tools/remedy-troubleticketer/pom.xml b/opennms-tools/remedy-troubleticketer/pom.xml index a2fc1c5a1a64..1bd6ae3f7a07 100644 --- a/opennms-tools/remedy-troubleticketer/pom.xml +++ b/opennms-tools/remedy-troubleticketer/pom.xml @@ -3,7 +3,7 @@ opennms-tools org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 remedy-troubleticketer diff --git a/opennms-tools/scriptd-event-proxy/pom.xml b/opennms-tools/scriptd-event-proxy/pom.xml index f17a87e2be74..2dd76050d1d8 100644 --- a/opennms-tools/scriptd-event-proxy/pom.xml +++ b/opennms-tools/scriptd-event-proxy/pom.xml @@ -3,7 +3,7 @@ opennms-tools org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 scriptd-event-proxy diff --git a/opennms-tools/selector-tracker/pom.xml b/opennms-tools/selector-tracker/pom.xml index 3eeaafdc8993..bdb1332548be 100644 --- a/opennms-tools/selector-tracker/pom.xml +++ b/opennms-tools/selector-tracker/pom.xml @@ -3,7 +3,7 @@ opennms-tools org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 selector-tracker diff --git a/opennms-tools/spectrum-event-importer/pom.xml b/opennms-tools/spectrum-event-importer/pom.xml index 0c070e96a4ce..321d0ca6e788 100644 --- a/opennms-tools/spectrum-event-importer/pom.xml +++ b/opennms-tools/spectrum-event-importer/pom.xml @@ -3,7 +3,7 @@ opennms-tools org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.netmgt.mib2events diff --git a/opennms-tools/syslog-profiler/pom.xml b/opennms-tools/syslog-profiler/pom.xml index c9f6640bef3b..25f2e2cbb65c 100644 --- a/opennms-tools/syslog-profiler/pom.xml +++ b/opennms-tools/syslog-profiler/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms-tools - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.opennms-tools diff --git a/opennms-tools/syslog-profiler/profiler/pom.xml b/opennms-tools/syslog-profiler/profiler/pom.xml index 0436869ee9c0..80b19b38f840 100644 --- a/opennms-tools/syslog-profiler/profiler/pom.xml +++ b/opennms-tools/syslog-profiler/profiler/pom.xml @@ -3,7 +3,7 @@ org.opennms.opennms-tools org.opennms.opennms-tools.syslog-profiler - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.opennms-tools.syslog-profiler diff --git a/opennms-util/pom.xml b/opennms-util/pom.xml index bd2b9f7c36d5..9ecebf1f11bc 100644 --- a/opennms-util/pom.xml +++ b/opennms-util/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-util diff --git a/opennms-web-api/pom.xml b/opennms-web-api/pom.xml index 913097b6447b..fc32b55a31a5 100644 --- a/opennms-web-api/pom.xml +++ b/opennms-web-api/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-web-api diff --git a/opennms-web-dependencies/pom.xml b/opennms-web-dependencies/pom.xml index 55d5dc70d0b5..fdfdf7778670 100644 --- a/opennms-web-dependencies/pom.xml +++ b/opennms-web-dependencies/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms diff --git a/opennms-webapp-rest/pom.xml b/opennms-webapp-rest/pom.xml index 78bf5b92d506..f90a6ea4faa2 100644 --- a/opennms-webapp-rest/pom.xml +++ b/opennms-webapp-rest/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-webapp-rest diff --git a/opennms-webapp/pom.xml b/opennms-webapp/pom.xml index 147dddb43596..73f2a37ed143 100644 --- a/opennms-webapp/pom.xml +++ b/opennms-webapp/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-webapp @@ -798,6 +798,11 @@ encoder-jsp ${owaspEncoderVersion} + + org.opennms + opennms-taglib + ${project.version} + diff --git a/opennms-webapp/src/main/java/org/opennms/web/enlinkd/BridgeElementNode.java b/opennms-webapp/src/main/java/org/opennms/web/enlinkd/BridgeElementNode.java index 7bf2f232c9a6..304081927275 100644 --- a/opennms-webapp/src/main/java/org/opennms/web/enlinkd/BridgeElementNode.java +++ b/opennms-webapp/src/main/java/org/opennms/web/enlinkd/BridgeElementNode.java @@ -40,10 +40,10 @@ public class BridgeElementNode { private Integer m_stpRootPort; private Integer m_vlan; private String m_vlanname; - private String m_bridgeNodeCreateTime; - private String m_bridgeNodeLastPollTime; + private String m_bridgeNodeCreateTime; + private String m_bridgeNodeLastPollTime; - public String getBaseBridgeAddress() { + public String getBaseBridgeAddress() { return m_baseBridgeAddress; } public void setBaseBridgeAddress(String baseBridgeAddress) { diff --git a/opennms-webapp/src/main/java/org/opennms/web/enlinkd/BridgeLinkNode.java b/opennms-webapp/src/main/java/org/opennms/web/enlinkd/BridgeLinkNode.java index 8bd733e2e64a..b22bf7219fa4 100644 --- a/opennms-webapp/src/main/java/org/opennms/web/enlinkd/BridgeLinkNode.java +++ b/opennms-webapp/src/main/java/org/opennms/web/enlinkd/BridgeLinkNode.java @@ -28,15 +28,66 @@ package org.opennms.web.enlinkd; -public class BridgeLinkNode extends NodeLinkBridge { +import java.util.ArrayList; +import java.util.List; - private Integer m_bridgeLocalVlan; +public class BridgeLinkNode implements Comparable{ + + private String m_bridgeLocalPort; + private String m_bridgeLocalPortUrl; + private List m_bridgeLinkRemoteNodes = new ArrayList(); + private String m_bridgeInfo; + private String m_bridgeLinkCreateTime; + private String m_bridgeLinkLastPollTime; - public Integer getBridgeLocalVlan() { - return m_bridgeLocalVlan; + public String getBridgeInfo() { + return m_bridgeInfo; } + public void setBridgeInfo(String bridgeInfo) { + m_bridgeInfo = bridgeInfo; + } + public String getBridgeLocalPortUrl() { + return m_bridgeLocalPortUrl; + } + public void setBridgeLocalPortUrl(String bridgeLocalPortUrl) { + m_bridgeLocalPortUrl = bridgeLocalPortUrl; + } + public String getBridgeLocalPort() { + return m_bridgeLocalPort; + } + public void setBridgeLocalPort(String nodeLocalPort) { + m_bridgeLocalPort = nodeLocalPort; + } + public List getBridgeLinkRemoteNodes() { + return m_bridgeLinkRemoteNodes; + } + public void setBridgeLinkRemoteNodes( + List bridgeLinkRemoteNodes) { + m_bridgeLinkRemoteNodes = bridgeLinkRemoteNodes; + } + + public String getBridgeLinkCreateTime() { + return m_bridgeLinkCreateTime; + } + + public void setBridgeLinkCreateTime(String bridgeLinkCreateTime) { + m_bridgeLinkCreateTime = bridgeLinkCreateTime; + } + + public String getBridgeLinkLastPollTime() { + return m_bridgeLinkLastPollTime; + } + + public void setBridgeLinkLastPollTime(String bridgeLinkLastPollTime) { + m_bridgeLinkLastPollTime = bridgeLinkLastPollTime; + } + + @Override + public int compareTo(BridgeLinkNode o) { + return m_bridgeLocalPort.compareTo(o.m_bridgeLocalPort); + } + + - public void setBridgeLocalVlan(Integer bridgeLocalVlan) { - m_bridgeLocalVlan = bridgeLocalVlan; - } } + diff --git a/opennms-webapp/src/main/java/org/opennms/web/enlinkd/BridgeLinkRemoteNode.java b/opennms-webapp/src/main/java/org/opennms/web/enlinkd/BridgeLinkRemoteNode.java index 52704466e3b2..f4ab29e675ab 100644 --- a/opennms-webapp/src/main/java/org/opennms/web/enlinkd/BridgeLinkRemoteNode.java +++ b/opennms-webapp/src/main/java/org/opennms/web/enlinkd/BridgeLinkRemoteNode.java @@ -30,18 +30,17 @@ public class BridgeLinkRemoteNode { - private String m_bridgeRemoteNode; + private String m_bridgeRemote; private String m_bridgeRemoteUrl; private String m_bridgeRemotePort; private String m_bridgeRemotePortUrl; - private Integer m_bridgeRemoteVlan; - public String getBridgeRemoteNode() { - return m_bridgeRemoteNode; + public String getBridgeRemote() { + return m_bridgeRemote; } - public void setBridgeRemoteNode(String bridgeRemoteNode) { - m_bridgeRemoteNode = bridgeRemoteNode; + public void setBridgeRemote(String bridgeRemote) { + m_bridgeRemote = bridgeRemote; } public String getBridgeRemoteUrl() { @@ -68,12 +67,4 @@ public void setBridgeRemotePortUrl(String bridgeRemotePortUrl) { m_bridgeRemotePortUrl = bridgeRemotePortUrl; } - public Integer getBridgeRemoteVlan() { - return m_bridgeRemoteVlan; - } - - public void setBridgeRemoteVlan(Integer bridgeRemoteVlan) { - m_bridgeRemoteVlan = bridgeRemoteVlan; - } - } diff --git a/opennms-webapp/src/main/java/org/opennms/web/enlinkd/BridgeLinkSharedHost.java b/opennms-webapp/src/main/java/org/opennms/web/enlinkd/BridgeLinkSharedHost.java deleted file mode 100644 index e93d02da253c..000000000000 --- a/opennms-webapp/src/main/java/org/opennms/web/enlinkd/BridgeLinkSharedHost.java +++ /dev/null @@ -1,70 +0,0 @@ -/******************************************************************************* - * This file is part of OpenNMS(R). - * - * Copyright (C) 2014 The OpenNMS Group, Inc. - * OpenNMS(R) is Copyright (C) 1999-2014 The OpenNMS Group, Inc. - * - * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. - * - * OpenNMS(R) is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published - * by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * OpenNMS(R) is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with OpenNMS(R). If not, see: - * http://www.gnu.org/licenses/ - * - * For more information contact: - * OpenNMS(R) Licensing - * http://www.opennms.org/ - * http://www.opennms.com/ - *******************************************************************************/ - -package org.opennms.web.enlinkd; - -public class BridgeLinkSharedHost { - private String m_sharedHost; - private String m_sharedHostUrl; - private String m_sharedHostPort; - private String m_sharedHostPortUrl; - - public String getSharedHost() { - return m_sharedHost; - } - - public void setSharedHost(String sharedHost) { - m_sharedHost = sharedHost; - } - - public String getSharedHostUrl() { - return m_sharedHostUrl; - } - - public void setSharedHostUrl(String sharedHostUrl) { - m_sharedHostUrl = sharedHostUrl; - } - - public String getSharedHostPort() { - return m_sharedHostPort; - } - - public void setSharedHostPort(String sharedHostPort) { - m_sharedHostPort = sharedHostPort; - } - - public String getSharedHostPortUrl() { - return m_sharedHostPortUrl; - } - - public void setSharedHostPortUrl(String sharedHostPortUrl) { - m_sharedHostPortUrl = sharedHostPortUrl; - } - - -} diff --git a/opennms-webapp/src/main/java/org/opennms/web/enlinkd/CdpLinkNode.java b/opennms-webapp/src/main/java/org/opennms/web/enlinkd/CdpLinkNode.java index dcdbbb1e90da..bc6029a48ee8 100644 --- a/opennms-webapp/src/main/java/org/opennms/web/enlinkd/CdpLinkNode.java +++ b/opennms-webapp/src/main/java/org/opennms/web/enlinkd/CdpLinkNode.java @@ -35,14 +35,14 @@ public class CdpLinkNode implements Comparable{ private String m_cdpLocalPort; private String m_cdpLocalPortUrl; - private String m_cdpCacheAddressType; - private String m_cdpCacheAddress; - private String m_cdpCacheVersion; - private String m_cdpCacheDeviceId; + private String m_cdpCacheDevice; private String m_cdpCacheDeviceUrl; + private String m_cdpCacheDevicePort; private String m_cdpCacheDevicePortUrl; - private String m_cdpCacheDevicePlatform; + + private String m_cdpCachePlatform; + private String m_cdpCreateTime; private String m_cdpLastPollTime; @@ -63,36 +63,13 @@ public void setCdpLocalPortUrl(String cdplocalPortUrl) { m_cdpLocalPortUrl = cdplocalPortUrl; } - public String getCdpCacheAddressType() { - return m_cdpCacheAddressType; - } - - public void setCdpCacheAddressType(String cdpCacheAddressType) { - m_cdpCacheAddressType = cdpCacheAddressType; - } - - public String getCdpCacheAddress() { - return m_cdpCacheAddress; - } - - public void setCdpCacheAddress(String cdpCacheAddress) { - m_cdpCacheAddress = cdpCacheAddress; - } - - public String getCdpCacheVersion() { - return m_cdpCacheVersion; - } - - public void setCdpCacheVersion(String cdpCacheVersion) { - m_cdpCacheVersion = cdpCacheVersion; - } - public String getCdpCacheDeviceId() { - return m_cdpCacheDeviceId; + public String getCdpCacheDevice() { + return m_cdpCacheDevice; } - public void setCdpCacheDeviceId(String cdpCacheDeviceId) { - m_cdpCacheDeviceId = cdpCacheDeviceId; + public void setCdpCacheDevice(String cdpCacheDevice) { + m_cdpCacheDevice = cdpCacheDevice; } public String getCdpCacheDeviceUrl() { @@ -119,12 +96,12 @@ public void setCdpCacheDevicePortUrl(String cdpCacheDevicePortUrl) { m_cdpCacheDevicePortUrl = cdpCacheDevicePortUrl; } - public String getCdpCacheDevicePlatform() { - return m_cdpCacheDevicePlatform; + public String getCdpCachePlatform() { + return m_cdpCachePlatform; } - public void setCdpCacheDevicePlatform(String cdpCacheDevicePlatform) { - m_cdpCacheDevicePlatform = cdpCacheDevicePlatform; + public void setCdpCachePlatform(String cdpCachePlatform) { + m_cdpCachePlatform = cdpCachePlatform; } public String getCdpCreateTime() { diff --git a/opennms-webapp/src/main/java/org/opennms/web/enlinkd/EnLinkdElementFactory.java b/opennms-webapp/src/main/java/org/opennms/web/enlinkd/EnLinkdElementFactory.java index c309988c7caf..127cf0f8e130 100644 --- a/opennms-webapp/src/main/java/org/opennms/web/enlinkd/EnLinkdElementFactory.java +++ b/opennms-webapp/src/main/java/org/opennms/web/enlinkd/EnLinkdElementFactory.java @@ -64,6 +64,8 @@ import org.opennms.netmgt.dao.api.OspfElementDao; import org.opennms.netmgt.dao.api.OspfLinkDao; import org.opennms.netmgt.dao.api.SnmpInterfaceDao; +import org.opennms.netmgt.dao.hibernate.BridgeTopologyDaoHibernate; +import org.opennms.netmgt.dao.hibernate.IpNetToMediaDaoHibernate; import org.opennms.netmgt.model.BridgeElement; import org.opennms.netmgt.model.BridgeElement.BridgeDot1dBaseType; import org.opennms.netmgt.model.BridgeElement.BridgeDot1dStpProtocolSpecification; @@ -87,8 +89,11 @@ import org.opennms.netmgt.model.OspfElement.TruthValue; import org.opennms.netmgt.model.OspfLink; import org.opennms.netmgt.model.topology.BridgePort; +import org.opennms.netmgt.model.topology.BridgeTopologyException; import org.opennms.netmgt.model.topology.SharedSegment; import org.opennms.web.api.Util; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; @@ -100,6 +105,8 @@ public class EnLinkdElementFactory implements InitializingBean, EnLinkdElementFactoryInterface { + private final static Logger LOG = LoggerFactory.getLogger(EnLinkdElementFactory.class); + @Autowired private OspfElementDao m_ospfElementDao; @@ -165,10 +172,10 @@ public OspfElementNode getOspfElement(int nodeId) { return convertFromModel(m_ospfElementDao.findByNodeId(Integer.valueOf(nodeId))); } - @SuppressWarnings("deprecation") private OspfElementNode convertFromModel(OspfElement ospf) { - if (ospf == null) + if (ospf == null) { return null; + } OspfElementNode ospfNode = new OspfElementNode(); ospfNode.setOspfRouterId(str(ospf.getOspfRouterId())); @@ -184,61 +191,121 @@ private OspfElementNode convertFromModel(OspfElement ospf) { public List getOspfLinks(int nodeId) { List nodelinks = new ArrayList(); for (OspfLink link : m_ospfLinkDao.findByNodeId(Integer.valueOf(nodeId))) { - nodelinks.addAll(convertFromModel(nodeId, link)); + nodelinks.add(convertFromModel(nodeId, link)); } return nodelinks; } - @Transactional - @SuppressWarnings("deprecation") - private List convertFromModel(int nodeid, OspfLink link) { - List linkNodes = new ArrayList(); + public OspfLinkNode create(int nodeid, OspfLink link) { + OspfLinkNode linknode = new OspfLinkNode(); + OnmsSnmpInterface snmpiface = null; + String ipaddr = str(link.getOspfIpAddr()); - List ospfElements = m_ospfElementDao.findAllByRouterId(link.getOspfRemRouterId()); + // set local info + if (link.getOspfIfIndex() != null) { + snmpiface = m_snmpInterfaceDao.findByNodeIdAndIfIndex(nodeid, + link.getOspfIfIndex()); + } else if (link.getOspfAddressLessIndex() > 0) { + snmpiface = m_snmpInterfaceDao.findByNodeIdAndIfIndex(nodeid, + link.getOspfAddressLessIndex()); + } - if (ospfElements.size() > 0) { - for (OspfElement ospfElement : ospfElements) { - OspfLinkNode linknode = new OspfLinkNode(); - linknode.setOspfIpAddr(str(link.getOspfIpAddr())); - linknode.setOspfAddressLessIndex(link.getOspfAddressLessIndex()); - linknode.setOspfIfIndex(link.getOspfIfIndex()); + if (snmpiface != null) { + if (link.getOspfAddressLessIndex() > 0) { + linknode.setOspfLocalPort(getPortString(snmpiface, + "address less", null)); + } else { + linknode.setOspfLocalPort(getPortString(snmpiface, "ip", + ipaddr)); + } + linknode.setOspfLocalPortUrl(getSnmpInterfaceUrl(nodeid, + snmpiface.getIfIndex())); + } else if (link.getOspfAddressLessIndex() > 0) { + linknode.setOspfLocalPort(getPortString(link.getOspfAddressLessIndex(), + "address less", null)); + } else if (link.getOspfIfIndex() != null && ipaddr != null) { + linknode.setOspfLocalPort(getPortString(link.getOspfIfIndex(), + "ip", ipaddr)); + linknode.setOspfLocalPortUrl(getIpInterfaceUrl(nodeid, ipaddr)); + } else if (ipaddr != null) { + linknode.setOspfLocalPort(getIdString("ip", ipaddr)); + linknode.setOspfLocalPortUrl(getIpInterfaceUrl(nodeid, ipaddr)); + } - linknode.setOspfRemRouterId(getRemRouterIdString(str(link.getOspfRemRouterId()), - ospfElement.getNode().getLabel())); - linknode.setOspfRemRouterUrl(getNodeUrl(ospfElement.getNode().getId())); + if (link.getOspfIpMask() != null) { + linknode.setOspfLinkInfo(getIdString("mask", str(link.getOspfIpMask()))); + } else { + linknode.setOspfLinkInfo(getIdString("No mask",null)); + } - linknode.setOspfRemIpAddr(str(link.getOspfRemIpAddr())); - linknode.setOspfRemAddressLessIndex(link.getOspfRemAddressLessIndex()); + linknode.setOspfLinkCreateTime(Util.formatDateToUIString(link.getOspfLinkCreateTime())); + linknode.setOspfLinkLastPollTime(Util.formatDateToUIString(link.getOspfLinkLastPollTime())); - if (ospfElement != null - && linknode.getOspfRemIpAddr() != null) - linknode.setOspfRemPortUrl(getIpInterfaceUrl(ospfElement.getNode().getId(), - linknode.getOspfRemIpAddr())); + return linknode; - linknode.setOspfLinkCreateTime(Util.formatDateToUIString(link.getOspfLinkCreateTime())); - linknode.setOspfLinkLastPollTime(Util.formatDateToUIString(link.getOspfLinkLastPollTime())); + } - linkNodes.add(linknode); - } + @Transactional + public OspfLinkNode convertFromModel(int nodeid, OspfLink link) { + OspfLinkNode linknode = create(nodeid, link); - } else { - OspfLinkNode linknode = new OspfLinkNode(); - linknode.setOspfIpAddr(str(link.getOspfIpAddr())); - linknode.setOspfAddressLessIndex(link.getOspfAddressLessIndex()); - linknode.setOspfIfIndex(link.getOspfIfIndex()); + Integer remNodeid = null; + String remNodeLabel = null; - linknode.setOspfRemRouterId(str(link.getOspfRemRouterId())); + // set rem info - linknode.setOspfRemIpAddr(str(link.getOspfRemIpAddr())); - linknode.setOspfRemAddressLessIndex(link.getOspfRemAddressLessIndex()); + List remOspfElements = m_ospfElementDao.findAllByRouterId(link.getOspfRemRouterId()); + if (remOspfElements.size() == 1) { + OspfElement remOspfElement = remOspfElements.iterator().next(); + remNodeid = remOspfElement.getNode().getId(); + remNodeLabel = remOspfElement.getNode().getLabel(); + } + // set rem Router id + if (remNodeid != null) { + linknode.setOspfRemRouterId(getHostString(remNodeLabel, + "router id", + str(link.getOspfRemRouterId()))); + linknode.setOspfRemRouterUrl(getNodeUrl(remNodeid)); + } else { + linknode.setOspfRemRouterId(getIdString("router id",str(link.getOspfRemRouterId()))); + } - linknode.setOspfLinkCreateTime(Util.formatDateToUIString(link.getOspfLinkCreateTime())); - linknode.setOspfLinkLastPollTime(Util.formatDateToUIString(link.getOspfLinkLastPollTime())); + String remipaddr = str(link.getOspfRemIpAddr()); + OnmsSnmpInterface remsnmpiface = null; - linkNodes.add(linknode); + if (remNodeid != null) { + if (link.getOspfRemAddressLessIndex() > 0) { + remsnmpiface = m_snmpInterfaceDao.findByNodeIdAndIfIndex(remNodeid, + link.getOspfAddressLessIndex()); + } else { + OnmsIpInterface remipiface = m_ipInterfaceDao.findByNodeIdAndIpAddress(remNodeid, + remipaddr); + if (remipiface != null) { + remsnmpiface = remipiface.getSnmpInterface(); + } + } } - Collections.sort(linkNodes); - return linkNodes; + + if (remsnmpiface != null) { + if (link.getOspfRemAddressLessIndex() > 0) { + linknode.setOspfRemPort(getPortString(remsnmpiface, + "address less", null)); + } else { + linknode.setOspfRemPort(getPortString(remsnmpiface, "ip", + remipaddr)); + } + linknode.setOspfRemPortUrl(getSnmpInterfaceUrl(remNodeid, + remsnmpiface.getIfIndex())); + } else if (link.getOspfAddressLessIndex() > 0) { + linknode.setOspfRemPort(getPortString(link.getOspfRemAddressLessIndex(), + "address less", null)); + } else if (remipaddr != null) { + linknode.setOspfRemPort(getIdString("ip",remipaddr)); + if (remNodeid != null) { + linknode.setOspfRemPortUrl(getIpInterfaceUrl(remNodeid, remipaddr)); + } + } + return linknode; } @Override @@ -246,18 +313,21 @@ public CdpElementNode getCdpElement(int nodeId) { return convertFromModel(m_cdpElementDao.findByNodeId(Integer.valueOf(nodeId))); } - @SuppressWarnings("deprecation") private CdpElementNode convertFromModel(CdpElement cdp) { - if (cdp == null) + if (cdp == null) { return null; + } CdpElementNode cdpNode = new CdpElementNode(); cdpNode.setCdpGlobalRun(TruthValue.getTypeString(cdp.getCdpGlobalRun().getValue())); cdpNode.setCdpGlobalDeviceId(cdp.getCdpGlobalDeviceId()); - if (cdp.getCdpGlobalDeviceIdFormat() != null) + + if (cdp.getCdpGlobalDeviceIdFormat() != null) { cdpNode.setCdpGlobalDeviceIdFormat(CdpGlobalDeviceIdFormat.getTypeString(cdp.getCdpGlobalDeviceIdFormat().getValue())); - else + } else { cdpNode.setCdpGlobalDeviceIdFormat(" "); + } + cdpNode.setCdpCreateTime(Util.formatDateToUIString(cdp.getCdpNodeCreateTime())); cdpNode.setCdpLastPollTime(Util.formatDateToUIString(cdp.getCdpNodeLastPollTime())); @@ -274,39 +344,56 @@ public List getCdpLinks(int nodeId) { return nodelinks; } - @Transactional - @SuppressWarnings("deprecation") - private CdpLinkNode convertFromModel(int nodeid, CdpLink link) { + public CdpLinkNode create(int nodeid, CdpLink link) { CdpLinkNode linknode = new CdpLinkNode(); - linknode.setCdpLocalPort(getPortString(link.getCdpCacheIfIndex(), - link.getCdpInterfaceName(), null)); - if (link.getCdpCacheIfIndex() != null) + linknode.setCdpLocalPort(getPortString(link.getCdpInterfaceName(), + link.getCdpCacheIfIndex(), + null, + null)); + + OnmsSnmpInterface snmpiface = m_snmpInterfaceDao.findByNodeIdAndIfIndex(nodeid, link.getCdpCacheIfIndex()); + Set ipifaces = snmpiface.getIpInterfaces(); + if (snmpiface != null) { + if (ipifaces.isEmpty() || ipifaces.size() > 1) { + linknode.setCdpLocalPort(getPortString(snmpiface,null,null)); + } else { + linknode.setCdpLocalPort(getPortString(snmpiface,"ip",str(ipifaces.iterator().next().getIpAddress()))); + } linknode.setCdpLocalPortUrl(getSnmpInterfaceUrl(nodeid, link.getCdpCacheIfIndex())); - - linknode.setCdpCacheAddressType(CiscoNetworkProtocolType.getTypeString(link.getCdpCacheAddressType().getValue())); - linknode.setCdpCacheAddress(link.getCdpCacheAddress()); - - linknode.setCdpCacheDeviceId(link.getCdpCacheDeviceId()); - linknode.setCdpCacheDevicePlatform(link.getCdpCacheDevicePlatform()); - linknode.setCdpCacheVersion(link.getCdpCacheVersion()); - linknode.setCdpCacheDevicePort(link.getCdpCacheDevicePort()); + } + + linknode.setCdpCreateTime(Util.formatDateToUIString(link.getCdpLinkCreateTime())); + linknode.setCdpLastPollTime(Util.formatDateToUIString(link.getCdpLinkLastPollTime())); + linknode.setCdpCachePlatform(link.getCdpCacheDevicePlatform()+ " -> " + link.getCdpCacheVersion()); + + return linknode; + } + + @Transactional + public CdpLinkNode convertFromModel(int nodeid, CdpLink link) { + CdpLinkNode linknode = create(nodeid, link); + linknode.setCdpCacheDevice(link.getCdpCacheDeviceId()); + linknode.setCdpCacheDevicePort(getPortString(link.getCdpCacheDevicePort(), null, + CiscoNetworkProtocolType.getTypeString(link.getCdpCacheAddressType().getValue()), + link.getCdpCacheAddress())); CdpElement cdpCacheElement = m_cdpElementDao.findByGlobalDeviceId(link.getCdpCacheDeviceId()); if (cdpCacheElement != null) { + linknode.setCdpCacheDevice(getHostString(cdpCacheElement.getNode().getLabel(), "Cisco Device Id", + link.getCdpCacheDeviceId())); linknode.setCdpCacheDeviceUrl(getNodeUrl(cdpCacheElement.getNode().getId())); OnmsSnmpInterface cdpcachesnmp = getFromCdpCacheDevicePort(cdpCacheElement.getNode().getId(), link.getCdpCacheDevicePort()); if (cdpcachesnmp != null) { - linknode.setCdpCacheDevicePort(getPortString(cdpcachesnmp.getIfIndex(), - link.getCdpCacheDevicePort(),cdpcachesnmp.getIfAlias())); + linknode.setCdpCacheDevicePort(getPortString(cdpcachesnmp, + CiscoNetworkProtocolType.getTypeString(link.getCdpCacheAddressType().getValue()), + link.getCdpCacheAddress())); linknode.setCdpCacheDevicePortUrl(getSnmpInterfaceUrl(cdpCacheElement.getNode().getId(), cdpcachesnmp.getIfIndex())); } } - linknode.setCdpCreateTime(Util.formatDateToUIString(link.getCdpLinkCreateTime())); - linknode.setCdpLastPollTime(Util.formatDateToUIString(link.getCdpLinkLastPollTime())); return linknode; } @@ -315,14 +402,17 @@ public LldpElementNode getLldpElement(int nodeId) { return convertFromModel(m_lldpElementDao.findByNodeId(Integer.valueOf(nodeId))); } - @SuppressWarnings("deprecation") private LldpElementNode convertFromModel(LldpElement lldp) { - if (lldp == null) + + if (lldp == null) { return null; + } LldpElementNode lldpNode = new LldpElementNode(); - lldpNode.setLldpChassisIdString(getChassisIdString(lldp.getLldpChassisId(), - lldp.getLldpChassisIdSubType())); + lldpNode.setLldpChassisId(getIdString( + LldpChassisIdSubType.getTypeString(lldp.getLldpChassisIdSubType().getValue()), + lldp.getLldpChassisId())); + lldpNode.setLldpSysName(lldp.getLldpSysname()); lldpNode.setLldpCreateTime(Util.formatDateToUIString(lldp.getLldpNodeCreateTime())); lldpNode.setLldpLastPollTime(Util.formatDateToUIString(lldp.getLldpNodeLastPollTime())); @@ -340,24 +430,36 @@ public List getLldpLinks(int nodeId) { return nodelinks; } + private LldpLinkNode create(int nodeid, LldpLink link) { + LldpLinkNode linknode = new LldpLinkNode(); + linknode.setLldpLocalPort(getPortString(link.getLldpPortDescr(), + link.getLldpPortIfindex(), + LldpPortIdSubType.getTypeString(link.getLldpPortIdSubType().getValue()), + link.getLldpPortId() + )); + linknode.setLldpLocalPortUrl(getSnmpInterfaceUrl(Integer.valueOf(nodeid), + link.getLldpPortIfindex())); + linknode.setLldpRemInfo(link.getLldpRemSysname()); + linknode.setLldpCreateTime(Util.formatDateToUIString(link.getLldpLinkCreateTime())); + linknode.setLldpLastPollTime(Util.formatDateToUIString(link.getLldpLinkLastPollTime())); + return linknode; + } + @Transactional - @SuppressWarnings("deprecation") private LldpLinkNode convertFromModel(int nodeid, LldpLink link) { + LldpLinkNode linknode = create(nodeid, link); - LldpLinkNode linknode = new LldpLinkNode(); - linknode.setLldpPortString(getPortString(link.getLldpPortId(), - link.getLldpPortIdSubType())); - linknode.setLldpPortDescr(link.getLldpPortDescr()); - linknode.setLldpPortUrl(getSnmpInterfaceUrl(Integer.valueOf(nodeid), - link.getLldpPortIfindex())); + linknode.setLldpRemChassisId(getIdString( + LldpChassisIdSubType.getTypeString(link.getLldpRemChassisIdSubType().getValue()), + link.getLldpRemChassisId() + )); - linknode.setLldpRemSysName(link.getLldpRemSysname()); - linknode.setLldpRemPortString(getPortString(link.getLldpRemPortId(), - link.getLldpRemPortIdSubType())); - linknode.setLldpRemPortDescr(link.getLldpRemPortDescr()); + linknode.setLldpRemPort(getPortString(link.getLldpRemPortDescr(), + null, + LldpPortIdSubType.getTypeString(link.getLldpRemPortIdSubType().getValue()), + link.getLldpRemPortId() + )); - linknode.setLldpCreateTime(Util.formatDateToUIString(link.getLldpLinkCreateTime())); - linknode.setLldpLastPollTime(Util.formatDateToUIString(link.getLldpLinkLastPollTime())); OnmsNode remNode = null; @@ -366,13 +468,6 @@ private LldpLinkNode convertFromModel(int nodeid, LldpLink link) { if (lldpremelements.size() == 1) { remNode = lldpremelements.get(0).getNode(); - } else if (lldpremelements.size() > 1) { - linknode.setLldpRemChassisIdString(getChassisIdString("Found " - + lldpremelements.size() - + " nodes for", - link.getLldpRemChassisId(), - link.getLldpRemChassisIdSubType())); - return linknode; } else { final Criteria criteria = new Criteria(OnmsNode.class).addRestriction(new EqRestriction( "sysName", @@ -383,9 +478,10 @@ private LldpLinkNode convertFromModel(int nodeid, LldpLink link) { } if (remNode != null) { - linknode.setLldpRemChassisIdString(getChassisIdString(remNode.getLabel(), - link.getLldpRemChassisId(), - link.getLldpRemChassisIdSubType())); + linknode.setLldpRemChassisId(getHostString(remNode.getLabel(), + LldpChassisIdSubType.getTypeString(link.getLldpRemChassisIdSubType().getValue()), + link.getLldpRemChassisId() + )); linknode.setLldpRemChassisIdUrl(getNodeUrl(remNode.getId())); if (link.getLldpRemPortIdSubType() == LldpPortIdSubType.LLDP_PORTID_SUBTYPE_LOCAL) { try { @@ -395,9 +491,6 @@ private LldpLinkNode convertFromModel(int nodeid, LldpLink link) { } catch (Exception e) { } } - } else { - linknode.setLldpRemChassisIdString(getChassisIdString(link.getLldpRemChassisId(), - link.getLldpRemChassisIdSubType())); } return linknode; } @@ -406,11 +499,10 @@ public IsisElementNode getIsisElement(int nodeId) { return convertFromModel(m_isisElementDao.findByNodeId(Integer.valueOf(nodeId))); } - @SuppressWarnings("deprecation") private IsisElementNode convertFromModel(IsIsElement isis) { - if (isis == null) + if (isis == null) { return null; - + } IsisElementNode isisNode = new IsisElementNode(); isisNode.setIsisSysID(isis.getIsisSysID()); isisNode.setIsisSysAdminState(IsIsElement.IsisAdminState.getTypeString(isis.getIsisSysAdminState().getValue())); @@ -431,7 +523,6 @@ public List getIsisLinks(int nodeId) { } @Transactional - @SuppressWarnings("deprecation") private IsisLinkNode convertFromModel(int nodeid, IsIsLink link) { IsisLinkNode linknode = new IsisLinkNode(); linknode.setIsisCircIfIndex(link.getIsisCircIfIndex()); @@ -439,8 +530,10 @@ private IsisLinkNode convertFromModel(int nodeid, IsIsLink link) { IsIsElement isiselement = m_isisElementDao.findByIsIsSysId(link.getIsisISAdjNeighSysID()); if (isiselement != null) { - linknode.setIsisISAdjNeighSysID(getAdjSysIDString(link.getIsisISAdjNeighSysID(), - isiselement.getNode().getLabel())); + linknode.setIsisISAdjNeighSysID(getHostString(isiselement.getNode().getLabel(), + "ISSysID", + link.getIsisISAdjNeighSysID() + )); linknode.setIsisISAdjUrl(getNodeUrl(isiselement.getNode().getId())); } else { linknode.setIsisISAdjNeighSysID(link.getIsisISAdjNeighSysID()); @@ -466,8 +559,7 @@ private IsisLinkNode convertFromModel(int nodeid, IsIsLink link) { } if (remiface != null) { - linknode.setIsisISAdjNeighPort(getPortString(remiface.getIfIndex(), - remiface.getIfName(), remiface.getIfAlias())); + linknode.setIsisISAdjNeighPort(getPortString(remiface,null,null)); linknode.setIsisISAdjUrl(getSnmpInterfaceUrl(remiface.getNode().getId(), remiface.getIfIndex())); } else { @@ -490,7 +582,6 @@ public List getBridgeElements(int nodeId) { return nodes; } - @SuppressWarnings("deprecation") private BridgeElementNode convertFromModel(BridgeElement bridge) { if (bridge == null) return null; @@ -516,127 +607,153 @@ private BridgeElementNode convertFromModel(BridgeElement bridge) { return bridgeNode; } - - @Override - public Collection getNodeLinks(int nodeId) { - Map> mactoIpMap = new HashMap>(); - for (OnmsIpInterface ip : m_ipInterfaceDao.findByNodeId(nodeId)) { - for (IpNetToMedia ipnetomedia : m_ipNetToMediaDao.findByNetAddress(ip.getIpAddress())) { - if (!mactoIpMap.containsKey(ipnetomedia.getPhysAddress())) - mactoIpMap.put(ipnetomedia.getPhysAddress(), - new HashSet()); - mactoIpMap.get(ipnetomedia.getPhysAddress()).add(ip.getIpAddress()); - } + + @Transactional + private BridgeLinkNode convertFromModel(Integer nodeid, SharedSegment segment) throws BridgeTopologyException { + + BridgeLinkNode linknode = new BridgeLinkNode(); + BridgePort bridgePort = segment.getBridgePort(nodeid); + final OnmsSnmpInterface iface = bridgePort.getBridgePortIfIndex() == null + ? null + : m_snmpInterfaceDao.findByNodeIdAndIfIndex(bridgePort.getNodeId(), + bridgePort.getBridgePortIfIndex()); + if (iface != null) { + linknode.setBridgeLocalPort(getPortString(iface,"bridgeport", bridgePort.getBridgePort().toString())); + linknode.setBridgeLocalPortUrl(getSnmpInterfaceUrl(bridgePort.getNodeId(), + bridgePort.getBridgePortIfIndex())); + } else { + linknode.setBridgeLocalPort(getPortString("port",bridgePort.getBridgePortIfIndex(),"bridgeport", bridgePort.getBridgePort().toString())); } - List nodelinks = new ArrayList(); - for (String mac : mactoIpMap.keySet()) { - SharedSegment segment = m_bridgetopologyDao.getHostSharedSegment(mac); - if (segment.isEmpty()) - continue; - if (!segment.containsMac(mac)) - continue; - nodelinks.add(convertFromModel(mac,segment, - getNodePortString(mactoIpMap.get(mac), - mac))); + BridgeElement bridgeElement = m_bridgeElementDao.getByNodeIdVlan(bridgePort.getNodeId(), bridgePort.getVlan()); + if (bridgeElement != null) { + linknode.setBridgeInfo(bridgeElement.getVlanname()); } - Collections.sort(nodelinks); - return nodelinks; + return addBridgeRemotesNodes(nodeid, null, linknode, segment); } @Transactional - private NodeLinkBridge convertFromModel(String mac, - SharedSegment segment, String port) { - final NodeLinkBridge linknode = new NodeLinkBridge(); - linknode.setNodeLocalPort(port); + private BridgeLinkNode convertFromModel(Integer nodeid, String mac, List ipaddrs, SharedSegment segment) { + BridgeLinkNode linknode = new BridgeLinkNode(); + + if (ipaddrs.size() == 0) { + linknode.setBridgeLocalPort(getIdString("mac", mac)); + } else if (ipaddrs.size() == 1 ) { + OnmsIpInterface ipiface =ipaddrs.iterator().next(); + if (ipiface != null) { + OnmsSnmpInterface snmpiface = ipiface.getSnmpInterface(); + if (snmpiface != null) { + linknode.setBridgeLocalPort(getPortString(snmpiface,"mac",mac)); + linknode.setBridgeLocalPortUrl(getSnmpInterfaceUrl(snmpiface.getNodeId(), snmpiface.getIfIndex())); + } else { + linknode.setBridgeLocalPort(getPortString(str(ipiface.getIpAddress()),ipiface.getIfIndex(),"mac",mac)); + linknode.setBridgeLocalPortUrl(getIpInterfaceUrl(ipiface.getNodeId(),str(ipiface.getIpAddress()))); + } + } + } else { + linknode.setBridgeLocalPort(getPortString(getIpListAsStringFromIpInterface(ipaddrs), null, "mac", mac)); + } - for (BridgePort link : segment.getBridgePortsOnSegment()) { + return addBridgeRemotesNodes(nodeid, mac, linknode, segment); + } + + @Transactional + private BridgeLinkNode addBridgeRemotesNodes(Integer nodeid, String mac, BridgeLinkNode linknode, + SharedSegment segment) { + + linknode.setBridgeLinkCreateTime(Util.formatDateToUIString(segment.getCreateTime())); + linknode.setBridgeLinkLastPollTime(Util.formatDateToUIString(segment.getLastPollTime())); + + for (BridgePort remport : segment.getBridgePortsOnSegment()) { + if (nodeid.intValue() == remport.getNodeId().intValue()) { + continue; + } final BridgeLinkRemoteNode remlinknode = new BridgeLinkRemoteNode(); - final Integer rempnodeId = link.getNodeId(); - final Integer rembridgePortIfIndex = link.getBridgePortIfIndex(); - remlinknode.setBridgeRemoteNode(m_nodeDao.get(rempnodeId).getLabel()); - remlinknode.setBridgeRemoteUrl(getNodeUrl(rempnodeId)); - - final OnmsSnmpInterface remiface = rembridgePortIfIndex == null - ? null - : m_snmpInterfaceDao.findByNodeIdAndIfIndex(rempnodeId, - rembridgePortIfIndex); + final BridgeElement remBridgeElement = m_bridgeElementDao.getByNodeIdVlan(remport.getNodeId(),remport.getVlan()); + if (remBridgeElement != null) { + remlinknode.setBridgeRemote(getHostString(remBridgeElement.getNode().getLabel(), "bridge base address", remBridgeElement.getBaseBridgeAddress())); + } else { + remlinknode.setBridgeRemote(getIdString("nodeid", remport.getNodeId().toString())); + } + remlinknode.setBridgeRemoteUrl(getNodeUrl(remport.getNodeId())); + + final OnmsSnmpInterface remiface = remport.getBridgePortIfIndex() == null + ? null + : m_snmpInterfaceDao.findByNodeIdAndIfIndex(remport.getNodeId(), + remport.getBridgePortIfIndex()); if (remiface != null) { - remlinknode.setBridgeRemotePort(getPortString(rembridgePortIfIndex, - remiface.getIfName(), - remiface.getIfAlias())); + remlinknode.setBridgeRemotePort(getPortString(remiface,"bridgeport",remport.getBridgePort().toString())); + remlinknode.setBridgeRemotePortUrl(getSnmpInterfaceUrl(remport.getNodeId(), + remport.getBridgePortIfIndex())); } else { - remlinknode.setBridgeRemotePort(getPortString(rembridgePortIfIndex, - null, null)); + remlinknode.setBridgeRemotePort(getPortString(null,remport.getBridgePortIfIndex(), + "bridgeport", remport.getBridgePort().toString())); } - remlinknode.setBridgeRemotePortUrl(getSnmpInterfaceUrl(rempnodeId, - rembridgePortIfIndex)); - remlinknode.setBridgeRemoteVlan(link.getVlan()); linknode.getBridgeLinkRemoteNodes().add(remlinknode); } - Map> sharedmacs = new HashMap>(); - for (String shredmac: segment.getMacsOnSegment()) { - if (shredmac.equals(mac)) + Map> macsToIpNetTOMediaMap = new HashMap>(); + for (String sharedmac: segment.getMacsOnSegment()) { + if (sharedmac.equals(mac)) { continue; - sharedmacs.put(shredmac, new ArrayList()); - sharedmacs.get(shredmac).addAll(m_ipNetToMediaDao.findByPhysAddress(shredmac)); + } + macsToIpNetTOMediaMap.put(sharedmac, new ArrayList(m_ipNetToMediaDao.findByPhysAddress(sharedmac))); } - Map> sharedhosts = new HashMap>(); - for (String shredmac: sharedmacs.keySet()) { - if (sharedmacs.get(shredmac).isEmpty()) { - BridgeLinkSharedHost remlinknode = new BridgeLinkSharedHost(); - OnmsSnmpInterface snmp = getFromPhysAddress(shredmac); + for (String sharedmac: macsToIpNetTOMediaMap.keySet()) { + final BridgeLinkRemoteNode remlinknode = new BridgeLinkRemoteNode(); + if (macsToIpNetTOMediaMap.get(sharedmac).isEmpty()) { + OnmsSnmpInterface snmp = getFromPhysAddress(sharedmac); if (snmp == null) { - remlinknode.setSharedHost(shredmac - + " No ip address found"); + remlinknode.setBridgeRemote(getIdString("mac", sharedmac)); } else { - remlinknode.setSharedHost(snmp.getNode().getLabel()); - remlinknode.setSharedHostUrl(getNodeUrl(snmp.getNode().getId())); + remlinknode.setBridgeRemote(getHostString(snmp.getNode().getLabel(),"mac",sharedmac)); + remlinknode.setBridgeRemoteUrl(getNodeUrl(snmp.getNode().getId())); - remlinknode.setSharedHostPort(getPortString(snmp.getIfIndex(),snmp.getIfName(),snmp.getIfAlias())); - remlinknode.setSharedHostPortUrl(getSnmpInterfaceUrl(snmp.getNode().getId(), + remlinknode.setBridgeRemotePort(getPortString(snmp,null,null)); + remlinknode.setBridgeRemotePortUrl(getSnmpInterfaceUrl(snmp.getNode().getId(), snmp.getIfIndex())); } - linknode.getBridgeLinkSharedHost().add(remlinknode); + linknode.getBridgeLinkRemoteNodes().add(remlinknode); + continue; + } + + List remipaddrs = new ArrayList(); + for (IpNetToMedia ipnettomedia : macsToIpNetTOMediaMap.get(sharedmac)) { + remipaddrs.addAll(m_ipInterfaceDao.findByIpAddress(ipnettomedia.getNetAddress().getHostAddress())); + } + + if (remipaddrs.size() == 0) { + remlinknode.setBridgeRemote(getIdString("mac", sharedmac)); + remlinknode.setBridgeRemotePort(getIpListAsStringFromIpNetToMedia(macsToIpNetTOMediaMap.get(sharedmac))); + linknode.getBridgeLinkRemoteNodes().add(remlinknode); continue; } - sharedhosts.put(shredmac, new ArrayList()); - for (IpNetToMedia ipnettomedia : sharedmacs.get(shredmac)) - sharedhosts.get(shredmac).addAll(m_ipInterfaceDao.findByIpAddress(ipnettomedia.getNetAddress().getHostAddress())); - } - for (String shredmac: sharedhosts.keySet()) { - BridgeLinkSharedHost remlinknode = new BridgeLinkSharedHost(); - Set ips = new HashSet(); - if (sharedhosts.get(shredmac).isEmpty()) { - for (IpNetToMedia ipnettomedia: sharedmacs.get(shredmac)) { - ips.add(ipnettomedia.getNetAddress()); + if (remipaddrs.size() == 1) { + OnmsIpInterface remiface = remipaddrs.iterator().next(); + remlinknode.setBridgeRemote(getHostString(remiface.getNode().getLabel(), "mac", sharedmac)); + remlinknode.setBridgeRemoteUrl(getNodeUrl(remiface.getNodeId())); + OnmsSnmpInterface remsnmpiface = remiface.getSnmpInterface(); + if (remsnmpiface != null) { + remlinknode.setBridgeRemotePort(getPortString(remsnmpiface, "ip", str(remiface.getIpAddress()))); + remlinknode.setBridgeRemotePortUrl(getSnmpInterfaceUrl(remiface.getNodeId(), remsnmpiface.getIfIndex())); + } else { + remlinknode.setBridgeRemotePort(getPortString(str(remiface.getIpAddress()), remiface.getIfIndex(), null, null)); + remlinknode.setBridgeRemotePortUrl(getIpInterfaceUrl(remiface.getNodeId(), str(remiface.getIpAddress()))); } - remlinknode.setSharedHost(getNodePortString(ips, shredmac)+ " No node found"); - linknode.getBridgeLinkSharedHost().add(remlinknode); + linknode.getBridgeLinkRemoteNodes().add(remlinknode); continue; } - OnmsIpInterface first = null; - boolean multiplenodeids = false; - for (OnmsIpInterface ip: sharedhosts.get(shredmac)) { - if (first == null ) - first = ip; - if (first.getNode().getId().intValue() != ip.getNode().getId().intValue() ) - multiplenodeids = true; - ips.add(ip.getIpAddress()); + Set labels = new HashSet(); + for (OnmsIpInterface remiface: remipaddrs) { + labels.add(remiface.getNode().getLabel()); } - if (multiplenodeids) { - remlinknode.setSharedHost(getNodePortString(ips, shredmac) + " duplicated ip multiple node associated in db"); - } else { - remlinknode.setSharedHost(first.getNode().getLabel()); - remlinknode.setSharedHostUrl(getNodeUrl(first.getNode().getId())); + if (labels.size() == 1) { + remlinknode.setBridgeRemote(getHostString(labels.iterator().next(),"mac",sharedmac)); + remlinknode.setBridgeRemoteUrl(getNodeUrl(remipaddrs.iterator().next().getNodeId())); } - remlinknode.setSharedHostPort(getNodePortString(ips, shredmac)); - if (ips.size() == 1) { - remlinknode.setSharedHostPortUrl(getIpInterfaceUrl(first)); - } - linknode.getBridgeLinkSharedHost().add(remlinknode); + remlinknode.setBridgeRemotePort(getIpListAsStringFromIpNetToMedia(macsToIpNetTOMediaMap.get(sharedmac))); + linknode.getBridgeLinkRemoteNodes().add(remlinknode); } return linknode; } @@ -645,142 +762,45 @@ private NodeLinkBridge convertFromModel(String mac, public Collection getBridgeLinks(int nodeId) { List bridgelinks = new ArrayList(); for (SharedSegment segment: m_bridgetopologyDao.getBridgeSharedSegments(nodeId)) { - bridgelinks.add(convertFromModel(nodeId, segment)); - } - Collections.sort(bridgelinks); - return bridgelinks; - } - - @Transactional - private BridgeLinkNode convertFromModel(int nodeid, SharedSegment segment) { - final BridgeLinkNode linknode = new BridgeLinkNode(); - for (BridgePort link : segment.getBridgePortsOnSegment()) { - final Integer rempnodeId = link.getNodeId(); - final Integer rembridgePortIfIndex = link.getBridgePortIfIndex(); - final OnmsSnmpInterface remiface = rembridgePortIfIndex == null - ? null - : m_snmpInterfaceDao.findByNodeIdAndIfIndex(rempnodeId, - rembridgePortIfIndex); - if (link.getNodeId().intValue() == nodeid) { - if (remiface != null) { - linknode.setNodeLocalPort(getPortString(rembridgePortIfIndex, - remiface.getIfName(), - remiface.getIfAlias())); - } else { - linknode.setNodeLocalPort(getPortString(rembridgePortIfIndex, - null, null)); - } - linknode.setBridgeLocalVlan(link.getVlan()); - continue; - } - final BridgeLinkRemoteNode remlinknode = new BridgeLinkRemoteNode(); - remlinknode.setBridgeRemoteNode(m_nodeDao.get(rempnodeId).getLabel()); - remlinknode.setBridgeRemoteUrl(getNodeUrl(rempnodeId)); - - if (remiface != null) { - remlinknode.setBridgeRemotePort(getPortString(rembridgePortIfIndex, - remiface.getIfName(), - remiface.getIfAlias())); - } else { - remlinknode.setBridgeRemotePort(getPortString(rembridgePortIfIndex, - null, null)); + try { + bridgelinks.add(convertFromModel(nodeId, segment)); + } catch (BridgeTopologyException e) { + e.printStackTrace(); } - remlinknode.setBridgeRemotePortUrl(getSnmpInterfaceUrl(rempnodeId, - rembridgePortIfIndex)); - remlinknode.setBridgeRemoteVlan(link.getVlan()); - linknode.getBridgeLinkRemoteNodes().add(remlinknode); } - - Map> sharedmacs = new HashMap>(); - for (String shredmac: segment.getMacsOnSegment()) { - sharedmacs.put(shredmac, new ArrayList()); - sharedmacs.get(shredmac).addAll(m_ipNetToMediaDao.findByPhysAddress(shredmac)); + if (bridgelinks.size() > 0 ) { + Collections.sort(bridgelinks); + LOG.debug("getBridgeLinks: node:[{}] is bridge found {} bridgelinks", nodeId, bridgelinks.size()); + return bridgelinks; } - - Map> sharedhosts = new HashMap>(); - for (String shredmac: sharedmacs.keySet()) { - if (sharedmacs.get(shredmac).isEmpty()) { - BridgeLinkSharedHost remlinknode = new BridgeLinkSharedHost(); - OnmsSnmpInterface snmp = getFromPhysAddress(shredmac); - if (snmp == null) { - remlinknode.setSharedHost(shredmac - + " No ip address found"); - } else { - remlinknode.setSharedHost(snmp.getNode().getLabel()); - remlinknode.setSharedHostUrl(getNodeUrl(snmp.getNode().getId())); - - remlinknode.setSharedHostPort(getPortString(snmp.getIfIndex(),snmp.getIfName(),snmp.getIfAlias())); - remlinknode.setSharedHostPortUrl(getSnmpInterfaceUrl(snmp.getNode().getId(), - snmp.getIfIndex())); + + Map> mactoIpNodeMap = new HashMap>(); + m_ipInterfaceDao.findByNodeId(nodeId).stream().forEach( ip -> { + LOG.debug("getBridgeLinks: node:[{}] is host found {} ip:{}", nodeId, str(ip.getIpAddress())); + m_ipNetToMediaDao.findByNetAddress(ip.getIpAddress()).stream().forEach( ipnettomedia -> { + if (!mactoIpNodeMap.containsKey(ipnettomedia.getPhysAddress())) { + mactoIpNodeMap.put(ipnettomedia.getPhysAddress(), + new ArrayList()); } - linknode.getBridgeLinkSharedHost().add(remlinknode); - continue; - } - sharedhosts.put(shredmac, new ArrayList()); - for (IpNetToMedia ipnettomedia : sharedmacs.get(shredmac)) - sharedhosts.get(shredmac).addAll(m_ipInterfaceDao.findByIpAddress(ipnettomedia.getNetAddress().getHostAddress())); - } + mactoIpNodeMap.get(ipnettomedia.getPhysAddress()).add(ip); + LOG.debug("getBridgeLinks: node:[{}] is host found {} ip:{} mac:{}", nodeId, str(ip.getIpAddress()),ipnettomedia.getPhysAddress()); + }); + }); - for (String shredmac: sharedhosts.keySet()) { - BridgeLinkSharedHost remlinknode = new BridgeLinkSharedHost(); - Set ips = new HashSet(); - if (sharedhosts.get(shredmac).isEmpty()) { - for (IpNetToMedia ipnettomedia: sharedmacs.get(shredmac)) { - ips.add(ipnettomedia.getNetAddress()); - } - remlinknode.setSharedHost(getNodePortString(ips, shredmac)+ " No node found"); - linknode.getBridgeLinkSharedHost().add(remlinknode); + for (String mac : mactoIpNodeMap.keySet()) { + SharedSegment segment = m_bridgetopologyDao.getHostSharedSegment(mac); + if (segment.isEmpty()) { continue; } - OnmsIpInterface first = null; - boolean multiplenodeids = false; - for (OnmsIpInterface ip: sharedhosts.get(shredmac)) { - if (first == null ) - first = ip; - if (first.getNode().getId().intValue() != ip.getNode().getId().intValue() ) - multiplenodeids = true; - ips.add(ip.getIpAddress()); - } - if (multiplenodeids) { - remlinknode.setSharedHost(getNodePortString(ips, shredmac) + " duplicated ip multiple node associated in db"); - } else { - remlinknode.setSharedHost(first.getNode().getLabel()); - remlinknode.setSharedHostUrl(getNodeUrl(first.getNode().getId())); - } - remlinknode.setSharedHostPort(getNodePortString(ips, shredmac)); - if (ips.size() == 1) { - remlinknode.setSharedHostPortUrl(getIpInterfaceUrl(first)); - } - linknode.getBridgeLinkSharedHost().add(remlinknode); - } - - return linknode; - - } - - - private String getAdjSysIDString(String adjsysid, String label) { - return adjsysid + "(" + label + ")"; - } - - private String getChassisIdString(String sysname, String chassisId, - LldpChassisIdSubType chassisType) { - return sysname + ": " - + LldpChassisIdSubType.getTypeString(chassisType.getValue()) - + ": " + chassisId; - } - - private String getChassisIdString(String chassisId, - LldpChassisIdSubType chassisType) { - return LldpChassisIdSubType.getTypeString(chassisType.getValue()) - + ": " + chassisId; - } - - private String getPortString(String portId, LldpPortIdSubType type) { - return LldpPortIdSubType.getTypeString(type.getValue()) + ": " - + portId; + bridgelinks.add(convertFromModel(nodeId, + mac, + mactoIpNodeMap.get(mac), + segment)); + } + Collections.sort(bridgelinks); + return bridgelinks; } - + private OnmsSnmpInterface getFromCdpCacheDevicePort(Integer nodeid, String cdpCacheDevicePort) { final CriteriaBuilder builder = new CriteriaBuilder( @@ -810,37 +830,76 @@ private OnmsSnmpInterface getFromPhysAddress(String physAddress) { return null; } - private String getNodePortString(Set ips, String physaddr) { - String port = ""; - if (ips.size() > 1) - port += "multiple ip addresses"; - if (ips.size() == 1) - port += str(ips.iterator().next()); - if (physaddr != null) - port += "(" + physaddr + ")"; - return port; + + private String getPortString(OnmsSnmpInterface snmpiface, String addrtype, String addr) { + StringBuffer sb = new StringBuffer(""); + if (snmpiface != null) { + sb.append(snmpiface.getIfName()); + sb.append("("); + sb.append(snmpiface.getIfAlias()); + sb.append(")"); + sb.append("(ifindex:"); + sb.append(snmpiface.getIfIndex()); + sb.append(")"); + } + sb.append(getIdString(addrtype, addr)); + return sb.toString(); + } + + private String getPortString(String ifname, Integer ifindex, String addrtype,String addr) { + StringBuffer sb = new StringBuffer(""); + if (ifname != null) { + sb.append(ifname); + } + if (ifindex != null) { + sb.append("(ifindex:"); + sb.append(ifindex); + sb.append(")"); + } + sb.append(getIdString(addrtype, addr)); + return sb.toString(); } - private String getPortString(Integer ifindex, String ifName, String ifAlias) { - if (ifindex == null && ifName == null && ifAlias == null) - return null; - String port = ""; - if (ifName != null) - port += ifName; - if (ifindex != null ) - port += "(ifindex:" + ifindex + ")"; - if (ifAlias != null) { - port += "(ifalias: " + ifAlias + ")"; + private String getPortString(Integer ifindex, String addrtype,String addr) { + StringBuffer sb = new StringBuffer(""); + if (ifindex != null) { + sb.append("(ifindex:"); + sb.append(ifindex); + sb.append(")"); } - return port; + sb.append(getIdString(addrtype, addr)); + return sb.toString(); } - private String getRemRouterIdString(String ip, String label) { - return ip + "(" + label + ")"; + private String getHostString(String label, String addrtype, String addr) { + StringBuffer sb = new StringBuffer(label); + if (addrtype != null && !label.equals(addr)) { + sb.append(getIdString(addrtype, addr)); + } + return sb.toString(); + } + + + private String getIdString(String addrtype, String addr) { + StringBuffer sb = new StringBuffer(""); + if (addrtype != null ) { + sb.append("("); + if ("ip".equals(addrtype)) { + sb.append(addr); + } else if (addr == null) { + sb.append(addrtype); + } else { + sb.append(addrtype); + sb.append(":"); + sb.append(addr); + } + sb.append(")"); + } + return sb.toString(); } - + private String getNodeUrl(Integer nodeid) { - return "element/node.jsp?node=" + nodeid; + return "element/linkednode.jsp?node=" + nodeid; } private String getSnmpInterfaceUrl(Integer nodeid, Integer ifindex) { @@ -853,10 +912,33 @@ private String getSnmpInterfaceUrl(Integer nodeid, Integer ifindex) { private String getIpInterfaceUrl(Integer nodeid, String ipaddress) { return "element/interface.jsp?node=" + nodeid + "&intf=" + ipaddress; } - - private String getIpInterfaceUrl(OnmsIpInterface ip) { - return "element/interface.jsp?node=" + ip.getNode().getId() - + "&intf=" + str(ip.getIpAddress()); + + private String getIpListAsStringFromIpInterface(List ipinterfaces) { + Set ipstrings = new HashSet(); + ipinterfaces.stream().forEach(ipinterface -> ipstrings.add(str(ipinterface.getIpAddress()))); + return getIpList(ipstrings); + } + + private String getIpListAsStringFromIpNetToMedia(List ipnettomedias) { + Set ipstrings = new HashSet(); + ipnettomedias.stream().forEach( ipnettomedia -> ipstrings.add(str(ipnettomedia.getNetAddress()))); + return getIpList(ipstrings); + } + + private String getIpList(Set ipstrings) { + StringBuffer sb = new StringBuffer("("); + boolean start = true; + for (String ipstring: ipstrings) { + if (start) { + start=false; + } else { + sb.append(":"); + } + sb.append(ipstring); + } + sb.append(")"); + return sb.toString(); + } } diff --git a/opennms-webapp/src/main/java/org/opennms/web/enlinkd/EnLinkdElementFactoryInterface.java b/opennms-webapp/src/main/java/org/opennms/web/enlinkd/EnLinkdElementFactoryInterface.java index 1769e31a27ae..450a6196e5e0 100644 --- a/opennms-webapp/src/main/java/org/opennms/web/enlinkd/EnLinkdElementFactoryInterface.java +++ b/opennms-webapp/src/main/java/org/opennms/web/enlinkd/EnLinkdElementFactoryInterface.java @@ -34,25 +34,18 @@ public interface EnLinkdElementFactoryInterface { List getBridgeElements(int nodeId); - Collection getBridgeLinks(int nodeId); - Collection getNodeLinks(int nodeId); - IsisElementNode getIsisElement(int nodeId); - List getIsisLinks(int nodeId); LldpElementNode getLldpElement(int nodeId); - List getLldpLinks(int nodeId); OspfElementNode getOspfElement(int nodeId); - List getOspfLinks(int nodeId); CdpElementNode getCdpElement(int nodeId); - List getCdpLinks(int nodeId); } diff --git a/opennms-webapp/src/main/java/org/opennms/web/enlinkd/LldpElementNode.java b/opennms-webapp/src/main/java/org/opennms/web/enlinkd/LldpElementNode.java index e56de8abaa92..f8589259f77e 100644 --- a/opennms-webapp/src/main/java/org/opennms/web/enlinkd/LldpElementNode.java +++ b/opennms-webapp/src/main/java/org/opennms/web/enlinkd/LldpElementNode.java @@ -30,17 +30,17 @@ public class LldpElementNode { - private String m_lldpChassisIdString; + private String m_lldpChassisId; private String m_lldpSysName; private String m_lldpCreateTime; private String m_lldpLastPollTime; - public String getLldpChassisIdString() { - return m_lldpChassisIdString; + public String getLldpChassisId() { + return m_lldpChassisId; } - public void setLldpChassisIdString(String lldpSysIdString) { - m_lldpChassisIdString = lldpSysIdString; + public void setLldpChassisId(String lldpChassisId) { + m_lldpChassisId = lldpChassisId; } public String getLldpSysName() { return m_lldpSysName; diff --git a/opennms-webapp/src/main/java/org/opennms/web/enlinkd/LldpLinkNode.java b/opennms-webapp/src/main/java/org/opennms/web/enlinkd/LldpLinkNode.java index df08e450248f..eb6c371a1971 100644 --- a/opennms-webapp/src/main/java/org/opennms/web/enlinkd/LldpLinkNode.java +++ b/opennms-webapp/src/main/java/org/opennms/web/enlinkd/LldpLinkNode.java @@ -30,73 +30,60 @@ public class LldpLinkNode implements Comparable { - private String m_lldpPortString; - private String m_lldpPortDescr; - private String m_lldpPortUrl; - private String m_lldpRemChassisIdString; - private String m_lldpRemSysName; - private String m_lldpRemChassisIdUrl; - private String m_lldpRemPortString; - private String m_lldpRemPortDescr; + private String m_lldpLocalPort; + private String m_lldpLocalPortUrl; + private String m_lldpRemChassisId; + private String m_lldpRemChassisIdUrl; + private String m_lldpRemInfo; + private String m_lldpRemPort; private String m_lldpRemPortUrl; private String m_lldpCreateTime; private String m_lldpLastPollTime; - public String getLldpPortString() { - return m_lldpPortString; - } - public void setLldpPortString(String lldpPortString) { - m_lldpPortString = lldpPortString; - } - public String getLldpPortDescr() { - return m_lldpPortDescr; - } - public void setLldpPortDescr(String lldpPortDescr) { - m_lldpPortDescr = lldpPortDescr; - } - public String getLldpPortUrl() { - return m_lldpPortUrl; - } - public void setLldpPortUrl(String lldpPortUrl) { - m_lldpPortUrl = lldpPortUrl; - } - public String getLldpRemChassisIdString() { - return m_lldpRemChassisIdString; - } - public void setLldpRemChassisIdString(String lldpRemChassisIdString) { - m_lldpRemChassisIdString = lldpRemChassisIdString; - } - public String getLldpRemSysName() { - return m_lldpRemSysName; - } - public void setLldpRemSysName(String lldpRemSysName) { - m_lldpRemSysName = lldpRemSysName; - } - public String getLldpRemChassisIdUrl() { - return m_lldpRemChassisIdUrl; - } - public void setLldpRemChassisIdUrl(String lldpRemChassisIdUrl) { - m_lldpRemChassisIdUrl = lldpRemChassisIdUrl; - } - public String getLldpRemPortString() { - return m_lldpRemPortString; - } - public void setLldpRemPortString(String lldpRemPortString) { - m_lldpRemPortString = lldpRemPortString; - } - public String getLldpRemPortDescr() { - return m_lldpRemPortDescr; - } - public void setLldpRemPortDescr(String lldpRemPortDescr) { - m_lldpRemPortDescr = lldpRemPortDescr; - } - public String getLldpRemPortUrl() { - return m_lldpRemPortUrl; - } - public void setLldpRemPortUrl(String lldpRemPortUrl) { - m_lldpRemPortUrl = lldpRemPortUrl; - } - public String getLldpCreateTime() { + + public String getLldpLocalPort() { + return m_lldpLocalPort; + } + public void setLldpLocalPort(String lldpLocalPort) { + m_lldpLocalPort = lldpLocalPort; + } + public String getLldpLocalPortUrl() { + return m_lldpLocalPortUrl; + } + public void setLldpLocalPortUrl(String lldpLocalPortUrl) { + m_lldpLocalPortUrl = lldpLocalPortUrl; + } + public String getLldpRemChassisId() { + return m_lldpRemChassisId; + } + public void setLldpRemChassisId(String lldpRemChassisId) { + m_lldpRemChassisId = lldpRemChassisId; + } + public String getLldpRemChassisIdUrl() { + return m_lldpRemChassisIdUrl; + } + public void setLldpRemChassisIdUrl(String lldpRemChassisIdUrl) { + m_lldpRemChassisIdUrl = lldpRemChassisIdUrl; + } + public String getLldpRemInfo() { + return m_lldpRemInfo; + } + public void setLldpRemInfo(String lldpRemInfo) { + m_lldpRemInfo = lldpRemInfo; + } + public String getLldpRemPort() { + return m_lldpRemPort; + } + public void setLldpRemPort(String lldpRemPort) { + m_lldpRemPort = lldpRemPort; + } + public String getLldpRemPortUrl() { + return m_lldpRemPortUrl; + } + public void setLldpRemPortUrl(String lldpRemPortUrl) { + m_lldpRemPortUrl = lldpRemPortUrl; + } + public String getLldpCreateTime() { return m_lldpCreateTime; } public void setLldpCreateTime(String lldpCreateTime) { @@ -110,7 +97,7 @@ public void setLldpLastPollTime(String lldpLastPollTime) { } @Override public int compareTo(LldpLinkNode o) { - return m_lldpPortString.compareTo(o.m_lldpPortString); + return m_lldpLocalPort.compareTo(o.m_lldpLocalPort); } } diff --git a/opennms-webapp/src/main/java/org/opennms/web/enlinkd/NodeLinkBridge.java b/opennms-webapp/src/main/java/org/opennms/web/enlinkd/NodeLinkBridge.java deleted file mode 100644 index ec56e34a2c05..000000000000 --- a/opennms-webapp/src/main/java/org/opennms/web/enlinkd/NodeLinkBridge.java +++ /dev/null @@ -1,87 +0,0 @@ -/******************************************************************************* - * This file is part of OpenNMS(R). - * - * Copyright (C) 2014 The OpenNMS Group, Inc. - * OpenNMS(R) is Copyright (C) 1999-2014 The OpenNMS Group, Inc. - * - * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. - * - * OpenNMS(R) is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published - * by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * OpenNMS(R) is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with OpenNMS(R). If not, see: - * http://www.gnu.org/licenses/ - * - * For more information contact: - * OpenNMS(R) Licensing - * http://www.opennms.org/ - * http://www.opennms.com/ - *******************************************************************************/ - -package org.opennms.web.enlinkd; - -import java.util.ArrayList; -import java.util.List; - -public class NodeLinkBridge implements Comparable{ - - private String m_nodeLocalPort; - private List m_bridgeLinkRemoteNodes = new ArrayList(); - private List m_bridgeLinkSharedHost = new ArrayList(); - private String m_bridgeLinkCreateTime; - private String m_bridgeLinkLastPollTime; - - public String getNodeLocalPort() { - return m_nodeLocalPort; - } - public void setNodeLocalPort(String nodeLocalPort) { - m_nodeLocalPort = nodeLocalPort; - } - public List getBridgeLinkRemoteNodes() { - return m_bridgeLinkRemoteNodes; - } - public void setBridgeLinkRemoteNodes( - List bridgeLinkRemoteNodes) { - m_bridgeLinkRemoteNodes = bridgeLinkRemoteNodes; - } - public List getBridgeLinkSharedHost() { - return m_bridgeLinkSharedHost; - } - public void setBridgeLinkSharedHost( - List bridgeLinkSharedHost) { - m_bridgeLinkSharedHost = bridgeLinkSharedHost; - } - - public String getBridgeLinkCreateTime() { - return m_bridgeLinkCreateTime; - } - - public void setBridgeLinkCreateTime(String bridgeLinkCreateTime) { - m_bridgeLinkCreateTime = bridgeLinkCreateTime; - } - - public String getBridgeLinkLastPollTime() { - return m_bridgeLinkLastPollTime; - } - - public void setBridgeLinkLastPollTime(String bridgeLinkLastPollTime) { - m_bridgeLinkLastPollTime = bridgeLinkLastPollTime; - } - - @Override - public int compareTo(NodeLinkBridge o) { - return m_nodeLocalPort.compareTo(o.m_nodeLocalPort); - } - - - -} - diff --git a/opennms-webapp/src/main/java/org/opennms/web/enlinkd/OspfLinkNode.java b/opennms-webapp/src/main/java/org/opennms/web/enlinkd/OspfLinkNode.java index 2a005d967cc6..cbea20b3ef4f 100644 --- a/opennms-webapp/src/main/java/org/opennms/web/enlinkd/OspfLinkNode.java +++ b/opennms-webapp/src/main/java/org/opennms/web/enlinkd/OspfLinkNode.java @@ -29,82 +29,96 @@ package org.opennms.web.enlinkd; public class OspfLinkNode implements Comparable{ - private String m_ospfIpAddr; - private Integer m_ospfIfIndex; - private Integer m_ospfAddressLessIndex; + + private String m_ospfLocalPort; + private String m_ospfLocalPortUrl; private String m_ospfRemRouterId; private String m_ospfRemRouterUrl; - private String m_ospfRemIpAddr; - private Integer m_ospfRemAddressLessIndex; + + private String m_ospfRemPort; private String m_ospfRemPortUrl; + + private String m_ospfLinkInfo; private String m_ospfLinkCreateTime; private String m_ospfLinkLastPollTime; - public String getOspfIpAddr() { - return m_ospfIpAddr; - } - public void setOspfIpAddr(String ospfIpAddr) { - m_ospfIpAddr = ospfIpAddr; - } - public Integer getOspfIfIndex() { - return m_ospfIfIndex; - } - public void setOspfIfIndex(Integer ospfIfIndex) { - m_ospfIfIndex = ospfIfIndex; - } - public Integer getOspfAddressLessIndex() { - return m_ospfAddressLessIndex; - } - public void setOspfAddressLessIndex(Integer ospfAddressLessIndex) { - m_ospfAddressLessIndex = ospfAddressLessIndex; - } - public String getOspfRemRouterId() { - return m_ospfRemRouterId; - } - public void setOspfRemRouterId(String ospfRemRouterId) { - m_ospfRemRouterId = ospfRemRouterId; - } - public String getOspfRemRouterUrl() { - return m_ospfRemRouterUrl; - } - public void setOspfRemRouterUrl(String ospfRemRouterUrl) { - m_ospfRemRouterUrl = ospfRemRouterUrl; - } - public String getOspfRemIpAddr() { - return m_ospfRemIpAddr; - } - public void setOspfRemIpAddr(String ospfRemIpAddr) { - m_ospfRemIpAddr = ospfRemIpAddr; - } - public Integer getOspfRemAddressLessIndex() { - return m_ospfRemAddressLessIndex; - } - public void setOspfRemAddressLessIndex(Integer ospfRemAddressLessIndex) { - m_ospfRemAddressLessIndex = ospfRemAddressLessIndex; - } - public String getOspfRemPortUrl() { - return m_ospfRemPortUrl; - } - public void setOspfRemPortUrl(String ospfRemPortUrl) { - m_ospfRemPortUrl = ospfRemPortUrl; - } - public String getOspfLinkCreateTime() { - return m_ospfLinkCreateTime; - } - public void setOspfLinkCreateTime(String ospfLinkCreateTime) { - m_ospfLinkCreateTime = ospfLinkCreateTime; - } - public String getOspfLinkLastPollTime() { - return m_ospfLinkLastPollTime; - } - public void setOspfLinkLastPollTime(String ospfLinkLastPollTime) { - m_ospfLinkLastPollTime = ospfLinkLastPollTime; - } + public String getOspfLocalPort() { + return m_ospfLocalPort; + } + + public void setOspfLocalPort(String ospfLocalPort) { + m_ospfLocalPort = ospfLocalPort; + } + + public String getOspfLocalPortUrl() { + return m_ospfLocalPortUrl; + } + + public void setOspfLocalPortUrl(String ospfLocalPortUrl) { + m_ospfLocalPortUrl = ospfLocalPortUrl; + } + + public String getOspfRemRouterId() { + return m_ospfRemRouterId; + } + + public void setOspfRemRouterId(String ospfRemRouterId) { + m_ospfRemRouterId = ospfRemRouterId; + } + + public String getOspfRemRouterUrl() { + return m_ospfRemRouterUrl; + } + + public void setOspfRemRouterUrl(String ospfRemRouterUrl) { + m_ospfRemRouterUrl = ospfRemRouterUrl; + } + + public String getOspfRemPort() { + return m_ospfRemPort; + } + + public void setOspfRemPort(String ospfRemPort) { + m_ospfRemPort = ospfRemPort; + } + + public String getOspfRemPortUrl() { + return m_ospfRemPortUrl; + } + + public void setOspfRemPortUrl(String ospfRemPortUrl) { + m_ospfRemPortUrl = ospfRemPortUrl; + } + + public String getOspfLinkInfo() { + return m_ospfLinkInfo; + } + + public void setOspfLinkInfo(String ospfLinkInfo) { + m_ospfLinkInfo = ospfLinkInfo; + } + + public String getOspfLinkCreateTime() { + return m_ospfLinkCreateTime; + } + + public void setOspfLinkCreateTime(String ospfLinkCreateTime) { + m_ospfLinkCreateTime = ospfLinkCreateTime; + } + + public String getOspfLinkLastPollTime() { + return m_ospfLinkLastPollTime; + } + + public void setOspfLinkLastPollTime(String ospfLinkLastPollTime) { + m_ospfLinkLastPollTime = ospfLinkLastPollTime; + } + @Override public int compareTo(OspfLinkNode o) { - return getOspfIpAddr().compareTo(o.getOspfIpAddr()); + return getOspfLocalPort().compareTo(o.getOspfLocalPort()); } } diff --git a/opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/detail.jsp b/opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/detail.jsp index 0ce88d6f85c3..69f080c17005 100644 --- a/opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/detail.jsp +++ b/opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/detail.jsp @@ -51,6 +51,7 @@ <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@taglib uri="/WEB-INF/taglib.tld" prefix="onms" %> <%@taglib tagdir="/WEB-INF/tags/form" prefix="form" %> <%! @@ -143,7 +144,7 @@ Last Event - + Interface <% if (alarm.getIpAddr() != null) {%> @@ -163,7 +164,7 @@ First Event - + Service <% if (alarm.getServiceType() != null) {%> @@ -262,7 +263,7 @@ <%=ack.getAckUser()%> <%=ack.getAckAction()%> - + <% }%> @@ -292,10 +293,10 @@
Author:
<%=(alarm.getStickyMemo().getAuthor() != null) ? alarm.getStickyMemo().getAuthor() : ""%>
Updated:
- +
Created:
- +
<% } else { %> @@ -330,10 +331,10 @@
Author:
<%=(alarm.getReductionKeyMemo().getAuthor() != null) ? alarm.getReductionKeyMemo().getAuthor() : ""%>
Updated:
- +
Created:
- +
<% } else { %> diff --git a/opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/list.jsp b/opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/list.jsp index d2feb4b31b8a..d11f48811062 100644 --- a/opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/list.jsp +++ b/opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/list.jsp @@ -55,7 +55,7 @@ <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<%@taglib uri="../../taglib.tld" prefix="onms" %> +<%@taglib uri="/WEB-INF/taglib.tld" prefix="onms" %> <%-- This page is written to be the display (view) portion of the AlarmQueryServlet @@ -685,7 +685,7 @@ <% if(alarms[i].getLastEvent() != null) { %><% } %> - + <% if(alarms[i].getLastEvent() != null) { %><% } %> ${addAfterFilter} ${addBeforeFilter} @@ -693,7 +693,7 @@
- + ${addAfterFilter} ${addBeforeFilter} diff --git a/opennms-webapp/src/main/webapp/WEB-INF/jsp/distributed/locationMonitorDetails.jsp b/opennms-webapp/src/main/webapp/WEB-INF/jsp/distributed/locationMonitorDetails.jsp index 41ea20b5fd6d..a4ed04cb31b7 100644 --- a/opennms-webapp/src/main/webapp/WEB-INF/jsp/distributed/locationMonitorDetails.jsp +++ b/opennms-webapp/src/main/webapp/WEB-INF/jsp/distributed/locationMonitorDetails.jsp @@ -33,6 +33,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%> <%@ taglib uri="http://www.springframework.org/tags" prefix="spring" %> +<%@taglib uri="/WEB-INF/taglib.tld" prefix="onms" %> @@ -103,8 +104,7 @@ - - + Never diff --git a/opennms-webapp/src/main/webapp/WEB-INF/jsp/distributed/locationMonitorList.jsp b/opennms-webapp/src/main/webapp/WEB-INF/jsp/distributed/locationMonitorList.jsp index 1e8a523d8fd3..c2c37278491f 100644 --- a/opennms-webapp/src/main/webapp/WEB-INF/jsp/distributed/locationMonitorList.jsp +++ b/opennms-webapp/src/main/webapp/WEB-INF/jsp/distributed/locationMonitorList.jsp @@ -36,6 +36,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> <%@ taglib uri="http://www.springframework.org/tags" prefix="spring" %> +<%@taglib uri="/WEB-INF/taglib.tld" prefix="onms" %> @@ -92,8 +93,7 @@ - - + Never diff --git a/opennms-webapp/src/main/webapp/WEB-INF/jsp/event/detail.jsp b/opennms-webapp/src/main/webapp/WEB-INF/jsp/event/detail.jsp index efd0221ba9e5..cc5efea3ce51 100644 --- a/opennms-webapp/src/main/webapp/WEB-INF/jsp/event/detail.jsp +++ b/opennms-webapp/src/main/webapp/WEB-INF/jsp/event/detail.jsp @@ -32,6 +32,7 @@ <%@page language="java" contentType="text/html" session="true" %> <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@taglib uri="/WEB-INF/taglib.tld" prefix="onms" %> <%@page import="java.util.HashMap"%> <%@page import="java.util.Map"%> @@ -120,7 +121,7 @@ Time - + Interface <% if( event.getIpAddress() != null ) { %> @@ -142,7 +143,7 @@ - +   diff --git a/opennms-webapp/src/main/webapp/WEB-INF/jsp/event/list.jsp b/opennms-webapp/src/main/webapp/WEB-INF/jsp/event/list.jsp index 79167219042e..01558b7af7f9 100644 --- a/opennms-webapp/src/main/webapp/WEB-INF/jsp/event/list.jsp +++ b/opennms-webapp/src/main/webapp/WEB-INF/jsp/event/list.jsp @@ -53,7 +53,7 @@ <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<%@taglib uri="../../taglib.tld" prefix="onms" %> +<%@taglib uri="/WEB-INF/taglib.tld" prefix="onms" %> <%-- This page is written to be the display (view) portion of the EventFilterController @@ -408,7 +408,7 @@ - + ${addAfterFilter} ${addBeforeFilter} diff --git a/opennms-webapp/src/main/webapp/WEB-INF/jsp/notification/list.jsp b/opennms-webapp/src/main/webapp/WEB-INF/jsp/notification/list.jsp index d3d3be24fc32..eb64452fbabf 100644 --- a/opennms-webapp/src/main/webapp/WEB-INF/jsp/notification/list.jsp +++ b/opennms-webapp/src/main/webapp/WEB-INF/jsp/notification/list.jsp @@ -44,6 +44,7 @@ %> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@taglib uri="/WEB-INF/taglib.tld" prefix="onms" %> <%-- This page is written to be the display (view) portion of the NotificationQueryServlet @@ -235,7 +236,7 @@ <% } %> <%=eventSeverity%> - + <% if ( event != null ) { %> <% Filter locationFilter = new LocationFilter(event.getLocation()); %> @@ -260,7 +261,7 @@ <%if (notification.getTimeReplied()!=null) { %> - + <% } %> diff --git a/opennms-webapp/src/main/webapp/WEB-INF/jsp/outage/detail.jsp b/opennms-webapp/src/main/webapp/WEB-INF/jsp/outage/detail.jsp index d1b03913ac6b..23ae48cea9d7 100644 --- a/opennms-webapp/src/main/webapp/WEB-INF/jsp/outage/detail.jsp +++ b/opennms-webapp/src/main/webapp/WEB-INF/jsp/outage/detail.jsp @@ -39,6 +39,7 @@ %> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@taglib uri="/WEB-INF/taglib.tld" prefix="onms" %> <%! public static DateFormat DATE_FORMAT = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM); @@ -77,7 +78,7 @@ Lost Service Time - + Lost Service Event <%=outage.getLostServiceEventId()%> @@ -106,7 +107,7 @@ <% Date regainTime = outage.getRegainedServiceTime(); %> <% if(regainTime != null) { %> - + <% } else { %> <% String label = OutageUtil.getStatusLabel(outage); %> <%=(label == null) ? " " : label %> diff --git a/opennms-webapp/src/main/webapp/WEB-INF/jsp/outage/interfaceOutages-box.jsp b/opennms-webapp/src/main/webapp/WEB-INF/jsp/outage/interfaceOutages-box.jsp index b99fa2e9f87c..44e835289442 100644 --- a/opennms-webapp/src/main/webapp/WEB-INF/jsp/outage/interfaceOutages-box.jsp +++ b/opennms-webapp/src/main/webapp/WEB-INF/jsp/outage/interfaceOutages-box.jsp @@ -46,6 +46,7 @@ %> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@taglib uri="/WEB-INF/taglib.tld" prefix="onms" %> <% int nodeId = (Integer)request.getAttribute("nodeId"); @@ -92,11 +93,11 @@ "> -   + <% if( outages[i].getRegainedServiceTime() == null ) { %> DOWN <% } else { %> -   + <% } %> <%=outages[i].getId()%> diff --git a/opennms-webapp/src/main/webapp/WEB-INF/jsp/outage/list.jsp b/opennms-webapp/src/main/webapp/WEB-INF/jsp/outage/list.jsp index d77beec3dc8b..52ac35ead094 100644 --- a/opennms-webapp/src/main/webapp/WEB-INF/jsp/outage/list.jsp +++ b/opennms-webapp/src/main/webapp/WEB-INF/jsp/outage/list.jsp @@ -60,6 +60,7 @@ <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@taglib uri="/WEB-INF/taglib.tld" prefix="onms" %> <%-- This page is written to be the display (view) portion of the OutageFilterServlet @@ -229,7 +230,7 @@ - + <%=AFTER_ICON%> <%=BEFORE_ICON%> @@ -238,7 +239,7 @@ <% Date regainedTime = outages[i].getRegainedServiceTime(); %> <% if(regainedTime != null ) { %> - + <%=AFTER_ICON%> <%=BEFORE_ICON%> diff --git a/opennms-webapp/src/main/webapp/WEB-INF/jsp/outage/nodeOutages-box.jsp b/opennms-webapp/src/main/webapp/WEB-INF/jsp/outage/nodeOutages-box.jsp index 71e0f2d3dd4b..c0470e2135c6 100644 --- a/opennms-webapp/src/main/webapp/WEB-INF/jsp/outage/nodeOutages-box.jsp +++ b/opennms-webapp/src/main/webapp/WEB-INF/jsp/outage/nodeOutages-box.jsp @@ -41,6 +41,7 @@ <%@page language="java" contentType="text/html" session="true" import="org.opennms.web.outage.*" %> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@taglib uri="/WEB-INF/taglib.tld" prefix="onms" %> <% int nodeId = (Integer)request.getAttribute("nodeId"); @@ -91,12 +92,12 @@ "> -   + <% if( outages[i].getRegainedServiceTime() == null ) { %> DOWN <% } else { %> -   + <% } %> <%=outages[i].getId()%> diff --git a/opennms-webapp/src/main/webapp/WEB-INF/jsp/outage/serviceOutages-box.jsp b/opennms-webapp/src/main/webapp/WEB-INF/jsp/outage/serviceOutages-box.jsp index adbd87cff12c..44157a16af87 100644 --- a/opennms-webapp/src/main/webapp/WEB-INF/jsp/outage/serviceOutages-box.jsp +++ b/opennms-webapp/src/main/webapp/WEB-INF/jsp/outage/serviceOutages-box.jsp @@ -46,6 +46,7 @@ %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@taglib uri="/WEB-INF/taglib.tld" prefix="onms" %> <% Outage[] outages = (Outage[])request.getAttribute("outages"); @@ -77,11 +78,11 @@ pageContext.setAttribute("outage", outage); %> "> -   + <% if( outages[i].getRegainedServiceTime() == null ) { %> DOWN <% } else { %> -   + <% } %> <%=outages[i].getId()%> diff --git a/opennms-webapp/src/main/webapp/WEB-INF/taglib.tld b/opennms-webapp/src/main/webapp/WEB-INF/taglib.tld index 9e564e2010e2..3f7cd931c98d 100644 --- a/opennms-webapp/src/main/webapp/WEB-INF/taglib.tld +++ b/opennms-webapp/src/main/webapp/WEB-INF/taglib.tld @@ -137,4 +137,22 @@ true + + datetime + org.opennms.web.tags.DateTimeTag + empty + + instant + false + true + java.time.Instant + + + date + false + true + java.util.Date + + + \ No newline at end of file diff --git a/opennms-webapp/src/main/webapp/admin/sysconfig.jsp b/opennms-webapp/src/main/webapp/admin/sysconfig.jsp index ec82052f90c9..b639200381d5 100644 --- a/opennms-webapp/src/main/webapp/admin/sysconfig.jsp +++ b/opennms-webapp/src/main/webapp/admin/sysconfig.jsp @@ -37,6 +37,8 @@ <%@page import="org.opennms.core.spring.BeanUtils"%> <%@page import="org.opennms.netmgt.config.SyslogdConfigFactory"%> <%@page import="org.opennms.netmgt.config.TrapdConfigFactory"%> +<%@page import="java.time.Instant"%> +<%@taglib uri="../WEB-INF/taglib.tld" prefix="onms" %> @@ -135,7 +137,7 @@ - + diff --git a/opennms-webapp/src/main/webapp/element/linkednode.jsp b/opennms-webapp/src/main/webapp/element/linkednode.jsp index a25ab278ca7f..cdd0244b523b 100644 --- a/opennms-webapp/src/main/webapp/element/linkednode.jsp +++ b/opennms-webapp/src/main/webapp/element/linkednode.jsp @@ -29,6 +29,10 @@ --%> +<%@page import="org.opennms.web.enlinkd.IsisElementNode"%> +<%@page import="org.opennms.web.enlinkd.OspfElementNode"%> +<%@page import="org.opennms.web.enlinkd.CdpElementNode"%> +<%@page import="org.opennms.web.enlinkd.LldpElementNode"%> <%@page import="java.util.Collection"%> <%@page import="org.opennms.core.utils.WebSecurityUtils"%> <%@page import="org.opennms.netmgt.model.OnmsNode"%> @@ -37,13 +41,12 @@ <%@page import="org.opennms.web.element.NetworkElementFactoryInterface"%> <%@page import="org.opennms.web.enlinkd.BridgeLinkNode"%> <%@page import="org.opennms.web.enlinkd.BridgeLinkRemoteNode"%> -<%@page import="org.opennms.web.enlinkd.BridgeLinkSharedHost"%> <%@page import="org.opennms.web.enlinkd.CdpLinkNode"%> <%@ page import="org.opennms.web.enlinkd.EnLinkdElementFactory" %> <%@ page import="org.opennms.web.enlinkd.EnLinkdElementFactoryInterface" %> <%@ page import="org.opennms.web.enlinkd.IsisLinkNode" %> <%@ page import="org.opennms.web.enlinkd.LldpLinkNode" %> -<%@ page import="org.opennms.web.enlinkd.NodeLinkBridge" %> +<%@ page import="org.opennms.web.enlinkd.BridgeLinkNode" %> <%@ page import="org.opennms.web.enlinkd.OspfLinkNode" %> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> @@ -72,9 +75,12 @@ Collection lldpLinks = enlinkdfactory.getLldpLinks(nodeId); Collection bridgelinks = enlinkdfactory.getBridgeLinks(nodeId); Collection cdpLinks = enlinkdfactory.getCdpLinks(nodeId); - Collection nodelinks = enlinkdfactory.getNodeLinks(nodeId); Collection ospfLinks = enlinkdfactory.getOspfLinks(nodeId); Collection isisLinks = enlinkdfactory.getIsisLinks(nodeId); + LldpElementNode lldpelem = enlinkdfactory.getLldpElement(nodeId); + CdpElementNode cdpelem = enlinkdfactory.getCdpElement(nodeId); + OspfElementNode ospfelem = enlinkdfactory.getOspfElement(nodeId); + IsisElementNode isiselem = enlinkdfactory.getIsisElement(nodeId); %> @@ -106,422 +112,273 @@
-<% - - if (bridgelinks.isEmpty()) { - if (nodelinks.isEmpty()) { -%> -
-

No Bridge Forwarding Table Links found on ${nodeLabel} by Enhanced Linkd

-
- <% } else { %> -
-

${nodeLabel} Shared Segments found by Enhanced Linkd using Bridge Forwarding Table

-
- -
Server Time:<%=new java.util.Date()%>
Client Time:
- - - - - - - - - - <% for( NodeLinkBridge nodelink: nodelinks) { %> - - - - - - <% } %> - -
Port - Ip - MacOther Hosts on SegmentBridge Ports on Segment
<%=nodelink.getNodeLocalPort()%> - <% if (nodelink.getBridgeLinkSharedHost().isEmpty()) {%> -   - <% } else { %> - - <% for (BridgeLinkSharedHost sharedhost: nodelink.getBridgeLinkSharedHost()) {%> - - - - <% }%> -
- <% if (sharedhost.getSharedHostUrl() != null) { %> - <%=sharedhost.getSharedHost()%> - <% } else { %> - <%=sharedhost.getSharedHost()%> - <% } %> - <% if (sharedhost.getSharedHostPortUrl() != null) { %> -  (<%=sharedhost.getSharedHostPort()%>) - <% } else if (sharedhost.getSharedHostPort() != null ){ %> -  (<%=sharedhost.getSharedHostPort()%>) - <% } else { %> -   - <% } %> -
- <% } %> - 		- <% if (nodelink.getBridgeLinkRemoteNodes().isEmpty()) {%> -   - <% } else { %> - - <% for (BridgeLinkRemoteNode remote: nodelink.getBridgeLinkRemoteNodes()) {%> - - - - - - <% }%> -
- <%=remote.getBridgeRemoteNode() %> - - <%=remote.getBridgeRemotePort()%> - - <% if (remote.getBridgeRemoteVlan() != null) { %> - VLAN(<%=remote.getBridgeRemoteVlan() %>) - <% } else { %> -   - <% } %> -
- <% }%> -
- - <% } %> - +

+<% if (bridgelinks.isEmpty()) { %> + No Bridge Forwarding Table Links found on ${nodeLabel} by Enhanced Linkd <% } else { %> -
-

${nodeLabel} Bridge Forwarding Table Links found by Enhanced Linkd

-
+ ${nodeLabel} Shared Segments found by Enhanced Linkd +<% } %> +

- - - - - - - - - - - - <% for( BridgeLinkNode bridgelink: bridgelinks) { %> +
PortVLANHosts on SegmentBridge Ports on Segment
+ + - - - + + + + + + +<% for( BridgeLinkNode bridgelink: bridgelinks) { %> + + - + - - <% } %> - <% } %> - -
<%=bridgelink.getNodeLocalPort()%> -<% if (bridgelink.getBridgeLocalVlan() == null) {%> -   -<% } else { %> - <%=bridgelink.getBridgeLocalVlan()%> -<%} %> - -<% if (bridgelink.getBridgeLinkSharedHost().isEmpty()) {%> -   + Local PortRemote PortInfoLast Poll
+<% if (bridgelink.getBridgeLocalPortUrl() == null) {%> + <%=bridgelink.getBridgeLocalPort()%> <% } else { %> - - <% for (BridgeLinkSharedHost sharedhost: bridgelink.getBridgeLinkSharedHost()) {%> - - - - <% }%> -
- <% if (sharedhost.getSharedHostUrl() != null) { %> - <%=sharedhost.getSharedHost()%> - <% } else { %> - <%=sharedhost.getSharedHost()%> - <% } %> - - <% if (sharedhost.getSharedHostPortUrl() != null) { %> -  (<%=sharedhost.getSharedHostPort()%>) - <% } else if (sharedhost.getSharedHostPort() != null ){ %> -  (<%=sharedhost.getSharedHostPort()%>) - <% } else { %> -   - <% } %> -
-<% }%> - 		+ <%=bridgelink.getBridgeLocalPort()%> +<% } %> + <% if (bridgelink.getBridgeLinkRemoteNodes().isEmpty()) {%>   <% } else { %> - - <% for (BridgeLinkRemoteNode remote: bridgelink.getBridgeLinkRemoteNodes()) {%> - - - + <% }%> +
- <%=remote.getBridgeRemoteNode()%> - + + <% for (BridgeLinkRemoteNode remote: bridgelink.getBridgeLinkRemoteNodes()) {%> + - - + <% } else if (remote.getBridgeRemotePort() != null){ %> + <%=remote.getBridgeRemotePort()%> <% }%> -
+ <% if (remote.getBridgeRemoteUrl() != null) { %> + <%=remote.getBridgeRemote()%> + <% } else { %> + <%=remote.getBridgeRemote()%> + <% } %> +   + <% if (remote.getBridgeRemotePortUrl() != null) { %> <%=remote.getBridgeRemotePort()%> - - <% if (remote.getBridgeRemoteVlan() != null) { %> - - VLAN(<%=remote.getBridgeRemoteVlan() %>) - <% } else { %> -   - <% } %> -
+
<% }%> -
+ + +<% if (bridgelink.getBridgeInfo() == null) {%> +   +<% } else { %> + <%=bridgelink.getBridgeInfo()%> +<% } %> + + <%=bridgelink.getBridgeLinkLastPollTime() %> + +<% } %> +
-<% - if (lldpLinks.isEmpty()) { -%> -
-

No LLDP Remote Table Links found on ${nodeLabel} by Enhanced Linkd

-
+ +

+<% if (lldpLinks.isEmpty()) { %> +No LLDP Remote Table Links found on ${nodeLabel} by Enhanced Linkd <% } else { %> -
-

${nodeLabel} LLDP Remote Table Links found by Enhanced Linkd

-
+${nodeLabel} (ChassidId <%=lldpelem.getLldpChassisId() %>) LLDP Remote Table Links found by Enhanced Linkd +<% } %> +

- +
- - - - - - - - - - - - + + + + + + + + - <% for( LldpLinkNode lldplink: lldpLinks) { %> - - - - - - - - - - - <% } %> +<% for( LldpLinkNode lldplink: lldpLinks) { %> + + + + + + +<% } %> -
Local PortLocal Port DescrRemote Chassis IdRemote SysnameRemote PortRemote Port DescrCreatedLast Poll
Local PortRemote PortInfoLast Poll
- <% if (lldplink.getLldpPortUrl() != null) { %> - <%=lldplink.getLldpPortString()%> - <% } else { %> - <%=lldplink.getLldpPortString()%> - <% } %> - <%=lldplink.getLldpPortDescr()%> - <% if (lldplink.getLldpRemChassisIdUrl() != null) { %> - <%=lldplink.getLldpRemChassisIdString()%> - <% } else { %> - <%=lldplink.getLldpRemChassisIdString()%> - <% } %> - - <%=lldplink.getLldpRemSysName()%> - - <% if (lldplink.getLldpRemPortUrl() != null) { %> - <%=lldplink.getLldpRemPortString()%> - <% } else { %> - <%=lldplink.getLldpRemPortString()%> - <% } %> - <%=lldplink.getLldpRemPortDescr()%><%=lldplink.getLldpCreateTime()%><%=lldplink.getLldpLastPollTime()%>
+ <% if (lldplink.getLldpLocalPortUrl() != null) { %> + <%=lldplink.getLldpLocalPort()%> + <% } else { %> + <%=lldplink.getLldpLocalPort()%> + <% } %> + + <% if (lldplink.getLldpRemChassisIdUrl() != null) { %> + <%=lldplink.getLldpRemChassisId()%> + <% } else { %> + <%=lldplink.getLldpRemChassisId()%> + <% } %> +   + <% if (lldplink.getLldpRemPortUrl() != null) { %> + <%=lldplink.getLldpRemPort()%> + <% } else { %> + <%=lldplink.getLldpRemPort()%> + <% } %> + <%=lldplink.getLldpRemInfo()%><%=lldplink.getLldpLastPollTime()%>
- -<% } %> +
+

<% if (cdpLinks.isEmpty()) { %> -
-

No CDP Cache Table Links found on ${nodeLabel} by Enhanced Linkd

-
+No CDP Cache Table Links found on ${nodeLabel} by Enhanced Linkd <% } else { %> -
-

${nodeLabel} CDP Cache Table Links found by Enhanced Linkd

-
- - - - - - - - - - - - - - - <% for( CdpLinkNode cdplink: cdpLinks) { %> - - + + <% } %> +
Local PortAddress TypeAddressVersionDevice IdDevice PortPlatformCreatedLast Poll
- <% if (cdplink.getCdpLocalPortUrl() != null) { %> +${nodeLabel} (Device Id <%=cdpelem.getCdpGlobalDeviceId() %>)CDP Cache Table Links found by Enhanced Linkd +<% } %> + + + + + + + + + + +<% for( CdpLinkNode cdplink: cdpLinks) { %> + + - - - - - - - - - - <% } %> -
Local PortRemote PortInfoLast Poll
+ <% if (cdplink.getCdpLocalPortUrl() != null) { %> <%=cdplink.getCdpLocalPort()%> - <% } else { %> + <% } else { %> <%=cdplink.getCdpLocalPort()%> - <% } %> + <% } %> <%=cdplink.getCdpCacheAddressType()%><%=cdplink.getCdpCacheAddress()%><%=cdplink.getCdpCacheVersion()%> + <% if (cdplink.getCdpCacheDeviceUrl() != null) { %> - <%=cdplink.getCdpCacheDeviceId()%> + <%=cdplink.getCdpCacheDevice()%> <% } else { %> - <%=cdplink.getCdpCacheDeviceId()%> - <% } %> - - <% if (cdplink.getCdpCacheDevicePortUrl() != null) { %> + <%=cdplink.getCdpCacheDevice()%> + <% } %> +   + <% if (cdplink.getCdpCacheDevicePortUrl() != null) { %> <%=cdplink.getCdpCacheDevicePort()%> - <% } else { %> + <% } else { %> <%=cdplink.getCdpCacheDevicePort()%> - <% } %> + <% } %> <%=cdplink.getCdpCacheDevicePlatform()%><%=cdplink.getCdpCreateTime()%><%=cdplink.getCdpLastPollTime()%>
+ 		<%=cdplink.getCdpCachePlatform()%><%=cdplink.getCdpLastPollTime()%>

-<% - if (ospfLinks.isEmpty()) { -%> -
-

No OSPF Nbr Links found on ${nodeLabel} by Enhanced Linkd

-
+

+<% if (ospfLinks.isEmpty()) { %> +No OSPF Links found on ${nodeLabel} by Enhanced Linkd <% } else { %> -
-

${nodeLabel} OSPF Nbr Table Links found by Enhanced Linkd

-
- - +${nodeLabel} (Router id <%=ospfelem.getOspfRouterId() %>)OSPF Nbr Table Links found by Enhanced Linkd +<% } %> + +
- - - - - - - - - + + + + + + - <% for( OspfLinkNode ospflink: ospfLinks) { %> - - - - - - - - - - <% } %> +<% for ( OspfLinkNode ospflink: ospfLinks) { %> + + + + + + +<% } %> -
Local Ip AddressLocal AddressLessIfIndexNbr Router IdNbr Ip AddressNbr AddressLessIfIndexCreatedLast Poll
Local PortRemote PortInfoLast Poll
<%=ospflink.getOspfIpAddr()%>(ifindex=<%=ospflink.getOspfIfIndex()%>)<%=ospflink.getOspfAddressLessIndex()%> - <% if (ospflink.getOspfRemRouterUrl() != null) { %> - <%=ospflink.getOspfRemRouterId()%> - <% } else { %> - <%=ospflink.getOspfRemRouterId()%> - <% } %> - - <% if (ospflink.getOspfRemPortUrl() != null) { %> - <%=ospflink.getOspfRemIpAddr()%> - <% } else { %> - <%=ospflink.getOspfRemIpAddr()%> - <% } %> - <%=ospflink.getOspfRemAddressLessIndex()%><%=ospflink.getOspfLinkCreateTime()%><%=ospflink.getOspfLinkLastPollTime()%>
+ <% if (ospflink.getOspfLocalPortUrl() != null ) { %> + <%=ospflink.getOspfLocalPort()%> + <% } else { %> + <%=ospflink.getOspfLocalPort()%> + <% } %> + + <% if (ospflink.getOspfRemRouterUrl() != null) { %> + <%=ospflink.getOspfRemRouterId()%> + <% } else { %> + <%=ospflink.getOspfRemRouterId()%> + <% } %> +   + <% if (ospflink.getOspfRemPortUrl() != null) { %> + <%=ospflink.getOspfRemPort()%> + <% } else { %> + <%=ospflink.getOspfRemPort()%> + <% } %> + <%=ospflink.getOspfLinkInfo()%><%=ospflink.getOspfLinkLastPollTime()%>
+ -<% } %>

-<% - if (isisLinks.isEmpty()) { -%>
-

No IS-IS Adjacency Links found on ${nodeLabel} by Enhanced Linkd

-
+

+<% if (isisLinks.isEmpty()) { %> +No IS-IS Adjacency Links found on ${nodeLabel} by Enhanced Linkd <% } else { %> -
-

${nodeLabel} IS-IS Adj Table Links found by Enhanced Linkd

-
+${nodeLabel} (id <%=isiselem.getIsisSysID() %>) IS-IS Adj Table Links found by Enhanced Linkd +<% } %> +

- +
+ + + + + + + + + - - - - - - - - - - - - - - - - <% for( IsisLinkNode isislink : isisLinks) { %> - - - - - - - - - - - - - <% } %> +<% for( IsisLinkNode isislink : isisLinks) { %> + + + + + + +<% } %> -
Local PortRemote PortInfoLast Poll
Circuit IfIndexCircuit Admin StateAdj Neigh Sys IDAdj Neigh Sys TypeAdj Neigh PortAdj Neigh StateAdj Neigh SNPA AddressAdj Neigh Extended Circ IDCreatedLast Poll
<%=isislink.getIsisCircIfIndex()%><%=isislink.getIsisCircAdminState()%> - <% if (isislink.getIsisISAdjNeighSysUrl() != null) { %> - <%=isislink.getIsisISAdjNeighSysID() %> - <% } else { %> - <%=isislink.getIsisISAdjNeighSysID()%> - <% } %> - <%=isislink.getIsisISAdjNeighSysType()%> - <% if (isislink.getIsisISAdjUrl() != null) { %> - <%=isislink.getIsisISAdjNeighPort()%> - <% } else { %> - <%=isislink.getIsisISAdjNeighPort()%> - <% } %> - <%=isislink.getIsisISAdjState()%><%=isislink.getIsisISAdjNeighSNPAAddress()%><%=isislink.getIsisISAdjNbrExtendedCircID()%><%=isislink.getIsisLinkCreateTime()%><%=isislink.getIsisLinkLastPollTime()%>
circuit:<%=isislink.getIsisCircIfIndex()%> status:<%=isislink.getIsisCircAdminState()%> + <% if (isislink.getIsisISAdjNeighSysUrl() != null) { %> + <%=isislink.getIsisISAdjNeighSysID() %> + <% } else { %> + <%=isislink.getIsisISAdjNeighSysID()%> + <% } %> + type:<%=isislink.getIsisISAdjNeighSysType()%> + <% if (isislink.getIsisISAdjUrl() != null) { %> + <%=isislink.getIsisISAdjNeighPort()%> + <% } else { %> + <%=isislink.getIsisISAdjNeighPort()%> + <% } %> + adjstate:<%=isislink.getIsisISAdjState()%> + adjSNPAaddr:<%=isislink.getIsisISAdjNeighSNPAAddress()%> + adjNbrExtCircId:<%=isislink.getIsisISAdjNbrExtendedCircID()%> + <%=isislink.getIsisLinkLastPollTime()%>
+ -<% } %>
diff --git a/opennms-webapp/src/main/webapp/element/node.jsp b/opennms-webapp/src/main/webapp/element/node.jsp index dcb359d64099..a18a467722ed 100644 --- a/opennms-webapp/src/main/webapp/element/node.jsp +++ b/opennms-webapp/src/main/webapp/element/node.jsp @@ -522,38 +522,6 @@ function confirmAssetEdit() { - - -
-
-

VLAN Information

-
- - - - - - - - - - - - - - - - - - - - - - -
Vlan IDVlan NameVlan TypeVlan StatusStatusLast Poll Time
${vlan.vlanId}${vlan.vlanName}${vlan.vlanTypeString}${vlan.vlanStatusString}${vlan.statusString}${vlan.lastPollTime}
-
- -
@@ -561,25 +529,12 @@ function confirmAssetEdit() {

LLDP Information

- - - - - - - - - - - - - - - - + + +
chassis id${model.lldp.lldpChassisIdString}
sysname${model.lldp.lldpSysName}
create time${model.lldp.lldpCreateTime}
last poll time${model.lldp.lldpLastPollTime}
chassis id${model.lldp.lldpChassisId}
sysname${model.lldp.lldpSysName}
last poll time${model.lldp.lldpLastPollTime}
- + @@ -588,99 +543,13 @@ function confirmAssetEdit() {

CDP Information

- - - - - - - - - - - - - - - - - - - - + + +
global device id${model.cdp.cdpGlobalDeviceId}
global device id format${model.cdp.cdpGlobalDeviceIdFormat}
global run${model.cdp.cdpGlobalRun}
create time${model.cdp.cdpCreateTime}
last poll time${model.cdp.cdpLastPollTime}
global device id${model.cdp.cdpGlobalDeviceId}
global run${model.cdp.cdpGlobalRun}
last poll time${model.cdp.cdpLastPollTime}
- - - - - - -
-
-

Bridge Information - - vlanid ${bridge.vlan} - - - (${bridge.vlanname}) - -

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Base Bridge Address${bridge.baseBridgeAddress}
Base Number of Ports${bridge.baseNumPorts}
Base Type${bridge.baseType}
STP Protocol Specification${bridge.stpProtocolSpecification}
STP Priority${bridge.stpPriority}
STP Designated Root${bridge.stpDesignatedRoot}
STP Root Cost${bridge.stpRootCost}
STP Root Port${bridge.stpRootPort}
Create Time${bridge.bridgeNodeCreateTime}
Last Poll Time${bridge.bridgeNodeLastPollTime}
-
- + + @@ -689,28 +558,11 @@ function confirmAssetEdit() {

OSPF Information

- - - - - - - - - - - - - - - - - - - - + + +
Router Id${model.ospf.ospfRouterId}
Version Number${model.ospf.ospfVersionNumber}
Admin Status${model.ospf.ospfAdminStat}
create time${model.ospf.ospfCreateTime}
last poll time${model.ospf.ospfLastPollTime}
Router Id${model.ospf.ospfRouterId}
Status${model.ospf.ospfAdminStat} version:${model.ospf.ospfVersionNumber}
last poll time${model.ospf.ospfLastPollTime}
- + @@ -720,27 +572,40 @@ function confirmAssetEdit() {

IS-IS Information

- - - - - - - - - - - - - - - - + + +
Sys ID${model.isis.isisSysID}
Admin State${model.isis.isisSysAdminState}
Create Time${model.isis.isisCreateTime}
Last Poll Time${model.isis.isisLastPollTime}
Sys ID${model.isis.isisSysID}
Admin State${model.isis.isisSysAdminState}
last poll time${model.isis.isisLastPollTime}
- + + +
+
+

Bridge Information

+
+ + + + + + +
Vlan ${bridge.vlanname} + (vlanid ${bridge.vlan}) + Default + (${bridge.baseNumPorts} port assigned) + baseAddress:${bridge.baseBridgeAddress} type:${bridge.baseType} + stpProtocolSpec:${bridge.stpProtocolSpecification} + Priority:${bridge.stpPriority} + DesignatedRoot:${bridge.stpDesignatedRoot} + RootPort:${bridge.stpRootPort} + RootCost:${bridge.stpRootCost} +
+
+ + +
@@ -759,25 +624,6 @@ function confirmAssetEdit() { ">View Node Rancid Inventory Info - - - - - -
  • - ">View Node IP Route Info -
    • -     - - - - - -
  • - ">View Node Bridge/STP Info -
    • -     - @@ -813,6 +659,7 @@ function confirmAssetEdit() { +
    diff --git a/opennms-webapp/src/main/webapp/heatmap/heatmap-box.jsp b/opennms-webapp/src/main/webapp/heatmap/heatmap-box.jsp index 4a39fe3f0fb5..f4f6f04a87bb 100644 --- a/opennms-webapp/src/main/webapp/heatmap/heatmap-box.jsp +++ b/opennms-webapp/src/main/webapp/heatmap/heatmap-box.jsp @@ -127,10 +127,6 @@ } - - - -

    &category=<%=category==null?"":Util.encode(category)%>&monitoredService=<%=monitoredService==null?"":Util.encode(monitoredService)%>"><%=WebSecurityUtils.sanitizeString(title)%> diff --git a/opennms-webapp/src/main/webapp/includes/bootstrap.jsp b/opennms-webapp/src/main/webapp/includes/bootstrap.jsp index 994678b27767..77d2d4d65499 100644 --- a/opennms-webapp/src/main/webapp/includes/bootstrap.jsp +++ b/opennms-webapp/src/main/webapp/includes/bootstrap.jsp @@ -114,15 +114,6 @@ - - - - - - - - - diff --git a/opennms-webapp/src/main/webapp/includes/eventlist.jsp b/opennms-webapp/src/main/webapp/includes/eventlist.jsp index 4d2f042269ed..c525df668350 100644 --- a/opennms-webapp/src/main/webapp/includes/eventlist.jsp +++ b/opennms-webapp/src/main/webapp/includes/eventlist.jsp @@ -52,6 +52,7 @@ <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@taglib uri="/WEB-INF/taglib.tld" prefix="onms" %> <% //required parameter: node @@ -189,7 +190,7 @@ <% } %> -   + <%= event.getSeverity().getLabel() %> <%=WebSecurityUtils.sanitizeString(event.getLogMessage(),true)%> diff --git a/opennms-webapp/src/main/webapp/includes/header.jsp b/opennms-webapp/src/main/webapp/includes/header.jsp index 9f52c96e2463..6197c280feda 100644 --- a/opennms-webapp/src/main/webapp/includes/header.jsp +++ b/opennms-webapp/src/main/webapp/includes/header.jsp @@ -55,6 +55,7 @@ %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib uri="/WEB-INF/taglib.tld" prefix="onms" %> <%! public void init() throws ServletException { @@ -203,9 +204,7 @@ final String baseHref = Util.calculateUrlBase( request ); - -   - +

    diff --git a/opennms-webapp/src/main/webapp/notification/detail.jsp b/opennms-webapp/src/main/webapp/notification/detail.jsp index 6398ec3dbb92..7fb04647781c 100644 --- a/opennms-webapp/src/main/webapp/notification/detail.jsp +++ b/opennms-webapp/src/main/webapp/notification/detail.jsp @@ -43,6 +43,7 @@ <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@taglib uri="/WEB-INF/taglib.tld" prefix="onms" %> <% WebApplicationContext context = WebApplicationContextUtils.getWebApplicationContext(application); @@ -100,12 +101,12 @@ - +
    Notification Time Time Replied - +   @@ -241,7 +242,7 @@ - +   diff --git a/opennms-webapp/src/main/webapp/rtc/category.jsp b/opennms-webapp/src/main/webapp/rtc/category.jsp index 50acf03e135d..0e69d7927df9 100644 --- a/opennms-webapp/src/main/webapp/rtc/category.jsp +++ b/opennms-webapp/src/main/webapp/rtc/category.jsp @@ -45,6 +45,7 @@ " %> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@taglib uri="/WEB-INF/taglib.tld" prefix="onms" %> <%! @@ -210,6 +211,6 @@
    -

    Last updated:

    +

    Last updated:

    diff --git a/opennms-wmi/pom.xml b/opennms-wmi/pom.xml index 4ec936d2ce4e..13f96fb56992 100644 --- a/opennms-wmi/pom.xml +++ b/opennms-wmi/pom.xml @@ -3,7 +3,7 @@ opennms org.opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 opennms-wmi diff --git a/pom.xml b/pom.xml index e90809e96705..e68899ea0457 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.opennms opennms - 22.0.1 + 22.0.2-SNAPSHOT pom OpenNMS http://opennms.org/ @@ -140,6 +140,7 @@ opennms-provision opennms-enterprise-reporting opennms-services + opennms-taglib opennms-jetty opennms-correlation opennms-reporting @@ -1190,7 +1191,7 @@ ${project.version} ${install.version} ${dist.dir}/${dist.name} - 22.0.1 + 22.0.2.SNAPSHOT true ${project.basedir} ${root.dir}/target @@ -1393,9 +1394,9 @@ 1.6 - v9.6.1 + v8.11.3 5.6.0 - v1.4.1 + v1.7.0     diff --git a/protocols/cifs/pom.xml b/protocols/cifs/pom.xml index 219bd9dc3ed6..0678da2711ae 100644 --- a/protocols/cifs/pom.xml +++ b/protocols/cifs/pom.xml @@ -4,7 +4,7 @@ org.opennms org.opennms.protocols - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.protocols diff --git a/protocols/dhcp/pom.xml b/protocols/dhcp/pom.xml index 99809ddac375..bf287b5e46d3 100644 --- a/protocols/dhcp/pom.xml +++ b/protocols/dhcp/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.protocols - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.protocols diff --git a/protocols/nsclient/pom.xml b/protocols/nsclient/pom.xml index 24a117652a4a..611a6cde4574 100644 --- a/protocols/nsclient/pom.xml +++ b/protocols/nsclient/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.protocols - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.protocols diff --git a/protocols/pom.xml b/protocols/pom.xml index 092e1e48dd74..f1952d100e51 100644 --- a/protocols/pom.xml +++ b/protocols/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.protocols diff --git a/protocols/radius/pom.xml b/protocols/radius/pom.xml index 363710949b7b..99730bd78253 100644 --- a/protocols/radius/pom.xml +++ b/protocols/radius/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.protocols - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.protocols diff --git a/protocols/selenium-monitor/pom.xml b/protocols/selenium-monitor/pom.xml index a92af1a5cea4..fce60af38028 100644 --- a/protocols/selenium-monitor/pom.xml +++ b/protocols/selenium-monitor/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.protocols - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.protocols diff --git a/protocols/xml/pom.xml b/protocols/xml/pom.xml index 1d7cc604ebed..3770f5e8c93c 100644 --- a/protocols/xml/pom.xml +++ b/protocols/xml/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.protocols - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.protocols diff --git a/protocols/xmp/pom.xml b/protocols/xmp/pom.xml index 5a925fab310b..2643ddcbef5c 100644 --- a/protocols/xmp/pom.xml +++ b/protocols/xmp/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.protocols - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.protocols diff --git a/smoke-test/pom.xml b/smoke-test/pom.xml index 96e8f8109d83..cda1a498d0bb 100644 --- a/smoke-test/pom.xml +++ b/smoke-test/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.opennms smoke-test - 22.0.1 + 22.0.2-SNAPSHOT OpenNMS Smoke Test true diff --git a/smoke-test/src/test/java/org/opennms/smoketest/RestInfoIT.java b/smoke-test/src/test/java/org/opennms/smoketest/RestInfoIT.java index 8973111e5fad..15f4caaa178d 100644 --- a/smoke-test/src/test/java/org/opennms/smoketest/RestInfoIT.java +++ b/smoke-test/src/test/java/org/opennms/smoketest/RestInfoIT.java @@ -61,7 +61,7 @@ public void canRetrieveProductInfo() throws ClientProtocolException, IOException final String json = response.getResponseText(); // The expected payload looks like: - // {"packageDescription":"OpenNMS","displayVersion":"22.0.1","packageName":"opennms","version":"22.0.1", "ticketerConfig":{"enabled":false, "plugin": null}} + // {"packageDescription":"OpenNMS","displayVersion":"22.0.2-SNAPSHOT","packageName":"opennms","version":"22.0.2", "ticketerConfig":{"enabled":false, "plugin": null}} final ObjectMapper mapper = new ObjectMapper(); final JsonNode infoObject = mapper.readTree(json); diff --git a/tests/dao/pom.xml b/tests/dao/pom.xml index 2ec48640fb68..5d0af6580498 100644 --- a/tests/dao/pom.xml +++ b/tests/dao/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.tests - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.tests diff --git a/tests/mock-elements/pom.xml b/tests/mock-elements/pom.xml index 14a41b0a4e49..9999dfa47306 100644 --- a/tests/mock-elements/pom.xml +++ b/tests/mock-elements/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.tests - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.tests diff --git a/tests/mock-snmp-agent/pom.xml b/tests/mock-snmp-agent/pom.xml index 23e60aabde6e..1d814efe84f1 100644 --- a/tests/mock-snmp-agent/pom.xml +++ b/tests/mock-snmp-agent/pom.xml @@ -3,7 +3,7 @@ org.opennms org.opennms.tests - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.tests diff --git a/tests/pom.xml b/tests/pom.xml index 63c1d7b89aeb..d9981fa98d7e 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -3,7 +3,7 @@ org.opennms opennms - 22.0.1 + 22.0.2-SNAPSHOT 4.0.0 org.opennms.tests