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

OBSDOCS-1011: Fix information about the user-workload-monitoring-conf… #75201

Merged
merged 1 commit into from May 10, 2024

Conversation

eromanova97
Copy link
Contributor

@eromanova97 eromanova97 commented Apr 26, 2024

Version(s): enterprise-4.12 and later

Issue: OBSDOCS-1011

Links to docs preview:

QE review:

  • QE has approved this change.

Additional information:

@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 26, 2024

@eromanova97: This pull request references OBSDOCS-1011 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 bug 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-1011

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 26, 2024
@openshift-ci openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 26, 2024
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Apr 26, 2024

🤖 Fri May 10 06:37:18 - Prow CI generated the docs preview:
https://75201--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@eromanova97 eromanova97 force-pushed the OBSDOCS-1011 branch 3 times, most recently from 69e9682 to 87150a9 Compare April 26, 2024 10:51
@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 26, 2024

@eromanova97: This pull request references OBSDOCS-1011 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 bug 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-1011

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

openshift-ci-robot commented Apr 26, 2024

@eromanova97: This pull request references OBSDOCS-1011 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 bug 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-1011

Links 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.

@eromanova97 eromanova97 force-pushed the OBSDOCS-1011 branch 2 times, most recently from 9c0a9f4 to 7d20a49 Compare April 26, 2024 14:40
@eromanova97 eromanova97 changed the title [WIP] OBSDOCS-1011: Fix information about the user-workload-monitoring-conf… OBSDOCS-1011: Fix information about the user-workload-monitoring-conf… May 2, 2024
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 2, 2024
@juzhao
Copy link

juzhao commented May 6, 2024

for all the description in the PR

** The `user-workload-monitoring-config` `ConfigMap` object exists.

along with the note

[NOTE]
====
Configurations applied to the `user-workload-monitoring-config` `ConfigMap` object are not activated unless a cluster administrator has enabled monitoring for user-defined projects.
====

they look good, but I think change

** The `user-workload-monitoring-config` `ConfigMap` object exists.

to

You have enabled monitoring for user-defined projects

is better, that is more clear, since the user-workload-monitoring-config ConfigMap is created by default if enabled user workload monitoring and users don't need to read the note if they have not enabled monitoring for user-defined projects.

@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 7, 2024
@eromanova97 eromanova97 force-pushed the OBSDOCS-1011 branch 2 times, most recently from 1baa025 to 63c02d8 Compare May 7, 2024 10:24
@juzhao
Copy link

juzhao commented May 7, 2024

/lgtm

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

openshift-ci-robot commented May 7, 2024

@eromanova97: This pull request references OBSDOCS-1011 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 bug 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-1011

Links 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.

@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 May 7, 2024
@tmalove
Copy link
Contributor

tmalove commented May 7, 2024

/remove-label peer-review-needed
/label peer-review-in-progress

@openshift-ci openshift-ci bot added the peer-review-in-progress Signifies that the peer review team is reviewing this PR label May 7, 2024
@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label May 9, 2024
@skopacz1 skopacz1 added this to the Continuous Release milestone May 9, 2024
Copy link
Contributor

@skopacz1 skopacz1 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, I just left a few ISG-based nits. Let me know when they're addressed and this PR will be ready to merge!

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 10, 2024
Copy link

openshift-ci bot commented May 10, 2024

New changes are detected. LGTM label has been removed.

@eromanova97
Copy link
Contributor Author

Thank you @skopacz1 the comments are addressed now 👍

Copy link

openshift-ci bot commented May 10, 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-sigs/prow repository. I understand the commands that are listed here.

@skopacz1
Copy link
Contributor

Changes LGTM, merging

@skopacz1 skopacz1 merged commit d3900c3 into openshift:main May 10, 2024
3 checks passed
@skopacz1
Copy link
Contributor

/cherrypick enterprise-4.12

@skopacz1
Copy link
Contributor

