Sidecar filebeat container for MC OpenStack
Apply ConfigMap to manager filebeat and log configuration for MultiCloud
Openstack plugins.
Change-Id: I4be0b086607bf637ac41a9e68e800ca1bf4ce40a
Issue-ID: MULTICLOUD-177
Issue-ID: LOG-137
Signed-off-by: Bin Yang <bin.yang@windriver.com>
diff --git a/kubernetes/multicloud/templates/multicloud-log-configmap.yaml b/kubernetes/multicloud/templates/multicloud-log-configmap.yaml
index 5435d60..1050f10 100644
--- a/kubernetes/multicloud/templates/multicloud-log-configmap.yaml
+++ b/kubernetes/multicloud/templates/multicloud-log-configmap.yaml
@@ -36,4 +36,20 @@
namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/log/vio/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: multicloud-ocata-log-configmap
+ namespace: {{ .Values.nsPrefix }}
+data:
+{{ tpl (.Files.Glob "resources/config/log/ocata/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: multicloud-windriver-log-configmap
+ namespace: {{ .Values.nsPrefix }}
+data:
+{{ tpl (.Files.Glob "resources/config/log/windriver/*").AsConfig . | indent 2 }}
#{{ end }}
diff --git a/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml b/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml
index aa1008a..ecbd74b 100644
--- a/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml
+++ b/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml
@@ -29,7 +29,6 @@
app: multicloud-ocata
name: multicloud-ocata
spec:
- hostname: multicloud-ocata
containers:
- env:
- name: MSB_ADDR
@@ -48,8 +47,11 @@
value: "AAI"
name: multicloud-ocata
volumeMounts:
- - mountPath: /opt/ocata/logs
+ - mountPath: /var/log/onap
name: ocata-log
+ - mountPath: /opt/ocata/ocata/pub/config/log.yml
+ name: ocata-logconfig
+ subPath: log.yml
image: {{ .Values.image.ocata }}
imagePullPolicy: {{ .Values.pullPolicy }}
ports:
@@ -64,11 +66,29 @@
timeoutSeconds: 10
successThreshold: 1
failureThreshold: 5
- restartPolicy: Always
+ - image: {{ .Values.image.filebeat }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ name: filebeat-onap
+ volumeMounts:
+ - mountPath: /usr/share/filebeat/filebeat.yml
+ name: filebeat-conf
+ subPath: filebeat.yml
+ - mountPath: /var/log/onap
+ name: ocata-log
+ - mountPath: /usr/share/filebeat/data
+ name: ocata-data-filebeat
volumes:
- name: ocata-log
- hostPath:
- path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/multicloud/ocata/logs
+ emptyDir: {}
+ - name: ocata-data-filebeat
+ emptyDir: {}
+ - name: filebeat-conf
+ configMap:
+ name: multicloud-filebeat-configmap
+ - name: ocata-logconfig
+ configMap:
+ name: multicloud-ocata-log-configmap
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
+ restartPolicy: Always
#{{ end }}
diff --git a/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml b/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml
index 6a7d6f4..8d9ec35 100644
--- a/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml
+++ b/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml
@@ -29,7 +29,6 @@
app: multicloud-windriver
name: multicloud-windriver
spec:
- hostname: multicloud-windriver
containers:
- env:
- name: MSB_ADDR
@@ -48,8 +47,11 @@
value: "AAI"
name: multicloud-windriver
volumeMounts:
- - mountPath: /opt/windriver/logs
+ - mountPath: /var/log/onap
name: windriver-log
+ - mountPath: /opt/windriver/titanium_cloud/pub/config/log.yml
+ name: windriver-logconfig
+ subPath: log.yml
image: {{ .Values.image.windriver }}
imagePullPolicy: {{ .Values.pullPolicy }}
ports:
@@ -64,11 +66,29 @@
timeoutSeconds: 10
successThreshold: 1
failureThreshold: 5
- restartPolicy: Always
+ - image: {{ .Values.image.filebeat }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ name: filebeat-onap
+ volumeMounts:
+ - mountPath: /usr/share/filebeat/filebeat.yml
+ name: filebeat-conf
+ subPath: filebeat.yml
+ - mountPath: /var/log/onap
+ name: windriver-log
+ - mountPath: /usr/share/filebeat/data
+ name: windriver-data-filebeat
volumes:
- name: windriver-log
- hostPath:
- path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/multicloud/windriver/logs
+ emptyDir: {}
+ - name: windriver-data-filebeat
+ emptyDir: {}
+ - name: filebeat-conf
+ configMap:
+ name: multicloud-filebeat-configmap
+ - name: windriver-logconfig
+ configMap:
+ name: multicloud-windriver-log-configmap
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
+ restartPolicy: Always
#{{ end }}