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

Disable Calico Prometheus metrics by default #10982

Merged

Conversation

hakman
Copy link
Member

@hakman hakman commented Mar 5, 2021

Fixes the incorrect defaults implementation but also defaults to the official Calico values.

Fixes: #10539

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 5, 2021
@olemarkus
Copy link
Member

Should we have a release note for this one? Can perhaps break a lot of monitoring.

@hakman
Copy link
Member Author

hakman commented Mar 5, 2021

The important stuff was already disabled, only the Go and Process metrics were enabled by default. Not sure if it really deserves a release note.

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: olemarkus

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:

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 5, 2021
k8s-ci-robot added a commit that referenced this pull request Mar 5, 2021
…-upstream-release-1.19

Automated cherry pick of #10982: Disable Calico Prometheus metrics by default
@hakman
Copy link
Member Author

hakman commented Mar 5, 2021

/retest

k8s-ci-robot added a commit that referenced this pull request Mar 5, 2021
…-upstream-release-1.20

Automated cherry pick of #10982: Disable Calico Prometheus metrics by default
@k8s-ci-robot k8s-ci-robot merged commit 89fdd16 into kubernetes:master Mar 5, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Mar 5, 2021
@hakman hakman deleted the disable-default-calico-metrics branch March 13, 2021 00:23
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. area/addons 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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Impossible to deactivate PrometheusGoMetrics for Calico Networking
3 participants