From c56e9e70f824d933cb169d023295182de4d196fb Mon Sep 17 00:00:00 2001
From: Nick Muerdter <12112+GUI@users.noreply.github.com>
Date: Wed, 14 Feb 2024 15:52:39 -0700
Subject: [PATCH] Configurable fluent bit log level and no_proxy settings.

---
 config/schema.cue                              | 2 ++
 templates/etc/fluent-bit/fluent-bit.yaml.etlua | 2 +-
 templates/etc/perp/fluent-bit/rc.env.etlua     | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/config/schema.cue b/config/schema.cue
index 65cd9970a..7cc0613b3 100644
--- a/config/schema.cue
+++ b/config/schema.cue
@@ -424,6 +424,7 @@ import "path"
     host: string | *"127.0.0.1"
     port: uint16 | *14014
     service: {
+      log_level: string | *"info"
       flush: float | *1
       storage_max_chunks_up: uint | *32
       storage_backlog_mem_limit: string | *"16M"
@@ -927,6 +928,7 @@ import "path"
 
   http_proxy?: string
   https_proxy?: string
+  no_proxy?: string
 
   version?: uint16
 
diff --git a/templates/etc/fluent-bit/fluent-bit.yaml.etlua b/templates/etc/fluent-bit/fluent-bit.yaml.etlua
index c27185897..0b6686907 100644
--- a/templates/etc/fluent-bit/fluent-bit.yaml.etlua
+++ b/templates/etc/fluent-bit/fluent-bit.yaml.etlua
@@ -1,5 +1,5 @@
 service:
-  log_level: info
+  log_level: <%- json_encode(config["fluent_bit"]["service"]["log_level"]) %>
   # How often to flush inputs to the outputs.
   flush: <%- json_encode(config["fluent_bit"]["service"]["flush"]) %>
   storage.path: <%- json_encode(path_join(config["db_dir"], "fluent-bit")) %>
diff --git a/templates/etc/perp/fluent-bit/rc.env.etlua b/templates/etc/perp/fluent-bit/rc.env.etlua
index e81739d87..bef6f977d 100644
--- a/templates/etc/perp/fluent-bit/rc.env.etlua
+++ b/templates/etc/perp/fluent-bit/rc.env.etlua
@@ -1,6 +1,9 @@
 <% if config["http_proxy"] then %>
 HTTP_PROXY=<%- config["http_proxy"] %>
 <% end %>
+<% if config["no_proxy"] then %>
+NO_PROXY=<%- config["no_proxy"] %>
+<% end %>
 <% if config["fluent_bit"]["aws_access_key_id"] then %>
 AWS_ACCESS_KEY_ID=<%- config["fluent_bit"]["aws_access_key_id"] %>
 <% end %>