Skip to content

RHDEVDOCS-2614 Define ClusterLogForwarder compatibility matrix#29573

Merged
ahardin-rh merged 1 commit intoopenshift:masterfrom
rolfedh:RHDEVDOCS-2614
Feb 24, 2021
Merged

RHDEVDOCS-2614 Define ClusterLogForwarder compatibility matrix#29573
ahardin-rh merged 1 commit intoopenshift:masterfrom
rolfedh:RHDEVDOCS-2614

Conversation

@rolfedh
Copy link
Copy Markdown
Contributor

@rolfedh rolfedh commented Feb 18, 2021

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

netlify Bot commented Feb 18, 2021

Deploy preview for osdocs ready!

Built with commit b1229d5

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

@rolfedh
Copy link
Copy Markdown
Contributor Author

rolfedh commented Feb 18, 2021

Please take a look, @sichvoge @jcantrill @vimalk78. I think I've addressed all of the issues we discussed in the OpenShift Logging compatibility matrix Google doc. Please mark this PR as "lgtm" or suggest further improvements here in this PR, not in the Google doc. I've also set up this Slack thread for us to discuss this PR.

Comment thread modules/cluster-logging-collector-log-forwarding-supported-plugins.adoc Outdated
Comment thread modules/cluster-logging-collector-log-forwarding-supported-plugins.adoc Outdated
Comment thread modules/cluster-logging-collector-log-forwarding-supported-plugins.adoc Outdated
Comment thread modules/cluster-logging-collector-log-forwarding-supported-plugins.adoc Outdated
Comment thread modules/cluster-logging-collector-log-forwarding-supported-plugins.adoc Outdated
Comment thread modules/cluster-logging-collector-log-forwarding-supported-plugins.adoc Outdated
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
Copy link
Copy Markdown
Contributor Author

rolfedh commented Feb 18, 2021

@jcantrill @sichvoge @vimalk78 Please approve this PR with "lgtm" thanks.

@vimalk78
Copy link
Copy Markdown

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 18, 2021
Comment thread logging/cluster-logging-external.adoc Outdated
Comment thread modules/cluster-logging-collector-log-forwarding-supported-plugins.adoc Outdated
Comment thread modules/cluster-logging-collector-log-forwarding-supported-plugins.adoc Outdated
Comment thread modules/cluster-logging-collector-log-forwarding-supported-plugins.adoc Outdated
Comment thread modules/cluster-logging-collector-log-forwarding-supported-plugins.adoc Outdated
Comment thread modules/cluster-logging-collector-log-forwarding-supported-plugins.adoc Outdated
Comment thread modules/cluster-logging-collector-log-forwarding-supported-plugins.adoc Outdated
@ahardin-rh ahardin-rh added branch/enterprise-4.7 peer-review-done Signifies that the peer review team has reviewed this PR labels Feb 18, 2021
@ahardin-rh ahardin-rh added this to the Future Release milestone Feb 18, 2021
@ahardin-rh
Copy link
Copy Markdown
Contributor

@rolfedh Just a few comments from me. 👍

@sichvoge
Copy link
Copy Markdown

Left another two comments.

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Feb 19, 2021
@sichvoge
Copy link
Copy Markdown

LGTM

Copy link
Copy Markdown
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.

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

@alanconway alanconway Feb 23, 2021

Choose a reason for hiding this comment

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

"Tested with" rather than "Target" - we don't want to imply these are the only versions that work, they're just the ones we've tested against. Otherwise all good.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Thanks, @alanconway. I've updated the heading. Please mark this PR as "/lgtm"

@openshift-ci-robot
Copy link
Copy Markdown

@rolfedh: you cannot LGTM your own PR.

Details

In response to this:

/lgtm

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.

Copy link
Copy Markdown

@alanconway alanconway 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-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 24, 2021
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Feb 24, 2021
@openshift-ci-robot
Copy link
Copy Markdown

New changes are detected. LGTM label has been removed.

@ahardin-rh ahardin-rh merged commit 4f1495e into openshift:master Feb 24, 2021
@ahardin-rh
Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.7

@ahardin-rh
Copy link
Copy Markdown
Contributor

/cherrypick enterprise-4.8

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Feb 24, 2021

@ahardin-rh: #29573 failed to apply on top of branch "enterprise-4.7":

Applying: [RHDEVDOCS-2614](https://issues.redhat.com/browse/RHDEVDOCS-2614) Define ClusterLogForwarder compatability Matrix
Using index info to reconstruct a base tree...
M	logging/cluster-logging-external.adoc
Falling back to patching base and 3-way merge...
Auto-merging logging/cluster-logging-external.adoc
CONFLICT (content): Merge conflict in logging/cluster-logging-external.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 [RHDEVDOCS-2614](https://issues.redhat.com/browse/RHDEVDOCS-2614) Define ClusterLogForwarder compatability Matrix
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.

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Feb 24, 2021

@ahardin-rh: #29573 failed to apply on top of branch "enterprise-4.8":

Applying: [RHDEVDOCS-2614](https://issues.redhat.com/browse/RHDEVDOCS-2614) Define ClusterLogForwarder compatability Matrix
Using index info to reconstruct a base tree...
M	logging/cluster-logging-external.adoc
Falling back to patching base and 3-way merge...
Auto-merging logging/cluster-logging-external.adoc
CONFLICT (content): Merge conflict in logging/cluster-logging-external.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 [RHDEVDOCS-2614](https://issues.redhat.com/browse/RHDEVDOCS-2614) Define ClusterLogForwarder compatability Matrix
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.


= Supported log data output types

[role="_abstract"]
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Hi @rolfedh - we are not using these Pv2 tags at the moment. Do you mind removing this as a follow up PR?

See my note in Slack.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@vikram-redhat Sure - no problem. I'll fix it today. This particular case comes from the redhat-documentation/modular-docs templates. We should have a tete-a-tete with Emily Murphy to avoid expanding issues like this.

Copy link
Copy Markdown
Contributor Author

@rolfedh rolfedh Mar 4, 2021

Choose a reason for hiding this comment

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

@vikram-redhat I've removed [role="_abstract"] in #30088, which is WIP. Please note that [role= also appears in the following locations:

Results for "[role=" in "*.adoc"

/home/rdlugyhe/openshift-docs/migration/migrating_3_4/migrating-applications-with-cam-3-4.adoc:
  62:  [role="_additional-resources"]


/home/rdlugyhe/openshift-docs/migration/migrating_3_4/troubleshooting-3-4.adoc:
  38:  [role="_additional-resources"]


/home/rdlugyhe/openshift-docs/migration/migrating_4_1_4/migrating-applications-with-cam-4-1-4.adoc:
  61:  [role="_additional-resources"]


/home/rdlugyhe/openshift-docs/migration/migrating_4_1_4/troubleshooting-4-1-4.adoc:
  37:  [role="_additional-resources"]


/home/rdlugyhe/openshift-docs/migration/migrating_4_2_4/migrating-applications-with-cam-4-2-4.adoc:
  61:  [role="_additional-resources"]


/home/rdlugyhe/openshift-docs/migration/migrating_4_2_4/troubleshooting-4-2-4.adoc:
  37:  [role="_additional-resources"]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.7 branch/enterprise-4.8 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

Development

Successfully merging this pull request may close these issues.

9 participants