From 8ae0713e4d40ffb23b72da3c8d3c6cd1ad52efaa Mon Sep 17 00:00:00 2001 From: JJGadgets Date: Thu, 16 May 2024 05:05:56 +0800 Subject: [PATCH] fix(jellyfin): missing bloody comma --- kube/deploy/apps/jellyfin/app/hr.yaml | 2 +- .../monitoring/kps/external/nighthawk.yaml | 20 +++++++++++++------ .../kps/external/smartctl-exporter.yaml | 9 ++++++--- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/kube/deploy/apps/jellyfin/app/hr.yaml b/kube/deploy/apps/jellyfin/app/hr.yaml index d189b667..d620a4b1 100644 --- a/kube/deploy/apps/jellyfin/app/hr.yaml +++ b/kube/deploy/apps/jellyfin/app/hr.yaml @@ -113,7 +113,7 @@ spec: fsGroup: *uid fsGroupChangePolicy: "Always" supplementalGroups: [ - 44, 104, 109, 128, 226 # GPU + 44, 104, 109, 128, 226, # GPU 6969 # NAS ] seccompProfile: { type: "RuntimeDefault" } diff --git a/kube/deploy/core/monitoring/kps/external/nighthawk.yaml b/kube/deploy/core/monitoring/kps/external/nighthawk.yaml index 0f6f4a4a..0c077702 100644 --- a/kube/deploy/core/monitoring/kps/external/nighthawk.yaml +++ b/kube/deploy/core/monitoring/kps/external/nighthawk.yaml @@ -7,11 +7,15 @@ metadata: namespace: monitoring spec: # TODO: set default intervals to debug memory spikes - scrapeInterval: "30s" - scrapeTimeout: "15s" staticConfigs: - - targets: ["${IP_NIGHTHAWK}:9182"] + - targets: + - &ip "${IP_NIGHTHAWK}:9182" metricsPath: "/metrics" + relabelings: + - sourceLabels: ["__address__"] + targetLabel: "instance" + regex: *ip + replacement: "nighthawk:9182" --- apiVersion: monitoring.coreos.com/v1alpha1 kind: ScrapeConfig @@ -21,8 +25,12 @@ metadata: spec: # scrapeInterval: "2s" # scrapeTimeout: "1s" - scrapeInterval: "30s" - scrapeTimeout: "15s" staticConfigs: - - targets: ["${IP_NIGHTHAWK}:9835"] + - targets: + - &ip "${IP_NIGHTHAWK}:9835" metricsPath: "/metrics" + relabelings: + - sourceLabels: ["__address__"] + targetLabel: "instance" + regex: *ip + replacement: "nighthawk:9835" diff --git a/kube/deploy/core/monitoring/kps/external/smartctl-exporter.yaml b/kube/deploy/core/monitoring/kps/external/smartctl-exporter.yaml index ba589f5a..33ef24c9 100644 --- a/kube/deploy/core/monitoring/kps/external/smartctl-exporter.yaml +++ b/kube/deploy/core/monitoring/kps/external/smartctl-exporter.yaml @@ -5,10 +5,13 @@ metadata: name: smartctl-exporter namespace: monitoring spec: - scrapeInterval: "1m" - scrapeTimeout: "10s" staticConfigs: - targets: - - "${IP_BLACKHAWK}:9633" # My laptop + - &blackhawk "${IP_BLACKHAWK}:9633" # My laptop metricsPath: "/metrics" + relabelings: + - sourceLabels: ["__address__"] + targetLabel: "instance" + regex: *blackhawk + replacement: "blackhawk:9633"