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

Bug 1858200: Disable LogFowarding when legacy protocols in use #604

Merged
merged 1 commit into from Jul 27, 2020
Merged

Bug 1858200: Disable LogFowarding when legacy protocols in use #604

merged 1 commit into from Jul 27, 2020

Conversation

periklis
Copy link
Contributor

@periklis periklis commented Jul 20, 2020 •
edited

Description

This PR addresses a fix to disable log forwarding config generation when one of the two legacy methods is used, i.e. fluentd legacy forward, syslog legacy forward).

To address: https://bugzilla.redhat.com/show_bug.cgi?id=1858200

Needs backport: release-4.5 and release-4.4

/cc @jcantrill @alanconway @vimalk78

@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Jul 20, 2020
@openshift-ci-robot
Copy link

@periklis: This pull request references Bugzilla bug 1858200, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1858200: Disable LogFowarding when legacy protocols in use

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-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Jul 20, 2020
@periklis
Copy link
Contributor Author

/retest

@openshift-ci-robot
Copy link

@periklis: This pull request references Bugzilla bug 1858200, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1858200: Disable LogFowarding when legacy protocols in use

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.

@jcantrill
Copy link
Contributor

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 20, 2020
@jcantrill
Copy link
Contributor

This PR addresses a fix to disable log forwarding config generation when one of the two legacy methods is used,

What is the reasoning for disabling? Why can the configuration not support both?

@periklis
Copy link
Contributor Author

This PR addresses a fix to disable log forwarding config generation when one of the two legacy methods is used,

What is the reasoning for disabling? Why can the configuration not support both?

According to this thread, our docs should be understood as exclusive alternatives.

jcantrill
jcantrill reviewed Jul 20, 2020
View reviewed changes
Copy link
Contributor

@jcantrill jcantrill left a comment

Choose a reason for hiding this comment

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

/approve

@jcantrill
Copy link
Contributor

/hold cancel

@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Jul 20, 2020
jcantrill
jcantrill reviewed Jul 21, 2020
View reviewed changes
Copy link
Contributor

@jcantrill jcantrill 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 Jul 21, 2020
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

10 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@periklis
Copy link
Contributor Author

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 22, 2020
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jul 22, 2020
@periklis
Copy link
Contributor Author

/retest

@periklis periklis force-pushed the bz-1858200 branch 4 times, most recently from 8ec806a to fefca9a Compare July 23, 2020 13:34
@periklis
Copy link
Contributor Author

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 23, 2020
vimalk78
vimalk78 reviewed Jul 24, 2020
View reviewed changes
Copy link
Contributor

@vimalk78 vimalk78 left a comment

Choose a reason for hiding this comment

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

The PR title give a different impression. Actually we are avoiding pipelines generation, and not generating detailed output conf for legacy fluent and syslog outputs.

test/e2e/logforwarding/fluentlegacy/forward_to_fluent_test.go Show resolved Hide resolved
pkg/generators/forwarding/fluentd/generators.go Show resolved Hide resolved
pkg/generators/forwarding/fluentd/output_conf_legacy_test.go Outdated Show resolved Hide resolved
pkg/generators/forwarding/fluentd/output_conf_legacy_test.go Outdated Show resolved Hide resolved
alanconway
alanconway reviewed Jul 24, 2020
View reviewed changes
Copy link
Contributor

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

Looks good, but will re-check after conflicts are resolved.

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 25, 2020
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 25, 2020
@vimalk78
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 27, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcantrill, periklis, vimalk78

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit ab7c674 into openshift:master Jul 27, 2020
@openshift-ci-robot
Copy link

@periklis: All pull requests linked via external trackers have merged: openshift/cluster-logging-operator#604. Bugzilla bug 1858200 has been moved to the MODIFIED state.

In response to this:

Bug 1858200: Disable LogFowarding when legacy protocols in use

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.

@periklis
Copy link
Contributor Author

/cherry-pick release-4.5

@openshift-cherrypick-robot
Copy link

@periklis: #604 failed to apply on top of branch "release-4.5":

In response to this:

/cherry-pick release-4.5

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.

@periklis periklis mentioned this pull request Jul 28, 2020
Merged
pmoogi-redhat pushed a commit to pmoogi-redhat/cluster-logging-operator that referenced this pull request Apr 26, 2022
@openshift-merge-robot
Merge pull request openshift#604 from periklis/bz-1858200
8efbd2c 
Bug 1858200: Disable LogFowarding when legacy protocols in use
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vimalk78 vimalk78 vimalk78 left review comments

@jcantrill jcantrill jcantrill left review comments

@alanconway alanconway alanconway left review comments

Assignees

@vimalk78 vimalk78

@jcantrill jcantrill

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@periklis @openshift-ci-robot @jcantrill @openshift-bot @vimalk78 @openshift-cherrypick-robot @alanconway @openshift-merge-robot