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.

Sign up for GitHub

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

Jump to bottom

Bug 1588736 Added important box to cluster metrics for Kube rules #10335

Merged
merged 1 commit into from
Jun 26, 2018
Merged

Bug 1588736 Added important box to cluster metrics for Kube rules #10335

merged 1 commit into from
Jun 26, 2018

Conversation

bfallonf
Copy link

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jun 22, 2018
@bfallonf bfallonf added the peer-review-needed Signifies that the peer review team needs to review this PR label Jun 22, 2018
@bfallonf
Copy link
Author

This should be ok for review.

PTAL @openshift/team-documentation

kalexand-rh
kalexand-rh reviewed Jun 22, 2018
View reviewed changes
Copy link
Contributor

@kalexand-rh kalexand-rh left a comment

Choose a reason for hiding this comment

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

I might move only: "metrics can be collected on only the default"
Otherwise, LGTM

@kalexand-rh kalexand-rh added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Jun 22, 2018
@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 23, 2018
@openshift-bot openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 26, 2018
@bfallonf bfallonf added this to the Next Release milestone Jun 26, 2018
@bfallonf
Copy link
Author

Thanks @kalexand-rh . Done and merging.

@bfallonf bfallonf merged commit 47e54f7 into openshift:master Jun 26, 2018
@bfallonf
Copy link
Author

/cherrypick enterprise-3.10

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jun 26, 2018
Merged
@openshift-cherrypick-robot
Copy link

@bfallonf: new pull request created: #10410

In response to this:

/cherrypick enterprise-3.10

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.

@bfallonf
Copy link
Author

/cherrypick enterprise-3.9

@openshift-cherrypick-robot
Copy link

@bfallonf: #10335 failed to apply on top of branch "enterprise-3.9":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A	install/configuring_inventory_file.adoc
M	install_config/cluster_metrics.adoc
Falling back to patching base and 3-way merge...
Auto-merging install_config/cluster_metrics.adoc
CONFLICT (modify/delete): install/configuring_inventory_file.adoc deleted in HEAD and modified in added important box to cluster metrics for Kube rules. Version added important box to cluster metrics for Kube rules of install/configuring_inventory_file.adoc left in tree.
Patch failed at 0001 added important box to cluster metrics for Kube rules

In response to this:

/cherrypick enterprise-3.9

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.

@bfallonf bfallonf deleted the metrics_1588736 branch June 26, 2018 00:52
bfallonf pushed a commit to bfallonf/openshift-docs that referenced this pull request Jun 26, 2018
added note box from openshift#10335
a37c0da
@bfallonf bfallonf mentioned this pull request Jun 26, 2018
Merged
bfallonf pushed a commit that referenced this pull request Jun 26, 2018
Merge pull request #10411 from bfallonf/enterprise-3.9
7ce179d 
added note box from #10335
bfallonf pushed a commit to bfallonf/openshift-docs that referenced this pull request Jun 26, 2018
added note box from openshift#10335
6f8d124
@bfallonf bfallonf mentioned this pull request Jun 26, 2018
Merged
bfallonf pushed a commit that referenced this pull request Jun 26, 2018
Merge pull request #10412 from bfallonf/enterprise-3.7
46f7362 
added note box from #10335
bfallonf pushed a commit to bfallonf/openshift-docs that referenced this pull request Jun 26, 2018
added note box from openshift#10335
1fffda9
@bfallonf bfallonf mentioned this pull request Jun 26, 2018
Merged
bfallonf pushed a commit that referenced this pull request Jun 26, 2018
Merge pull request #10413 from bfallonf/enterprise-3.6
0a392e0 
added note box from #10335
bfallonf pushed a commit to bfallonf/openshift-docs that referenced this pull request Jun 26, 2018
added note box from openshift#10335
cef86c8
@bfallonf bfallonf mentioned this pull request Jun 26, 2018
Merged
bfallonf pushed a commit that referenced this pull request Jun 26, 2018
Merge pull request #10414 from bfallonf/enterprise-3.4
da99232 
added note box from #10335
@bfallonf bfallonf mentioned this pull request Jun 26, 2018
Merged
bfallonf pushed a commit to bfallonf/openshift-docs that referenced this pull request Jun 26, 2018
added note box from openshift#10335
b928912
@bfallonf bfallonf mentioned this pull request Jun 26, 2018
Merged
bfallonf pushed a commit that referenced this pull request Jun 26, 2018
Merge pull request #10416 from bfallonf/enterprise-3.3
a559f34 
added note box from #10335
bfallonf pushed a commit to bfallonf/openshift-docs that referenced this pull request Jun 26, 2018
added note box from openshift#10335
3073796
@bfallonf bfallonf mentioned this pull request Jun 26, 2018
Merged
bfallonf pushed a commit that referenced this pull request Jun 26, 2018
Update cluster_metrics.adoc
2e932df 
For: #10335
bfallonf pushed a commit that referenced this pull request Jun 26, 2018
Merge pull request #10417 from bfallonf/enterprise-3.2
5f29ff8 
added note box from #10335
@bfallonf
Copy link
Author

Endless conflicts, but this is done.

Please never change anything ever again 😭

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kalexand-rh kalexand-rh kalexand-rh left review comments

Assignees
No one assigned
Labels
branch/enterprise-3.6 branch/enterprise-3.7 branch/enterprise-3.9 branch/enterprise-3.10 peer-review-done Signifies that the peer review team has reviewed this PR size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
Next Release
Development

Successfully merging this pull request may close these issues.
5 participants
@bfallonf @openshift-cherrypick-robot @kalexand-rh @openshift-bot @openshift-ci-robot