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

fix: change headless service to gRPC and expose 9094 TCP #494

Merged
merged 25 commits into from
Apr 9, 2024
Merged

fix: change headless service to gRPC and expose 9094 TCP #494

merged 25 commits into from
Apr 9, 2024

Conversation

locmai
Copy link
Contributor

@locmai locmai commented Apr 3, 2024

What this PR does

Follow-up the work of @AlexandreRoux from #435 and related to #420 to run the helm-docs for the README.md

This PR corrects the alertmanager headless service with exposing gRPC port instead of HTTP.

I tested the Helm chart and I can't reproduce the EOF issue.

humblebundledore and others added 18 commits February 16, 2023 10:03
@humblebundledore
change alertmanager-svc-headless from http to grpc port
dcc7660 
Signed-off-by: AlexandreRoux <alexandreroux42@protonmail.com>
@humblebundledore
edit CHANGELOG.md
d8bdc70 
Signed-off-by: AlexandreRoux <alexandreroux42@protonmail.com>
@humblebundledore
expose 9094 TCP UDP for gossip cluster
a001e49 
Signed-off-by: AlexandreRoux <alexandreroux42@protonmail.com>
@humblebundledore
Merge branch 'master' into master
b0df50e
@humblebundledore
support configuration of gossip cluster port
e483cd5 
Signed-off-by: AlexandreRoux <alexandreroux42@protonmail.com>
@humblebundledore
Merge branch 'master' into master
84c1331
@nschad
WIP: configure alertmanager HA cluster mode for sts
05b3403 
Signed-off-by: Niclas Schad <niclas.schad@gmail.com>
@humblebundledore
Merge branch 'cortexproject:master' into master
d29022e
@humblebundledore
Merge remote-tracking branch 'upstream/feature/alertmanager-cluster'
8d22e3a
@humblebundledore
configure alertmanager cluster peers as comma seperated list
1d830da 
Signed-off-by: AlexandreRoux <alexandreroux42@protonmail.com>
@humblebundledore
clarify values.yaml about cluster enable by default
e909803 
Signed-off-by: AlexandreRoux <alexandreroux42@protonmail.com>
@humblebundledore
replicaset should not set -alertmanager-cluster-peers when cluster is…
b9efaee 
… disable

Signed-off-by: AlexandreRoux <alexandreroux42@protonmail.com>
@humblebundledore
fix wrong name for grpc targetPort
87e6eb4 
Signed-off-by: AlexandreRoux <alexandreroux42@protonmail.com>
@humblebundledore
re-introduce alertmanager-dep.yaml
62c1222 
Signed-off-by: AlexandreRoux <alexandreroux42@protonmail.com>
@locmai
Merge branch 'master' into alertmanager/expose-9094
5d9c403
@locmai
docs: update READEME.md
047bd29 
Signed-off-by: Loc Mai <locmai0201@gmail.com>
@locmai
update CHANGELOG.md
3236b34 
Signed-off-by: Loc Mai <locmai0201@gmail.com>
@locmai
update CHANGELOG.md
bd4b07f 
Signed-off-by: Loc Mai <locmai0201@gmail.com>
@locmai locmai force-pushed the alertmanager/expose-9094 branch from af2d7b5 to bd4b07f Compare April 3, 2024 10:48
nschad
nschad reviewed Apr 4, 2024
View reviewed changes
templates/alertmanager/alertmanager-svc-headless.yaml Show resolved Hide resolved
templates/alertmanager/alertmanager-svc-headless.yaml Outdated
Comment on lines 22 to 23
name: http-metrics
targetPort: http-metrics
Copy link
Collaborator

Choose a reason for hiding this comment

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

we should inform the user about this breaking chance in CHANGELOG.md

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have updated the CHANGELOG.md to make this clearer. Or do you think we should add a better indication that this may break if users were using the http-metrics port for their own usage? Similar to the old PR we have here #169

And by breaking - do you mean we should make it to v3 (too much I think?) or a line in the CHANGELOG should be good enough?

Copy link
Collaborator

@nschad nschad Apr 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Hmmm. I don't have a strong opinion about it. Technically it should be a major release because it will break if somebody depends on it (somehow).

And to be honest so #169 should have been.

CC: @kd7lxl Do you have an opinion?

Copy link
Collaborator

Choose a reason for hiding this comment

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

I would just not touch the http-metrics port, so that there is no breaking change. Adding gRPC has nothing to do with the http-metrics port.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That sounds good. Let me update that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done!

templates/alertmanager/alertmanager-svc-headless.yaml Show resolved Hide resolved
locmai added 4 commits April 5, 2024 16:30
@locmai
update CHANGELOG.md
970ea28 
Signed-off-by: Loc Mai <locmai0201@gmail.com>
@locmai
update CHANGELOG.md
355af4d 
Signed-off-by: Loc Mai <locmai0201@gmail.com>
@locmai
update CHANGELOG.md
ce177c3 
Signed-off-by: Loc Mai <locmai0201@gmail.com>
@locmai
update CHANGELOG.md
2f421f2 
Signed-off-by: Loc Mai <locmai0201@gmail.com>
nschad
nschad reviewed Apr 8, 2024
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
@locmai
add Alertmanager scope
d75baf1 
Signed-off-by: Loc Mai <locmai0201@gmail.com>
@nschad nschad requested a review from kd7lxl April 8, 2024 09:25
@locmai
add http-metrics back
56238b6 
Signed-off-by: Loc Mai <locmai0201@gmail.com>
kd7lxl
kd7lxl approved these changes Apr 8, 2024
View reviewed changes
CHANGELOG.md Outdated
Comment on lines 5 to 6
* [CHANGE] Alertmanager: Add `grpc` port #494
* [CHANGE] Alertmanager: Expose 9094 TCP and UDP for gossip cluster #494
Copy link
Collaborator

Choose a reason for hiding this comment

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

These should be ENHANCEMENT.

@locmai
update CHANGELOG.md
a4f1c17 
Signed-off-by: Loc Mai <locmai0201@gmail.com>
@nschad nschad merged commit 1ad5dfb into cortexproject:master Apr 9, 2024
2 checks passed
@locmai locmai mentioned this pull request Apr 12, 2024
Merged
1 task
@nschad nschad mentioned this pull request Oct 17, 2024
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nschad nschad nschad approved these changes

@kd7lxl kd7lxl kd7lxl approved these changes

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

Successfully merging this pull request may close these issues.
4 participants
@locmai @kd7lxl @nschad @humblebundledore