feat(backend): redis 日志支持时区 #2688

TencentBlueKing · Dec 20, 2023 · 456798e · 456798e
1 parent 8878efd
commit 456798e
Show file tree

Hide file tree

Showing 16 changed files with 1,112 additions and 1,058 deletions.
diff --git a/.github/workflows/auto_create_release.yml b/.github/workflows/auto_create_release.yml
@@ -86,7 +86,7 @@ jobs:
         cat ${filename}
         git config --global user.email [email protected]
         git config --global user.name github-actions
-        git remote set-url origin https://x-access-token:[email protected]/TencentBlueKing/blueking-dbm
+        git remote set-url upstream https://[email protected]/TencentBlueKing/blueking-dbm
         git add .
         git commit -m "docs: release version ${{ steps.yaml-data.outputs.data }} #1"
-        git push origin ${{ steps.get-current-branch.outputs.current_branch }}
+        git push upstream ${{ steps.get-current-branch.outputs.current_branch }}
diff --git a/dbm-ui/backend/dbm_init/json_files/bklog/backup_stm_log.json b/dbm-ui/backend/dbm_init/json_files/bklog/backup_stm_log.json
@@ -9,7 +9,6 @@
     "environment": "linux",
     "data_encoding": "UTF-8",
     "retention": 7,
-    "allocation_min_days": 3,
     "es_shards": 3,
     "target_object_type": "HOST",
     "target_node_type": "TOPO",

diff --git a/dbm-ui/backend/dbm_init/json_files/bklog/dbm_dbactuator.json b/dbm-ui/backend/dbm_init/json_files/bklog/dbm_dbactuator.json
@@ -7,13 +7,14 @@
     "etl_config": "bk_log_text",
     "data_encoding": "UTF-8",
     "retention": 7,
-    "allocation_min_days": 3,
     "es_shards": 3,
     "target_object_type": "HOST",
     "target_node_type": "TOPO",
     "target_nodes": [],
     "params": {
-        "paths": ["/data/install/dbactuator*/logs/*.log"],
+        "paths": [
+            "/data/install/dbactuator*/logs/*.log"
+        ],
         "conditions": {
             "separator": "",
             "separator_filters": [],