From 4ca69ea2b6a2aaaf0974953a3c3dec7694fdfcb0 Mon Sep 17 00:00:00 2001
From: Itay Hassid <itay.hassid@amdocs.com>
Date: Thu, 31 Aug 2017 14:40:18 +0000
Subject: added filebeat to all components

Deployment of: filebeat containar for each relevant component
Issue-ID:OOM-110
Change-Id: I3605a975ee9dbe3e34b8fa6b17fef52e9d29b975
Signed-off-by: Itay Hassid <itay.hassid@amdocs.com>
---
 .../vid/templates/vid-server-deployment.yaml       | 29 ++++++++++++++++++++++
 kubernetes/vid/values.yaml                         |  3 ++-
 2 files changed, 31 insertions(+), 1 deletion(-)

(limited to 'kubernetes/vid')

diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml
index 69c0b57ae1..8226f54f0c 100644
--- a/kubernetes/vid/templates/vid-server-deployment.yaml
+++ b/kubernetes/vid/templates/vid-server-deployment.yaml
@@ -86,6 +86,15 @@ spec:
         image: {{ .Values.image.vid }} 
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: vid-server
+        volumeMounts:
+        - mountPath: /var/log/onap
+          name: vid-logs
+        - mountPath: /tmp/logback.xml
+          name: vid-logback
+        lifecycle:
+          postStart:
+            exec:
+              command: ["/bin/sh", "-c", "sleep 20; cp -f /tmp/logback.xml /usr/local/tomcat/webapps/vid/WEB-INF/classes/logback.xml"]
         ports:
         - containerPort: 8080
         volumeMounts:
@@ -97,9 +106,29 @@ spec:
             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"
diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml
index a7d494c73c..5d24d347d8 100644
--- a/kubernetes/vid/values.yaml
+++ b/kubernetes/vid/values.yaml
@@ -1,7 +1,8 @@
 nsPrefix: onap
-pullPolicy: IfNotPresent
+pullPolicy: Always
 nodePortPrefix: 302
 image:
   readiness: oomk8s/readiness-check:1.0.0
   mariadb: nexus3.onap.org:10001/library/mariadb:10
   vid: nexus3.onap.org:10001/openecomp/vid:1.1-STAGING-latest
+  filebeat: docker.elastic.co/beats/filebeat:5.5.0
\ No newline at end of file
-- 
cgit 1.2.3-korg