瀏覽代碼

deploy qa/offline-process-charge:v1.0.39 运行环境test

datard 3 年之前
父節點
當前提交
763f85a25d
共有 1 個文件被更改,包括 13 次插入4 次删除
  1. 13 4
      deploy-tmp.yaml

+ 13 - 4
deploy-tmp.yaml

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