diff options
Diffstat (limited to 'controlloop/common/feature-controlloop-amsterdam')
2 files changed, 75 insertions, 34 deletions
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 d7dc0c1c0..b52b1f4eb 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 @@ -2,7 +2,7 @@ # ============LICENSE_START======================================================= # ONAP # ================================================================================ -# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,67 +20,52 @@ controller.name=amsterdam -dmaap.source.topics=${{DCAE_TOPIC}},APPC-CL,APPC-LCM-WRITE,SDNR-CL-RSP +dmaap.source.topics=DCAE_TOPIC,APPC-CL,APPC-LCM-WRITE,SDNR-CL-RSP -dmaap.source.topics.${{DCAE_TOPIC}}.servers=${{DCAE_SERVERS}} -dmaap.source.topics.${{DCAE_TOPIC}}.apiKey= -dmaap.source.topics.${{DCAE_TOPIC}}.apiSecret= -dmaap.source.topics.${{DCAE_TOPIC}}.consumerGroup=${{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.custom.gson=org.onap.policy.controlloop.util.Serialization,gson -dmaap.source.topics.${{DCAE_TOPIC}}.https=true +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.custom.gson=org.onap.policy.controlloop.util.Serialization,gson +dmaap.source.topics.DCAE_TOPIC.https=true -dmaap.source.topics.APPC-CL.servers=${{DMAAP_SERVERS}} -dmaap.source.topics.APPC-CL.apiKey= -dmaap.source.topics.APPC-CL.apiSecret= +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 -dmaap.source.topics.APPC-LCM-WRITE.servers=${{DMAAP_SERVERS}} -dmaap.source.topics.APPC-LCM-WRITE.apiKey= -dmaap.source.topics.APPC-LCM-WRITE.apiSecret= +dmaap.source.topics.APPC-LCM-WRITE.servers=${env:DMAAP_SERVERS} dmaap.source.topics.APPC-LCM-WRITE.events=org.onap.policy.appclcm.LcmResponseWrapper -dmaap.source.topics.APPC-LCM-WRITE.events.org.onap.policy.appclcm.LcmResponseWrapper.filter=type\=response +dmaap.source.topics.APPC-LCM-WRITE.events.org.onap.policy.appclcm.LcmResponseWrapper.filter=[?($.type == 'response')] dmaap.source.topics.APPC-LCM-WRITE.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson dmaap.source.topics.APPC-LCM-WRITE.https=true -dmaap.source.topics.SDNR-CL-RSP.servers=${{DMAAP_SERVERS}} -dmaap.source.topics.SDNR-CL-RSP.apiKey= -dmaap.source.topics.SDNR-CL-RSP.apiSecret= +dmaap.source.topics.SDNR-CL-RSP.servers=${env:DMAAP_SERVERS} dmaap.source.topics.SDNR-CL-RSP.events=org.onap.policy.sdnr.PciResponseWrapper -dmaap.source.topics.SDNR-CL-RSP.events.org.onap.policy.sdnr.PciResponseWrapper.filter=type\=response +dmaap.source.topics.SDNR-CL-RSP.events.org.onap.policy.sdnr.PciResponseWrapper.filter=[?($.type == 'response')] dmaap.source.topics.SDNR-CL-RSP.events.custom.gson=org.onap.policy.sdnr.util.Serialization,gson dmaap.source.topics.SDNR-CL-RSP.https=true dmaap.sink.topics=APPC-CL,APPC-LCM-READ,POLICY-CL-MGT,SDNR-CL -dmaap.sink.topics.APPC-CL.servers=${{DMAAP_SERVERS}} -dmaap.sink.topics.APPC-CL.apiKey= -dmaap.sink.topics.APPC-CL.apiSecret= +dmaap.sink.topics.APPC-CL.servers=${env:DMAAP_SERVERS} dmaap.sink.topics.APPC-CL.events=org.onap.policy.appc.Request dmaap.sink.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty dmaap.sink.topics.APPC-CL.https=true -dmaap.sink.topics.APPC-LCM-READ.servers=${{DMAAP_SERVERS}} -dmaap.sink.topics.APPC-LCM-READ.apiKey= -dmaap.sink.topics.APPC-LCM-READ.apiSecret= +dmaap.sink.topics.APPC-LCM-READ.servers=${env:DMAAP_SERVERS} dmaap.sink.topics.APPC-LCM-READ.events=org.onap.policy.appclcm.LcmRequestWrapper dmaap.sink.topics.APPC-LCM-READ.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson dmaap.sink.topics.APPC-LCM-READ.https=true -dmaap.sink.topics.POLICY-CL-MGT.servers=${{DMAAP_SERVERS}} -dmaap.sink.topics.POLICY-CL-MGT.apiKey= -dmaap.sink.topics.POLICY-CL-MGT.apiSecret= +dmaap.sink.topics.POLICY-CL-MGT.servers=${env:DMAAP_SERVERS} dmaap.sink.topics.POLICY-CL-MGT.events=org.onap.policy.controlloop.VirtualControlLoopNotification dmaap.sink.topics.POLICY-CL-MGT.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty dmaap.sink.topics.POLICY-CL-MGT.https=true -dmaap.sink.topics.SDNR-CL.servers=${{DMAAP_SERVERS}} -dmaap.sink.topics.SDNR-CL.apiKey= -dmaap.sink.topics.SDNR-CL.apiSecret= +dmaap.sink.topics.SDNR-CL.servers=${env:DMAAP_SERVERS} dmaap.sink.topics.SDNR-CL.events=org.onap.policy.sdnr.PciRequestWrapper dmaap.sink.topics.SDNR-CL.events.custom.gson=org.onap.policy.sdnr.util.Serialization,gson dmaap.sink.topics.SDNR-CL.https=true diff --git a/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/logback-include-amsterdam.xml b/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/logback-include-amsterdam.xml new file mode 100644 index 000000000..780fbdb3a --- /dev/null +++ b/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/logback-include-amsterdam.xml @@ -0,0 +1,56 @@ +<!-- + ============LICENSE_START======================================================= + feature-controlloop-amsterdam + ================================================================================ + Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + ============LICENSE_END========================================================= + --> + +<!-- + The logger configurations in this file are for each individual controller + to have their own network logger for topic traffic. This is an extension of + logback.xml or logback-eelf.xml. + + NOTE: Each logger MUST contain the same name as the control loop's controller. +--> +<included> + + <property name="logDir" value="${POLICY_LOGS}" /> + <property name="amsterdamLog" value="amsterdam-network" /> + <property name="networkPattern" value="[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%t]%m%n" /> + + <!-- Amsterdam Network Logging Properties --> + <appender name="AmsterdamOut" class="ch.qos.logback.core.rolling.RollingFileAppender"> + <file>${logDir}/${amsterdamLog}.log</file> + <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> + <fileNamePattern>${logDir}/${amsterdamLog}.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern> + <maxFileSize>50MB</maxFileSize> + <maxHistory>30</maxHistory> + <totalSizeCap>10GB</totalSizeCap> + </rollingPolicy> + <encoder> + <pattern>${networkPattern}</pattern> + </encoder> + </appender> + + <appender name="AsyncAmsterdamOut" class="ch.qos.logback.classic.AsyncAppender"> + <appender-ref ref="AmsterdamOut" /> + </appender> + + <logger name="amsterdam" level="INFO" additivity="false"> + <appender-ref ref="AsyncAmsterdamOut" /> + </logger> + +</included>
\ No newline at end of file |