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>
---
 .../portal/templates/portal-apps-deployment.yaml   | 26 +++++++++++++++++++++-
 .../templates/portal-mariadb-deployment.yaml       | 24 ++++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)

(limited to 'kubernetes/portal/templates')

diff --git a/kubernetes/portal/templates/portal-apps-deployment.yaml b/kubernetes/portal/templates/portal-apps-deployment.yaml
index 2048a694f2..13cf57093d 100755
--- a/kubernetes/portal/templates/portal-apps-deployment.yaml
+++ b/kubernetes/portal/templates/portal-apps-deployment.yaml
@@ -95,6 +95,10 @@ spec:
           name: portal-root
         - mountPath: "{{ .Values.onapPortal.webappsDir }}/logs"
           name: portal-logs
+        - mountPath: /var/log/onap
+          name: portal-logs2
+        - mountPath: /PROJECT/APPS/ECOMPPORTAL/ECOMPSDKAPP/WEB-INF/classes/logback.xml
+          name: portal-logback-be
         ports:
         - containerPort: 8005
         - containerPort: 8009
@@ -104,10 +108,30 @@ 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: portal-logs2
+        - mountPath: /usr/share/filebeat/data
+          name: portal-data-filebeat
       volumes:
         - name: localtime
           hostPath:
             path: /etc/localtime
+        - name: filebeat-conf
+          hostPath:
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
+        - name: portal-logs2
+          emptyDir: {}
+        - name: portal-data-filebeat
+          emptyDir: {}
+        - name: portal-logback-be
+          hostPath:
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/portal/portal-be/logback.xml
         - name: portal-fusion-properties
           hostPath:
             path:  /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties
@@ -143,7 +167,7 @@ spec:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties
         - name: sdkapp-fusion-properties
           hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties            
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties
         - name: portal-mariadb-onboarding-sql
           hostPath:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/mariadb/oom_updates.sql
diff --git a/kubernetes/portal/templates/portal-mariadb-deployment.yaml b/kubernetes/portal/templates/portal-mariadb-deployment.yaml
index f4e46ab062..df38a2abb3 100755
--- a/kubernetes/portal/templates/portal-mariadb-deployment.yaml
+++ b/kubernetes/portal/templates/portal-mariadb-deployment.yaml
@@ -28,6 +28,10 @@ spec:
           readOnly: true
         - mountPath: /var/lib/mysql
           name: portal-mariadb-data
+        - mountPath: /var/log/onap
+          name: portal-logs
+        - mountPath: /tmp/logback.xml
+          name: portal-logback
         ports:
         - containerPort: 3306
           name: portaldb
@@ -36,6 +40,16 @@ spec:
             port: 3306
           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: portal-logs
+        - mountPath: /usr/share/filebeat/data
+          name: portal-data-filebeat
       volumes:
       - name: localtime
         hostPath:
@@ -43,5 +57,15 @@ spec:
       - name: portal-mariadb-data
         persistentVolumeClaim:
           claimName: portal-db
+      - name: filebeat-conf
+        hostPath:
+          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
+      - name: portal-logs
+        emptyDir: {}
+      - name: portal-data-filebeat
+        emptyDir: {}
+      - name: portal-logback
+        hostPath:
+          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/portal/portal-db/logback.xml
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-- 
cgit 1.2.3-korg