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

helm-chart: Flexibility to add extra custom relabelling config for serviceMonitor #5511

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

raghavtan
Copy link

@raghavtan raghavtan commented Jan 12, 2024

Description

helm-chart update
Extra variable in values.yaml metrics.serviceMonitor.relabelings and templating toggle in the serviceMonitor template
This will allow us to add extra labels to prometheus metrics exposed by addition to scrape_config for the job

Fixes: #5510

Related Issues

Ability to use custom relabelling for all prometheus metrics exported by emissary.
Since we use the upstream chart and just customise it using the values.yaml

Testing

As per the documentation

make test
make gotest
make pytest
make lint

additional

Also updated the CHANGELOG.md with make generate

Checklist

  • Does my change need to be backported to a previous release?

    • What backport versions were discussed with the Maintainers in the Issue?
  • I made sure to update CHANGELOG.md.

    Remember, the CHANGELOG needs to mention:

    • Any new features
    • Any changes to our included version of Envoy
    • Any non-backward-compatible changes
    • Any deprecations
  • This is unlikely to impact how Ambassador performs at scale.

    Remember, things that might have an impact at scale include:

    • Any significant changes in memory use that might require adjusting the memory limits
    • Any significant changes in CPU use that might require adjusting the CPU limits
    • Anything that might change how many replicas users should use
    • Changes that impact data-plane latency/scalability
  • My change is adequately tested.

    Remember when considering testing:

    • Your change needs to be specifically covered by tests.
      • Tests need to cover all the states where your change is relevant: for example, if you add a behavior that can be enabled or disabled, you'll need tests that cover the enabled case and tests that cover the disabled case. It's not sufficient just to test with the behavior enabled.
    • You also need to make sure that the entire area being changed has adequate test coverage.
      • If existing tests don't actually cover the entire area being changed, add tests.
      • This applies even for aspects of the area that you're not changing – check the test coverage, and improve it if needed!
    • We should lean on the bulk of code being covered by unit tests, but...
    • ... an end-to-end test should cover the integration points
  • I updated DEVELOPING.md with any any special dev tricks I had to use to work on this code efficiently.

  • The changes in this PR have been reviewed for security concerns and adherence to security best practices.

@raghavtan raghavtan changed the title Flexibility to add extra custom relabelling config for serviceMonitor Flexibility to add extra custom relabelling config for serviceMonitor Jan 12, 2024
Signed-off-by: Raghav Tandon <raghavtan@gmail.com>
@raghavtan raghavtan force-pushed the patch-servicemonitor-relabeling branch from 572fdce to ed757a9 Compare January 12, 2024 13:55
@raghavtan raghavtan changed the title Flexibility to add extra custom relabelling config for serviceMonitor helm-chart: Flexibility to add extra custom relabelling config for serviceMonitor Jan 12, 2024
Signed-off-by: Raghav Tandon <raghavtan@gmail.com>
Signed-off-by: Raghav Tandon <raghavtan@gmail.com>
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.

Add support to create custom relabelling config for serviceMonitor
1 participant