/cherrypick enterprise-4.13

@skopacz1
Copy link
Contributor

/cherrypick enterprise-4.14

@skopacz1
Copy link
Contributor

/cherrypick enterprise-4.15

@skopacz1
Copy link
Contributor

/cherrypick enterprise-4.16

@openshift-cherrypick-robot

@skopacz1: #75201 failed to apply on top of branch "enterprise-4.12":

Applying: OBSDOCS-1011: Fix information about the user-workload-monitoring-config ConfigMap
Using index info to reconstruct a base tree...
A	modules/monitoring-adding-a-secret-to-the-alertmanager-configuration.adoc
M	modules/monitoring-assigning-tolerations-to-monitoring-components.adoc
M	modules/monitoring-attaching-additional-labels-to-your-time-series-and-alerts.adoc
M	modules/monitoring-configuring-a-local-persistent-volume-claim.adoc
M	modules/monitoring-configuring-external-alertmanagers.adoc
A	modules/monitoring-configuring-pod-topology-spread-constraints.adoc
M	modules/monitoring-configuring-remote-write-storage.adoc
M	modules/monitoring-configuring-the-monitoring-stack.adoc
M	modules/monitoring-creating-cluster-id-labels-for-metrics.adoc
M	modules/monitoring-enabling-a-separate-alertmanager-instance-for-user-defined-alert-routing.adoc
M	modules/monitoring-granting-users-permission-to-configure-alert-routing-for-user-defined-projects.adoc
M	modules/monitoring-investigating-why-user-defined-metrics-are-unavailable.adoc
M	modules/monitoring-modifying-retention-time-and-size-for-prometheus-metrics-data.adoc
M	modules/monitoring-modifying-the-retention-time-for-thanos-ruler-metrics-data.adoc
M	modules/monitoring-moving-monitoring-components-to-different-nodes.adoc
M	modules/monitoring-setting-log-levels-for-monitoring-components.adoc
M	modules/monitoring-setting-query-log-file-for-prometheus.adoc
M	modules/monitoring-setting-scrape-sample-and-label-limits-for-user-defined-projects.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/monitoring-setting-scrape-sample-and-label-limits-for-user-defined-projects.adoc
CONFLICT (content): Merge conflict in modules/monitoring-setting-scrape-sample-and-label-limits-for-user-defined-projects.adoc
Auto-merging modules/monitoring-setting-query-log-file-for-prometheus.adoc
CONFLICT (content): Merge conflict in modules/monitoring-setting-query-log-file-for-prometheus.adoc
Auto-merging modules/monitoring-setting-log-levels-for-monitoring-components.adoc
CONFLICT (content): Merge conflict in modules/monitoring-setting-log-levels-for-monitoring-components.adoc
Auto-merging modules/monitoring-moving-monitoring-components-to-different-nodes.adoc
CONFLICT (content): Merge conflict in modules/monitoring-moving-monitoring-components-to-different-nodes.adoc
Auto-merging modules/monitoring-modifying-the-retention-time-for-thanos-ruler-metrics-data.adoc
CONFLICT (content): Merge conflict in modules/monitoring-modifying-the-retention-time-for-thanos-ruler-metrics-data.adoc
Auto-merging modules/monitoring-modifying-retention-time-and-size-for-prometheus-metrics-data.adoc
CONFLICT (content): Merge conflict in modules/monitoring-modifying-retention-time-and-size-for-prometheus-metrics-data.adoc
Auto-merging modules/monitoring-investigating-why-user-defined-metrics-are-unavailable.adoc
Auto-merging modules/monitoring-granting-users-permission-to-configure-alert-routing-for-user-defined-projects.adoc
CONFLICT (content): Merge conflict in modules/monitoring-granting-users-permission-to-configure-alert-routing-for-user-defined-projects.adoc
Auto-merging modules/monitoring-enabling-a-separate-alertmanager-instance-for-user-defined-alert-routing.adoc
CONFLICT (content): Merge conflict in modules/monitoring-enabling-a-separate-alertmanager-instance-for-user-defined-alert-routing.adoc
Auto-merging modules/monitoring-creating-cluster-id-labels-for-metrics.adoc
CONFLICT (content): Merge conflict in modules/monitoring-creating-cluster-id-labels-for-metrics.adoc
Auto-merging modules/monitoring-configuring-the-monitoring-stack.adoc
CONFLICT (content): Merge conflict in modules/monitoring-configuring-the-monitoring-stack.adoc
Auto-merging modules/monitoring-configuring-remote-write-storage.adoc
CONFLICT (content): Merge conflict in modules/monitoring-configuring-remote-write-storage.adoc
CONFLICT (modify/delete): modules/monitoring-configuring-pod-topology-spread-constraints.adoc deleted in HEAD and modified in OBSDOCS-1011: Fix information about the user-workload-monitoring-config ConfigMap. Version OBSDOCS-1011: Fix information about the user-workload-monitoring-config ConfigMap of modules/monitoring-configuring-pod-topology-spread-constraints.adoc left in tree.
Auto-merging modules/monitoring-configuring-external-alertmanagers.adoc
CONFLICT (content): Merge conflict in modules/monitoring-configuring-external-alertmanagers.adoc
Auto-merging modules/monitoring-configuring-a-local-persistent-volume-claim.adoc
CONFLICT (content): Merge conflict in modules/monitoring-configuring-a-local-persistent-volume-claim.adoc
Auto-merging modules/monitoring-attaching-additional-labels-to-your-time-series-and-alerts.adoc
CONFLICT (content): Merge conflict in modules/monitoring-attaching-additional-labels-to-your-time-series-and-alerts.adoc
Auto-merging modules/monitoring-assigning-tolerations-to-monitoring-components.adoc
CONFLICT (content): Merge conflict in modules/monitoring-assigning-tolerations-to-monitoring-components.adoc
CONFLICT (modify/delete): modules/monitoring-adding-a-secret-to-the-alertmanager-configuration.adoc deleted in HEAD and modified in OBSDOCS-1011: Fix information about the user-workload-monitoring-config ConfigMap. Version OBSDOCS-1011: Fix information about the user-workload-monitoring-config ConfigMap of modules/monitoring-adding-a-secret-to-the-alertmanager-configuration.adoc left in tree.
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-1011: Fix information about the user-workload-monitoring-config ConfigMap
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:

