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

Backport metrics fixes #16266

Merged
merged 1 commit into from
Sep 16, 2017
Merged

Conversation

smarterclayton
Copy link
Contributor

Fixes #16208

This needs to be in the next release drop

UPSTREAM: 48583: Record 429 and timeout errors to prometheus
UPSTREAM: 49117: Add apiserver metric for response sizes split by namespace scope
UPSTREAM: 49678: Report non-resource URLs in max-in-flight correctly
UPSTREAM: 49678: Timeout filter returns 504 and an inconsistent error body
UPSTREAM: 50123: Report pod logs as CONNECT in metrics
UPSTREAM: 52237: Add scope to all apiserver metrics and report resource scope

@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 9, 2017
@openshift-merge-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: smarterclayton

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

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 9, 2017
@smarterclayton
Copy link
Contributor Author

/retest

@stevekuznetsov
Copy link
Contributor

/unassign

UPSTREAM: 49117: Add apiserver metric for response sizes split by namespace scope
UPSTREAM: 49678: Report non-resource URLs in max-in-flight correctly
UPSTREAM: 49678: Timeout filter returns 504 and an inconsistent error body
UPSTREAM: 50123: Report pod logs as CONNECT in metrics
UPSTREAM: 52237: Add scope to all apiserver metrics and report resource scope
@smarterclayton
Copy link
Contributor Author

Updated with latest from upstream @sttts @liggitt

@liggitt
Copy link
Contributor

liggitt commented Sep 16, 2017

changes look fine, reason for squashing to a single commit?

@smarterclayton
Copy link
Contributor Author

Cherry pick was easier because the script cant (today) handle creating individual commits, it creates a patch from a range and rebases onto our upstream commit

@smarterclayton smarterclayton added the lgtm Indicates that a PR is ready to be merged. label Sep 16, 2017
@openshift-merge-robot
Copy link
Contributor

/test all [submit-queue is verifying that this PR is safe to merge]

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 16, 2017

@smarterclayton: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/cmd 3959bdc link /test cmd

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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-merge-robot
Copy link
Contributor

Automatic merge from submit-queue (batch tested with PRs 16362, 16266)

@openshift-merge-robot openshift-merge-robot merged commit 87f0882 into openshift:master Sep 16, 2017
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. kind/delivery-blocker lgtm 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.

5 participants