From 92bff5eef68a0d8bf5e4fb684d29d01388a95714 Mon Sep 17 00:00:00 2001 From: Andrew Crump Date: Wed, 8 Nov 2023 01:27:33 +0000 Subject: [PATCH] Can suppress warnings for invalid drains (Windows) In b64e1ee9 we made warnings for invalid syslog drains configurable but neglected to add the same property to the loggr-syslog-agent-windows job. --- jobs/loggr-syslog-agent-windows/monit | 3 ++- jobs/loggr-syslog-agent-windows/spec | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/jobs/loggr-syslog-agent-windows/monit b/jobs/loggr-syslog-agent-windows/monit index d21bfd047..63b1c47cd 100644 --- a/jobs/loggr-syslog-agent-windows/monit +++ b/jobs/loggr-syslog-agent-windows/monit @@ -44,8 +44,9 @@ "METRICS_CERT_FILE_PATH" => "#{certs_dir}/metrics.crt", "METRICS_KEY_FILE_PATH" => "#{certs_dir}/metrics.key", "DEBUG_METRICS" => "#{p("metrics.debug")}", - "PPROF_PORT" => "#{p("metrics.pprof_port")}", + "PPROF_PORT" => "#{p("metrics.pprof_port")}", "USE_RFC3339" => "#{p("logging.format.timestamp") == "rfc3339"}", + "WARN_ON_INVALID_DRAINS" => "#{p("warn_on_invalid_drains")}", } } if_p("drain_cipher_suites") do | ciphers | diff --git a/jobs/loggr-syslog-agent-windows/spec b/jobs/loggr-syslog-agent-windows/spec index 850afa4a2..9187e12a5 100644 --- a/jobs/loggr-syslog-agent-windows/spec +++ b/jobs/loggr-syslog-agent-windows/spec @@ -123,3 +123,7 @@ properties: logging.format.timestamp: description: "Format for timestamp in component logs. Valid values are 'deprecated' and 'rfc3339'." default: "deprecated" + + warn_on_invalid_drains: + description: "Whether to output log warnings on invalid drains" + default: true