Parcourir la source

deploy pro/realtime-yuewen-v2:r188753 测试是否能提交

pmrd il y a 1 an
Parent
commit
f5b3b97195
3 fichiers modifiés avec 80 ajouts et 6 suppressions
  1. 4 4
      .drone.yml
  2. 1 1
      Dockerfile
  3. 75 1
      deploy-tmp.yaml

+ 4 - 4
.drone.yml

@@ -21,7 +21,7 @@ steps:
   environment:
     JNLP_ENV: pro
     JNLP_REPLICAS: 1
-    JNLP_TAG: r188751
+    JNLP_TAG: r188753
     JNLP_VERSION: v1  # default v1, v2 for canary
     DEPLOY_ENV: k8s-1 # 可以选择把应用部署到集群:k8s-1 or k8s-2
     JNLP_REPO: hub.evbj.easou.com
@@ -54,8 +54,8 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline pro/realtime-yuewen-v2:r188751 Success"
-    description: "${DRONE_BUILD_LINK} pro/realtime-yuewen-v2:r188751 部署完成 测试是否能提交"
+    title: "Pipeline pro/realtime-yuewen-v2:r188753 Success"
+    description: "${DRONE_BUILD_LINK} pro/realtime-yuewen-v2:r188753 部署完成 测试是否能提交"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
   when:
@@ -68,7 +68,7 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline pro/realtime-yuewen-v2:r188751 Failure"
+    title: "Pipeline pro/realtime-yuewen-v2:r188753 Failure"
     description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!测试是否能提交"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"

+ 1 - 1
Dockerfile

@@ -1 +1 @@
-FROM hub.evbj.easou.com/pro/realtime-yuewen-v2:r188751
+FROM hub.evbj.easou.com/pro/realtime-yuewen-v2:r188753

+ 75 - 1
deploy-tmp.yaml

@@ -47,7 +47,7 @@ spec:
       #              topologyKey: kubernetes.io/hostname
       containers:
         - name: realtime-yuewen-v2
-          image: hub.evbj.easou.com/pro/realtime-yuewen-v2:r188751
+          image: hub.evbj.easou.com/pro/realtime-yuewen-v2:r188753
           imagePullPolicy: IfNotPresent
           env:
             - name: MY_NODE_NAME
@@ -105,6 +105,16 @@ spec:
           volumeMounts:
             - name: volume #日志同时挂载在nginx和filebeat中
               mountPath: /data
+            - name: flume-config
+              mountPath: /app/soft/flume-1.7.0/conf/flume.conf
+              subPath: flume.conf
+      volumes:
+        - name: flume-config
+          configMap:
+            name: flume-config-realtime-yuewen-v2
+            items:
+              - key: flume.conf
+                path: flume.conf
 
   volumeClaimTemplates:
     - metadata:
@@ -160,3 +170,67 @@ spec:
                   port:
                     number: 8080
   ingressClassName: nginx
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: flume-config-realtime-yuewen-v2
+  namespace: pro
+data:
+  flume.conf: |
+    a1.sources = r1
+    a1.channels = c1
+    a1.sinks =
+    
+    a1.sources.r1.type = com.github.ningg.flume.source.SpoolDirectoryTailFileSource
+    a1.sources.r1.channels = c1
+    a1.sources.r1.spoolDir = /data/logs/app/
+    a1.sources.r1.fileSuffix = .COMPLETED
+    a1.sources.r1.deletePolicy = never
+    a1.sources.r1.ignorePattern = ^$
+    a1.sources.r1.targetPattern = access.*(\\d){10}.*
+    a1.sources.r1.targetFilename = yyyyMMddHH
+    a1.sources.r1.trackerDir = .flumespooltail_earning
+    a1.sources.r1.consumeOrder = oldest
+    a1.sources.r1.bufferMaxLineLength = 500000
+    a1.sources.r1.inputCharset = UTF-8
+    a1.sources.r1.decodeErrorPolicy = REPLACE
+    a1.sources.r1.deserializer = LINE
+    a1.sources.r1.interceptors = i1 i2 i3 i4
+    
+    #配置 interceptor i1
+    a1.sources.r1.interceptors.i1.type = regex_filter
+    a1.sources.r1.interceptors.i1.regex = ^\\s*$
+    a1.sources.r1.interceptors.i1.excludeEvents = true
+    #配置 interceptor i2
+    a1.sources.r1.fileHeader = true
+    a1.sources.r1.basenameHeader = true
+    a1.sources.r1.interceptors.i2.type = com.easou.flume.interceptor.RegexExtractorExtInterceptor$Builder
+    a1.sources.r1.interceptors.i2.regex = (.*)\\.(.*)\\.(.*)
+    a1.sources.r1.interceptors.i2.extractorHeader = true
+    a1.sources.r1.interceptors.i2.extractorHeaderKey = basename
+    a1.sources.r1.interceptors.i2.serializers = s1 s2 s3
+    a1.sources.r1.interceptors.i2.serializers.s1.name = log_type
+    a1.sources.r1.interceptors.i2.serializers.s2.name = file_type
+    a1.sources.r1.interceptors.i2.serializers.s3.name = log_data
+    #配置 interceptor i3
+    a1.sources.r1.interceptors.i3.type=com.easou.flume.interceptor.ServerTimeInterceptor$Builder
+    a1.sources.r1.interceptors.i3.isServerTime=true
+    a1.sources.r1.interceptors.i3.timeType=yyyyMMddHHmmss
+    #配置 interceptor i4
+    a1.sources.r1.interceptors.i4.type = timestamp
+    
+    
+    a1.channels.c1.type = org.apache.flume.channel.kafka.KafkaChannel
+    a1.channels.c1.kafka.bootstrap.servers = 10.26.27.71:8092,10.26.22.102:8092,10.26.22.120:8092,10.26.22.121:8092,10.26.22.122:8092
+    a1.channels.c1.kafka.topic = yuewen_buydetail
+    # 开启kafka幂等性,保证重试不会产生数据重复
+    a1.channels.c1.kafka.producer.enable.idempotence = true
+    a1.channels.c1.kafka.producer.acks = all
+    a1.channels.c1.kafka.producer.max.in.flight.requests.per.connection = 1
+    # 重试 20次,每次超时30秒,一次发送数据最长约10分钟。尽量保证kafka不报异常,因为异常后flumesource会重试,导致数据重复
+    a1.channels.c1.kafka.producer.retries = 20
+    a1.channels.c1.kafka.producer.request.timeout.ms = 30000
+    a1.channels.c1.kafka.consumer.group.id = integral2kafka
+
+