From d0707be0a30087bb5e30110dc09fdcdca1cd5d9d Mon Sep 17 00:00:00 2001
From: yuryn <Yury.Novitsky@Amdocs.com>
Date: Wed, 27 Sep 2017 14:54:18 +0300
Subject: added filebeat to all components

Deployment of: filebeat containar for each relevant component
+ chown of log dir to root - prevents filebeat complaining about filebeat file
+ ecomp web app renamed onap - fixed dep-pap.yaml
+ fixed multiple volumeMounts in vid-server

Change-Id: I74f8f2abd5feeba1d37b044d2a023674fd41c994
Issue-ID:OOM-110
Signed-off-by: yuryn <Yury.Novitsky@Amdocs.com>
---
 .../vid/templates/vid-server-deployment.yaml       | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'kubernetes/vid/templates')

diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml
index 69c0b57ae1..ff341335a3 100644
--- a/kubernetes/vid/templates/vid-server-deployment.yaml
+++ b/kubernetes/vid/templates/vid-server-deployment.yaml
@@ -86,20 +86,48 @@ spec:
         image: {{ .Values.image.vid }} 
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: vid-server
+        lifecycle:
+          postStart:
+            exec:
+              command: ["/bin/sh", "-c", "export LOG=wait_logback.log; touch $LOG; export SRC=/tmp/logback.xml; export DST=/usr/local/tomcat/webapps/vid/WEB-INF/classes/; while [ ! -e $DST ]; do echo 'Waiting for $DST...' >> $LOG; sleep 5; done; sleep 2; /bin/cp -f $SRC $DST; echo 'Done' >> $LOG"]
         ports:
         - containerPort: 8080
         volumeMounts:
         - mountPath: /etc/localtime
           name: localtime
           readOnly: true
+        - mountPath: /var/log/onap
+          name: vid-logs
+        - mountPath: /tmp/logback.xml
+          name: vid-logback
         readinessProbe:
           tcpSocket:
             port: 8080
           initialDelaySeconds: 5
           periodSeconds: 10
+      - image: {{ .Values.image.filebeat }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: filebeat-onap
+        volumeMounts:
+        - mountPath: /usr/share/filebeat/filebeat.yml
+          name: filebeat-conf
+        - mountPath: /var/log/onap
+          name: vid-logs
+        - mountPath: /usr/share/filebeat/data
+          name: vid-data-filebeat
       volumes:
         - name: localtime
           hostPath:
             path: /etc/localtime
+        - name: filebeat-conf
+          hostPath:
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
+        - name: vid-logs
+          emptyDir: {}
+        - name: vid-data-filebeat
+          emptyDir: {}
+        - name: vid-logback
+          hostPath:
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/vid/logback.xml
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-- 
cgit 1.2.3-korg