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

Added ruler.tls-enabled configuration for alertmanager client #3432

Merged

Conversation

Rustin170506
Copy link
Contributor

@Rustin170506 Rustin170506 commented Nov 11, 2022

What this PR does

Add tls_enabled flag for alertmanager_client config.

Which issue(s) this PR fixes or relates to

close #3220

Checklist

  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

}

func (cfg *NotifierConfig) RegisterFlags(f *flag.FlagSet) {
f.BoolVar(&cfg.TLSEnabled, "ruler.tls-enabled", true, "Enable TLS for gRPC client connecting to alertmanager-client.")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to validate the TLS flag when tls-enabled is enabled?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems we didn't check it in other components. So I'll follow it.

@Rustin170506 Rustin170506 marked this pull request as ready for review November 17, 2022 01:27
@Rustin170506 Rustin170506 requested review from a team as code owners November 17, 2022 01:27
@Rustin170506 Rustin170506 changed the title Add tls_enabled flag for alertmanager_client config Added ruler.tls-enabled configuration for alertmanager client Nov 17, 2022
@Rustin170506 Rustin170506 force-pushed the rustin-patch-notifier-config branch from c313d2e to 6064583 Compare November 17, 2022 01:37
CHANGELOG.md Outdated Show resolved Hide resolved
@Rustin170506
Copy link
Contributor Author

Friendly ping @dimitarvdimitrov ~

Copy link
Contributor

@dimitarvdimitrov dimitarvdimitrov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I left a minor wording suggestion. The docs and the config descriptor will also need to be updated

pkg/ruler/notifier.go Outdated Show resolved Hide resolved
@dimitarvdimitrov dimitarvdimitrov merged commit d9e780f into grafana:main Nov 29, 2022
@Rustin170506 Rustin170506 deleted the rustin-patch-notifier-config branch November 29, 2022 09:41
masonmei pushed a commit to udmire/mimir that referenced this pull request Dec 16, 2022
…ana#3432)

* Add `tls_enabled` flag for `alertmanager_client` config

* Update CHANGELOG.md

* Update CHANGELOG.md

* Address comment
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

tls_enabled param missing from ruler's alertmanager_client config
3 participants