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>
---
 kubernetes/sdc/templates/sdc-be.yaml | 24 ++++++++++++++++++++++++
 kubernetes/sdc/templates/sdc-fe.yaml | 26 ++++++++++++++++++++++++++
 kubernetes/sdc/values.yaml           |  1 +
 3 files changed, 51 insertions(+)

(limited to 'kubernetes/sdc')

diff --git a/kubernetes/sdc/templates/sdc-be.yaml b/kubernetes/sdc/templates/sdc-be.yaml
index 77c7545f6b..29f029f9ed 100644
--- a/kubernetes/sdc/templates/sdc-be.yaml
+++ b/kubernetes/sdc/templates/sdc-be.yaml
@@ -84,6 +84,10 @@ spec:
           readOnly: true
         - mountPath: /var/lib/jetty/logs
           name: sdc-logs
+        - mountPath: /var/log/onap
+          name: sdc-logs-2
+        - mountPath: /var/lib/jetty/config/catalog-be/logback.xml
+          name: sdc-logback
         ports:
         - containerPort: 8443
         - containerPort: 8080
@@ -92,7 +96,27 @@ spec:
             port: 8443
           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: sdc-logs-2
+        - mountPath: /usr/share/filebeat/data
+          name: sdc-data-filebeat
       volumes:
+        - name: filebeat-conf
+          hostPath:
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
+        - name: sdc-logs-2
+          emptyDir: {}
+        - name: sdc-data-filebeat
+          emptyDir: {}
+        - name: sdc-logback
+          hostPath:
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/sdc/be/logback.xml
         - name: sdc-sdc-es-es
           hostPath:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-es/ES
diff --git a/kubernetes/sdc/templates/sdc-fe.yaml b/kubernetes/sdc/templates/sdc-fe.yaml
index 0ca83ae164..1a89889607 100644
--- a/kubernetes/sdc/templates/sdc-fe.yaml
+++ b/kubernetes/sdc/templates/sdc-fe.yaml
@@ -70,6 +70,12 @@ spec:
           name: sdc-logs
         - mountPath: /root/chef-solo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb
           name: sdc-fe-config
+        - mountPath: /tmp/logback.xml
+          name: sdc-logback
+        lifecycle:
+          postStart:
+            exec:
+              command: ["/bin/sh", "-c", "sleep 20; cp -f /tmp/logback.xml /var/lib/jetty/config/catalog-fe/logback.xml"]
         ports:
         - containerPort: 9443
         - containerPort: 8181
@@ -78,7 +84,27 @@ spec:
             port: 8181
           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: sdc-logs-2
+        - mountPath: /usr/share/filebeat/data
+          name: sdc-data-filebeat
       volumes:
+        - name: filebeat-conf
+          hostPath:
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
+        - name: sdc-logs-2
+          emptyDir: {}
+        - name: sdc-data-filebeat
+          emptyDir: {}
+        - name: sdc-logback
+          hostPath:
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/sdc/fe/logback.xml
         - name: sdc-sdc-es-es
           hostPath:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-es/ES
diff --git a/kubernetes/sdc/values.yaml b/kubernetes/sdc/values.yaml
index 58bcf1c3f3..a9b7ca30a3 100644
--- a/kubernetes/sdc/values.yaml
+++ b/kubernetes/sdc/values.yaml
@@ -8,3 +8,4 @@ image:
   sdcElasticsearch: nexus3.onap.org:10001/openecomp/sdc-elasticsearch:1.1-STAGING-latest
   sdcCassandra: nexus3.onap.org:10001/openecomp/sdc-cassandra:1.1-STAGING-latest
   sdcBackend: nexus3.onap.org:10001/openecomp/sdc-backend:1.1-STAGING-latest
+  filebeat: docker.elastic.co/beats/filebeat:5.5.0
\ No newline at end of file
-- 
cgit 1.2.3-korg