| 
					
				 | 
			
			
				@@ -30,7 +30,7 @@ spec: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       #  app.touchrs: touchrs 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       containers: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         - name: offline-process-charge 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          image: hub.evbj.easou.com/qa/offline-process-charge:v1.0.40 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          image: hub.evbj.easou.com/qa/offline-process-charge:v1.0.41 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           imagePullPolicy: Always 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           env: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             - name: JAVA_OPTS 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -52,10 +52,10 @@ spec: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               path: /actuator/health 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               port: 8080 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               httpHeaders: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              - name: Custom-Header 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                value: Awesome 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              - name: Custom-Header 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                value: Awesome 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                - name: Custom-Header 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  value: Awesome 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                - name: Custom-Header 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  value: Awesome 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             initialDelaySeconds: 30        #60s后启动第一次探测 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             periodSeconds: 10              # 每隔10s启动一次探测 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             timeoutSeconds: 3              # 超时时间3s 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -69,19 +69,6 @@ spec: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         - image: docker.elastic.co/beats/filebeat:6.8.12 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           imagePullPolicy: Always 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           name: filebeat 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          env: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          - name: ELASTICSEARCH_HOST 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            value: elasticsearch 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          - name: ELASTICSEARCH_PORT 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            value: "9200" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          - 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 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -154,18 +141,29 @@ data: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       multiline.negate: true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       multiline.match: after 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       multiline.timeout: 30 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      fields: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          log_topic: offline-process-charge 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      fields_under_root: true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       paths: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        - "/data/logs/app/all.log" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        - "/data/logs/app/*.log" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         - "/data/logs/*.log" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     setup.template.enabled: true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     setup.template.name: offline-process-charge 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     setup.template.pattern: offline-process-charge* 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     setup.dashboards.enabled: true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    output.elasticsearch: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      username: elastic 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      password: changeme 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      hosts: ['elasticsearch:9200'] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      index: "offline-process-charge" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    output.kafka: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      version: 0.10.2.1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      enable: true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      # initial brokers for reading cluster metadata 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      hosts: ["kafka-0.kafka-svc.qa.svc.cluster.local:9093", "kafka-1.kafka-svc.qa.svc.cluster.local:9093", "kafka-2.kafka-svc.qa.svc.cluster.local:9093"] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      # message topic selection + partitioning 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      # topic: '%{[fields.log_topic]}' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      topic: 'offline-process-topic' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      partition.round_robin: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        reachable_only: false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      required_acks: 0 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      compression: gzip 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      max_message_bytes: 1000000 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     setup.kibana: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       host: 'qa-kibana.ieasou.cn:80' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 #       host: 'kibana-svc:80' 
			 |