|
@@ -12,11 +12,16 @@ data:
|
|
|
- "/data/logs/app/all.log"
|
|
|
setup.template.name: "filebeat"
|
|
|
setup.template.pattern: "filebeat-*"
|
|
|
+ setup.dashboards.enabled: true
|
|
|
+ setup.template.enabled: true
|
|
|
output.elasticsearch:
|
|
|
username: ${ELASTICSEARCH_USERNAME}
|
|
|
password: ${ELASTICSEARCH_PASSWORD}
|
|
|
- hosts: ["{{ .Values.elastricsearch.addr }}"]
|
|
|
+ #hosts: ${ELASTICSEARCH_HOST}
|
|
|
+ hosts: ['${ELASTICSEARCH_HOST:elasticsearch}:${ELASTICSEARCH_PORT:9200}']
|
|
|
index: "frontend-filebeat"
|
|
|
+ setup.kibana:
|
|
|
+ host: '${KIBANA_HOST:kibana}:${KIBANA_PORT:5601}'
|
|
|
---
|
|
|
apiVersion: apps/v1
|
|
|
kind: StatefulSet
|
|
@@ -65,7 +70,7 @@ spec:
|
|
|
lifecycle:
|
|
|
preStop:
|
|
|
exec:
|
|
|
- command: ["/bin/sh","-c","curl -u amdin:ea1so2ua3dm4in5 -X POST 127.0.0.1:8080/actuator/shutdown"]
|
|
|
+ command: ["/bin/sh","-c","curl -X POST 127.0.0.1:8080/actuator/shutdown"]
|
|
|
livenessProbe:
|
|
|
httpGet:
|
|
|
path: /actuator/health
|
|
@@ -90,13 +95,17 @@ spec:
|
|
|
name: filebeat
|
|
|
env:
|
|
|
- name: ELASTICSEARCH_HOST
|
|
|
- value: elasticsearch
|
|
|
+ value: qa-elasticsearch.ieasou.cn
|
|
|
- name: ELASTICSEARCH_PORT
|
|
|
- value: "9200"
|
|
|
+ value: "80"
|
|
|
- name: ELASTICSEARCH_USERNAME
|
|
|
value: elastic
|
|
|
- name: ELASTICSEARCH_PASSWORD
|
|
|
value: changeme
|
|
|
+ - name: KIBANA_HOST
|
|
|
+ value: kibana
|
|
|
+ - name: KIBANA_PORT
|
|
|
+ value: "5601"
|
|
|
volumeMounts:
|
|
|
- name: volume #日志同时挂载在nginx和filebeat中
|
|
|
mountPath: /data
|