From 43571b8aa5db7895d761ee078b03bd4cd0051f1b Mon Sep 17 00:00:00 2001 From: nsano-rururu Date: Mon, 4 Dec 2023 02:11:42 +0900 Subject: [PATCH] add telegram_thread_id --- .../config/alert/ConfigAlertTelegram.vue | 17 +++++++++++++++++ src/store/config/alert.js | 5 +++++ src/store/config/index.js | 5 +++++ .../unit/mockData/alert/ruleDataTelegram003.js | 1 + .../specs/alert/ConfigYamlTelegram003.spec.js | 1 + 5 files changed, 29 insertions(+) diff --git a/src/components/config/alert/ConfigAlertTelegram.vue b/src/components/config/alert/ConfigAlertTelegram.vue index f317451d..6ff9ec89 100644 --- a/src/components/config/alert/ConfigAlertTelegram.vue +++ b/src/components/config/alert/ConfigAlertTelegram.vue @@ -39,6 +39,11 @@ + + + + + @@ -103,6 +108,18 @@ export default { this.$store.commit('config/alert/UPDATE_TELEGRAM_PARSE_MODE', value); } }, + + telegramThreadId: { + get() { + return this.$store.state.config.alert.telegramThreadId; + }, + set(value) { + this.$store.commit( + 'config/alert/UPDATE_TELEGRAM_THREAD_ID', + value + ); + } + }, }, methods: { diff --git a/src/store/config/alert.js b/src/store/config/alert.js index 6fef75fd..be364f92 100644 --- a/src/store/config/alert.js +++ b/src/store/config/alert.js @@ -345,6 +345,7 @@ function initialState() { telegramProxyLogin: '', telegramProxyPass: '', telegramParseMode: 'markdown', + telegramThreadId: '', /* Tencent SMS */ tencentSmsSecretId: '', @@ -1953,6 +1954,10 @@ export default { state.telegramParseMode = telegramParseMode; }, + UPDATE_TELEGRAM_THREAD_ID(state, telegramThreadId) { + state.telegramThreadId = telegramThreadId; + }, + /* Tencent SMS */ UPDATE_TENCENT_SMS_SECRET_ID(state, tencentSmsSecretId) { state.tencentSmsSecretId = tencentSmsSecretId; diff --git a/src/store/config/index.js b/src/store/config/index.js index 670ab693..ca60af9c 100644 --- a/src/store/config/index.js +++ b/src/store/config/index.js @@ -327,6 +327,7 @@ export default { commit('alert/UPDATE_TELEGRAM_PROXY', config.telegram_proxy); commit('alert/UPDATE_TELEGRAM_PROXY_LOGIN', config.telegram_proxy_login); commit('alert/UPDATE_TELEGRAM_PROXY_PASS', config.telegram_proxy_pass); + commit('alert/UPDATE_TELEGRAM_THREAD_ID', config.telegram_thread_id); if (config.telegram_parse_mode) { commit('alert/UPDATE_TELEGRAM_PARSE_MODE', config.telegram_parse_mode); @@ -1851,6 +1852,10 @@ export default { config.telegram_parse_mode = state.alert.telegramParseMode; } + if (state.alert.telegramThreadId) { + config.telegram_thread_id = state.alert.telegramThreadId; + } + return config; }, diff --git a/tests/unit/mockData/alert/ruleDataTelegram003.js b/tests/unit/mockData/alert/ruleDataTelegram003.js index 47166a21..68a41028 100644 --- a/tests/unit/mockData/alert/ruleDataTelegram003.js +++ b/tests/unit/mockData/alert/ruleDataTelegram003.js @@ -23,6 +23,7 @@ telegram_proxy: hostname:8080 telegram_proxy_login: user telegram_proxy_pass: password telegram_room_id: http://testserver +telegram_thread_id: 123456789 timeframe: minutes: 5 timestamp_field: '@timestamp' diff --git a/tests/unit/specs/alert/ConfigYamlTelegram003.spec.js b/tests/unit/specs/alert/ConfigYamlTelegram003.spec.js index 4368baab..08ac170b 100644 --- a/tests/unit/specs/alert/ConfigYamlTelegram003.spec.js +++ b/tests/unit/specs/alert/ConfigYamlTelegram003.spec.js @@ -37,6 +37,7 @@ telegram_proxy: "hostname:8080" telegram_proxy_login: "user" telegram_proxy_pass: "password" telegram_room_id: "http://testserver" +telegram_thread_id: 123456789 terms_size: 50 timeframe: minutes: 5