diff options
author | Alexis de Talhouƫt <alexis.de_talhouet@bell.ca> | 2017-09-26 12:13:38 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2017-09-26 12:13:38 +0000 |
commit | 7e46c63029117817ffba478e871777ea0dd17514 (patch) | |
tree | d593cce9eb4f3a890121a6b012d1bd2b0bd2d778 /kubernetes/mso | |
parent | 244b3e19d3343f149684bb14ee6aa579c968964a (diff) | |
parent | 4ca69ea2b6a2aaaf0974953a3c3dec7694fdfcb0 (diff) |
Merge "added filebeat to all components"
Diffstat (limited to 'kubernetes/mso')
-rw-r--r-- | kubernetes/mso/templates/mso-deployment.yaml | 70 | ||||
-rw-r--r-- | kubernetes/mso/values.yaml | 2 |
2 files changed, 68 insertions, 4 deletions
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 |