/cherrypick 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-sigs/prow repository.

@openshift-cherrypick-robot

@skopacz1: #75201 failed to apply on top of branch "enterprise-4.13":

Applying: OBSDOCS-1011: Fix information about the user-workload-monitoring-config ConfigMap
Using index info to reconstruct a base tree...
A	modules/monitoring-configuring-pod-topology-spread-constraints.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/monitoring-configuring-pod-topology-spread-constraints.adoc deleted in HEAD and modified in OBSDOCS-1011: Fix information about the user-workload-monitoring-config ConfigMap. Version OBSDOCS-1011: Fix information about the user-workload-monitoring-config ConfigMap of modules/monitoring-configuring-pod-topology-spread-constraints.adoc left in tree.
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-1011: Fix information about the user-workload-monitoring-config ConfigMap
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:

/cherrypick 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-sigs/prow repository.

@openshift-cherrypick-robot

@skopacz1: new pull request created: #75773

In response to this:

/cherrypick 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-sigs/prow repository.

@openshift-cherrypick-robot

@skopacz1: new pull request created: #75774

In response to this:

/cherrypick 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-sigs/prow repository.

@openshift-cherrypick-robot

@skopacz1: new pull request created: #75775

In response to this:

/cherrypick 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-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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 merge-review-needed Signifies that the merge review team needs to review this PR 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.

None yet

7 participants