From: Itay Hassid Date: Thu, 31 Aug 2017 14:40:18 +0000 (+0000) Subject: added filebeat to all components X-Git-Tag: 2.0.0-ONAP~628^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=4ca69ea2b6a2aaaf0974953a3c3dec7694fdfcb0 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 --- diff --git a/kubernetes/aai/templates/aai-deployment.yaml b/kubernetes/aai/templates/aai-deployment.yaml index dc375cb6bc..fe5d1ffc95 100644 --- a/kubernetes/aai/templates/aai-deployment.yaml +++ b/kubernetes/aai/templates/aai-deployment.yaml @@ -67,4 +67,4 @@ spec: path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/haproxy/haproxy.cfg" restartPolicy: Always imagePullSecrets: - - name: "{{ .Values.nsPrefix }}-docker-registry-key" + - name: "{{ .Values.nsPrefix }}-docker-registry-key" \ No newline at end of file diff --git a/kubernetes/aai/templates/modelloader-deployment.yaml b/kubernetes/aai/templates/modelloader-deployment.yaml index 22b72815cb..85102a0b7d 100644 --- a/kubernetes/aai/templates/modelloader-deployment.yaml +++ b/kubernetes/aai/templates/modelloader-deployment.yaml @@ -43,4 +43,4 @@ spec: path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/model-loader/logs/" restartPolicy: Always imagePullSecrets: - - name: "{{ .Values.nsPrefix }}-docker-registry-key" + - name: "{{ .Values.nsPrefix }}-docker-registry-key" \ No newline at end of file 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 diff --git a/kubernetes/mso/templates/mso-deployment.yaml b/kubernetes/mso/templates/mso-deployment.yaml index 862f572d3c..ce327fe7a4 100644 --- a/kubernetes/mso/templates/mso-deployment.yaml +++ b/kubernetes/mso/templates/mso-deployment.yaml @@ -42,7 +42,7 @@ spec: spec: containers: - command: - - /tmp/start-jboss-server.sh + - /docker-files/scripts/start-jboss-server.sh image: {{ .Values.image.mso }} imagePullPolicy: {{ .Values.pullPolicy }} name: mso @@ -52,8 +52,28 @@ spec: readOnly: true - mountPath: /shared name: mso - - mountPath: /tmp/start-jboss-server.sh + - mountPath: /docker-files 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,15 +88,59 @@ 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 + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/docker-files imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" 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..b789f5a565 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", "sleep 60; cp -f /tmp/logback.xml /opt/app/policy/config/logback.xml"] + - 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..0ee1b12d3c 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", "sleep 60; cp -f /tmp/logback.xml /opt/app/policy/servers/pap/webapps/pap/WEB-INF/classes/logback.xml;cp -f /tmp/policy-install/logback.xml /opt/app/policy/servers/console/webapps/ecomp/WEB-INF/classes/logback.xml"] + - 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..6ba2a335ae 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", "sleep 60; cp -f /tmp/logback.xml /opt/app/policy/servers/pdp/webapps/pdp/WEB-INF/classes/logback.xml"] + - 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..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 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..8226f54f0c 100644 --- a/kubernetes/vid/templates/vid-server-deployment.yaml +++ b/kubernetes/vid/templates/vid-server-deployment.yaml @@ -86,6 +86,15 @@ spec: image: {{ .Values.image.vid }} imagePullPolicy: {{ .Values.pullPolicy }} name: vid-server + volumeMounts: + - mountPath: /var/log/onap + name: vid-logs + - mountPath: /tmp/logback.xml + name: vid-logback + lifecycle: + postStart: + exec: + command: ["/bin/sh", "-c", "sleep 20; cp -f /tmp/logback.xml /usr/local/tomcat/webapps/vid/WEB-INF/classes/logback.xml"] ports: - containerPort: 8080 volumeMounts: @@ -97,9 +106,29 @@ 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: 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