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-339 Configuring Loki to tolerate membership creation failure #73363

Merged
merged 1 commit into from Mar 21, 2024
Merged

OBSDOCS-339 Configuring Loki to tolerate membership creation failure #73363

merged 1 commit into from Mar 21, 2024

Conversation

shreyasiddhartha
Copy link
Contributor

@shreyasiddhartha shreyasiddhartha commented Mar 19, 2024 •
edited

Change type: Doc update; Configuring Loki to tolerate membership creation failure
Doc JIRA: https://issues.redhat.com/browse/OBSDOCS-339

Fix Version: 4.11+

Doc Preview: https://73363--ocpdocs-pr.netlify.app/openshift-enterprise/latest/logging/log_storage/cluster-logging-loki#logging-loki-memberlist-ip_cluster-logging-loki

SME Review: @r2d2rnd
QE Review: @kabirbhartiRH
Peer Review: @kcarmichael08

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 19, 2024
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Mar 19, 2024 •
edited

🤖 Thu Mar 21 14:20:42 - Prow CI generated the docs preview:
https://73363--ocpdocs-pr.netlify.app

@r2d2rnd
Copy link

r2d2rnd commented Mar 21, 2024

/lgtm

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

/lgtm

@shreyasiddhartha
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 21, 2024
@kcarmichael08 kcarmichael08 added peer-review-in-progress Signifies that the peer review team is reviewing this PR branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Mar 21, 2024
kcarmichael08
kcarmichael08 reviewed Mar 21, 2024
View reviewed changes
Copy link
Contributor

@kcarmichael08 kcarmichael08 left a comment

Choose a reason for hiding this comment

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

Left a small suggestion; lgtm!

modules/logging-loki-memberlist-ip.adoc Outdated Show resolved Hide resolved
@kcarmichael08 kcarmichael08 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 21, 2024
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 21, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Mar 21, 2024

New changes are detected. LGTM label has been removed.

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Mar 21, 2024

@shreyasiddhartha: 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.

@shreyasiddhartha
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 21, 2024
@jab-rh jab-rh merged commit fd272b9 into openshift:main Mar 21, 2024
2 checks passed
@jab-rh
Copy link
Contributor

jab-rh commented Mar 21, 2024

/cherry-pick enterprise-4.16

@jab-rh
Copy link
Contributor

jab-rh commented Mar 21, 2024

/cherry-pick enterprise-4.15

@jab-rh
Copy link
Contributor

jab-rh commented Mar 21, 2024

/cherry-pick enterprise-4.14

@jab-rh
Copy link
Contributor

jab-rh commented Mar 21, 2024

/cherry-pick enterprise-4.13

@jab-rh
Copy link
Contributor

jab-rh commented Mar 21, 2024

/cherry-pick enterprise-4.12

@jab-rh
Copy link
Contributor

jab-rh commented Mar 21, 2024

/cherry-pick enterprise-4.11

@openshift-cherrypick-robot
Copy link

@jab-rh: new pull request created: #73544

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

@jab-rh: new pull request created: #73545

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.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Mar 21, 2024
Merged
@openshift-cherrypick-robot
Copy link

@jab-rh: new pull request created: #73546

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 Mar 21, 2024
Merged
@openshift-cherrypick-robot
Copy link

@jab-rh: new pull request created: #73547

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 Mar 21, 2024
Merged
@openshift-cherrypick-robot
Copy link

@jab-rh: #73363 failed to apply on top of branch "enterprise-4.11":

Applying: OBSDOCS-339 Configuring Loki to tolerate membership creation failure
.git/rebase-apply/patch:64: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	logging/log_storage/cluster-logging-loki.adoc
Falling back to patching base and 3-way merge...
Auto-merging logging/log_storage/cluster-logging-loki.adoc
CONFLICT (content): Merge conflict in logging/log_storage/cluster-logging-loki.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-339 Configuring Loki to tolerate membership creation failure
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.11

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 Mar 21, 2024
Merged
@openshift-cherrypick-robot
Copy link

@jab-rh: new pull request created: #73548

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.

@jab-rh
Copy link
Contributor

jab-rh commented Mar 21, 2024

@shreyasiddhartha, looks like this needs a manual cherry-pick for 4.11.

@jab-rh jab-rh 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 Mar 21, 2024
@shreyasiddhartha shreyasiddhartha mentioned this pull request Mar 21, 2024
Merged
@shreyasiddhartha
Copy link
Contributor Author

@shreyasiddhartha, looks like this needs a manual cherry-pick for 4.11.

@jab-rh Here's the manual CP PR that I created for 4.11: #73549
Can you PTAL and merge it? Thanks! :)

@jab-rh jab-rh removed the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Mar 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@r2d2rnd r2d2rnd r2d2rnd left review comments

@kcarmichael08 kcarmichael08 kcarmichael08 left review comments

Assignees

@r2d2rnd r2d2rnd

@kabirbhartiRH kabirbhartiRH

Labels
branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 peer-review-done Signifies that the peer review team has reviewed this PR size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@shreyasiddhartha @ocpdocs-previewbot @r2d2rnd @kabirbhartiRH @jab-rh @openshift-cherrypick-robot @kcarmichael08