Skip to content

RHDEVDOCS-2685 Document that we test Logstash with fluent forward v1 … #30088

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
Merged
codyhoag merged 1 commit into from
Mar 17, 2021
Merged

RHDEVDOCS-2685 Document that we test Logstash with fluent forward v1 … #30088

codyhoag merged 1 commit into from
Mar 17, 2021

Conversation

@rolfedh
Copy link
Contributor

@rolfedh rolfedh commented Mar 4, 2021 •
edited
Loading

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 4, 2021
@netlify
Copy link

netlify bot commented Mar 4, 2021 •
edited
Loading

Deploy preview for osdocs ready!

Built with commit 2c94679

https://deploy-preview-30088--osdocs.netlify.app

@rolfedh rolfedh mentioned this pull request Mar 4, 2021
Merged
@rolfedh rolfedh changed the title RHDEVDOCS-2685 Document that we test Logstash with fluent forward v1 … [WIP]RHDEVDOCS-2685 Document that we test Logstash with fluent forward v1 … Mar 4, 2021
@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 4, 2021
@eranra
Copy link

eranra commented Mar 10, 2021

@jcantrill can you take final look on this and merge / etc as needed

rolfedh
rolfedh commented Mar 10, 2021
View reviewed changes
Copy link
Contributor Author

@rolfedh rolfedh left a comment

Choose a reason for hiding this comment

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

@jcantrill Please review and approve. Thanks.

@jcantrill
Copy link

jcantrill commented Mar 13, 2021

Lgtm

@rolfedh rolfedh changed the title [WIP]RHDEVDOCS-2685 Document that we test Logstash with fluent forward v1 … RHDEVDOCS-2685 Document that we test Logstash with fluent forward v1 … Mar 13, 2021
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 13, 2021
@eranra
Copy link

eranra commented Mar 13, 2021 •
edited
Loading

@rolfedh you can add to the text "... You can optionally forward logs to an external Elasticsearch v5.x or v6.x instance" the text "v7.x" to indicate the change to support ES7 ... post that you can merge this

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 13, 2021
@rolfedh
Copy link
Contributor Author

rolfedh commented Mar 13, 2021

ou can optionally forward logs to an external Elasticsearch v5.x or v6.x instance" the text "v7.x" to indicate the change to support ES7 ... post that you can

Sorry, Eran. We can't do that. Please see my response in Slack: https://coreos.slack.com/archives/GGUR75P60/p1615652636205000?thread_ts=1615587986.202600&cid=GGUR75P60

@eranra
Copy link

eranra commented Mar 14, 2021

/lgtm

@codyhoag codyhoag added this to the Next Release milestone Mar 16, 2021
codyhoag
codyhoag reviewed Mar 16, 2021
View reviewed changes
Copy link
Contributor

@codyhoag codyhoag left a comment

Choose a reason for hiding this comment

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

One question; otherwise, LGTM!

@codyhoag codyhoag added the peer-review-done Signifies that the peer review team has reviewed this PR label Mar 16, 2021
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Mar 16, 2021
@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 16, 2021

New changes are detected. LGTM label has been removed.

@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 16, 2021
@rolfedh
Copy link
Contributor Author

rolfedh commented Mar 16, 2021

@codyhoag Thanks for your review. It looks like this is ready to merge now.

@codyhoag codyhoag merged commit e621ddb into openshift:master Mar 17, 2021
@codyhoag
Copy link
Contributor

codyhoag commented Mar 17, 2021

/cherrypick enterprise-4.8

@codyhoag
Copy link
Contributor

codyhoag commented Mar 17, 2021

/cherrypick enterprise-4.7

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Mar 17, 2021

@codyhoag: #30088 failed to apply on top of branch "enterprise-4.8":

Applying: RHDEVDOCS-2685 Document that we test Logstash with fluent forward v1 protocol (and elasticsearch 7.10)
Using index info to reconstruct a base tree...
A	modules/cluster-logging-collector-log-forwarding-supported-plugins.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/cluster-logging-collector-log-forwarding-supported-plugins.adoc deleted in HEAD and modified in RHDEVDOCS-2685 Document that we test Logstash with fluent forward v1 protocol (and elasticsearch 7.10). Version RHDEVDOCS-2685 Document that we test Logstash with fluent forward v1 protocol (and elasticsearch 7.10) of modules/cluster-logging-collector-log-forwarding-supported-plugins.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 RHDEVDOCS-2685 Document that we test Logstash with fluent forward v1 protocol (and elasticsearch 7.10)
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".
Details

In response to this:

/cherrypick enterprise-4.8

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

openshift-cherrypick-robot commented Mar 17, 2021

@codyhoag: #30088 failed to apply on top of branch "enterprise-4.7":

Applying: RHDEVDOCS-2685 Document that we test Logstash with fluent forward v1 protocol (and elasticsearch 7.10)
Using index info to reconstruct a base tree...
A	modules/cluster-logging-collector-log-forwarding-supported-plugins.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/cluster-logging-collector-log-forwarding-supported-plugins.adoc deleted in HEAD and modified in RHDEVDOCS-2685 Document that we test Logstash with fluent forward v1 protocol (and elasticsearch 7.10). Version RHDEVDOCS-2685 Document that we test Logstash with fluent forward v1 protocol (and elasticsearch 7.10) of modules/cluster-logging-collector-log-forwarding-supported-plugins.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 RHDEVDOCS-2685 Document that we test Logstash with fluent forward v1 protocol (and elasticsearch 7.10)
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".
Details

In response to this:

/cherrypick enterprise-4.7

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.

@rolfedh rolfedh mentioned this pull request Mar 17, 2021
Merged
codyhoag added a commit that referenced this pull request Mar 17, 2021
@codyhoag
Merge pull request #30571 from rolfedh/cp#30088-to-4.7
4d3e3b4 
cp pr #30088 to 4.7 and 4.8
vikram-redhat added a commit that referenced this pull request Mar 17, 2021
@vikram-redhat
Merge pull request #30579 from openshift-cherrypick-robot/cherry-pick…
4f0a2a1 
…-30571-to-enterprise-4.8

[enterprise-4.8] cp pr #30088 to 4.7 and 4.8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@codyhoag codyhoag codyhoag left review comments

@vimalk78 vimalk78 vimalk78 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@eranra eranra

@vimalk78 vimalk78

Labels

branch/enterprise-4.7 branch/enterprise-4.8 peer-review-done Signifies that the peer review team has reviewed this PR size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Milestone

Next Release

Development

Successfully merging this pull request may close these issues.

7 participants

@rolfedh @eranra @jcantrill @openshift-ci-robot @codyhoag @openshift-cherrypick-robot @vimalk78