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

Add enableMetrics configuration #1380

Merged
merged 1 commit into from
Sep 23, 2022

Conversation

torredil
Copy link
Member

What is this PR about? / Why do we need it?

  • This PR adds a Helm chart configuration which facilitates scraping AWS metrics when enableMetrics is set to true and the Prometheus Operator is installed, by deploying:

    1. A Service object that exposes the EBS CSI Driver's controller metric port through a ClusterIP.

    2. A ServiceMonitor object which updates the Prometheus scrape configuration and allows scraping metrics from the endpoint defined. For more information, see the manifest metrics.yaml.

  • httpEndpoint is deprecated.

What testing is done?

  • See docs/metrics.md.

Signed-off-by: Eddie Torres [email protected]

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Sep 12, 2022
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 12, 2022
Copy link
Contributor

@ConnorJC3 ConnorJC3 left a comment

Choose a reason for hiding this comment

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

current version lgtm

@rdpsin
Copy link
Contributor

rdpsin commented Sep 23, 2022

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 23, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ConnorJC3, rdpsin, torredil, wmesard

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [ConnorJC3,rdpsin,torredil]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit 03cde05 into kubernetes-sigs:master Sep 23, 2022
namespace: kube-system
labels:
app: ebs-csi-controller
release: prometheus
Copy link

Choose a reason for hiding this comment

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

It would be great if these labels were configurable / overridable without needing to use helm's kustomize post-renderers support.

In my setup release label should have a different value. Maybe app label can remain fixed, but release: prometheus one should ideally be part of e.g. controller.serviceMonitor.additionalLabels, to allow for overrides. Then also enable switch can be moved under controller.serviceMonitor.enabled

WDYT @torredil ?

Copy link
Member Author

Choose a reason for hiding this comment

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

@stevo-f3 Thanks for the feedback, included this improvement in #1419.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants