From 4bcabf5fd1120f9d4cba26b0f8bf1a85c1c958d3 Mon Sep 17 00:00:00 2001 From: "mark.j.leonard" Date: Fri, 4 May 2018 17:09:48 +0100 Subject: 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 --- .../charts/aai-babel/resources/config/logback.xml | 2 +- .../aai/charts/aai-babel/templates/deployment.yaml | 21 ++++++++++++++++++++- .../resources/config/log/logback.xml | 2 +- .../aai-modelloader/templates/deployment.yaml | 6 +++--- 4 files changed, 25 insertions(+), 6 deletions(-) (limited to 'kubernetes/aai') diff --git a/kubernetes/aai/charts/aai-babel/resources/config/logback.xml b/kubernetes/aai/charts/aai-babel/resources/config/logback.xml index 63b8faf09a..f406dc8581 100644 --- a/kubernetes/aai/charts/aai-babel/resources/config/logback.xml +++ b/kubernetes/aai/charts/aai-babel/resources/config/logback.xml @@ -4,7 +4,7 @@ - + diff --git a/kubernetes/aai/charts/aai-babel/templates/deployment.yaml b/kubernetes/aai/charts/aai-babel/templates/deployment.yaml index af25b47624..2aac029a9f 100644 --- a/kubernetes/aai/charts/aai-babel/templates/deployment.yaml +++ b/kubernetes/aai/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/kubernetes/aai/charts/aai-modelloader/resources/config/log/logback.xml b/kubernetes/aai/charts/aai-modelloader/resources/config/log/logback.xml index fcfac840b1..6c2fcdc0d2 100644 --- a/kubernetes/aai/charts/aai-modelloader/resources/config/log/logback.xml +++ b/kubernetes/aai/charts/aai-modelloader/resources/config/log/logback.xml @@ -1,6 +1,6 @@ - + diff --git a/kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml b/kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml index f93a0d349d..7ca2a9fc32 100644 --- a/kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml +++ b/kubernetes/aai/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 -- cgit 1.2.3-korg