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: [PATCH] [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>
---
 .../config/appconfig/auth/tomcat_keystore          | Bin 2214 -> 3429 bytes
 .../resources/config/dynamic/conf/champ-beans.xml  |  16 ++++++---
 .../aai/charts/aai-champ/templates/deployment.yaml |  37 +++++++++++----------
 kubernetes/aai/charts/aai-champ/values.yaml        |   8 +++++
 4 files changed, 38 insertions(+), 23 deletions(-)

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 9eec841aa2c1243b5ca3e22b0b116e5bca2afd49..c4c72718ff1e42cb9c7ac04ef72c66237f497180 100644
GIT binary patch
delta 1238
zcmZ1`_*AO?-`jt085kIt;8;2(H!-n5H@8SZBQvigwJ0|=B{Q)kH90ZfP?LdyG4=To
zkuC<-2t88+O9lp(Zi6P4c7rD7`~}QRj7&_7Tn4;soLX%jZQpqr8M#>*4BQR54LI4D
zLs{5_nL>jNc@4Nh94;Ofe?P|nL%w<g9uS|Kht)sW(b3IN(m))<XXX(=w%pk<-q1i!
zoY&C8z|6qZ(9{%2Mgh5&2ByY_P_98TUYnE*6d)E!g8i3U<d9pWmy)Xw^s8Qe9*8JP
zH{?Teji3QP#5EkSK$&dHrda>ZWWo&Q-L-c%K8QVeR&IWelwlITRIZepVyM2T>0dMR
zmklo@JmteHS4CKO{JQz)i^+{G4zY7r?mGI<vt~!NR#lo%4pUT`wDqi2hX0fA*r{Gz
z#ZZ`K(rualrYn6}Lbg@gm-(!(YdV@;+wUEb*MG41c&KE^2KC^mcQJLY;$=JQYwq)2
zSrNmKaN&Ay=D%f+w>$2>&UAUo>{D(%Df@-eADpy#<{ephTAWGvnuWO0p{+qdF}W*W
zXtH0>Kcqj&X!`WGKbR9IGykvjbyzYt<7y~h-FpLd^^KJqvs0Hzx2+I%^SD?oYSuLW
z=FRBMQDPyJ9@rReJ*UMVwru&|iZeStg>I?8#mmIZ$iTR`i7~;Ti7^Hozp}zCOa=@F
zf^3`#Z61tmKb#mDSy-5v*bW#NBZPQa)WlT$3sUofgMAd-Q}a@bfGI0QAvm?DEVW3%
zIkl)HGc7Y2C}toF40l;R7BLo)n2lA>a(V7`t@JtZw#@tSq=1k0T8j)qK=R5gz6Rb6
zB2rhviwe9hr>}hd@J^E9ruGZ}-mh9{utd*52O~n!k{@!?Y+__G-~*Y;&&c>6<aE{t
z5Lc+Oh#82macHwKva+%>GqQ2iLzzql$sqNDEHMUAO?<hj#l?x~sk%k^rNCU%Bn3=f
zi3OQ@#hJMUIjJeBx%u#9)+CIo7A(;OPhw5Hu*3$IK+90fO^o%73{!jBJ0rTX4C50R
zI=YG;#>ijORP_qEUAwdF;-AILvvwSd^V)g-?=Q*Oc4wZoE?Ro8wCc6bVXt+Y+{CJE
zW|z!T(+(~^wQQ@Z>CFhnQw#Qdvlp~D!u`TJzWnbY{kJPNPF#`IQ>#%Fu4egsNAeBF
zGtZh!k4-F#RNwxIQDfnQTlGzer~WMXXcXvY8@crJpV^Ok<r-Q-4tpwYovg#OU_#KU
zs1pL(_SQaE9@J?izjD_Xp3Aa0?R%=Hu*}V`2DQ&NdzW30`S>Mr#Y~eO)23#>isoCc
zboAGy=NCdsuPRh-uyySefAsOvM4wA>F4sP-;!)N3KC9y8gLRRLFWr{$IT<wCu^h|!
f8oZIGjYA||(WgcIQ^02CeqLUwUkrD76>4Pw49>U$

delta 43
ycmaDVwM>xb-`jt085kItfS7UfX_ht)k#hZ}6aT+&66d=)e^1+SmaYBL>Y@OCw-KEH

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-->
diff --git a/kubernetes/aai/charts/aai-champ/templates/deployment.yaml b/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
index 0e2bb90aa7..d2f7bca593 100644
--- a/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
@@ -31,23 +31,6 @@ spec:
         app: {{ include "common.name" . }}
         release: {{ .Release.Name }}
     spec:
-      initContainers:
-      - command:
-        - /root/ready.py
-        args:
-        - --container-name
-        - aai-resources
-        - --container-name
-        - message-router-kafka
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-        image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        name: {{ include "common.name" . }}-readiness
       containers:
         - name: {{ include "common.name" . }}
           image: "{{ include "common.repository" . }}/{{ .Values.image }}"
@@ -100,7 +83,7 @@ spec:
           - mountPath: /opt/app/champ-service/bundleconfig/etc/logback.xml
             name: {{ include "common.fullname" . }}-logback-config
             subPath: logback.xml
-          - mountPath: /logs
+          - mountPath: /var/log/onap
             name: {{ include "common.fullname" . }}-logs
           resources:
 {{ toYaml .Values.resources | indent 12 }}
@@ -113,6 +96,19 @@ spec:
 {{ toYaml .Values.affinity | indent 10 }}
         {{- end }}
 
+        # side car containers
+        - name: filebeat-onap
+          image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+          volumeMounts:
+          - mountPath: /usr/share/filebeat/filebeat.yml
+            subPath: filebeat.yml
+            name: filebeat-conf
+          - mountPath: /var/log/onap
+            name: {{ include "common.fullname" . }}-logs
+          - mountPath: /usr/share/filebeat/data
+            name: aai-filebeat
+
       volumes:
         - name: localtime
           hostPath:
@@ -140,5 +136,10 @@ spec:
             items:
             - key: logback.xml
               path: logback.xml
+        - name: filebeat-conf
+          configMap:
+            name: aai-filebeat
+        - name: aai-filebeat
+          emptyDir: {}
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/aai/charts/aai-champ/values.yaml b/kubernetes/aai/charts/aai-champ/values.yaml
index c59a9b3d02..a6435dd795 100644
--- a/kubernetes/aai/charts/aai-champ/values.yaml
+++ b/kubernetes/aai/charts/aai-champ/values.yaml
@@ -61,3 +61,11 @@ ingress:
   enabled: false
 
 resources: {}
+
+# XML beans configuration
+event:
+  port:
+    dmaap: 3905
+  protocol: https
+  publisher:
+    topic: champRawEvents
-- 
2.16.6