Переглянути джерело

deploy pro/realtime-yuewen:r181363 阅文实时接口k8s日志收集

datard 2 роки тому
батько
коміт
491d4aa078
3 змінених файлів з 7 додано та 9 видалено
  1. 4 4
      .drone.yml
  2. 1 1
      Dockerfile
  3. 2 4
      deploy-tmp.yaml

+ 4 - 4
.drone.yml

@@ -21,7 +21,7 @@ steps:
   environment:
     JNLP_ENV: pro
     JNLP_REPLICAS: 2
-    JNLP_TAG: r181362
+    JNLP_TAG: r181363
     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:r181362 Success"
-    description: "${DRONE_BUILD_LINK} pro/realtime-yuewen:r181362 部署完成 阅文实时接口k8s日志收集"
+    title: "Pipeline pro/realtime-yuewen:r181363 Success"
+    description: "${DRONE_BUILD_LINK} pro/realtime-yuewen:r181363 部署完成 阅文实时接口k8s日志收集"
     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:r181362 Failure"
+    title: "Pipeline pro/realtime-yuewen:r181363 Failure"
     description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!阅文实时接口k8s日志收集"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"

+ 1 - 1
Dockerfile

@@ -1 +1 @@
-FROM hub.evbj.easou.com/pro/realtime-yuewen:r181362
+FROM hub.evbj.easou.com/pro/realtime-yuewen:r181363

+ 2 - 4
deploy-tmp.yaml

@@ -47,7 +47,7 @@ spec:
 #              topologyKey: kubernetes.io/hostname
       containers:
         - name: realtime-yuewen
-          image: hub.evbj.easou.com/pro/realtime-yuewen:r181362
+          image: hub.evbj.easou.com/pro/realtime-yuewen:r181363
           imagePullPolicy: IfNotPresent
           env:
             - name: MY_NODE_NAME
@@ -204,15 +204,13 @@ data:
         Mem_Buf_Limit 5MB
         Skip_Long_Lines On
         Parser json
-    [FILTER]
-        Name              kubernetes
-        Match             log.*
     [OUTPUT]
         Name           kafka
         Match          *
         Brokers        10.26.22.124:8092,10.26.22.121:8092,10.26.22.120:8092,10.26.22.102:8092,10.26.22.122:8092
         Topics         test_realtime_yuewen_nginx
         Retry_Limit    false
+        format  msgpack
         # hides errors "Receive failed: Disconnected" when kafka kills idle connections
         rdkafka.log.connection.close false
         # producer buffer is not included in http://fluentbit.io/documentation/0.12/configuration/memory_usage.html#estimating