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/appc/templates/appc-deployment.yaml | 26 +++++++++++++++++++++++++-
 kubernetes/appc/values.yaml                    |  1 +
 2 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'kubernetes/appc')

diff --git a/kubernetes/appc/templates/appc-deployment.yaml b/kubernetes/appc/templates/appc-deployment.yaml
index 661980b296..b192c30fbf 100644
--- a/kubernetes/appc/templates/appc-deployment.yaml
+++ b/kubernetes/appc/templates/appc-deployment.yaml
@@ -46,7 +46,7 @@ spec:
         - name: MYSQL_ROOT_PASSWORD
           value: openECOMP1.0
         - name: SDNC_CONFIG_DIR
-          value: /opt/openecomp/appc/data/properties
+          value: /opt/openecomp/sdnc/data/properties
         - name: APPC_CONFIG_DIR
           value: /opt/openecomp/appc/data/properties
         - name: DMAAP_TOPIC_ENV
@@ -66,6 +66,10 @@ spec:
           name: sdnc-aaiclient-properties
         - mountPath: /opt/openecomp/sdnc/data/properties/admportal.json
           name: sdnc-admportal-json
+        - mountPath: /var/log/onap
+          name: appc-logs
+        - mountPath: /opt/opendaylight/current/etc/org.ops4j.pax.logging.cfg
+          name: appc-log-config
         ports:
         - containerPort: 8181
         - containerPort: 1830
@@ -74,10 +78,30 @@ 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: appc-logs
+        - mountPath: /usr/share/filebeat/data
+          name: appc-data-filebeat
       volumes:
         - name: localtime
           hostPath:
             path: /etc/localtime
+        - name: filebeat-conf
+          hostPath:
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml
+        - name: appc-log-config
+          hostPath:
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/appc/org.ops4j.pax.logging.cfg
+        - name: appc-logs
+          emptyDir: {}
+        - name: appc-data-filebeat
+          emptyDir: {}
         - name: appc-properties
           hostPath:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/appc/conf/appc.properties
diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml
index 7916b734aa..ea14b83960 100644
--- a/kubernetes/appc/values.yaml
+++ b/kubernetes/appc/values.yaml
@@ -6,3 +6,4 @@ image:
   appc: nexus3.onap.org:10001/openecomp/appc-image:1.1-STAGING-latest
   mysqlServer: mysql/mysql-server:5.6
   dgbuilderSdnc: nexus3.onap.org:10001/openecomp/dgbuilder-sdnc-image:1.1-STAGING-latest
+  filebeat: docker.elastic.co/beats/filebeat:5.5.0
\ No newline at end of file
-- 
cgit 1.2.3-korg