Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 111

Fix some config mismatches in osquery logging (#5488)

Browse source
This commit is contained in:
Martin Angers 2022-05-10 11:27:32 -04:00 committed by GitHub
parent 660ef8d14a
commit 421a0ec635
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
server/logging/logging.go
View file

@ -23,7 +23,7 @@ func New(config config.FleetConfig, logger log.Logger) (*OsqueryLogger, error) {
switch config.Osquery.StatusLogPlugin {
case "":
// Allow "" to mean filesystem for backwards compatibility
level.Info(logger).Log("msg", "fleet_status_log_plugin not explicitly specified. Assuming 'filesystem'")
level.Info(logger).Log("msg", "osquery_status_log_plugin not explicitly specified. Assuming 'filesystem'")
fallthrough
case "filesystem":
status, err = NewFilesystemLogWriter(
@ -107,7 +107,7 @@ func New(config config.FleetConfig, logger log.Logger) (*OsqueryLogger, error) {
switch config.Osquery.ResultLogPlugin {
case "":
// Allow "" to mean filesystem for backwards compatibility
level.Info(logger).Log("msg", "fleet_result_log_plugin not explicitly specified. Assuming 'filesystem'")
level.Info(logger).Log("msg", "osquery_result_log_plugin not explicitly specified. Assuming 'filesystem'")
fallthrough
case "filesystem":
result, err = NewFilesystemLogWriter(
@ -125,7 +125,7 @@ func New(config config.FleetConfig, logger log.Logger) (*OsqueryLogger, error) {
config.Firehose.EndpointURL,
config.Firehose.AccessKeyID,
config.Firehose.SecretAccessKey,
config.Kinesis.StsAssumeRoleArn,
config.Firehose.StsAssumeRoleArn,
config.Firehose.ResultStream,
logger,
)
@ -184,7 +184,7 @@ func New(config config.FleetConfig, logger log.Logger) (*OsqueryLogger, error) {
}
default:
return nil, fmt.Errorf(
"unknown result log plugin: %s", config.Osquery.StatusLogPlugin,
"unknown result log plugin: %s", config.Osquery.ResultLogPlugin,
)
}
return &OsqueryLogger{Status: status, Result: result}, nil