From 421a0ec63553fa7e2adfa695b86067e3dda29d7f Mon Sep 17 00:00:00 2001 From: Martin Angers Date: Tue, 10 May 2022 11:27:32 -0400 Subject: [PATCH] Fix some config mismatches in osquery logging (#5488) --- server/logging/logging.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/logging/logging.go b/server/logging/logging.go index 481f3ff60f..e3c29bfafd 100644 --- a/server/logging/logging.go +++ b/server/logging/logging.go @@ -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