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

OBSDOCS-991: Add information to the Support monitoring section about … #74818

Merged
merged 1 commit into from
Apr 19, 2024
Merged

OBSDOCS-991: Add information to the Support monitoring section about … #74818

merged 1 commit into from
Apr 19, 2024

Conversation

eromanova97
Copy link
Contributor

@eromanova97 eromanova97 commented Apr 18, 2024 •
edited

Version(s): enterprise-4.12 and later

Issue: OBSDOCS-991

Link to docs preview: Support considerations for monitoring

QE review:

  • QE has approved this change.

Additional information:

@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 18, 2024 •
edited by openshift-ci bot

@eromanova97: This pull request references OBSDOCS-991 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.16.0" version, but no target version was set.

In response to this:

Version(s): enterprise-4.12 and later

Issue: OBSDOCS-991

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 18, 2024
@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 18, 2024
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Apr 18, 2024 •
edited

🤖 Fri Apr 19 14:49:03 - Prow CI generated the docs preview:

https://74818--ocpdocs-pr.netlify.app/openshift-dedicated/latest/observability/monitoring/configuring-the-monitoring-stack.html
https://74818--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/monitoring/configuring-the-monitoring-stack.html
https://74818--ocpdocs-pr.netlify.app/openshift-rosa/latest/observability/monitoring/configuring-the-monitoring-stack.html

@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 18, 2024 •
edited by openshift-ci bot

@eromanova97: This pull request references OBSDOCS-991 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.16.0" version, but no target version was set.

In response to this:

Version(s): enterprise-4.12 and later

Issue: OBSDOCS-991

Link to docs preview: Support considerations for monitoring

QE review:

  • QE has approved this change.

Additional information:

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 openshift-eng/jira-lifecycle-plugin repository.

@juzhao
Copy link

juzhao commented Apr 19, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 19, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 19, 2024 •
edited by openshift-ci bot

@eromanova97: This pull request references OBSDOCS-991 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.16.0" version, but no target version was set.

In response to this:

Version(s): enterprise-4.12 and later

Issue: OBSDOCS-991

Link to docs preview: Support considerations for monitoring

QE review:

  • QE has approved this change.

Additional information:

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 openshift-eng/jira-lifecycle-plugin repository.

@eromanova97
Copy link
Contributor Author

/label peer-review-needed

@openshift-ci openshift-ci bot added the peer-review-needed Signifies that the peer review team needs to review this PR label Apr 19, 2024
@jab-rh jab-rh added this to the Continuous Release milestone Apr 19, 2024
@jab-rh jab-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 Apr 19, 2024
@jab-rh
Copy link
Contributor

jab-rh commented Apr 19, 2024

@eromanova97, LGTM, thanks!

@eromanova97
Copy link
Contributor Author

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Apr 19, 2024
@maxwelldb maxwelldb added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Apr 19, 2024
maxwelldb
maxwelldb reviewed Apr 19, 2024
View reviewed changes
Copy link
Contributor

@maxwelldb maxwelldb left a comment

Choose a reason for hiding this comment

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

Just one question before merging. @eromanova97

modules/monitoring-support-considerations.adoc Outdated Show resolved Hide resolved
modules/monitoring-support-considerations.adoc Outdated Show resolved Hide resolved
@eromanova97
OBSDOCS-991: Add information to the Support monitoring section about …
505c68e 
…the usage of openshift.io/cluster-monitoring label
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 19, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Apr 19, 2024

New changes are detected. LGTM label has been removed.

@eromanova97
Copy link
Contributor Author

Hello @maxwelldb I made the changes so that there is no double meaning now, thank you!

@maxwelldb
Copy link
Contributor

/cherry-pick enterprise-4.12

@maxwelldb
Copy link
Contributor

/cherry-pick enterprise-4.13

@openshift-cherrypick-robot
Copy link

@maxwelldb: once the present PR merges, I will cherry-pick it on top of enterprise-4.12 in a new PR and assign it to you.

