added filebeat to all components

[oom.git] / kubernetes / portal / templates / portal-mariadb-deployment.yaml

diff --git a/kubernetes/portal/templates/portal-mariadb-deployment.yaml b/kubernetes/portal/templates/portal-mariadb-deployment.yaml
index cf8bbd6..df38a2a 100755 (executable)
--- a/kubernetes/portal/templates/portal-mariadb-deployment.yaml
+++ b/kubernetes/portal/templates/portal-mariadb-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: portaldb
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-portal"
 spec:
   selector:
     matchLabels:
@@ -19,12 +19,19 @@ spec:
         name: "portaldb"
         env:
         - name: MYSQL_HOST
-          value: portaldb.onap-portal
+          value: "portaldb.{{ .Values.nsPrefix }}-portal"
         - name: MYSQL_ROOT_PASSWORD
           value: password
         volumeMounts:
+        - mountPath: /etc/localtime
+          name: localtime
+          readOnly: true
         - mountPath: /var/lib/mysql
           name: portal-mariadb-data
+        - mountPath: /var/log/onap
+          name: portal-logs
+        - mountPath: /tmp/logback.xml
+          name: portal-logback
         ports:
         - containerPort: 3306
           name: portaldb
@@ -33,9 +40,32 @@ spec:
             port: 3306
           initialDelaySeconds: 5
           periodSeconds: 10
+      - image: {{ .Values.image.filebeat }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: filebeat-onap
+        volumeMounts:
+        - mountPath: /usr/share/filebeat/filebeat.yml
+          name: filebeat-conf
+        - mountPath: /var/log/onap
+          name: portal-logs
+        - mountPath: /usr/share/filebeat/data
+          name: portal-data-filebeat
       volumes:
+      - name: localtime
+        hostPath:
+          path: /etc/localtime
       - name: portal-mariadb-data
+        persistentVolumeClaim:
+          claimName: portal-db
+      - name: filebeat-conf
+        hostPath:
+          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
+      - name: portal-logs
+        emptyDir: {}
+      - name: portal-data-filebeat
+        emptyDir: {}
+      - name: portal-logback
         hostPath:
-          path: /dockerdata-nfs/onap/portal/mariadb/data
+          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/portal/portal-db/logback.xml
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"