summaryrefslogtreecommitdiffstats
path: root/kubernetes/portal
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/portal')
-rwxr-xr-xkubernetes/portal/templates/portal-apps-deployment.yaml26
-rwxr-xr-xkubernetes/portal/templates/portal-mariadb-deployment.yaml24
-rw-r--r--kubernetes/portal/values.yaml1
3 files changed, 50 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"
diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml
index 4a3cbd185d..757995ab63 100644
--- a/kubernetes/portal/values.yaml
+++ b/kubernetes/portal/values.yaml
@@ -9,5 +9,6 @@ image:
portalwms: nexus3.onap.org:10001/openecomp/portal-wms:1.1-STAGING-latest
ubuntuInit: oomk8s/ubuntu-init:1.0.0
ubuntuDesktop: dorowu/ubuntu-desktop-lxde-vnc
+ filebeat: docker.elastic.co/beats/filebeat:5.5.0
onapPortal:
webappsDir: "/opt/apache-tomcat-8.0.37/webapps"