diff options
| author |   BorislavG <Borislav.Glozman@amdocs.com> | 2017-10-03 15:40:55 +0300 |
|---|---|---|
| committer | Borislav Glozman <Borislav.Glozman@amdocs.com> | 2017-10-03 17:14:19 +0000 |
| commit | b2b99184fe715d28c06c89c95006f6edf30dbfad (patch) | |
| tree | 91a3df6d4565812f5dfca04a06ae379506884b1b /kubernetes/aai/templates/modelloader-deployment.yaml | |
| parent | 63f2cc936ed6e6790f287195694f6d067decdd89 (diff) | |
Add missing aai canonical logging
Add filebeats and logback configuration to:
sparky-be, search-data-service, model-loader,
traversal, resources using configMaps
Issue-ID: OOM-112
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
Change-Id: Ia1fa0ee2ad3894553a60468797d9d2b1cecb8f2e
Diffstat (limited to 'kubernetes/aai/templates/modelloader-deployment.yaml')
| -rw-r--r-- | kubernetes/aai/templates/modelloader-deployment.yaml | 43 |
1 files changed, 36 insertions, 7 deletions
diff --git a/kubernetes/aai/templates/modelloader-deployment.yaml b/kubernetes/aai/templates/modelloader-deployment.yaml index 22b72815cb..3f2bda3d6c 100644 --- a/kubernetes/aai/templates/modelloader-deployment.yaml +++ b/kubernetes/aai/templates/modelloader-deployment.yaml @@ -14,7 +14,10 @@ spec: name: model-loader-service spec: containers: - - env: + - name: model-loader-service + image: "{{ .Values.image.modelLoaderImage }}:{{ .Values.image.modelLoaderVersion }}" + imagePullPolicy: {{ .Values.pullPolicy }} + env: - name: CONFIG_HOME value: /opt/app/model-loader/config/ volumeMounts: @@ -23,14 +26,24 @@ spec: readOnly: true - mountPath: /opt/app/model-loader/config/ name: aai-model-loader-config - - mountPath: /logs/ + - mountPath: /var/log/onap name: aai-model-loader-logs - image: "{{ .Values.image.modelLoaderImage }}:{{ .Values.image.modelLoaderVersion }}" - imagePullPolicy: {{ .Values.pullPolicy }} - name: model-loader-service + - mountPath: /opt/app/model-loader/bundleconfig/etc/logback.xml + name: aai-model-loader-log-conf + subPath: logback.xml ports: - containerPort: 8080 - containerPort: 8443 + - name: filebeat-onap-aai-model-loader + image: {{ .Values.image.filebeat }} + imagePullPolicy: {{ .Values.pullPolicy }} + volumeMounts: + - mountPath: /usr/share/filebeat/filebeat.yml + name: filebeat-conf + - mountPath: /var/log/onap + name: aai-model-loader-logs + - mountPath: /usr/share/filebeat/data + name: aai-model-loader-filebeat volumes: - name: localtime hostPath: @@ -38,9 +51,25 @@ spec: - name: aai-model-loader-config hostPath: path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/model-loader/appconfig/" - - name: aai-model-loader-logs + - name: filebeat-conf hostPath: - path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/model-loader/logs/" + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml + - name: aai-model-loader-logs + emptyDir: {} + - name: aai-model-loader-filebeat + emptyDir: {} + - name: aai-model-loader-log-conf + configMap: + name: aai-model-loader-configmap restartPolicy: Always imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: aai-model-loader-configmap + namespace: {{ .Values.nsPrefix }}-aai +data: +{{ (.Files.Glob "resources/model-loader/conf/logback.xml").AsConfig | indent 2 }} + |