From cf49baf49fe75a2394f5ce89e15b588a125b6115 Mon Sep 17 00:00:00 2001 From: Maksim Shakavin Date: Mon, 19 Aug 2024 16:34:42 +0200 Subject: [PATCH] fix(vector): try again to remap --- .../default/qbittorrent/tools/emonoda/helmrelease.yaml | 2 +- .../qbittorrent/tools/qbit_manage/helmrelease.yaml | 2 +- .../vector/app/aggregator/resources/vector.yaml | 10 ++++++++++ .../bootstrap/talos/clusterconfig/talosconfig | 2 ++ 4 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 kubernetes/bootstrap/talos/kubernetes/bootstrap/talos/clusterconfig/talosconfig diff --git a/kubernetes/apps/default/qbittorrent/tools/emonoda/helmrelease.yaml b/kubernetes/apps/default/qbittorrent/tools/emonoda/helmrelease.yaml index 3ebfc58b..73ffe843 100644 --- a/kubernetes/apps/default/qbittorrent/tools/emonoda/helmrelease.yaml +++ b/kubernetes/apps/default/qbittorrent/tools/emonoda/helmrelease.yaml @@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: - name: qbittorrent-emonoda + name: qbittorrent-tools-emonoda spec: interval: 30m chart: diff --git a/kubernetes/apps/default/qbittorrent/tools/qbit_manage/helmrelease.yaml b/kubernetes/apps/default/qbittorrent/tools/qbit_manage/helmrelease.yaml index 5b1f64f8..11897494 100644 --- a/kubernetes/apps/default/qbittorrent/tools/qbit_manage/helmrelease.yaml +++ b/kubernetes/apps/default/qbittorrent/tools/qbit_manage/helmrelease.yaml @@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: - name: qbit-manage + name: qbittorrent-tools-manage spec: interval: 30m chart: diff --git a/kubernetes/apps/observability/vector/app/aggregator/resources/vector.yaml b/kubernetes/apps/observability/vector/app/aggregator/resources/vector.yaml index 7d0c4b41..cd4f19e1 100644 --- a/kubernetes/apps/observability/vector/app/aggregator/resources/vector.yaml +++ b/kubernetes/apps/observability/vector/app/aggregator/resources/vector.yaml @@ -32,6 +32,16 @@ transforms: .custom_app_name = .pod_labels."app.kubernetes.io/name" || .pod_labels.app || .pod_labels."k8s-app" || "unknown" # Drop pod_labels del(.pod_labels) + unwrap_logs: + type: remap + inputs: ["kubernetes_remap"] + source: | + if contains(string!(.custom_app_name), "qbittorrent-tools") { + .log = .message + } else { + .log = encode_json(.) + } + del(.message) # # Sinks diff --git a/kubernetes/bootstrap/talos/kubernetes/bootstrap/talos/clusterconfig/talosconfig b/kubernetes/bootstrap/talos/kubernetes/bootstrap/talos/clusterconfig/talosconfig new file mode 100644 index 00000000..e35e5db5 --- /dev/null +++ b/kubernetes/bootstrap/talos/kubernetes/bootstrap/talos/clusterconfig/talosconfig @@ -0,0 +1,2 @@ +context: "" +contexts: {}