child cluster clearer fluent variable names, template output URI

K0rdent · Dec 6, 2024 · 99c8652 · 99c8652
1 parent e1d3cc2
commit 99c8652
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/charts/motel-child/Chart.yaml b/charts/motel-child/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: motel-child
 description: A Helm chart that deploys Grafana, OpenTelemetry, and VictoriaMetrics.
-version: 0.1.0
+version: 0.1.1
 appVersion: "1.0"
 dependencies:
   - name: victoria-metrics-operator

diff --git a/charts/motel-child/templates/victoria/fluent-out.yaml b/charts/motel-child/templates/victoria/fluent-out.yaml
@@ -10,8 +10,8 @@ data:
     [OUTPUT]
       Name             http
       Match            kube.*
-      Host             {{ index .Values "fluent-bit" "outputUrl" }}
-      URI              /vls/insert/jsonline
+      Host             {{ index .Values "fluent-bit" "outputHost" }}
+      URI              {{ index .Values "fluent-bit" "outputURI" | default "/vls/insert/jsonline" }}
       port             443
       tls              on
       compress         gzip

diff --git a/charts/motel-child/values.yaml b/charts/motel-child/values.yaml
@@ -27,7 +27,8 @@ victoriametrics:
     remotePassword: motel
 fluent-bit:
   enabled: true
-  outputUrl: vmauth.hmc0.example.net
+  outputHost: vmauth.hmc0.example.net
+  outputURI: /vls/insert/jsonline
   outputUsername: motel
   outputPassword: motel
   args:

diff --git a/demo/cluster/aws-child.yaml b/demo/cluster/aws-child.yaml
@@ -33,6 +33,6 @@ spec:
             remotePassword: motel
         fluent-bit:
           enabled: true
-          outputUrl: vmauth.hmc0.example.net
+          outputHost: vmauth.hmc0.example.net
           outputUsername: motel
           outputPassword: motel