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/vid | |
parent | 244b3e19d3343f149684bb14ee6aa579c968964a (diff) | |
parent | 4ca69ea2b6a2aaaf0974953a3c3dec7694fdfcb0 (diff) |
Merge "added filebeat to all components"
Diffstat (limited to 'kubernetes/vid')
-rw-r--r-- | kubernetes/vid/templates/vid-server-deployment.yaml | 29 | ||||
-rw-r--r-- | kubernetes/vid/values.yaml | 3 |
2 files changed, 31 insertions, 1 deletions
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 |