From 5ceee5a519fb6214646b997c42cdad6efb4c75df Mon Sep 17 00:00:00 2001 From: Michael Arrastia <MArrasti@amdocs.com> Date: Mon, 17 Sep 2018 15:12:45 +0100 Subject: [Champ] Update to use DMaaP with SSL - Reconfigure event publisher in champ-beans.xml to use DMaaP client. - Add property values to values.yaml file. - Update JKS trust store (tomcat_keystore) to accept the DMaaP certificate. - Additionally, to align with other microservices, update deployment.yaml to map logs to filebeat sidecar. Change-Id: I37da421b1cbf03a85fa19dda1e38955b17fa56ca Issue-ID: AAI-1597 Signed-off-by: Michael Arrastia <MArrasti@amdocs.com> --- .../resources/config/appconfig/auth/tomcat_keystore | Bin 2214 -> 3429 bytes .../resources/config/dynamic/conf/champ-beans.xml | 16 +++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'charts/aai-champ/resources') diff --git a/charts/aai-champ/resources/config/appconfig/auth/tomcat_keystore b/charts/aai-champ/resources/config/appconfig/auth/tomcat_keystore index 9eec841..c4c7271 100644 Binary files a/charts/aai-champ/resources/config/appconfig/auth/tomcat_keystore and b/charts/aai-champ/resources/config/appconfig/auth/tomcat_keystore differ diff --git a/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml b/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml index 325982b..38fd64c 100644 --- a/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml +++ b/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml @@ -24,11 +24,17 @@ xsi:schemaLocation=" http://www.springframework.org/schema/util/spring-util.xsd "> - <!-- Event publisher to pass to the Champ library for logging raw graph - events (Kafka implementation). --> - <bean id="champEventPublisher" class="org.onap.aai.event.client.KafkaEventPublisher" > - <constructor-arg name="hosts" value="message-router-kafka.{{.Release.Namespace}}:9092" /> - <constructor-arg name="topic" value="champRawEvents" /> + <bean id="champEventPublisher" class="org.onap.aai.event.client.DMaaPEventPublisher" > + <constructor-arg name="host" value="message-router.{{.Release.Namespace}}:{{.Values.event.port.dmaap}}" /> + <constructor-arg name="topic" value="{{.Values.event.publisher.topic}}" /> + <constructor-arg name="username" value="" /> + <constructor-arg name="password" value="" /> + <constructor-arg name="maxBatchSize" value="100" /> + <constructor-arg name="maxAgeMs" value="250" /> + <constructor-arg name="delayBetweenBatchesMs" value="50" /> + <constructor-arg name="transportType" value="HTTPAUTH" /> + <constructor-arg name="protocol" value="{{.Values.event.protocol}}" /> + <constructor-arg name="contentType" value="application/json" /> </bean> <!-- Graph Implementation Configuration--> -- cgit 1.2.3-korg