From b2b99184fe715d28c06c89c95006f6edf30dbfad Mon Sep 17 00:00:00 2001
From: BorislavG <Borislav.Glozman@amdocs.com>
Date: Tue, 3 Oct 2017 15:40:55 +0300
Subject: Add missing aai canonical logging

Add filebeats and logback configuration to:
sparky-be, search-data-service, model-loader,
traversal, resources using configMaps
Issue-ID: OOM-112

Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
Change-Id: Ia1fa0ee2ad3894553a60468797d9d2b1cecb8f2e
---
 .../aai/templates/aai-resources-deployment.yaml    | 39 +++++++++++++++++++---
 1 file changed, 34 insertions(+), 5 deletions(-)

(limited to 'kubernetes/aai/templates/aai-resources-deployment.yaml')

diff --git a/kubernetes/aai/templates/aai-resources-deployment.yaml b/kubernetes/aai/templates/aai-resources-deployment.yaml
index 6c78ca8798..303d006249 100644
--- a/kubernetes/aai/templates/aai-resources-deployment.yaml
+++ b/kubernetes/aai/templates/aai-resources-deployment.yaml
@@ -60,10 +60,13 @@ spec:
         - mountPath: /etc/localtime
           name: localtime
           readOnly: true
-        - mountPath: /opt/aai/logroot/AAI-RES
-          name: aai-resources-logs
         - mountPath: /var/chef/aai-data/
           name: aai-data
+        - mountPath: /var/log/onap
+          name: aai-resources-logs
+        - mountPath: /opt/app/aai-resources/bundleconfig/etc/logback.xml
+          name: aai-resources-log-conf
+          subPath: logback.xml
         ports:
         - containerPort: 8447
         readinessProbe:
@@ -71,16 +74,42 @@ spec:
             port: 8447
           initialDelaySeconds: 5
           periodSeconds: 10
+      - name: filebeat-onap-aai-resources
+        image: {{ .Values.image.filebeat }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        volumeMounts:
+        - mountPath: /usr/share/filebeat/filebeat.yml
+          name: filebeat-conf
+        - mountPath: /var/log/onap
+          name: aai-resources-logs
+        - mountPath: /usr/share/filebeat/data
+          name: aai-resources-filebeat
       volumes:
       - name: localtime
         hostPath:
           path: /etc/localtime
-      - name: aai-resources-logs
-        hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-resources/logs/"
       - name: aai-data
         hostPath:
           path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/"
+      - name: filebeat-conf
+        hostPath:
+          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml
+      - name: aai-resources-logs
+        emptyDir: {}
+      - name: aai-resources-filebeat
+        emptyDir: {}
+      - name: aai-resources-log-conf
+        configMap:
+         name: aai-resources-configmap
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: aai-resources-configmap
+  namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ (.Files.Glob "resources/resources/conf/logback.xml").AsConfig | indent 2 }}
+
-- 
cgit 1.2.3-korg