فهرست منبع

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

datard 2 سال پیش
والد
کامیت
d9bb3cdb4f
3فایلهای تغییر یافته به همراه22 افزوده شده و 10 حذف شده
  1. 4 4
      .drone.yml
  2. 1 1
      Dockerfile
  3. 17 5
      deploy-tmp.yaml

+ 4 - 4
.drone.yml

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

+ 17 - 5
deploy-tmp.yaml

@@ -47,7 +47,7 @@ spec:
 #              topologyKey: kubernetes.io/hostname
       containers:
         - name: realtime-yuewen
-          image: hub.evbj.easou.com/pro/realtime-yuewen:r181357
+          image: hub.evbj.easou.com/pro/realtime-yuewen:r181358
           imagePullPolicy: IfNotPresent
           env:
             - name: MY_NODE_NAME
@@ -114,6 +114,9 @@ spec:
             - name: fluent-bit-config
               mountPath: /opt/bitnami/fluent-bit/conf/fluent-bit.conf
               subPath: fluent-bit.conf
+            - name: fluent-bit-config-parses
+              mountPath: /opt/bitnami/fluent-bit/conf/parsers.conf
+              subPath: parsers.conf
       volumes:
         - name: fluent-bit-config
           configMap:
@@ -121,6 +124,13 @@ spec:
             items:
             - key: fluent-bit.conf
               path: fluent-bit.conf
+        - name: fluent-bit-config-parses
+          configMap:
+            name: fluent-bit-config-realtime-yuewen
+            items:
+            - key: parsers.conf
+              path: parsers.conf
+
 
   volumeClaimTemplates:
     - metadata:
@@ -188,10 +198,7 @@ data:
         Flush     5
         Daemon    off
         Log_Level info
-    [PARSER]
-        Name   multiline_pattern
-        Format regex
-        Regex  ^\\s*$
+        Parsers_File /opt/bitnami/fluent-bit/conf/parsers.conf
     [INPUT]
         Name tail
         Path /data/logs/app/access.log
@@ -210,3 +217,8 @@ data:
         # for logs you'll probably want this ot be 0 or 1, not more
         rdkafka.request.required.acks 1
 
+  parsers.conf: |
+    [PARSER]
+        Name   multiline_pattern
+        Format regex
+        Regex  ^\\s*$