fix:修复版本比对异常

feat:日志添加时间类型

Author: vine2024

Dockerfile

@@ -0,0 +1,31 @@
+FROM golang:1.22-alpine AS builder
+
+LABEL stage=gobuilder
+
+ENV GOPROXY https://goproxy.cn,direct
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+
+RUN apk update --no-cache && apk add --no-cache tzdata
+
+WORKDIR /build
+
+ADD go.mod .
+ADD go.sum .
+RUN go mod download
+COPY . .
+# 静态编译Go程序
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o app stash/stash.go
+
+
+FROM alpine
+
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
+
+WORKDIR /app
+
+# 复制编译好的二进制文件到运行时镜像
+COPY --from=builder /build/app /app
+
+COPY --from=builder /build/stash/etc /app/etc
+
+CMD ["./app", "-f", "etc/config.yaml"]

stash/Dockerfile

@@ -1,46 +1,42 @@
 Clusters:
-- Input:
-    Kafka:
-      Name: gostash
-      Brokers:
-        - "172.16.186.16:19092"
-        - "172.16.186.17:19092"
-      Topics:
-        - k8slog
-      Group: pro
-      Consumers: 16
-  Filters:
-    - Action: drop
-      Conditions:
-        - Key: k8s_container_name
-          Value: "-rpc"
-          Type: contains
-        - Key: level
-          Value: info
-          Type: match
-          Op: and
-    - Action: remove_field
-      Fields:
-        - message
-        - _source
-        - _type
-        - _score
-        - _id
-        - "@version"
-        - topic
-        - index
-        - beat
-        - docker_container
-        - offset
-        - prospector
-        - source
-        - stream
-    - Action: transfer
-      Field: message
-      Target: data
-  Output:
-    ElasticSearch:
-      Hosts:
-        - http://172.16.141.4:9200
-        - http://172.16.141.5:9200
-      Index: "{.event}-{{yyyy-MM-dd}}"
+  - Input:
+      Kafka:
+        Name: gostash
+        Brokers:
+          - "43.198.115.11:30019"
+        Topics:
+          - BotLog
+          - ChatRoomLog
+          - GameLog
+          - GatewayLog
+          - MiniGameLog
+          - StoreLog
+          - UserLog
+        Group: gostash
+        Consumers: 16
+    Filters:
+      - Action: remove_field
+        Fields:
+          - message
+          - _source
+          - _score
+          - _id
+          - "@version"
+          - topic
+          - index
+          - beat
+          - docker_container
+          - offset
+          - prospector
+          - source
+          - stream
+      - Action: transfer
+        Field: ts
+        Target: timestamp
+    Output:
+      ElasticSearch:
+        Hosts:
+          - http://43.198.115.11:30002
+        Username: elastic
+        Password: iT2Fw06YEAD4719fJ8k8rY9K
+        Index: "pokerup-log-{{yyyy-MM-dd}}"

stash/etc/config.yaml

@@ -0,0 +1,46 @@
+Clusters:
+- Input:
+    Kafka:
+      Name: gostash
+      Brokers:
+        - "172.16.186.16:19092"
+        - "172.16.186.17:19092"
+      Topics:
+        - k8slog
+      Group: pro
+      Consumers: 16
+  Filters:
+    - Action: drop
+      Conditions:
+        - Key: k8s_container_name
+          Value: "-rpc"
+          Type: contains
+        - Key: level
+          Value: info
+          Type: match
+          Op: and
+    - Action: remove_field
+      Fields:
+        - message
+        - _source
+        - _type
+        - _score
+        - _id
+        - "@version"
+        - topic
+        - index
+        - beat
+        - docker_container
+        - offset
+        - prospector
+        - source
+        - stream
+    - Action: transfer
+      Field: message
+      Target: data
+  Output:
+    ElasticSearch:
+      Hosts:
+        - http://172.16.141.4:9200
+        - http://172.16.141.5:9200
+      Index: "{.event}-{{yyyy-MM-dd}}"

stash/etc/config_back.yaml

@@ -16,7 +16,7 @@ import (
 	"github.com/zeromicro/go-zero/core/service"
 )
 
-var configFile = flag.String("f", "etc/config.yaml", "Specify the config file")
+var configFile = flag.String("f", "./stash/etc/config.yaml", "Specify the config file")
 
 func toKqConf(c config.KafkaConf) []kq.KqConf {
 	var ret []kq.KqConf