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
diff --git a/kubernetes/aai/templates/aai-resources-deployment.yaml b/kubernetes/aai/templates/aai-resources-deployment.yaml
index 6c78ca8..303d006 100644
--- a/kubernetes/aai/templates/aai-resources-deployment.yaml
+++ b/kubernetes/aai/templates/aai-resources-deployment.yaml
@@ -60,10 +60,13 @@
- 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 @@
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 }}
+
diff --git a/kubernetes/aai/templates/aai-traversal-deployment.yaml b/kubernetes/aai/templates/aai-traversal-deployment.yaml
index a566080..87861b4 100644
--- a/kubernetes/aai/templates/aai-traversal-deployment.yaml
+++ b/kubernetes/aai/templates/aai-traversal-deployment.yaml
@@ -64,10 +64,13 @@
- mountPath: /etc/localtime
name: localtime
readOnly: true
- - mountPath: /opt/aai/logroot/AAI-GQ
- name: aai-traversal-logs
- mountPath: /var/chef/aai-data/
name: aai-data
+ - mountPath: /var/log/onap
+ name: aai-traversal-logs
+ - mountPath: /opt/app/aai-traversal/bundleconfig/etc/logback.xml
+ name: aai-traversal-log-conf
+ subPath: logback.xml
ports:
- containerPort: 8446
readinessProbe:
@@ -75,16 +78,42 @@
port: 8446
initialDelaySeconds: 5
periodSeconds: 10
+ - name: filebeat-onap-aai-traversal
+ image: {{ .Values.image.filebeat }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ volumeMounts:
+ - mountPath: /usr/share/filebeat/filebeat.yml
+ name: filebeat-conf
+ - mountPath: /var/log/onap
+ name: aai-traversal-logs
+ - mountPath: /usr/share/filebeat/data
+ name: aai-traversal-filebeat
volumes:
- name: localtime
hostPath:
path: /etc/localtime
- - name: aai-traversal-logs
- hostPath:
- path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-traversal/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-traversal-logs
+ emptyDir: {}
+ - name: aai-traversal-filebeat
+ emptyDir: {}
+ - name: aai-traversal-log-conf
+ configMap:
+ name: aai-traversal-configmap
restartPolicy: Always
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: aai-traversal-configmap
+ namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ (.Files.Glob "resources/traversal/conf/logback.xml").AsConfig | indent 2 }}
+
diff --git a/kubernetes/aai/templates/modelloader-deployment.yaml b/kubernetes/aai/templates/modelloader-deployment.yaml
index 22b7281..3f2bda3 100644
--- a/kubernetes/aai/templates/modelloader-deployment.yaml
+++ b/kubernetes/aai/templates/modelloader-deployment.yaml
@@ -14,7 +14,10 @@
name: model-loader-service
spec:
containers:
- - env:
+ - name: model-loader-service
+ image: "{{ .Values.image.modelLoaderImage }}:{{ .Values.image.modelLoaderVersion }}"
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ env:
- name: CONFIG_HOME
value: /opt/app/model-loader/config/
volumeMounts:
@@ -23,14 +26,24 @@
readOnly: true
- mountPath: /opt/app/model-loader/config/
name: aai-model-loader-config
- - mountPath: /logs/
+ - mountPath: /var/log/onap
name: aai-model-loader-logs
- image: "{{ .Values.image.modelLoaderImage }}:{{ .Values.image.modelLoaderVersion }}"
- imagePullPolicy: {{ .Values.pullPolicy }}
- name: model-loader-service
+ - mountPath: /opt/app/model-loader/bundleconfig/etc/logback.xml
+ name: aai-model-loader-log-conf
+ subPath: logback.xml
ports:
- containerPort: 8080
- containerPort: 8443
+ - name: filebeat-onap-aai-model-loader
+ image: {{ .Values.image.filebeat }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ volumeMounts:
+ - mountPath: /usr/share/filebeat/filebeat.yml
+ name: filebeat-conf
+ - mountPath: /var/log/onap
+ name: aai-model-loader-logs
+ - mountPath: /usr/share/filebeat/data
+ name: aai-model-loader-filebeat
volumes:
- name: localtime
hostPath:
@@ -38,9 +51,25 @@
- name: aai-model-loader-config
hostPath:
path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/model-loader/appconfig/"
- - name: aai-model-loader-logs
+ - name: filebeat-conf
hostPath:
- path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/model-loader/logs/"
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml
+ - name: aai-model-loader-logs
+ emptyDir: {}
+ - name: aai-model-loader-filebeat
+ emptyDir: {}
+ - name: aai-model-loader-log-conf
+ configMap:
+ name: aai-model-loader-configmap
restartPolicy: Always
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: aai-model-loader-configmap
+ namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ (.Files.Glob "resources/model-loader/conf/logback.xml").AsConfig | indent 2 }}
+
diff --git a/kubernetes/aai/templates/search-data-service-deployment.yaml b/kubernetes/aai/templates/search-data-service-deployment.yaml
index 7413275..3eb0c5c 100644
--- a/kubernetes/aai/templates/search-data-service-deployment.yaml
+++ b/kubernetes/aai/templates/search-data-service-deployment.yaml
@@ -30,8 +30,11 @@
readOnly: true
- mountPath: /opt/app/search-data-service/config/
name: aai-search-data-service-config
- - mountPath: /logs/
+ - mountPath: /var/log/onap
name: aai-search-data-service-logs
+ - mountPath: /opt/app/search-data-service/bundleconfig/etc/logback.xml
+ name: aai-search-data-service-log-conf
+ subPath: logback.xml
ports:
- containerPort: 9509
readinessProbe:
@@ -39,6 +42,16 @@
port: 9509
initialDelaySeconds: 5
periodSeconds: 10
+ - name: filebeat-onap-aai-search
+ image: {{ .Values.image.filebeat }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ volumeMounts:
+ - mountPath: /usr/share/filebeat/filebeat.yml
+ name: filebeat-conf
+ - mountPath: /var/log/onap
+ name: aai-search-data-service-logs
+ - mountPath: /usr/share/filebeat/data
+ name: aai-search-data-service-filebeat
volumes:
- name: localtime
hostPath:
@@ -46,9 +59,25 @@
- name: aai-search-data-service-config
hostPath:
path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/search-data-service/appconfig/"
- - name: aai-search-data-service-logs
+ - name: filebeat-conf
hostPath:
- path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/search-data-service/logs/"
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml
+ - name: aai-search-data-service-logs
+ emptyDir: {}
+ - name: aai-search-data-service-filebeat
+ emptyDir: {}
+ - name: aai-search-data-service-log-conf
+ configMap:
+ name: aai-search-data-service-configmap
restartPolicy: Always
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: aai-search-data-service-configmap
+ namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ (.Files.Glob "resources/search-data-service/conf/logback.xml").AsConfig | indent 2 }}
+
diff --git a/kubernetes/aai/templates/sparky-be-deployment.yaml b/kubernetes/aai/templates/sparky-be-deployment.yaml
index a17325c..ee9e067 100644
--- a/kubernetes/aai/templates/sparky-be-deployment.yaml
+++ b/kubernetes/aai/templates/sparky-be-deployment.yaml
@@ -30,8 +30,11 @@
readOnly: true
- mountPath: /opt/app/sparky/config/
name: aai-sparky-be-config
- - mountPath: /logs/
+ - mountPath: /var/log/onap
name: aai-sparky-be-logs
+ - mountPath: /opt/app/sparky/bundleconfig/etc/logback.xml
+ name: aai-sparky-be-log-conf
+ subPath: logback.xml
ports:
- containerPort: 9517
readinessProbe:
@@ -39,6 +42,16 @@
port: 9517
initialDelaySeconds: 5
periodSeconds: 10
+ - name: filebeat-onap-aai-sparky
+ image: {{ .Values.image.filebeat }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ volumeMounts:
+ - mountPath: /usr/share/filebeat/filebeat.yml
+ name: filebeat-conf
+ - mountPath: /var/log/onap
+ name: aai-sparky-be-logs
+ - mountPath: /usr/share/filebeat/data
+ name: aai-sparky-filebeat
volumes:
- name: localtime
hostPath:
@@ -46,9 +59,25 @@
- name: aai-sparky-be-config
hostPath:
path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/sparky-be/appconfig/"
- - name: aai-sparky-be-logs
+ - name: filebeat-conf
hostPath:
- path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/sparky-be/logs/"
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml
+ - name: aai-sparky-be-logs
+ emptyDir: {}
+ - name: aai-sparky-filebeat
+ emptyDir: {}
+ - name: aai-sparky-be-log-conf
+ configMap:
+ name: aai-sparky-be-configmap
restartPolicy: Always
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: aai-sparky-be-configmap
+ namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ (.Files.Glob "resources/sparky-be/conf/logback.xml").AsConfig | indent 2 }}
+