From 99c865233ae3582a89296c971f84c6d2b17a2195 Mon Sep 17 00:00:00 2001 From: Pavel Basov Date: Fri, 6 Dec 2024 12:13:12 +0100 Subject: [PATCH] child cluster clearer fluent variable names, template output URI --- charts/motel-child/Chart.yaml | 2 +- charts/motel-child/templates/victoria/fluent-out.yaml | 4 ++-- charts/motel-child/values.yaml | 3 ++- demo/cluster/aws-child.yaml | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/charts/motel-child/Chart.yaml b/charts/motel-child/Chart.yaml index b24b2aa..6a03e09 100644 --- 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 index 5794c71..b8f2954 100644 --- 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 index ece6f9b..8e92ca2 100644 --- 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 index 9f14d29..25108ce 100644 --- 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 \ No newline at end of file