RHDEVDOCS-2685 Document that we test Logstash with fluent forward v1 … by rolfedh · Pull Request #30088 · openshift/openshift-docs

rolfedh · 2021-03-04T02:31:09Z

For versions 4.7+
https://issues.redhat.com/browse/RHDEVDOCS-2685 Document that we test Logstash 7.10 with Fluent forward v.1 output type.
https://issues.redhat.com/browse/RHDEVDOCS-2735 Document that we test Elasticsearch 7.10.1 with the elasticsearch
output type.
Direct link to doc preview: https://deploy-preview-30088--osdocs.netlify.app/openshift-enterprise/latest/logging/cluster-logging-external.html#cluster-logging-collector-log-forwarding-supported-plugins_cluster-logging-external
Ready for peer review and merge

netlify · 2021-03-04T02:32:44Z

Deploy preview for osdocs ready!

Built with commit 2c94679

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

eranra · 2021-03-10T13:34:48Z

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

rolfedh

@jcantrill Please review and approve. Thanks.

jcantrill · 2021-03-13T00:58:47Z

Lgtm

eranra · 2021-03-13T16:13:43Z

@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

rolfedh · 2021-03-13T19:13:09Z

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 · 2021-03-14T11:46:58Z

/lgtm

codyhoag

One question; otherwise, LGTM!

…protocol (and elasticsearch 7.10)

openshift-ci-robot · 2021-03-16T22:50:57Z

New changes are detected. LGTM label has been removed.

rolfedh · 2021-03-16T22:53:39Z

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

codyhoag · 2021-03-17T00:32:48Z

/cherrypick enterprise-4.8

codyhoag · 2021-03-17T00:32:53Z

/cherrypick enterprise-4.7

openshift-cherrypick-robot · 2021-03-17T00:33:29Z

@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 · 2021-03-17T00:33:34Z

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

cp pr #30088 to 4.7 and 4.8

…-30571-to-enterprise-4.8 [enterprise-4.8] cp pr #30088 to 4.7 and 4.8

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

rolfedh mentioned this pull request Mar 4, 2021

RHDEVDOCS-2614 Define ClusterLogForwarder compatibility matrix #29573

Merged

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

rolfedh commented Mar 10, 2021

View reviewed changes

Comment thread modules/cluster-logging-collector-log-forwarding-supported-plugins.adoc Outdated

Comment thread modules/cluster-logging-collector-log-forwarding-supported-plugins.adoc Outdated

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

openshift-ci-robot assigned vimalk78 Mar 13, 2021

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 13, 2021

openshift-ci-robot assigned eranra Mar 14, 2021

codyhoag added branch/enterprise-4.7 branch/enterprise-4.8 labels Mar 16, 2021

codyhoag added this to the Next Release milestone Mar 16, 2021

codyhoag reviewed Mar 16, 2021

View reviewed changes

Comment thread modules/cluster-logging-collector-log-forwarding-supported-plugins.adoc Outdated

codyhoag added the peer-review-done Signifies that the peer review team has reviewed this PR label Mar 16, 2021

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

2c94679

…protocol (and elasticsearch 7.10)

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Mar 16, 2021

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

codyhoag merged commit e621ddb into openshift:master Mar 17, 2021

rolfedh mentioned this pull request Mar 17, 2021

cp pr #30088 to 4.7 and 4.8 #30571

Merged

codyhoag added a commit that referenced this pull request Mar 17, 2021

Merge pull request #30571 from rolfedh/cp#30088-to-4.7

4d3e3b4

cp pr #30088 to 4.7 and 4.8

vikram-redhat pushed a commit that referenced this pull request Mar 17, 2021

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

Conversation

rolfedh commented Mar 4, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

netlify Bot commented Mar 4, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

eranra commented Mar 10, 2021

Uh oh!

rolfedh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

jcantrill commented Mar 13, 2021

Uh oh!

eranra commented Mar 13, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rolfedh commented Mar 13, 2021

Uh oh!

eranra commented Mar 14, 2021

Uh oh!

codyhoag left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

openshift-ci-robot commented Mar 16, 2021

Uh oh!

rolfedh commented Mar 16, 2021

Uh oh!

codyhoag commented Mar 17, 2021

Uh oh!

codyhoag commented Mar 17, 2021

Uh oh!

openshift-cherrypick-robot commented Mar 17, 2021

Uh oh!

openshift-cherrypick-robot commented Mar 17, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

rolfedh commented Mar 4, 2021 •

edited

Loading

netlify Bot commented Mar 4, 2021 •

edited

Loading

eranra commented Mar 13, 2021 •

edited

Loading