diff options
| author |   Mike Elliott <mike.elliott@amdocs.com> | 2017-10-05 18:39:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-10-05 18:39:40 +0000 |
| commit | 97a44f0edbec1b47934c229c895e29e1a5973add (patch) | |
| tree | f9430a7c9f5cb5b982c767afce72fdb19060bfbe /kubernetes/aai/templates/aai-resources-deployment.yaml | |
| parent | 0e2770217c4bd5e80f9ab64c6c88026526930df4 (diff) | |
| parent | b2b99184fe715d28c06c89c95006f6edf30dbfad (diff) | |
Merge "Add missing aai canonical logging"
Diffstat (limited to 'kubernetes/aai/templates/aai-resources-deployment.yaml')
| -rw-r--r-- | kubernetes/aai/templates/aai-resources-deployment.yaml | 39 |
1 files changed, 34 insertions, 5 deletions
diff --git a/kubernetes/aai/templates/aai-resources-deployment.yaml b/kubernetes/aai/templates/aai-resources-deployment.yaml index 6c78ca8798..303d006249 100644 --- a/kubernetes/aai/templates/aai-resources-deployment.yaml +++ b/kubernetes/aai/templates/aai-resources-deployment.yaml @@ -60,10 +60,13 @@ spec: - 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 @@ 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: 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 }} + |