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-72: Document that when metrics data retention time is set to … #72782

Merged
merged 1 commit into from
Mar 8, 2024

Conversation

eromanova97
Copy link
Contributor

@eromanova97 eromanova97 commented Mar 7, 2024

Version(s): enterprise-4.12 and later

Issue: OBSDOCS-72

Link to docs preview: Modifying the retention time and size for Prometheus metrics data

QE review:

  • QE has approved this change.

Peer review:

  • Peer review done

Additional information:

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 7, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 7, 2024

@eromanova97: This pull request references OBSDOCS-72 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 story to target the "4.16.0" version, but no target version was set.

In response to this:

Version(s): enterprise-4.13 and later

Issue: OBSDOCS-72

Link to docs preview:

QE review:

  • QE has approved this change.

Peer review:

  • Peer review done

Additional information:
After the merge, I will also cherrypick this to enterprise-4.12 manually. The reason is because the retention time is set to 15 days by default in 4.12, not 11 days.

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 openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 7, 2024
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Mar 7, 2024

🤖 Fri Mar 08 10:17:55 - Prow CI generated the docs preview:
https://72782--ocpdocs-pr.netlify.app

@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 7, 2024

@eromanova97: This pull request references OBSDOCS-72 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 story to target the "4.16.0" version, but no target version was set.

In response to this:

Version(s): enterprise-4.13 and later

Issue: OBSDOCS-72

Link to docs preview: Modifying the retention time and size for Prometheus metrics data

QE review:

  • QE has approved this change.

Peer review:

  • Peer review done

Additional information:
After the merge, I will also cherrypick this to enterprise-4.12 manually. The reason is because the retention time is set to 15 days by default in 4.12, not 11 days.

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 Mar 7, 2024

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

Link to docs preview: Modifying the retention time and size for Prometheus metrics data

QE review:

  • QE has approved this change.

Peer review:

  • Peer review done

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.

Copy link

@simonpasquier simonpasquier left a comment

Choose a reason for hiding this comment

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

/lgtm

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

juzhao commented Mar 8, 2024

/lgtm

@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 8, 2024

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

Link to docs preview: Modifying the retention time and size for Prometheus metrics data

QE review:

  • QE has approved this change.

Peer review:

  • Peer review done

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 Mar 8, 2024
@dfitzmau
Copy link
Contributor

dfitzmau commented Mar 8, 2024

/remove-label peer-review-needed

/label peer-review-in-progress

@openshift-ci openshift-ci bot added peer-review-in-progress Signifies that the peer review team is reviewing this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Mar 8, 2024
Copy link
Contributor

@dfitzmau dfitzmau left a comment

Choose a reason for hiding this comment

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

Hi @eromanova97 .

Nice work. I added some minor comment inline.

@dfitzmau
Copy link
Contributor

dfitzmau commented Mar 8, 2024

/remove-label peer-review-in-progress

/label peer-review-done

@openshift-ci openshift-ci bot added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR labels Mar 8, 2024
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 8, 2024
Copy link

openshift-ci bot commented Mar 8, 2024

New changes are detected. LGTM label has been removed.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 8, 2024

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

Link to docs preview: Modifying the retention time and size for Prometheus metrics data

QE review:

  • QE has approved this change.

Peer review:

  • Peer review done

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.

Copy link

openshift-ci bot commented Mar 8, 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.

@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 Mar 8, 2024
@mburke5678 mburke5678 added this to the Continuous Release milestone Mar 8, 2024
@mburke5678 mburke5678 merged commit 16a4a14 into openshift:main Mar 8, 2024
2 checks passed
@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.12

@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.13

@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.14

@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.15

@mburke5678
Copy link
Contributor

/cherrypick enterprise-4.16

@openshift-cherrypick-robot

@mburke5678: #72782 failed to apply on top of branch "enterprise-4.12":

Applying: OBSDOCS-72: Document that when metrics data retention time is set to 0, the default values apply
Using index info to reconstruct a base tree...
M	modules/monitoring-modifying-retention-time-and-size-for-prometheus-metrics-data.adoc
Falling back to patching base and 3-way merge...
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
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-72: Document that when metrics data retention time is set to 0, the default values apply
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/test-infra repository.

@openshift-cherrypick-robot

@mburke5678: new pull request created: #72879

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/test-infra repository.

@openshift-cherrypick-robot

@mburke5678: new pull request created: #72880

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/test-infra repository.

@openshift-cherrypick-robot

@mburke5678: new pull request created: #72881

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/test-infra repository.

@openshift-cherrypick-robot

@mburke5678: new pull request created: #72882

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/test-infra 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants