Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Bug 2007677: Adjust dropped cAdvisor metrics #1402

Merged
merged 3 commits into from
Sep 28, 2021
Merged

Bug 2007677: Adjust dropped cAdvisor metrics #1402

merged 3 commits into from
Sep 28, 2021

Conversation

philipgough
Copy link
Contributor

@philipgough philipgough commented Sep 28, 2021 •
edited
Loading

This change drops pod-centric metrics that have a non empty container label. For context it is best to look at the detailed discussion on prometheus-operator/kube-prometheus#1402 and the issues it links to

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

@openshift-ci openshift-ci bot added the bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. label Sep 28, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 28, 2021

@philipgough: This pull request references Bugzilla bug 2007677, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.10.0) matches configured target release for branch (4.10.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @juzhao

In response to this:

Bug 2007677: Adjust dropped cAdvisor metrics

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci openshift-ci bot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Sep 28, 2021
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 28, 2021
@philipgough
jsonnet: Patch metric relabelings for control plane
3402cf5 
We drop some pod-centric metrics from cAdvisor to reduce cardinality.
This metrics are available at the slice level.
@slashpai
Copy link
Member

@philipgough Can you add the description in PR

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 28, 2021

@philipgough: This pull request references Bugzilla bug 2007677, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.10.0) matches configured target release for branch (4.10.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @juzhao

In response to this:

Bug 2007677: Adjust dropped cAdvisor metrics

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@philipgough
Copy link
Contributor Author

/skip

dgrisonnet
dgrisonnet reviewed Sep 28, 2021
View reviewed changes
Copy link
Member

@dgrisonnet dgrisonnet left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 28, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 28, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dgrisonnet, PhilipGough

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 [PhilipGough,dgrisonnet]

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 28, 2021

@philipgough: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/versions 3402cf5 link false /test versions
ci/prow/e2e-aws-single-node 3402cf5 link false /test e2e-aws-single-node

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@philipgough
Copy link
Contributor Author

/retest

@openshift-merge-robot openshift-merge-robot merged commit 685048d into openshift:master Sep 28, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 28, 2021

@philipgough: All pull requests linked via external trackers have merged:

Bugzilla bug 2007677 has been moved to the MODIFIED state.

In response to this:

Bug 2007677: Adjust dropped cAdvisor metrics

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@philipgough philipgough mentioned this pull request Sep 29, 2021
Merged
2 tasks
slashpai added a commit to slashpai/cluster-monitoring-operator that referenced this pull request May 29, 2022
@slashpai
jsonnet/main.jsonnet: Override containerfsSelector
c9aaf49 
container_fs_.* metrics doesn't have "container" label after
openshift/pull/1402 which caused regression
for dashboards using "container" label since it gives empty datapoints
for all queries using "container" label in queries containing
container_fs_.* metrices.

Inorder to fix the dashboards added containerfsSelector in
kubernetes-monitoring/kubernetes-mixin/pull/737 and overrided the containerfsSelector
default value from  container!="" to harmless id!="" in this commit.
We really don't need that selector since we dropped the container label
in OCP for container_fs_.* metrices but we need to override the
selector for the queries involving container_fs_.* to work.
@slashpai slashpai mentioned this pull request May 29, 2022
Merged
2 tasks
slashpai added a commit to slashpai/cluster-monitoring-operator that referenced this pull request Jun 3, 2022
@slashpai
jsonnet: Revert dropping container label on container_fs* metrices
63f33a2 
container_fs_.* metrics doesn't have "container" label after
openshift/pull/1402 which caused regression
for dashboards using "container" label since it gives empty datapoints
for all queries using "container" label in queries containing
container_fs_.* metrices.

Signed-off-by: Jayapriya Pai <janantha@redhat.com>
@slashpai slashpai mentioned this pull request Jun 3, 2022
Closed
2 tasks
slashpai added a commit to slashpai/cluster-monitoring-operator that referenced this pull request Jun 8, 2022
@slashpai
jsonnet/main.jsonnet: Override containerfsSelector
c7a57af 
container_fs_.* metrics doesn't have "container" label after
openshift/pull/1402 which caused regression
for dashboards using "container" label since it gives empty datapoints
for all queries using "container" label in queries containing
container_fs_.* metrices.

Inorder to fix the dashboards added containerfsSelector in
kubernetes-monitoring/kubernetes-mixin/pull/737 and overrided the containerfsSelector
default value from  container!="" to harmless id!="" in this commit.
We really don't need that selector since we dropped the container label
in OCP for container_fs_.* metrices but we need to override the
selector for the queries involving container_fs_.* to work.
slashpai added a commit to slashpai/cluster-monitoring-operator that referenced this pull request Jun 21, 2022
@slashpai
jsonnet/main.jsonnet: Override containerfsSelector
c8b96bf 
container_fs_.* metrics doesn't have "container" label after
openshift/pull/1402 which caused regression
for dashboards using "container" label since it gives empty datapoints
for all queries using "container" label in queries containing
container_fs_.* metrices.

Inorder to fix the dashboards added containerfsSelector in
kubernetes-monitoring/kubernetes-mixin/pull/737 and overrided the containerfsSelector
default value from  container!="" to harmless id!="" in this commit.
We really don't need that selector since we dropped the container label
in OCP for container_fs_.* metrices but we need to override the
selector for the queries involving container_fs_.* to work.
slashpai added a commit to slashpai/cluster-monitoring-operator that referenced this pull request Oct 17, 2022
@slashpai
container_fs_.* metrics doesn't have container label after
99006ce 
openshift/pull/1402 which caused regression
for dashboards using container label since it gives empty datapoints
for all queries using container label in queries containing
container_fs_.* metrices.

Inorder to fix the dashboards added containerfsSelector in
kubernetes-monitoring/kubernetes-mixin/pull/737 and overrided the containerfsSelector
default value from  container!= to harmless id!= in this commit.
We really don't need that selector since we dropped the container label
in OCP for container_fs_.* metrices but we need to override the
selector for the queries involving container_fs_.* to work.

Signed-off-by: Jayapriya Pai <janantha@redhat.com>
slashpai added a commit to slashpai/cluster-monitoring-operator that referenced this pull request Nov 15, 2022
@slashpai
container_fs_.* metrics doesn't have container label after
3e42112 
openshift/pull/1402 which caused regression
for dashboards using container label since it gives empty datapoints
for all queries using container label in queries containing
container_fs_.* metrices.

Inorder to fix the dashboards added containerfsSelector in
kubernetes-monitoring/kubernetes-mixin/pull/737 and overrided the containerfsSelector
default value from  container!= to harmless id!= in this commit.
We really don't need that selector since we dropped the container label
in OCP for container_fs_.* metrices but we need to override the
selector for the queries involving container_fs_.* to work.

Signed-off-by: Jayapriya Pai <janantha@redhat.com>
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@dgrisonnet dgrisonnet dgrisonnet left review comments

@juzhao juzhao Awaiting requested review from juzhao

@arajkumar arajkumar Awaiting requested review from arajkumar

@slashpai slashpai Awaiting requested review from slashpai

Assignees

@dgrisonnet dgrisonnet

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@philipgough @slashpai @openshift-bot @dgrisonnet @openshift-merge-robot