From 1149a06956120c94b6de419e8777eea0499dc217 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 'kubernetes/aai/charts/aai-champ/resources')

diff --git a/kubernetes/aai/charts/aai-champ/resources/config/appconfig/auth/tomcat_keystore b/kubernetes/aai/charts/aai-champ/resources/config/appconfig/auth/tomcat_keystore
index 9eec841aa2..c4c72718ff 100644
Binary files a/kubernetes/aai/charts/aai-champ/resources/config/appconfig/auth/tomcat_keystore and b/kubernetes/aai/charts/aai-champ/resources/config/appconfig/auth/tomcat_keystore differ
diff --git a/kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml b/kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml
index 325982b0ac..38fd64c5dc 100644
--- a/kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml
+++ b/kubernetes/aai/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