Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding telegram support #2827

Merged
merged 20 commits into from
Feb 22, 2022
Merged

Adding telegram support #2827

merged 20 commits into from
Feb 22, 2022

Conversation

timmilesdw
Copy link
Contributor

@timmilesdw timmilesdw commented Feb 4, 2022 •
edited
Loading

Added telegram integration

Features:

  • Custom API URL
  • Disable Notifications
  • Message templating

image

@timmilesdw
added telegram config in notifiers
f0eed9b 
Signed-off-by: timmilesdw <tuktamyshev.t0308@gmail.com>
@timmilesdw
added telegram config to config.go
d09a414 
Signed-off-by: timmilesdw <tuktamyshev.t0308@gmail.com>
@timmilesdw
added package telegram to notify and initialization in cmd
28e7f3a 
Signed-off-by: timmilesdw <tuktamyshev.t0308@gmail.com>
@timmilesdw
added telegram.default.message
fc16a1f 
Signed-off-by: timmilesdw <tuktamyshev.t0308@gmail.com>
@timmilesdw
added telegram template to notifiers.go
ba40e58 
Signed-off-by: timmilesdw <tuktamyshev.t0308@gmail.com>
@timmilesdw
added message rendering from template to telegram integration
7ce20ae 
Signed-off-by: timmilesdw <tuktamyshev.t0308@gmail.com>
@timmilesdw
documentation for telegram_configs
a1393c2 
Signed-off-by: timmilesdw <tuktamyshev.t0308@gmail.com>
@timmilesdw
added tests for telegram
b52fdac 
Signed-off-by: timmilesdw <tuktamyshev.t0308@gmail.com>
@timmilesdw
fixed config_test.go
8e365cd 
Signed-off-by: timmilesdw <tuktamyshev.t0308@gmail.com>
@timmilesdw timmilesdw changed the title Telegram support Adding telegram support Feb 4, 2022
@timmilesdw
Copy link
Contributor Author

@w0rm

@w0rm
Copy link
Member

w0rm commented Feb 4, 2022

@timmilesdw @SuperQ sorry folks, I can’t review the go code! Happy to review the UI anytime though 😅

@timmilesdw
Copy link
Contributor Author

Oh, sorry, i had no clue about it. @SuperQ can you please revoke review request from w0rm? I should probably mention @simonpasquier instead

@SuperQ SuperQ requested review from gouthamve and matthiasr and removed request for w0rm February 6, 2022 11:11
matthiasr
matthiasr reviewed Feb 6, 2022
View reviewed changes
config/notifiers.go Outdated Show resolved Hide resolved
docs/configuration.md Show resolved Hide resolved
notify/telegram/telegram.go Outdated Show resolved Hide resolved
notify/telegram/telegram.go Show resolved Hide resolved
notify/telegram/telegram.go Show resolved Hide resolved
@timmilesdw
added valid parse_mode list to the error log
b884e06 
Signed-off-by: timmilesdw <tuktamyshev.t0308@gmail.com>
@timmilesdw
made use of httpconfig, moved telegram client creation to New func, c…
e039834 
…hanged message truncation to 4096 chars

Signed-off-by: timmilesdw <tuktamyshev.t0308@gmail.com>
@timmilesdw
changed supported values for telegram config
7984905 
Signed-off-by: timmilesdw <tuktamyshev.t0308@gmail.com>
@timmilesdw
added mock url for telegram tests to pass
fe86e87 
Signed-off-by: timmilesdw <tuktamyshev.t0308@gmail.com>
@timmilesdw
Copy link
Contributor Author

the test is failing, but i don't see that i affect the TestClusterDeduplication test, maybe someone could rerun tests?

@metalmatze
Copy link
Member

This looks amazing and I'd love to see this being added to alertmanager itself!
Since the alertmanager-bot only ever supported Telegram and only few of the chat commands really are used, I'd be happy to sunset/deprecate the bot in-favor if this implementation.

simonpasquier
simonpasquier reviewed Feb 7, 2022
View reviewed changes
cmd/alertmanager/main.go Outdated Show resolved Hide resolved
config/notifiers.go Show resolved Hide resolved
config/notifiers.go Outdated Show resolved Hide resolved
docs/configuration.md Show resolved Hide resolved
@timmilesdw
added api_url check to telegram config
c431bfb 
Signed-off-by: timmilesdw <tuktamyshev.t0308@gmail.com>
@timmilesdw
changed bot_token type to secret
0993989 
Signed-off-by: timmilesdw <tuktamyshev.t0308@gmail.com>
@timmilesdw
removed extra emptyline
f5ef565 
Signed-off-by: timmilesdw <tuktamyshev.t0308@gmail.com>
@timmilesdw
convert bot_token to string in telegram client creation
256ba76 
Signed-off-by: timmilesdw <tuktamyshev.t0308@gmail.com>
@timmilesdw
updated configuration.md
fef2437 
Signed-off-by: timmilesdw <tuktamyshev.t0308@gmail.com>
@timmilesdw
fixed mixed up errors
15576d8 
Signed-off-by: timmilesdw <tuktamyshev.t0308@gmail.com>
@timmilesdw
check telegram api url without conversion to string
d7a3829 
Signed-off-by: timmilesdw <tuktamyshev.t0308@gmail.com>
@timmilesdw
Copy link
Contributor Author

Could someone rerun frontend test? Failed because it can't pull image from dockerhub

@metalmatze
Copy link
Member

Anything left to do here in order to merge? Amazing work!

@timmilesdw
Copy link
Contributor Author

Anything left to do here in order to merge? Amazing work!

Thanks! @simonpasquier any updates?

@timmilesdw
Copy link
Contributor Author

Comment for activity, waiting for merge or re-review

@simonpasquier
Copy link
Member

Chatted offline with @metalmatze who's willing to help with maintaining this integration so this is a 👍 for me too.

@simonpasquier simonpasquier merged commit 1138a08 into prometheus:main Feb 22, 2022
@simonpasquier
Copy link
Member

Thanks!

@timmilesdw
Copy link
Contributor Author

Great! Thank you too!

@sengaya sengaya mentioned this pull request Mar 30, 2022
Closed
@gotjosh gotjosh mentioned this pull request Apr 11, 2022
Closed
@chanyshev
Copy link

chanyshev commented May 7, 2022 •
edited
Loading

I have chat_id negative number and I see this error
"Notify attempt failed, will retry later" attempts=1 err="telegram: Bad Request: can't parse entities: Character '-' is reserved and must be escaped with the preceding '\\' (400)"
udp:
The problem turned out to be in the parameter parse_mode:
I changed to HTML and the messages started coming.
How to use parse_mode: MarkdownV2 ?

@tazhate
Copy link

tazhate commented May 19, 2022

HOLY MOLY! Thanks a lot for this MR!

@JohnVillalovos JohnVillalovos mentioned this pull request Dec 30, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@metalmatze metalmatze metalmatze left review comments

@gouthamve gouthamve Awaiting requested review from gouthamve

@matthiasr matthiasr Awaiting requested review from matthiasr

@simonpasquier simonpasquier Awaiting requested review from simonpasquier

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@timmilesdw @w0rm @metalmatze @simonpasquier @chanyshev @tazhate @matthiasr