diff options
| author |   mark.j.leonard <mark.j.leonard@gmail.com> | 2018-05-04 17:09:48 +0100 |
|---|---|---|
| committer | mark.j.leonard <mark.j.leonard@gmail.com> | 2018-05-08 11:56:58 +0100 |
| commit | 827c851f18a72c06bf9bf91a89b9e68a7507ed23 (patch) | |
| tree | 5feca1df93f889e94a2f5a874fcee0374adcd97c /charts/aai-babel | |
| parent | e17614d0be4a12a10f5b4ef3818945bff1a3aa50 (diff) | |
Update ML and Babel logback.xml config
Change the log directory to /var/log/onap and amend Babel
deployment.yaml to match with the Model Loader configuration.
Issue-ID: AAI-1110
Change-Id: Ieeaab28102810f5e665436ce01e9af9ca69a7ab6
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
Diffstat (limited to 'charts/aai-babel')
| -rw-r--r-- | charts/aai-babel/resources/config/logback.xml | 2 | ||||
| -rw-r--r-- | charts/aai-babel/templates/deployment.yaml | 21 |
2 files changed, 21 insertions, 2 deletions
diff --git a/charts/aai-babel/resources/config/logback.xml b/charts/aai-babel/resources/config/logback.xml index 63b8faf..f406dc8 100644 --- a/charts/aai-babel/resources/config/logback.xml +++ b/charts/aai-babel/resources/config/logback.xml @@ -4,7 +4,7 @@ <include resource="org/springframework/boot/logging/logback/base.xml" /> <property name="componentName" value="AAI-BAS" /> - <property name="logDirectory" value="${APP_HOME}/logs/${componentName}" /> + <property name="logDirectory" value="/var/log/onap/${componentName}" /> <!-- default EELF log file names --> <property name="generalLogName" value="error" /> diff --git a/charts/aai-babel/templates/deployment.yaml b/charts/aai-babel/templates/deployment.yaml index af25b47..2aac029 100644 --- a/charts/aai-babel/templates/deployment.yaml +++ b/charts/aai-babel/templates/deployment.yaml @@ -75,7 +75,7 @@ spec: subPath: babel-auth.properties - mountPath: /opt/app/babel/config/auth name: {{ include "common.fullname" . }}-secrets - - mountPath: /logs + - mountPath: /var/log/onap name: {{ include "common.fullname" . }}-logs - mountPath: /opt/app/babel/config/logback.xml name: {{ include "common.fullname" . }}-config @@ -90,6 +90,20 @@ spec: affinity: {{ toYaml .Values.affinity | indent 10 }} {{- end }} + + # side car containers + - name: filebeat-onap + image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + volumeMounts: + - mountPath: /usr/share/filebeat/filebeat.yml + subPath: filebeat.yml + name: filebeat-conf + - mountPath: /var/log/onap + name: {{ include "common.fullname" . }}-logs + - mountPath: /usr/share/filebeat/data + name: aai-filebeat + volumes: - name: localtime hostPath: @@ -107,7 +121,12 @@ spec: - name: {{ include "common.fullname" . }}-secrets secret: secretName: {{ include "common.fullname" . }}-babel-secrets + - name: filebeat-conf + configMap: + name: aai-filebeat - name: {{ include "common.fullname" . }}-logs emptyDir: {} + - name: aai-filebeat + emptyDir: {} imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" |