In response to this:

/cherry-pick enterprise-4.12

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.

@maxwelldb
Copy link
Contributor

/cherry-pick enterprise-4.14

@openshift-cherrypick-robot
Copy link

@maxwelldb: once the present PR merges, I will cherry-pick it on top of enterprise-4.13 in a new PR and assign it to you.

In response to this:

/cherry-pick enterprise-4.13

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.

@maxwelldb
Copy link
Contributor

/cherry-pick enterprise-4.15

@openshift-cherrypick-robot
Copy link

@maxwelldb: once the present PR merges, I will cherry-pick it on top of enterprise-4.14 in a new PR and assign it to you.

In response to this:

/cherry-pick enterprise-4.14

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
Copy link

@maxwelldb: once the present PR merges, I will cherry-pick it on top of enterprise-4.15 in a new PR and assign it to you.

In response to this:

/cherry-pick enterprise-4.15

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.

@maxwelldb
Copy link
Contributor

/cherry-pick enterprise-4.16

@openshift-cherrypick-robot
Copy link

@maxwelldb: once the present PR merges, I will cherry-pick it on top of enterprise-4.16 in a new PR and assign it to you.

In response to this:

/cherry-pick enterprise-4.16

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
Copy link

openshift-ci bot commented Apr 19, 2024

@eromanova97: all tests passed!

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.

@maxwelldb maxwelldb merged commit d1395d9 into openshift:main Apr 19, 2024
3 checks passed
@openshift-cherrypick-robot
Copy link

@maxwelldb: #74818 failed to apply on top of branch "enterprise-4.12":

Applying: OBSDOCS-991: Add information to the Support monitoring section about the usage of openshift.io/cluster-monitoring label
.git/rebase-apply/patch:13: trailing whitespace.
* *Manually deploying monitoring resources into namespaces that have the `openshift.io/cluster-monitoring: "true"` label.* 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	modules/monitoring-support-considerations.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/monitoring-support-considerations.adoc
CONFLICT (content): Merge conflict in modules/monitoring-support-considerations.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OBSDOCS-991: Add information to the Support monitoring section about the usage of openshift.io/cluster-monitoring label
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick enterprise-4.12

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
Copy link

@maxwelldb: new pull request created: #74899

In response to this:

/cherry-pick enterprise-4.13

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 openshift-cherrypick-robot mentioned this pull request Apr 19, 2024
Merged
@openshift-cherrypick-robot
Copy link

@maxwelldb: new pull request created: #74900

In response to this:

/cherry-pick enterprise-4.14

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 openshift-cherrypick-robot mentioned this pull request Apr 19, 2024
Merged
@openshift-cherrypick-robot
Copy link

@maxwelldb: new pull request created: #74901

In response to this:

/cherry-pick enterprise-4.15

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.

This was referenced Apr 19, 2024
Merged
Merged
@openshift-cherrypick-robot
Copy link

@maxwelldb: new pull request created: #74902

In response to this:

/cherry-pick enterprise-4.16

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.

@maxwelldb
Copy link
Contributor

@eromanova97 You'll need to make a fresh PR for 4.12.

@eromanova97 eromanova97 mentioned this pull request Apr 19, 2024
Merged
@eromanova97 eromanova97 deleted the OBSDOCS-991 branch April 22, 2024 06:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@simonpasquier simonpasquier simonpasquier left review comments

@juzhao juzhao juzhao left review comments

@maxwelldb maxwelldb maxwelldb left review comments

Assignees

@juzhao juzhao

Labels
branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. merge-review-in-progress Signifies that the merge review team is reviewing this PR peer-review-done Signifies that the peer review team has reviewed this PR size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
Continuous Release
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@eromanova97 @openshift-ci-robot @ocpdocs-previewbot @juzhao @jab-rh @maxwelldb @openshift-cherrypick-robot @simonpasquier