openshift-docs
openshift-docs copied to clipboard
openshift
OBSDOCS-1857: Fix Loki retention module and remove the duplicate module
Version(s): standalone-logging-docs-6.0, standalone-logging-docs-6.1 standalone-logging-docs-6.2, standalone-logging-docs-6.3
Issue: https://issues.redhat.com/browse/OBSDOCS-1857#
Link to docs preview:
- https://95075--ocpdocs-pr.netlify.app/openshift-logging/latest/configuring/configuring-the-log-store.html#logging-loki-retention_configuring-the-log-store
QE review:
- [ ] QE has approved this change.
Additional information:
@eromanova97: This pull request references OBSDOCS-1857 which is a valid jira issue.
In response to this:
Version(s):
standalone-logging-docs-6.2,standalone-logging-docs-6.3Issue: https://issues.redhat.com/browse/OBSDOCS-1857#
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.
🤖 Fri Jul 04 07:10:25 - Prow CI generated the docs preview:
https://95075--ocpdocs-pr.netlify.app/ https://95075--ocpdocs-pr.netlify.app/openshift-logging/latest/configuring/configuring-the-log-store.html
@eromanova97: This pull request references OBSDOCS-1857 which is a valid jira issue.
In response to this:
Version(s):
standalone-logging-docs-6.2,standalone-logging-docs-6.3Issue: https://issues.redhat.com/browse/OBSDOCS-1857#
Link to docs preview:
- https://95075--ocpdocs-pr.netlify.app/openshift-logging/latest/configuring/configuring-the-log-store.html#logging-loki-retention_configuring-the-log-store
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: This pull request references OBSDOCS-1857 which is a valid jira issue.
In response to this:
Version(s):
standalone-logging-docs-6.0,standalone-logging-docs-6.1standalone-logging-docs-6.2,standalone-logging-docs-6.3Issue: https://issues.redhat.com/browse/OBSDOCS-1857#
Link to docs preview:
- https://95075--ocpdocs-pr.netlify.app/openshift-logging/latest/configuring/configuring-the-log-store.html#logging-loki-retention_configuring-the-log-store
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.
Hello @anpingli, @kabirbhartiRH, @QiaolingTang can you please review the changes in this PR? Thank you!
@eromanova97: This pull request references OBSDOCS-1857 which is a valid jira issue.
In response to this:
Version(s):
standalone-logging-docs-6.0,standalone-logging-docs-6.1standalone-logging-docs-6.2,standalone-logging-docs-6.3Issue: https://issues.redhat.com/browse/OBSDOCS-1857#
Link to docs preview:
- https://95075--ocpdocs-pr.netlify.app/openshift-logging/latest/configuring/configuring-the-log-store.html#logging-loki-retention_configuring-the-log-store
QE review:
- [x] 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.
/cherry-pick standalone-logging-docs-6.0 /cherry-pick standalone-logging-docs-6.1 /cherry-pick standalone-logging-docs-6.2 /cherry-pick standalone-logging-docs-6.3
@maxwelldb: once the present PR merges, I will cherry-pick it on top of standalone-logging-docs-6.0, standalone-logging-docs-6.1, standalone-logging-docs-6.2, standalone-logging-docs-6.3 in new PRs and assign them to you.
In response to this:
/cherry-pick standalone-logging-docs-6.0 /cherry-pick standalone-logging-docs-6.1 /cherry-pick standalone-logging-docs-6.2 /cherry-pick standalone-logging-docs-6.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-sigs/prow repository.
@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.
![openshift-ci[bot] avatar](https://avatars.githubusercontent.com/in/91280?v=4 "Published by a pub.dev verified publisher"){kind=small}
@maxwelldb: #95075 failed to apply on top of branch "standalone-logging-docs-6.1":
Applying: OBSDOCS-1857: Fix Loki retention module and remove duplicate
.git/rebase-apply/patch:51: trailing whitespace.
.Prerequisites
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
A configuring/configuring-the-log-store.adoc
M modules/loki-retention.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/loki-retention.adoc deleted in OBSDOCS-1857: Fix Loki retention module and remove duplicate and modified in HEAD. Version HEAD of modules/loki-retention.adoc left in tree.
CONFLICT (modify/delete): configuring/configuring-the-log-store.adoc deleted in HEAD and modified in OBSDOCS-1857: Fix Loki retention module and remove duplicate. Version OBSDOCS-1857: Fix Loki retention module and remove duplicate of configuring/configuring-the-log-store.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OBSDOCS-1857: Fix Loki retention module and remove duplicate
In response to this:
/cherry-pick standalone-logging-docs-6.0 /cherry-pick standalone-logging-docs-6.1 /cherry-pick standalone-logging-docs-6.2 /cherry-pick standalone-logging-docs-6.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-sigs/prow repository.
@maxwelldb: new pull request created: #95668
In response to this:
/cherry-pick standalone-logging-docs-6.0 /cherry-pick standalone-logging-docs-6.1 /cherry-pick standalone-logging-docs-6.2 /cherry-pick standalone-logging-docs-6.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-sigs/prow repository.
@maxwelldb: new pull request created: #95669
In response to this:
/cherry-pick standalone-logging-docs-6.0 /cherry-pick standalone-logging-docs-6.1 /cherry-pick standalone-logging-docs-6.2 /cherry-pick standalone-logging-docs-6.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-sigs/prow repository.
@maxwelldb: #95075 failed to apply on top of branch "standalone-logging-docs-6.0":
Applying: OBSDOCS-1857: Fix Loki retention module and remove duplicate
.git/rebase-apply/patch:51: trailing whitespace.
.Prerequisites
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
A configuring/configuring-the-log-store.adoc
M modules/loki-retention.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/loki-retention.adoc deleted in OBSDOCS-1857: Fix Loki retention module and remove duplicate and modified in HEAD. Version HEAD of modules/loki-retention.adoc left in tree.
CONFLICT (modify/delete): configuring/configuring-the-log-store.adoc deleted in HEAD and modified in OBSDOCS-1857: Fix Loki retention module and remove duplicate. Version OBSDOCS-1857: Fix Loki retention module and remove duplicate of configuring/configuring-the-log-store.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OBSDOCS-1857: Fix Loki retention module and remove duplicate
In response to this:
/cherry-pick standalone-logging-docs-6.0 /cherry-pick standalone-logging-docs-6.1 /cherry-pick standalone-logging-docs-6.2 /cherry-pick standalone-logging-docs-6.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-sigs/prow repository.
@xenolinux: #95075 failed to apply on top of branch "standalone-logging-docs-6.1":
Applying: OBSDOCS-1857: Fix Loki retention module and remove duplicate
.git/rebase-apply/patch:51: trailing whitespace.
.Prerequisites
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
A configuring/configuring-the-log-store.adoc
M modules/loki-retention.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/loki-retention.adoc deleted in OBSDOCS-1857: Fix Loki retention module and remove duplicate and modified in HEAD. Version HEAD of modules/loki-retention.adoc left in tree.
CONFLICT (modify/delete): configuring/configuring-the-log-store.adoc deleted in HEAD and modified in OBSDOCS-1857: Fix Loki retention module and remove duplicate. Version OBSDOCS-1857: Fix Loki retention module and remove duplicate of configuring/configuring-the-log-store.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OBSDOCS-1857: Fix Loki retention module and remove duplicate
In response to this:
/cherrypick standalone-logging-docs-6.1
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.
@xenolinux: new pull request could not be created: failed to create pull request against openshift/openshift-docs#standalone-logging-docs-6.2 from head openshift-cherrypick-robot:cherry-pick-95075-to-standalone-logging-docs-6.2: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"A pull request already exists for openshift-cherrypick-robot:cherry-pick-95075-to-standalone-logging-docs-6.2."}],"documentation_url":"https://docs.github.com/rest/pulls/pulls#create-a-pull-request","status":"422"}
In response to this:
/cherrypick standalone-logging-docs-6.2
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.
@xenolinux: new pull request could not be created: failed to create pull request against openshift/openshift-docs#standalone-logging-docs-6.3 from head openshift-cherrypick-robot:cherry-pick-95075-to-standalone-logging-docs-6.3: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"A pull request already exists for openshift-cherrypick-robot:cherry-pick-95075-to-standalone-logging-docs-6.3."}],"documentation_url":"https://docs.github.com/rest/pulls/pulls#create-a-pull-request","status":"422"}
In response to this:
/cherrypick standalone-logging-docs-6.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-sigs/prow repository.
@xenolinux: #95075 failed to apply on top of branch "standalone-logging-docs-6.0":
Applying: OBSDOCS-1857: Fix Loki retention module and remove duplicate
.git/rebase-apply/patch:51: trailing whitespace.
.Prerequisites
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
A configuring/configuring-the-log-store.adoc
M modules/loki-retention.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/loki-retention.adoc deleted in OBSDOCS-1857: Fix Loki retention module and remove duplicate and modified in HEAD. Version HEAD of modules/loki-retention.adoc left in tree.
CONFLICT (modify/delete): configuring/configuring-the-log-store.adoc deleted in HEAD and modified in OBSDOCS-1857: Fix Loki retention module and remove duplicate. Version OBSDOCS-1857: Fix Loki retention module and remove duplicate of configuring/configuring-the-log-store.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OBSDOCS-1857: Fix Loki retention module and remove duplicate
In response to this:
/cherrypick standalone-logging-docs-6.0
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.
Hello @xenolinux The manual cherry-picks for 6.0 and 6.1 are linked above, thanks!