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.

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

feat: add bot_token_file in TelegramConfig #5882

Merged
merged 1 commit into from Sep 7, 2023

Conversation

slashpai
Copy link
Contributor

@slashpai slashpai commented Sep 4, 2023

Fixes #5858

Description

Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue.

Type of change

What type of changes does your code introduce to the Prometheus operator? Put an x in the box that apply.

  • CHANGE (fix or feature that would cause existing functionality to not work as expected)
  • FEATURE (non-breaking change which adds functionality)
  • BUGFIX (non-breaking change which fixes an issue)
  • ENHANCEMENT (non-breaking change which improves existing functionality)
  • NONE (if none of the other choices apply. Example, tooling, build system, CI, docs, etc.)

Changelog entry

Please put a one-line changelog entry below. This will be copied to the changelog file during the release process.

feat: add bot_token_file in TelegramConfig

@slashpai
Copy link
Contributor Author

slashpai commented Sep 4, 2023

Updating validations as well, would be ready for review after that

@slashpai
Copy link
Contributor Author

slashpai commented Sep 4, 2023

Updating validations as well, would be ready for review after that

telegramConfigs validation was missing in v1beta. I added it in this PR

@slashpai slashpai marked this pull request as ready for review September 4, 2023 07:11
@slashpai slashpai requested a review from a team as a code owner September 4, 2023 07:11
@slashpai slashpai mentioned this pull request Sep 4, 2023
5 tasks
HaveFun83 pushed a commit to HaveFun83/prometheus-operator that referenced this pull request Sep 4, 2023
@slashpai
Copy link
Contributor Author

slashpai commented Sep 4, 2023

@simonpasquier addressed comments

@simonpasquier
Copy link
Contributor

Unit tests are complaining :)

@slashpai
Copy link
Contributor Author

slashpai commented Sep 4, 2023

Unit tests are complaining :)

fixed :)

@slashpai
Copy link
Contributor Author

slashpai commented Sep 6, 2023

Is this good to merge? :)

@slashpai slashpai mentioned this pull request Sep 6, 2023
Fixes prometheus-operator#5858

Signed-off-by: Jayapriya Pai <slashpai9@gmail.com>
@slashpai
Copy link
Contributor Author

slashpai commented Sep 7, 2023

@ArthurSens Please take a look again :)

@ArthurSens ArthurSens merged commit 51c3ea0 into prometheus-operator:main Sep 7, 2023
17 checks passed
@slashpai slashpai deleted the bot_token_file branch September 9, 2023 04:53
simonpasquier pushed a commit that referenced this pull request Sep 11, 2023
* alertmanager: add missing types

alertmanager v0.26 introduced some new types in receiver configuration

Fixes #5857

* pkg/alertmanager: add BotTokenFile to telegramConfig

alertmanager v0.26 introduced some new types in receiver configuration

* pkg/alertmanager: add input sanitize and unit test

add input sanitize and unit test for new alertmanager types
Telegram: bot_token_file
Webhook: url_file
Pushover: user_key_file and token_file

fix: #5857

* fix format

* pkg/alertmanger: remove changes for telegram bot_toke_file

The telegram bot_token_file is already handle in #5882

* pkg/alertmanager: revert name change in telegramconfig

---------

Co-authored-by: Hendrik Ferber <ferber@synyx.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support bot_token_file for Telegram integration
3 participants