Skip to content

Conversation

@rh-max
Copy link
Contributor

@rh-max rh-max commented Dec 20, 2019

No description provided.

@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 20, 2019
@openshift-docs-preview-bot

The preview will be available shortly at:

@rh-max rh-max force-pushed the enterprise-4.3-monitoring-user-workload branch from 17dcbee to 7fe68bc Compare December 20, 2019 22:45
@s-urbaniak
Copy link
Contributor

/cc @openshift/openshift-team-monitoring

@vikram-redhat
Copy link
Contributor

@rh-max has QE team reviewed it?

Copy link

@juzhao juzhao left a comment

Choose a reason for hiding this comment

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

LGTM, all the changes are implemented

Copy link
Contributor

@sheriff-rh sheriff-rh left a comment

Choose a reason for hiding this comment

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

Great work, Max!

@rh-max
Copy link
Contributor Author

rh-max commented Jan 21, 2020

@sheriff-rh This PR has developer, QE, and doc team ACKs. Could you please merge this and cherry-pick into enterprise-4.3? Thanks.
Thanks a lot everybody!

@sheriff-rh sheriff-rh merged commit 4a6310f into openshift:master Jan 21, 2020
@sheriff-rh
Copy link
Contributor

/cherrypick enterprise-4.3

@openshift-cherrypick-robot

@sheriff-rh: new pull request created: #19196

Details

In response to this:

/cherrypick enterprise-4.3

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-cherrypick-robot

@sheriff-rh: #18788 failed to apply on top of branch "enterprise-4.3":

.git/rebase-apply/patch:967: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	monitoring/cluster-monitoring/examining-cluster-metrics.adoc
Falling back to patching base and 3-way merge...
Auto-merging monitoring/cluster-monitoring/examining-cluster-metrics.adoc
CONFLICT (content): Merge conflict in monitoring/cluster-monitoring/examining-cluster-metrics.adoc
Auto-merging modules/monitoring-examining-metrics-as-a-developer.adoc
CONFLICT (add/add): Merge conflict in modules/monitoring-examining-metrics-as-a-developer.adoc
Auto-merging _topic_map.yml
CONFLICT (content): Merge conflict in _topic_map.yml
Patch failed at 0001 Add the user workload monitoring documentation

Details

In response to this:

/cherrypick enterprise-4.3

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.

@vikram-redhat vikram-redhat added the peer-review-done Signifies that the peer review team has reviewed this PR label Jan 23, 2020
@openshift-cherrypick-robot

@sheriff-rh: #18788 failed to apply on top of branch "enterprise-4.3":

.git/rebase-apply/patch:967: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	monitoring/cluster-monitoring/examining-cluster-metrics.adoc
Falling back to patching base and 3-way merge...
Auto-merging monitoring/cluster-monitoring/examining-cluster-metrics.adoc
CONFLICT (content): Merge conflict in monitoring/cluster-monitoring/examining-cluster-metrics.adoc
Auto-merging modules/monitoring-examining-metrics-as-a-developer.adoc
CONFLICT (add/add): Merge conflict in modules/monitoring-examining-metrics-as-a-developer.adoc
Auto-merging _topic_map.yml
CONFLICT (content): Merge conflict in _topic_map.yml
Patch failed at 0001 Add the user workload monitoring documentation

Details

In response to this:

/cherrypick enterprise-4.3

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.

@vikram-redhat
Copy link
Contributor

@rh-max 16 commits?

@sheriff-rh please make sure to request that commits are squashed and labels for peer review and branch and milestone are added.

@rh-max
Copy link
Contributor Author

rh-max commented Jan 23, 2020

@vikram-redhat @sheriff-rh Damn, my bad, forgot to squash. Sorry.

vikram-redhat added a commit to vikram-redhat/openshift-docs that referenced this pull request Jan 26, 2020
vikram-redhat added a commit that referenced this pull request Jan 26, 2020
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/openshift-docs that referenced this pull request Jan 26, 2020
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/openshift-docs that referenced this pull request Jan 26, 2020
vikram-redhat added a commit that referenced this pull request Jan 26, 2020
…-19320-to-enterprise-4.3

[enterprise-4.3] fixing #18788
vikram-redhat added a commit that referenced this pull request Jan 26, 2020
…-19320-to-enterprise-4.4

[enterprise-4.4] fixing #18788
@yuvalk yuvalk mentioned this pull request Mar 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.3 peer-review-done Signifies that the peer review team has reviewed this PR 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.