Fix wrong filebeat config in aai

[oom.git] / 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 1aff10b..3c4183e 100644 (file)
--- a/kubernetes/aai/templates/aai-resources-deployment.yaml
+++ b/kubernetes/aai/templates/aai-resources-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiAaiResources }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -37,7 +38,7 @@ spec:
               "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "aai-resources-readiness"
           }
-        ]'      
+        ]'
     spec:
       containers:
       - name: aai-resources
@@ -45,7 +46,7 @@ spec:
         imagePullPolicy: {{ .Values.pullPolicy }}
         env:
         - name: CHEF_BRANCH
-          value: master
+          value: amsterdam
         - name: AAI_CHEF_ENV
           value: simpledemo
         - name: AAI_CORE_VERSION
@@ -54,13 +55,19 @@ spec:
           value: /var/chef/aai-data/environments
         - name: CHEF_GIT_URL
           value: http://gerrit.onap.org/r/aai
+        - name: HBASE_STARTUP_ARTIFICIAL_DELAY
+          value: "60"
         volumeMounts:
-        - mountPath: /opt/aai/logroot/
-          name: aai-resources-logs
+        - mountPath: /etc/localtime
+          name: localtime
+          readOnly: true
         - mountPath: /var/chef/aai-data/
           name: aai-data
-        - mountPath: /docker-entrypoint.sh
-          name: entrypoint-override
+        - 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:
@@ -68,16 +75,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: aai-resources-logs
+      - name: localtime
         hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-resources/logs/"
+          path: /etc/localtime
       - name: aai-data
         hostPath:
           path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/"
-      - name: entrypoint-override
+      - name: filebeat-conf
         hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-resources/docker-entrypoint.sh"
+          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/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 }}
+#{{ end }}