diff options
author | 2018-05-09 18:26:07 +0000 | |
---|---|---|
committer | 2018-05-09 18:26:07 +0000 | |
commit | d632eeff06ad076d93143522ac56288eeba84d90 (patch) | |
tree | b88fb5ab76786b193ea0e6d87155f825528a0df1 /charts | |
parent | 73389db3174ebbe46f033a90d6f51ff9fc072568 (diff) | |
parent | 827c851f18a72c06bf9bf91a89b9e68a7507ed23 (diff) |
Merge "Update ML and Babel logback.xml config"
Diffstat (limited to 'charts')
-rw-r--r-- | charts/aai-babel/resources/config/logback.xml | 2 | ||||
-rw-r--r-- | charts/aai-babel/templates/deployment.yaml | 21 | ||||
-rw-r--r-- | charts/aai-modelloader/resources/config/log/logback.xml | 2 | ||||
-rw-r--r-- | charts/aai-modelloader/templates/deployment.yaml | 6 |
4 files changed, 25 insertions, 6 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" diff --git a/charts/aai-modelloader/resources/config/log/logback.xml b/charts/aai-modelloader/resources/config/log/logback.xml index fcfac84..6c2fcdc 100644 --- a/charts/aai-modelloader/resources/config/log/logback.xml +++ b/charts/aai-modelloader/resources/config/log/logback.xml @@ -1,6 +1,6 @@ <configuration scan="true" scanPeriod="3 seconds" debug="false"> <include resource="org/springframework/boot/logging/logback/base.xml" /> - <property name="logDir" value="${AJSC_HOME}/logs" /> + <property name="logDir" value="/var/log/onap" /> <property name="componentName" value="AAI-ML"></property> <!-- default eelf log file names --> diff --git a/charts/aai-modelloader/templates/deployment.yaml b/charts/aai-modelloader/templates/deployment.yaml index f93a0d3..7ca2a9f 100644 --- a/charts/aai-modelloader/templates/deployment.yaml +++ b/charts/aai-modelloader/templates/deployment.yaml @@ -1,4 +1,4 @@ -# Copyright © 2017 Amdocs, Bell Canada +# Copyright © 2018 Amdocs, AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -50,7 +50,7 @@ spec: name: {{ include "common.fullname" . }}-prop-config - mountPath: /opt/app/model-loader/config/auth/ name: {{ include "common.fullname" . }}-auth-config - - mountPath: /logs + - mountPath: /var/log/onap name: {{ include "common.fullname" . }}-logs - mountPath: /opt/app/model-loader/logback.xml name: {{ include "common.fullname" . }}-log-conf @@ -67,7 +67,7 @@ spec: - mountPath: /usr/share/filebeat/filebeat.yml subPath: filebeat.yml name: filebeat-conf - - mountPath: /logs + - mountPath: /var/log/onap name: {{ include "common.fullname" . }}-logs - mountPath: /usr/share/filebeat/data name: aai-filebeat |