summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryuryn <Yury.Novitsky@Amdocs.com>2017-09-27 14:54:18 +0300
committerYury Novitsky <Yury.Novitsky@Amdocs.com>2017-09-27 16:39:45 +0000
commitd0707be0a30087bb5e30110dc09fdcdca1cd5d9d (patch)
treed22bf2f0c9e5a52c207657172b61b507e9987872
parent82a02441c188081380d735c387cd464d0f2f1e19 (diff)
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 <Yury.Novitsky@Amdocs.com>
-rw-r--r--kubernetes/appc/templates/appc-deployment.yaml24
-rw-r--r--kubernetes/appc/values.yaml1
-rwxr-xr-xkubernetes/config/docker/init/config-init.sh1
-rw-r--r--kubernetes/mso/templates/mso-deployment.yaml64
-rw-r--r--kubernetes/mso/values.yaml2
-rw-r--r--kubernetes/policy/templates/dep-drools.yaml28
-rw-r--r--kubernetes/policy/templates/dep-pap.yaml33
-rw-r--r--kubernetes/policy/templates/dep-pdp.yaml28
-rw-r--r--kubernetes/policy/values.yaml1
-rwxr-xr-xkubernetes/portal/templates/portal-apps-deployment.yaml26
-rwxr-xr-xkubernetes/portal/templates/portal-mariadb-deployment.yaml24
-rw-r--r--kubernetes/portal/values.yaml1
-rw-r--r--kubernetes/sdc/templates/sdc-be.yaml24
-rw-r--r--kubernetes/sdc/templates/sdc-fe.yaml26
-rw-r--r--kubernetes/sdc/values.yaml1
-rw-r--r--kubernetes/sdnc/templates/sdnc-deployment.yaml26
-rw-r--r--kubernetes/sdnc/values.yaml1
-rw-r--r--kubernetes/vid/templates/vid-server-deployment.yaml28
-rw-r--r--kubernetes/vid/values.yaml3
19 files changed, 338 insertions, 4 deletions
diff --git a/kubernetes/appc/templates/appc-deployment.yaml b/kubernetes/appc/templates/appc-deployment.yaml
index 661980b296..f320fee539 100644
--- a/kubernetes/appc/templates/appc-deployment.yaml
+++ b/kubernetes/appc/templates/appc-deployment.yaml
@@ -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
diff --git a/kubernetes/config/docker/init/config-init.sh b/kubernetes/config/docker/init/config-init.sh
index 29167bf844..e212971a87 100755
--- a/kubernetes/config/docker/init/config-init.sh
+++ b/kubernetes/config/docker/init/config-init.sh
@@ -71,6 +71,7 @@ chmod -R 777 /config-init/$NAMESPACE/aai/search-data-service/logs/
chmod -R 777 /config-init/$NAMESPACE/aai/data-router/logs/
chmod -R 777 /config-init/$NAMESPACE/policy/mariadb/
chmod -R 777 /config-init/$NAMESPACE/log/elasticsearch
+chown -R root:root /config-init/$NAMESPACE/log
echo "Substituting configuration parameters"
diff --git a/kubernetes/mso/templates/mso-deployment.yaml b/kubernetes/mso/templates/mso-deployment.yaml
index 862f572d3c..bf350aeca1 100644
--- a/kubernetes/mso/templates/mso-deployment.yaml
+++ b/kubernetes/mso/templates/mso-deployment.yaml
@@ -54,6 +54,26 @@ spec:
name: mso
- mountPath: /tmp/start-jboss-server.sh
name: mso-docker-files
+ - mountPath: /var/log/onap
+ name: mso-logs
+ - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-api-handler-infra-config/logback.apihandler-infra.xml
+ name: logback-apihandler-infra
+ - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-po-adapter-config/logback.network.xml
+ name: logback-network
+ - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-po-adapter-config/logback.tenant.xml
+ name: logback-tenant
+ - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-po-adapter-config/logback.vnf.xml
+ name: logback-vnf
+ - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-appc-adapter-config/logback.appc.xml
+ name: logback-appc
+ - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-requests-db-adapter-config/logback.msorequestsdbadapter.xml
+ name: logback-msorequestsdbadapter
+ - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-asdc-controller-config/logback.asdc.xml
+ name: logback-asdc
+ - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-sdnc-adapter-config/logback.sdnc.xml
+ name: logback-sdnc
+ - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-bpmn-config/logback.bpmn.xml
+ name: logback-bpmn
env:
- name: JBOSS_DEBUG
value: "false"
@@ -68,13 +88,57 @@ 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: mso-logs
+ - mountPath: /usr/share/filebeat/data
+ name: mso-data-filebeat
volumes:
- name: localtime
hostPath:
path: /etc/localtime
+ - name: logback-apihandler-infra
+ hostPath:
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.apihandler-infra.xml
+ - name: logback-network
+ hostPath:
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.network.xml
+ - name: logback-tenant
+ hostPath:
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.tenant.xml
+ - name: logback-vnf
+ hostPath:
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.vnf.xml
+ - name: logback-appc
+ hostPath:
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.appc.xml
+ - name: logback-msorequestsdbadapter
+ hostPath:
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.msorequestsdbadapter.xml
+ - name: logback-asdc
+ hostPath:
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.asdc.xml
+ - name: logback-sdnc
+ hostPath:
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.sdnc.xml
+ - name: logback-bpmn
+ hostPath:
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.bpmn.xml
- name: mso
hostPath:
path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/mso
+ - name: filebeat-conf
+ hostPath:
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
+ - name: mso-logs
+ emptyDir: {}
+ - name: mso-data-filebeat
+ emptyDir: {}
- name: mso-docker-files
hostPath:
path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/docker-files/scripts/start-jboss-server.sh
diff --git a/kubernetes/mso/values.yaml b/kubernetes/mso/values.yaml
index 883db87a8d..4584e73c9b 100644
--- a/kubernetes/mso/values.yaml
+++ b/kubernetes/mso/values.yaml
@@ -5,4 +5,4 @@ image:
readiness: oomk8s/readiness-check:1.0.0
mso: nexus3.onap.org:10001/openecomp/mso:1.1-STAGING-latest
mariadb: nexus3.onap.org:10001/mariadb:10.1.11
-
+ filebeat: docker.elastic.co/beats/filebeat:5.5.0
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
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"
diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml
index 4a3cbd185d..757995ab63 100644
--- a/kubernetes/portal/values.yaml
+++ b/kubernetes/portal/values.yaml
@@ -9,5 +9,6 @@ image:
portalwms: nexus3.onap.org:10001/openecomp/portal-wms:1.1-STAGING-latest
ubuntuInit: oomk8s/ubuntu-init:1.0.0
ubuntuDesktop: dorowu/ubuntu-desktop-lxde-vnc
+ filebeat: docker.elastic.co/beats/filebeat:5.5.0
onapPortal:
webappsDir: "/opt/apache-tomcat-8.0.37/webapps"
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..56d62963c4 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", "export LOG=wait_logback.log; touch $LOG; export SRC=/tmp/logback.xml; export DST=/var/lib/jetty/config/catalog-fe/; while [ ! -e $DST ]; do echo 'Waiting for $DST...' >> $LOG; sleep 5; done; sleep 2; /bin/cp -f $SRC $DST; echo 'Done' >> $LOG"]
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
diff --git a/kubernetes/sdnc/templates/sdnc-deployment.yaml b/kubernetes/sdnc/templates/sdnc-deployment.yaml
index 4b123906af..8b4d0ebad6 100644
--- a/kubernetes/sdnc/templates/sdnc-deployment.yaml
+++ b/kubernetes/sdnc/templates/sdnc-deployment.yaml
@@ -57,7 +57,11 @@ spec:
- mountPath: /opt/openecomp/sdnc/data/properties/aaiclient.properties
name: sdnc-aaiclient-properties
- mountPath: /opt/openecomp/sdnc/data/properties/admportal.json
- name: sdnc-admportal-json
+ name: sdnc-admportal-json
+ - mountPath: /var/log/onap
+ name: sdnc-logs
+ - mountPath: /opt/opendaylight/current/etc/org.ops4j.pax.logging.cfg
+ name: sdnc-log-config
ports:
- containerPort: 8181
readinessProbe:
@@ -65,10 +69,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: sdnc-logs
+ - mountPath: /usr/share/filebeat/data
+ name: sdnc-data-filebeat
volumes:
- name: localtime
hostPath:
path: /etc/localtime
+ - name: filebeat-conf
+ hostPath:
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml
+ - name: sdnc-log-config
+ hostPath:
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/sdnc/org.ops4j.pax.logging.cfg
+ - name: sdnc-logs
+ emptyDir: {}
+ - name: sdnc-data-filebeat
+ emptyDir: {}
- name: sdnc-aaiclient-properties
hostPath:
path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/aaiclient.properties
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 0ccc357526..20d045807e 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -7,3 +7,4 @@ image:
dgbuilderSdnc: nexus3.onap.org:10001/openecomp/dgbuilder-sdnc-image:1.1-STAGING-latest
sdnc: nexus3.onap.org:10001/openecomp/sdnc-image:1.1-STAGING-latest
admportalSdnc: nexus3.onap.org:10001/openecomp/admportal-sdnc-image:1.1-STAGING-latest
+ filebeat: docker.elastic.co/beats/filebeat:5.5.0 \ No newline at end of file
diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml
index 69c0b57ae1..ff341335a3 100644
--- a/kubernetes/vid/templates/vid-server-deployment.yaml
+++ b/kubernetes/vid/templates/vid-server-deployment.yaml
@@ -86,20 +86,48 @@ spec:
image: {{ .Values.image.vid }}
imagePullPolicy: {{ .Values.pullPolicy }}
name: vid-server
+ lifecycle:
+ postStart:
+ exec:
+ command: ["/bin/sh", "-c", "export LOG=wait_logback.log; touch $LOG; export SRC=/tmp/logback.xml; export DST=/usr/local/tomcat/webapps/vid/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"]
ports:
- containerPort: 8080
volumeMounts:
- mountPath: /etc/localtime
name: localtime
readOnly: true
+ - mountPath: /var/log/onap
+ name: vid-logs
+ - mountPath: /tmp/logback.xml
+ name: vid-logback
readinessProbe:
tcpSocket:
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