Prechádzať zdrojové kódy

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

datard 2 rokov pred
rodič
commit
e1a1304b73
3 zmenil súbory, kde vykonal 10 pridanie a 6 odobranie
  1. 4 4
      .drone.yml
  2. 1 1
      Dockerfile
  3. 5 1
      deploy-tmp.yaml

+ 4 - 4
.drone.yml

@@ -21,7 +21,7 @@ steps:
   environment:
     JNLP_ENV: pro
     JNLP_REPLICAS: 2
-    JNLP_TAG: r181356
+    JNLP_TAG: r181357
     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:r181356 Success"
-    description: "${DRONE_BUILD_LINK} pro/realtime-yuewen:r181356 部署完成 阅文实时接口k8s日志收集"
+    title: "Pipeline pro/realtime-yuewen:r181357 Success"
+    description: "${DRONE_BUILD_LINK} pro/realtime-yuewen:r181357 部署完成 阅文实时接口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:r181356 Failure"
+    title: "Pipeline pro/realtime-yuewen:r181357 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:r181356
+FROM hub.evbj.easou.com/pro/realtime-yuewen:r181357

+ 5 - 1
deploy-tmp.yaml

@@ -47,7 +47,7 @@ spec:
 #              topologyKey: kubernetes.io/hostname
       containers:
         - name: realtime-yuewen
-          image: hub.evbj.easou.com/pro/realtime-yuewen:r181356
+          image: hub.evbj.easou.com/pro/realtime-yuewen:r181357
           imagePullPolicy: IfNotPresent
           env:
             - name: MY_NODE_NAME
@@ -188,6 +188,10 @@ data:
         Flush     5
         Daemon    off
         Log_Level info
+    [PARSER]
+        Name   multiline_pattern
+        Format regex
+        Regex  ^\\s*$
     [INPUT]
         Name tail
         Path /data/logs/app/access.log