From a344155cb2eac9b4382e331b89602526201999aa Mon Sep 17 00:00:00 2001 From: Jahziel Villasana-Espinoza Date: Mon, 3 Jun 2024 11:31:01 -0400 Subject: [PATCH 1/3] fix: add missing variables --- tools/osquery/in-a-box/docker-compose.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/osquery/in-a-box/docker-compose.yml b/tools/osquery/in-a-box/docker-compose.yml index 85fde2c55c..7d7d1a3483 100644 --- a/tools/osquery/in-a-box/docker-compose.yml +++ b/tools/osquery/in-a-box/docker-compose.yml @@ -55,6 +55,7 @@ services: FLEET_VULNERABILITIES_DATABASES_PATH: /vulndb FLEET_VULNERABILITIES_PERIODICITY: 5m FLEET_LOGGING_DEBUG: 'true' + FLEET_SERVER_PRIVATE_KEY: ${FLEET_SERVER_PRIVATE_KEY} # This can be configured for testing purposes but otherwise uses the # typical default of provided. FLEET_OSQUERY_HOST_IDENTIFIER: ${FLEET_OSQUERY_HOST_IDENTIFIER:-provided} @@ -65,6 +66,7 @@ services: - .:/fleet/ - ./logs:/logs - ./vulndb:/vulndb + - ./config:/config ports: - "8412:8412" networks: @@ -93,8 +95,8 @@ services: FLEET_MYSQL_PASSWORD: fleet FLEET_REDIS_ADDRESS: redis01:6379 FLEET_SERVER_ADDRESS: 0.0.0.0:1337 - FLEET_SERVER_TLS: 'false' - FLEET_LOGGING_JSON: 'true' + FLEET_SERVER_TLS: "false" + FLEET_LOGGING_JSON: "true" FLEET_SESSION_DURATION: 720h FLEET_OSQUERY_STATUS_LOG_PLUGIN: stdout FLEET_OSQUERY_RESULT_LOG_PLUGIN: stdout @@ -102,12 +104,15 @@ services: FLEET_LICENSE_KEY: ${FLEET_LICENSE_KEY} FLEET_OSQUERY_LABEL_UPDATE_INTERVAL: 1m FLEET_VULNERABILITIES_CURRENT_INSTANCE_CHECKS: "no" + FLEET_SERVER_PRIVATE_KEY: ${FLEET_SERVER_PRIVATE_KEY} # This can be configured for testing purposes but otherwise uses the # typical default of provided. FLEET_OSQUERY_HOST_IDENTIFIER: ${FLEET_OSQUERY_HOST_IDENTIFIER:-provided} depends_on: - mysql01 - redis01 + volumes: + - ./config:/config ports: - "1337:1337" networks: From d260135dfe0815bad80c56ece3b37edb434ddc86 Mon Sep 17 00:00:00 2001 From: Jahziel Villasana-Espinoza Date: Mon, 3 Jun 2024 12:29:24 -0400 Subject: [PATCH 2/3] chore: modify go file for CI to run test --- cmd/fleetctl/preview.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/fleetctl/preview.go b/cmd/fleetctl/preview.go index 41aa155dd2..8edd1ff86d 100644 --- a/cmd/fleetctl/preview.go +++ b/cmd/fleetctl/preview.go @@ -239,7 +239,7 @@ Use the stop and reset subcommands to manage the server and dependencies once st } if err := os.WriteFile(pkFilename, []byte(genPK), 0o777); err != nil { - return "", fmt.Errorf("writing private key file: %w", err) + return "", fmt.Errorf("writing private TODO(JVE): revert this key file: %w", err) } return genPK, nil From 420a3523dd651bbd8eec39e12e3cd1d24d10202e Mon Sep 17 00:00:00 2001 From: Jahziel Villasana-Espinoza Date: Mon, 3 Jun 2024 13:28:45 -0400 Subject: [PATCH 3/3] chore: revert go change --- cmd/fleetctl/preview.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/fleetctl/preview.go b/cmd/fleetctl/preview.go index 8edd1ff86d..41aa155dd2 100644 --- a/cmd/fleetctl/preview.go +++ b/cmd/fleetctl/preview.go @@ -239,7 +239,7 @@ Use the stop and reset subcommands to manage the server and dependencies once st } if err := os.WriteFile(pkFilename, []byte(genPK), 0o777); err != nil { - return "", fmt.Errorf("writing private TODO(JVE): revert this key file: %w", err) + return "", fmt.Errorf("writing private key file: %w", err) } return genPK, nil