diff options
| author |   yuryn <Yury.Novitsky@Amdocs.com> | 2017-09-27 14:54:18 +0300 |
|---|---|---|
| committer | Yury Novitsky <Yury.Novitsky@Amdocs.com> | 2017-09-27 16:39:45 +0000 |
| commit | d0707be0a30087bb5e30110dc09fdcdca1cd5d9d (patch) | |
| tree | d22bf2f0c9e5a52c207657172b61b507e9987872 /kubernetes/sdc | |
| parent | 82a02441c188081380d735c387cd464d0f2f1e19 (diff) | |
added filebeat to all components
Deployment of: filebeat containar for each relevant component
+ chown of log dir to root - prevents filebeat complaining about filebeat file
+ ecomp web app renamed onap - fixed dep-pap.yaml
+ fixed multiple volumeMounts in vid-server
Change-Id: I74f8f2abd5feeba1d37b044d2a023674fd41c994
Issue-ID:OOM-110
Signed-off-by: yuryn <Yury.Novitsky@Amdocs.com>
Diffstat (limited to 'kubernetes/sdc')
| -rw-r--r-- | kubernetes/sdc/templates/sdc-be.yaml | 24 | ||||
| -rw-r--r-- | kubernetes/sdc/templates/sdc-fe.yaml | 26 | ||||
| -rw-r--r-- | kubernetes/sdc/values.yaml | 1 |
3 files changed, 51 insertions, 0 deletions
diff --git a/kubernetes/sdc/templates/sdc-be.yaml b/kubernetes/sdc/templates/sdc-be.yaml index 77c7545f6b..29f029f9ed 100644 --- a/kubernetes/sdc/templates/sdc-be.yaml +++ b/kubernetes/sdc/templates/sdc-be.yaml @@ -84,6 +84,10 @@ spec: 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 @@ -92,7 +96,27 @@ 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/{{ .Values.nsPrefix }}/sdc/sdc-es/ES diff --git a/kubernetes/sdc/templates/sdc-fe.yaml b/kubernetes/sdc/templates/sdc-fe.yaml index 0ca83ae164..56d62963c4 100644 --- a/kubernetes/sdc/templates/sdc-fe.yaml +++ b/kubernetes/sdc/templates/sdc-fe.yaml @@ -70,6 +70,12 @@ spec: name: sdc-logs - mountPath: /root/chef-solo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb name: sdc-fe-config + - mountPath: /tmp/logback.xml + name: sdc-logback + lifecycle: + postStart: + exec: + command: ["/bin/sh", "-c", "export LOG=wait_logback.log; touch $LOG; export SRC=/tmp/logback.xml; export DST=/var/lib/jetty/config/catalog-fe/; while [ ! -e $DST ]; do echo 'Waiting for $DST...' >> $LOG; sleep 5; done; sleep 2; /bin/cp -f $SRC $DST; echo 'Done' >> $LOG"] ports: - containerPort: 9443 - containerPort: 8181 @@ -78,7 +84,27 @@ spec: port: 8181 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/fe/logback.xml - name: sdc-sdc-es-es hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-es/ES diff --git a/kubernetes/sdc/values.yaml b/kubernetes/sdc/values.yaml index 58bcf1c3f3..a9b7ca30a3 100644 --- a/kubernetes/sdc/values.yaml +++ b/kubernetes/sdc/values.yaml @@ -8,3 +8,4 @@ image: sdcElasticsearch: nexus3.onap.org:10001/openecomp/sdc-elasticsearch:1.1-STAGING-latest sdcCassandra: nexus3.onap.org:10001/openecomp/sdc-cassandra:1.1-STAGING-latest sdcBackend: nexus3.onap.org:10001/openecomp/sdc-backend:1.1-STAGING-latest + filebeat: docker.elastic.co/beats/filebeat:5.5.0
\ No newline at end of file |