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

Alertmanager: Remove upstream clustering (gossip) operation. #1126

Merged
merged 2 commits into from
Feb 10, 2022

Conversation

stevesg
Copy link
Contributor

@stevesg stevesg commented Feb 8, 2022

This commit removes the ability for alertmanager to be run with the upstream
clustering (gossip) functionality. Alertmanager must now be run with sharding
enabled. In essence, -alertmanager.sharding-enabled=true is now the default.

This removes the following configuration options which are no longer needed:

  • -alertmanager.sharding-enabled
  • -alertmanager.cluster.advertise-address
  • -alertmanager.cluster.gossip-interval
  • -alertmanager.cluster.listen-address
  • -alertmanager.cluster.peers
  • -alertmanager.cluster.push-pull-interval

The following configuration option is renamed:

  • -alertmanager.cluster.peer-timeout to -alertmanager.peer-timeout

Some points of note:

  • The state field of the Alertmanager struct is now always of the type
    alertmanager.state, allowing simplification of certain code paths.
  • The "status" endpoint for Alertmanager which would display the list of
    peers, now simply shows the service status (Starting, Running, etc).
    The equivalent information for sharding is found in the ring page.
  • All remaining unit tests and integration tests which did not run with
    sharding enabled, have now been ported to work with sharding.

@stevesg stevesg force-pushed the remove-alertmanager-no-sharding-mode branch from 9b79d1a to ec6987a Compare February 8, 2022 20:59
@stevesg stevesg changed the title remove alertmanager no sharding mode WIP: Remove upstream alertmanager gossip operation. Feb 8, 2022
@stevesg stevesg force-pushed the remove-alertmanager-no-sharding-mode branch from ec6987a to f1c4aec Compare February 8, 2022 22:02
Copy link
Member

@pstibrany pstibrany left a comment

Choose a reason for hiding this comment

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

Good job! Let's update CHANGELOG too and fix jsonnet tests ( make build-jsonnet-tests).

pkg/alertmanager/multitenant.go Outdated Show resolved Hide resolved
@stevesg stevesg force-pushed the remove-alertmanager-no-sharding-mode branch from f1c4aec to ef8c975 Compare February 9, 2022 13:59
@stevesg stevesg changed the title WIP: Remove upstream alertmanager gossip operation. Alertmanager: Remove upstream clustering (gossip) operation. Feb 9, 2022
@stevesg stevesg force-pushed the remove-alertmanager-no-sharding-mode branch 2 times, most recently from 6cfc39b to cf0afbd Compare February 9, 2022 14:36
This commit removes the ability for alertmanager to be run with the upstream
clustering (gossip) functionality. Alertmanager must now be run with sharding
enabled. In essence, `-alertmanager.sharding-enabled=true` is now the default.

This removes the following configuration options which are no longer needed:
- `-alertmanager.sharding-enabled`
- `-alertmanager.cluster.advertise-address`
- `-alertmanager.cluster.gossip-interval`
- `-alertmanager.cluster.listen-address`
- `-alertmanager.cluster.peers`
- `-alertmanager.cluster.push-pull-interval`

Some points of note:
- The `state` field of the `Alertmanager` struct is now always of the type
  `alertmanager.state`, allowing simplification of certain code paths.
- The "status" endpoint for Alertmanager which would display the list of
  peers, now simply shows the service status (Starting, Running, etc).
  The equivalent information for sharding is found in the ring page.
- All remaining unit tests and integration tests which did not run with
  sharding enabled, have now been ported to work with sharding.
@stevesg stevesg force-pushed the remove-alertmanager-no-sharding-mode branch from cf0afbd to 5c7f694 Compare February 9, 2022 14:49
@stevesg stevesg marked this pull request as ready for review February 9, 2022 16:54
Copy link
Member

@pstibrany pstibrany left a comment

Choose a reason for hiding this comment

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

Thank you!

@pstibrany pstibrany merged commit a380d30 into main Feb 10, 2022
@pstibrany pstibrany deleted the remove-alertmanager-no-sharding-mode branch February 10, 2022 16:32
@stevesg
Copy link
Contributor Author

stevesg commented Feb 11, 2022

Part of: #856

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.

2 participants