From 26dce81cd8e1dd0ae16476020500d232a3a4c93b Mon Sep 17 00:00:00 2001 From: jhh Date: Wed, 17 Jul 2019 19:32:06 -0500 Subject: change json path to delete regex matching This is necessary as the explicit "match-all" regular expressions causes events to be accepted in error, even when the json field is not present in the document. Change-Id: Idf4b408850514f49ebe8375d2870e116e793a935 Issue-ID: POLICY-1830 Signed-off-by: jhh --- .../src/main/feature/config/amsterdam-controller.properties | 4 ++-- .../src/main/feature/config/usecases-controller.properties | 4 ++-- .../src/main/config/__artifactId__-controller.properties | 4 ++-- .../src/main/config/__artifactId__-controller.properties | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'controlloop') diff --git a/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/amsterdam-controller.properties b/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/amsterdam-controller.properties index b52b1f4eb..d769d9af2 100644 --- a/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/amsterdam-controller.properties +++ b/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/amsterdam-controller.properties @@ -26,13 +26,13 @@ dmaap.source.topics.DCAE_TOPIC.effectiveTopic=${env:DCAE_TOPIC} dmaap.source.topics.DCAE_TOPIC.servers=${env:DMAAP_SERVERS} dmaap.source.topics.DCAE_TOPIC.consumerGroup=${env:DCAE_CONSUMER_GROUP} dmaap.source.topics.DCAE_TOPIC.events=org.onap.policy.controlloop.VirtualControlLoopEvent -dmaap.source.topics.DCAE_TOPIC.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=[?($.closedLoopEventStatus =~ /.*/)] +dmaap.source.topics.DCAE_TOPIC.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=[?($.closedLoopEventStatus)] dmaap.source.topics.DCAE_TOPIC.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gson dmaap.source.topics.DCAE_TOPIC.https=true dmaap.source.topics.APPC-CL.servers=${env:DMAAP_SERVERS} dmaap.source.topics.APPC-CL.events=org.onap.policy.appc.Response -dmaap.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=[?($.CommonHeader =~ /.*/ && $.Status =~ /.*/)] +dmaap.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=[?($.CommonHeader && $.Status)] dmaap.source.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty dmaap.source.topics.APPC-CL.servers.https=true diff --git a/controlloop/common/feature-controlloop-usecases/src/main/feature/config/usecases-controller.properties b/controlloop/common/feature-controlloop-usecases/src/main/feature/config/usecases-controller.properties index 10696b8ef..f4196ccb1 100644 --- a/controlloop/common/feature-controlloop-usecases/src/main/feature/config/usecases-controller.properties +++ b/controlloop/common/feature-controlloop-usecases/src/main/feature/config/usecases-controller.properties @@ -26,13 +26,13 @@ dmaap.source.topics.DCAE_TOPIC.effectiveTopic=${env:DCAE_TOPIC} dmaap.source.topics.DCAE_TOPIC.servers=${env:DMAAP_SERVERS} dmaap.source.topics.DCAE_TOPIC.consumerGroup=${env:DCAE_CONSUMER_GROUP} dmaap.source.topics.DCAE_TOPIC.events=org.onap.policy.controlloop.VirtualControlLoopEvent -dmaap.source.topics.DCAE_TOPIC.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=[?($.closedLoopEventStatus =~ /.*/)] +dmaap.source.topics.DCAE_TOPIC.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=[?($.closedLoopEventStatus)] dmaap.source.topics.DCAE_TOPIC.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gson dmaap.source.topics.DCAE_TOPIC.https=true dmaap.source.topics.APPC-CL.servers=${env:DMAAP_SERVERS} dmaap.source.topics.APPC-CL.events=org.onap.policy.appc.Response -dmaap.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=[?($.CommonHeader =~ /.*/ && $.Status =~ /.*/)] +dmaap.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=[?($.CommonHeader && $.Status)] dmaap.source.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty dmaap.source.topics.APPC-CL.https=true diff --git a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties index cc95d5530..edb828676 100644 --- a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties +++ b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties @@ -26,7 +26,7 @@ dmaap.source.topics.${dcaeTopic}.servers=${dcaeServers} dmaap.source.topics.${dcaeTopic}.apiKey= dmaap.source.topics.${dcaeTopic}.apiSecret= dmaap.source.topics.${dcaeTopic}.events=org.onap.policy.controlloop.VirtualControlLoopEvent -dmaap.source.topics.${dcaeTopic}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=[?($.closedLoopEventStatus =~ /.*/)] +dmaap.source.topics.${dcaeTopic}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=[?($.closedLoopEventStatus)] dmaap.source.topics.${dcaeTopic}.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gson dmaap.source.topics.${dcaeTopic}.https=true @@ -34,7 +34,7 @@ dmaap.source.topics.APPC-CL.servers=${dmaapServers} dmaap.source.topics.APPC-CL.apiKey= dmaap.source.topics.APPC-CL.apiSecret= dmaap.source.topics.APPC-CL.events=org.onap.policy.appc.Response -dmaap.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=[?($.CommonHeader =~ /.*/ && $.Status =~ /.*/)] +dmaap.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=[?($.CommonHeader && $.Status)] dmaap.source.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty dmaap.source.topics.APPC-CL.https=true diff --git a/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties index fb516ed13..8314f4861 100644 --- a/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties +++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties @@ -26,14 +26,14 @@ dmaap.source.topics.${brmsgwTopic}.servers=${brmsgwServers} dmaap.source.topics.${brmsgwTopic}.apiKey= dmaap.source.topics.${brmsgwTopic}.apiSecret= dmaap.source.topics.${brmsgwTopic}.events=org.onap.policy.controlloop.params.ControlLoopParams -dmaap.source.topics.${brmsgwTopic}.events.org.onap.policy.controlloop.params.ControlLoopParams.filter=[?($.closedLoopControlName =~ /.*/ && $.controlLoopYaml =~ /.*/)] +dmaap.source.topics.${brmsgwTopic}.events.org.onap.policy.controlloop.params.ControlLoopParams.filter=[?($.closedLoopControlName && $.controlLoopYaml)] dmaap.source.topics.${brmsgwTopic}.https=true dmaap.source.topics.${dcaeTopic}.servers=${dcaeServers} dmaap.source.topics.${dcaeTopic}.apiKey= dmaap.source.topics.${dcaeTopic}.apiSecret= dmaap.source.topics.${dcaeTopic}.events=org.onap.policy.controlloop.VirtualControlLoopEvent -dmaap.source.topics.${dcaeTopic}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=[?($.closedLoopEventStatus =~ /.*/)] +dmaap.source.topics.${dcaeTopic}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=[?($.closedLoopEventStatus)] dmaap.source.topics.${dcaeTopic}.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gson dmaap.source.topics.${dcaeTopic}.https=true @@ -41,7 +41,7 @@ dmaap.source.topics.APPC-CL.servers=${dmaapServers} dmaap.source.topics.APPC-CL.apiKey= dmaap.source.topics.APPC-CL.apiSecret= dmaap.source.topics.APPC-CL.events=org.onap.policy.appc.Response -dmaap.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=[?($.CommonHeader =~ /.*/ && $.Status =~ /.*/)] +dmaap.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=[?($.CommonHeader && $.Status)] dmaap.source.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty dmaap.source.topics.APPC-CL.https=true -- cgit 1.2.3-korg