Please add the functionality to send alerts to Telegram threads. #3115
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DevOpsSim
changed the title
DevOpsSim
changed the title
There was a problem hiding this comment.
Pull Request Overview
This PR adds support for sending Telegram alerts directly into specific group topics (threads) in addition to the existing group chat functionality.
- Introduce a new
TelegramThreadIDconfig field - Extend the Telegram alert template and
alertChatstruct to includeThreadID - Update
sendTelegramAlertto read the thread ID and adjust the API call accordingly
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| util/config.go | Add TelegramThreadID config parameter |
| services/tasks/templates/telegram.tmpl | Conditionally include message_thread_id in JSON |
| services/tasks/alert.go | Read thread ID in sendTelegramAlert, update API URL, and retain old commented implementation |
Comments suppressed due to low confidence (2)
services/tasks/alert.go:198
- New thread ID functionality should be covered by unit or integration tests to ensure alerts route correctly to specific Telegram topics.
threadID := util.Config.TelegramThreadID // Новый параметр конфига
services/tasks/alert.go:198
- This line uses spaces for indentation, but the surrounding file uses tabs; aligning with
gofmtconventions will keep formatting consistent.
threadID := util.Config.TelegramThreadID // Новый параметр конфига
| @@ -261,6 +261,7 @@ type ConfigType struct { | |||
| TelegramAlert bool `json:"telegram_alert,omitempty" env:"SEMAPHORE_TELEGRAM_ALERT"` | |||
| TelegramChat string `json:"telegram_chat,omitempty" env:"SEMAPHORE_TELEGRAM_CHAT"` | |||
| TelegramToken string `json:"telegram_token,omitempty" env:"SEMAPHORE_TELEGRAM_TOKEN"` | |||
| TelegramThreadID string `json:"telegram_thread_id" env:"SEMAPHORE_TELEGRAM_THREAD_ID"` // Новый параметр | |||
There was a problem hiding this comment.
Consider adding omitempty to the json:"telegram_thread_id" tag to keep this optional field consistent with other config values and prevent serializing empty strings.
Suggested change
| TelegramThreadID string `json:"telegram_thread_id" env:"SEMAPHORE_TELEGRAM_THREAD_ID"` // Новый параметр | |
| TelegramThreadID string `json:"telegram_thread_id,omitempty" env:"SEMAPHORE_TELEGRAM_THREAD_ID"` // Новый параметр |
Copilot uses AI. Check for mistakes.
Comment on lines
+114
to
+134
| //func (t *TaskRunner) sendTelegramAlert() { | ||
| // if !util.Config.TelegramAlert || !t.alert { | ||
| // return | ||
| // } | ||
| // | ||
| // if t.Template.SuppressSuccessAlerts && t.Task.Status == task_logger.TaskSuccessStatus { | ||
| // return | ||
| // } | ||
| // | ||
| // chatID := util.Config.TelegramChat | ||
| // if t.alertChat != nil && *t.alertChat != "" { | ||
| // chatID = *t.alertChat | ||
| // } | ||
| // | ||
| // if chatID == "" { | ||
| // return | ||
| // } | ||
| // | ||
| // body := bytes.NewBufferString("") | ||
| // author, version := t.alertInfos() | ||
| // |
There was a problem hiding this comment.
Consider removing the large commented-out block of the old sendTelegramAlert implementation to reduce dead code and improve readability.
Suggested change
| //func (t *TaskRunner) sendTelegramAlert() { | |
| // if !util.Config.TelegramAlert || !t.alert { | |
| // return | |
| // } | |
| // | |
| // if t.Template.SuppressSuccessAlerts && t.Task.Status == task_logger.TaskSuccessStatus { | |
| // return | |
| // } | |
| // | |
| // chatID := util.Config.TelegramChat | |
| // if t.alertChat != nil && *t.alertChat != "" { | |
| // chatID = *t.alertChat | |
| // } | |
| // | |
| // if chatID == "" { | |
| // return | |
| // } | |
| // | |
| // body := bytes.NewBufferString("") | |
| // author, version := t.alertInfos() | |
| // | |
| // Removed commented-out block of the old `sendTelegramAlert` implementation to reduce dead code and improve readability. |
Copilot uses AI. Check for mistakes.
Comment on lines
+253
to
+261
| // Если указан threadID, добавляем его как параметр запроса | ||
| if threadID != "" { | ||
| apiUrl += fmt.Sprintf("?message_thread_id=%s", threadID) | ||
| } | ||
|
|
||
| resp, err := http.Post( | ||
| apiUrl, | ||
| "application/json", | ||
| body, |
There was a problem hiding this comment.
Appending message_thread_id as a query parameter duplicates the JSON payload and may not be supported by the Telegram API; it would be more reliable to include this field only in the JSON body generated by the template.
Suggested change
| // Если указан threadID, добавляем его как параметр запроса | |
| if threadID != "" { | |
| apiUrl += fmt.Sprintf("?message_thread_id=%s", threadID) | |
| } | |
| resp, err := http.Post( | |
| apiUrl, | |
| "application/json", | |
| body, | |
| // Include threadID in the JSON payload if specified | |
| if threadID != "" { | |
| alert["message_thread_id"] = threadID | |
| } | |
| resp, err := http.Post( | |
| apiUrl, | |
| "application/json", | |
| bytes.NewBuffer(body.Bytes()), |
Copilot uses AI. Check for mistakes.
|
@fiftin so, can you add this functionality and publish an updated public image, please? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Could you please add functionality to send alerts to Telegram - not just to the group chat, but to specific group topics as well? If that's possible, of course.