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.

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

[Elastic Log Driver] Fix file check bug, deal with logging #15935

Merged

Conversation

fearful-symmetry
Copy link
Contributor

This addresses a bug where we weren't properly checking to see if a meta.json file existed, and also a default debug log level. Users can now config the log level with LOG_DRIVER_LEVEL

@fearful-symmetry fearful-symmetry added bug needs_backport PR is waiting to be backported to other branches. Team:Integrations Label for the Integrations team v7.6.0 labels Jan 29, 2020
@fearful-symmetry fearful-symmetry requested a review from a team January 29, 2020 15:58
@fearful-symmetry fearful-symmetry self-assigned this Jan 29, 2020
x-pack/dockerlogbeat/config.json Show resolved Hide resolved
x-pack/dockerlogbeat/handlers.go Show resolved Hide resolved
@@ -26,8 +26,12 @@ import (

// genNewMonitoringConfig is a hacked-in function to enable a debug stderr logger
func genNewMonitoringConfig() (*common.Config, error) {
lvl, isSet := os.LookupEnv("LOG_DRIVER_LEVEL")
Copy link
Contributor

Choose a reason for hiding this comment

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

no need to change 😬 maybe logDriverLevel or ldl is better?

@mikemadden42
Copy link
Contributor

run beats-ci/package

@mikemadden42 mikemadden42 mentioned this pull request Jan 30, 2020
8 tasks
@mikemadden42
Copy link
Contributor

run beats-ci/package

@mikemadden42
Copy link
Contributor

run beats-ci/package

1 similar comment
@mikemadden42
Copy link
Contributor

run beats-ci/package

@fearful-symmetry fearful-symmetry merged commit d60e65b into elastic:master Jan 31, 2020
@fearful-symmetry fearful-symmetry removed the needs_backport PR is waiting to be backported to other branches. label Feb 5, 2020
fearful-symmetry added a commit to fearful-symmetry/beats that referenced this pull request Feb 5, 2020
…5935)

* fix file check bug, deal with logging

* add logging env fix

* remove space

* fix nil pointer deref

* add missing blocking read call

(cherry picked from commit d60e65b)
fearful-symmetry added a commit to fearful-symmetry/beats that referenced this pull request Feb 5, 2020
…5935)

* fix file check bug, deal with logging

* add logging env fix

* remove space

* fix nil pointer deref

* add missing blocking read call

(cherry picked from commit d60e65b)
fearful-symmetry added a commit that referenced this pull request Feb 5, 2020
…16094)

* fix file check bug, deal with logging

* add logging env fix

* remove space

* fix nil pointer deref

* add missing blocking read call

(cherry picked from commit d60e65b)
fearful-symmetry added a commit that referenced this pull request Feb 5, 2020
…eal with logging (#16095)

* [Elastic Log Driver] Fix file check bug, deal with logging (#15935)

* fix file check bug, deal with logging

* add logging env fix

* remove space

* fix nil pointer deref

* add missing blocking read call

(cherry picked from commit d60e65b)

* remove space
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Team:Integrations Label for the Integrations team v7.6.0 v7.7.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants