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

[Feature] support prometheus-operator serviceMonitor and prometeusRules #902

Merged
merged 6 commits into from
Jul 14, 2022

Conversation

PedroMSantosD
Copy link

@PedroMSantosD PedroMSantosD commented Jul 11, 2022

Description

This enables exposing elastalert2 using the 'metrics' configuration section of the Chart. It also supports creating both serviceMonitor and prometheusRules custom resources for prometheus-operator to be able to automacitally detect and reconfigure prometheus accordingly.

Breaking change:

  • The labelset of kubernetes objects have been changed to match helm_charts recommended labels. You'll need to uninstall and reinstall the chart for it to work.
  • Enabling of the metrics endpoint, configuration of pod port and annotations have been moved to metrics section.

Checklist

  • I have reviewed the contributing guidelines.
  • [] I have included unit tests for my changes or additions.
  • I have successfully run make test-docker with my changes.
  • I have manually tested all relevant modes of the change in this PR.
  • [] I have updated the documentation.
  • I have updated the changelog.

Questions or Comments

no manual tests included for the chart. It has been deployed through helm_install without issues.

Pedro Santos added 2 commits July 11, 2022 08:56
… 'metrics' variable. Add support for prometheus-operator custom resources: prometheusrules and servicemonitor.

Chart labels updated to reflect helm recommended labelset.
Copy link
Owner

@jertel jertel left a comment

Choose a reason for hiding this comment

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

Thanks for submitting this. Please take a look at the README.md descriptions -- I spotted several typos on the new field descriptions. I'll leave it open for a few days to let others comment, since, as you said, it will impact existing chart users.

@PedroMSantosD
Copy link
Author

Hi, file updated. I have a question thought,
most of the files have been adapted from repo: https://github.com/bitnami/charts/tree/master/bitnami/thanos/templates
Does this have to be mentioned anywhere ?

@jertel
Copy link
Owner

jertel commented Jul 12, 2022

Hi, file updated. I have a question thought, most of the files have been adapted from repo: https://github.com/bitnami/charts/tree/master/bitnami/thanos/templates Does this have to be mentioned anywhere ?

It's fine with me if you'd like to mention in the chart's README.md where you found the inspiration for the new tagging structure.

There are still some typos on the README field descriptions (like merics instead of metrics, aply instead of apply and when detected when detected). If you don't get around to fixing them I'll make some edits later this week as time allows.

@jertel
Copy link
Owner

jertel commented Jul 12, 2022

Please correct the checklist in this PR. There are slashes instead of x's and it makes it difficult to understand which checklist items you are marking as completed. Use an x to mark a check list item as complete. If it does not apply, such as unit test updates, leave it blank.

@jertel jertel merged commit e1c7c27 into jertel:master Jul 14, 2022
@albertoCrego
Copy link

@jertel when will be available the new release? This feature's really useful.

@jertel
Copy link
Owner

jertel commented Jul 28, 2022

The current plan is this weekend.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 18, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants