added filebeat to all components

[oom.git] / kubernetes / sdc / templates / sdc-be.yaml

diff --git a/kubernetes/sdc/templates/sdc-be.yaml b/kubernetes/sdc/templates/sdc-be.yaml
index 96fee81..29f029f 100644 (file)
--- a/kubernetes/sdc/templates/sdc-be.yaml
+++ b/kubernetes/sdc/templates/sdc-be.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app: sdc-be
   name: sdc-be
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-sdc"
 spec:
   selector:
     matchLabels:
@@ -54,7 +54,7 @@ spec:
               "env": [
                   {
                       "name": "NAMESPACE",
-                      "value": "onap-message-router"
+                      "value": "{{ .Values.nsPrefix }}-message-router"
                   }
               ],
               "image": "{{ .Values.image.readiness }}",
@@ -79,12 +79,15 @@ spec:
           name: sdc-sdc-es-es
         - mountPath: /root/chef-solo/environments/
           name: sdc-environments
-        - mountPath: /var/lib/jetty/etc/keystore
-          name: sdc-jetty-keystore
         - mountPath: /etc/localtime
           name: sdc-localtime
+          readOnly: true
         - mountPath: /var/lib/jetty/logs
           name: sdc-logs
+        - mountPath: /var/log/onap
+          name: sdc-logs-2
+        - mountPath: /var/lib/jetty/config/catalog-be/logback.xml
+          name: sdc-logback
         ports:
         - containerPort: 8443
         - containerPort: 8080
@@ -93,21 +96,38 @@ spec:
             port: 8443
           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: sdc-logs-2
+        - mountPath: /usr/share/filebeat/data
+          name: sdc-data-filebeat
       volumes:
+        - name: filebeat-conf
+          hostPath:
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
+        - name: sdc-logs-2
+          emptyDir: {}
+        - name: sdc-data-filebeat
+          emptyDir: {}
+        - name: sdc-logback
+          hostPath:
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/sdc/be/logback.xml
         - name: sdc-sdc-es-es
           hostPath:
-            path: /dockerdata-nfs/onap/sdc/sdc-es/ES
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-es/ES
         - name: sdc-environments
           hostPath:
-            path: /dockerdata-nfs/onap/sdc/environments
-        - name: sdc-jetty-keystore
-          hostPath:
-            path: /dockerdata-nfs/onap/sdc/jetty/keystore
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/environments
         - name: sdc-localtime
           hostPath:
             path:  /etc/localtime
         - name:  sdc-logs
           hostPath:
-            path:  /dockerdata-nfs/onap/sdc/logs
+            path:  /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"