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/portal/templates | |
| 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/portal/templates')
| -rwxr-xr-x | kubernetes/portal/templates/portal-apps-deployment.yaml | 26 | ||||
| -rwxr-xr-x | kubernetes/portal/templates/portal-mariadb-deployment.yaml | 24 |
2 files changed, 49 insertions, 1 deletions
diff --git a/kubernetes/portal/templates/portal-apps-deployment.yaml b/kubernetes/portal/templates/portal-apps-deployment.yaml index 2048a694f2..13cf57093d 100755 --- a/kubernetes/portal/templates/portal-apps-deployment.yaml +++ b/kubernetes/portal/templates/portal-apps-deployment.yaml @@ -95,6 +95,10 @@ spec: name: portal-root - mountPath: "{{ .Values.onapPortal.webappsDir }}/logs" name: portal-logs + - mountPath: /var/log/onap + name: portal-logs2 + - mountPath: /PROJECT/APPS/ECOMPPORTAL/ECOMPSDKAPP/WEB-INF/classes/logback.xml + name: portal-logback-be ports: - containerPort: 8005 - containerPort: 8009 @@ -104,10 +108,30 @@ spec: port: 8080 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: portal-logs2 + - mountPath: /usr/share/filebeat/data + name: portal-data-filebeat volumes: - name: localtime hostPath: path: /etc/localtime + - name: filebeat-conf + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml + - name: portal-logs2 + emptyDir: {} + - name: portal-data-filebeat + emptyDir: {} + - name: portal-logback-be + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/portal/portal-be/logback.xml - name: portal-fusion-properties hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties @@ -143,7 +167,7 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties - name: sdkapp-fusion-properties hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties - name: portal-mariadb-onboarding-sql hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/mariadb/oom_updates.sql diff --git a/kubernetes/portal/templates/portal-mariadb-deployment.yaml b/kubernetes/portal/templates/portal-mariadb-deployment.yaml index f4e46ab062..df38a2abb3 100755 --- a/kubernetes/portal/templates/portal-mariadb-deployment.yaml +++ b/kubernetes/portal/templates/portal-mariadb-deployment.yaml @@ -28,6 +28,10 @@ spec: readOnly: true - mountPath: /var/lib/mysql name: portal-mariadb-data + - mountPath: /var/log/onap + name: portal-logs + - mountPath: /tmp/logback.xml + name: portal-logback ports: - containerPort: 3306 name: portaldb @@ -36,6 +40,16 @@ spec: port: 3306 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: portal-logs + - mountPath: /usr/share/filebeat/data + name: portal-data-filebeat volumes: - name: localtime hostPath: @@ -43,5 +57,15 @@ spec: - name: portal-mariadb-data persistentVolumeClaim: claimName: portal-db + - name: filebeat-conf + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml + - name: portal-logs + emptyDir: {} + - name: portal-data-filebeat + emptyDir: {} + - name: portal-logback + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/portal/portal-db/logback.xml imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" |