From d0707be0a30087bb5e30110dc09fdcdca1cd5d9d Mon Sep 17 00:00:00 2001 From: yuryn 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 --- kubernetes/policy/templates/dep-drools.yaml | 28 ++++++++++++++++++++++++ kubernetes/policy/templates/dep-pap.yaml | 33 +++++++++++++++++++++++++++++ kubernetes/policy/templates/dep-pdp.yaml | 28 ++++++++++++++++++++++++ kubernetes/policy/values.yaml | 1 + 4 files changed, 90 insertions(+) (limited to 'kubernetes/policy') diff --git a/kubernetes/policy/templates/dep-drools.yaml b/kubernetes/policy/templates/dep-drools.yaml index 9c3fc29d99..2f06a08791 100644 --- a/kubernetes/policy/templates/dep-drools.yaml +++ b/kubernetes/policy/templates/dep-drools.yaml @@ -71,10 +71,38 @@ spec: name: drools - mountPath: /usr/share/maven/conf/settings.xml name: drools-settingsxml + - mountPath: /var/log/onap + name: policy-logs + - mountPath: /tmp/logback.xml + name: policy-logback + lifecycle: + postStart: + exec: + command: ["/bin/sh", "-c", "export LOG=wait_logback.log; touch $LOG; export SRC=/tmp/logback.xml; export DST=/opt/app/policy/config/; while [ ! -e $DST ]; do echo 'Waiting for $DST...' >> $LOG; sleep 5; done; sleep 2; /bin/cp -f $SRC $DST; echo 'Done' >> $LOG"] + - 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: policy-logs + - mountPath: /usr/share/filebeat/data + name: policy-data-filebeat volumes: - name: localtime hostPath: path: /etc/localtime + - name: filebeat-conf + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml + - name: policy-logs + emptyDir: {} + - name: policy-data-filebeat + emptyDir: {} + - name: policy-logback + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/policy/drools/logback.xml - name: drools-settingsxml hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/drools/settings.xml diff --git a/kubernetes/policy/templates/dep-pap.yaml b/kubernetes/policy/templates/dep-pap.yaml index 794c6548b8..aeb3d6b323 100644 --- a/kubernetes/policy/templates/dep-pap.yaml +++ b/kubernetes/policy/templates/dep-pap.yaml @@ -86,10 +86,43 @@ spec: readOnly: true - mountPath: /tmp/policy-install/config/ name: pe + - mountPath: /var/log/onap + name: policy-logs + - mountPath: /tmp/policy-install/logback.xml + name: policy-sdk-logback + - mountPath: /tmp/logback.xml + name: policy-logback + lifecycle: + postStart: + exec: + command: ["/bin/sh", "-c", "export LOG=wait_logback.log; touch $LOG; export SRC=/tmp/logback.xml; export DST=/opt/app/policy/servers/pap/webapps/pap/WEB-INF/classes/; while [ ! -e $DST ]; do echo 'Waiting for $DST...' >> $LOG; sleep 5; done; sleep 2; /bin/cp -f $SRC $DST; export SRC=/tmp/policy-install/logback.xml; export DST=/opt/app/policy/servers/console/webapps/onap/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"] + - 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: policy-logs + - mountPath: /usr/share/filebeat/data + name: policy-data-filebeat volumes: - name: localtime hostPath: path: /etc/localtime + - name: filebeat-conf + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml + - name: policy-logs + emptyDir: {} + - name: policy-data-filebeat + emptyDir: {} + - name: policy-logback + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/policy/xacml-pap-rest/logback.xml + - name: policy-sdk-logback + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/policy/ep_sdk_app/logback.xml - name: pe hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/ diff --git a/kubernetes/policy/templates/dep-pdp.yaml b/kubernetes/policy/templates/dep-pdp.yaml index d7d697d71d..841d55c00e 100644 --- a/kubernetes/policy/templates/dep-pdp.yaml +++ b/kubernetes/policy/templates/dep-pdp.yaml @@ -65,10 +65,38 @@ spec: readOnly: true - mountPath: /tmp/policy-install/config name: pe + - mountPath: /var/log/onap + name: policy-logs + - mountPath: /tmp/logback.xml + name: policy-logback + lifecycle: + postStart: + exec: + command: ["/bin/sh", "-c", "export LOG=wait_logback.log; touch $LOG; export SRC=/tmp/logback.xml; export DST=/opt/app/policy/servers/pdp/webapps/pdp/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"] + - 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: policy-logs + - mountPath: /usr/share/filebeat/data + name: policy-data-filebeat volumes: - name: localtime hostPath: path: /etc/localtime + - name: filebeat-conf + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml + - name: policy-logs + emptyDir: {} + - name: policy-data-filebeat + emptyDir: {} + - name: policy-logback + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/policy/xacml-pdp-rest/logback.xml - name: pe hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/policy/opt/policy/config/pe/ diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml index 62e91f88f5..8119331afb 100644 --- a/kubernetes/policy/values.yaml +++ b/kubernetes/policy/values.yaml @@ -13,3 +13,4 @@ image: policyNexus: nexus3.onap.org:10001/onap/policy/policy-nexus policyNexusVersion: 1.1-STAGING-latest ubuntu: ubuntu:16.04 + filebeat: docker.elastic.co/beats/filebeat:5.5.0 \ No newline at end of file -- cgit 1.2.3-korg