diff --git a/nodes/ansible/hosts b/nodes/ansible/hosts index 8f25dcd..033d62b 100644 --- a/nodes/ansible/hosts +++ b/nodes/ansible/hosts @@ -2,3 +2,7 @@ casa casa-mini-minion-01 casa-minion-01 + + +[maintenance-node-target] +casa-mini-minion-01 \ No newline at end of file diff --git a/services/monitoring/deploy/alloy/kube-scraper/helm-values.yaml b/services/monitoring/deploy/alloy/kube-scraper/helm-values.yaml index 0f493ee..d39f5ee 100644 --- a/services/monitoring/deploy/alloy/kube-scraper/helm-values.yaml +++ b/services/monitoring/deploy/alloy/kube-scraper/helm-values.yaml @@ -62,116 +62,6 @@ alloy: } } - // ============================================ - // Logs: Loki config - // ============================================ - - loki.write "loki_srv" { - endpoint { - url = sys.env("LOKI_URL") - } - } - - loki.process "loki_srv" { - stage.static_labels { - values = { - cluster = sys.env("CLUSTER_NAME"), - zone = sys.env("ZONE"), - } - } - forward_to = [loki.write.loki_srv.receiver] - } - - - // ============================================ - // Loki.source kube_pod_logs - // Requirements: - // - discovery.relabel: kube_pod_logs - // - discovery.process: loki_srv - // ============================================ - - loki.source.kubernetes "kube_pod_logs" { - targets = discovery.relabel.kube_pod_logs.output - forward_to = [loki.process.loki_srv.receiver] - } - - - // ============================================ - // Discovery:relabel: kube_pod_logs - // Requirements: - // - discovery.kubernetes.role.pod: kube_pods - // ============================================ - - discovery.relabel "kube_pod_logs" { - targets = discovery.kubernetes.kube_pods.targets - rule { - source_labels = ["__meta_kubernetes_namespace"] - target_label = "namespace" - } - - rule { - source_labels = ["__meta_kubernetes_pod_name"] - regex = "^(.+?)-[0-9a-zA-Z]{4,16}(?:-[0-9a-zA-Z]{4,16})?$" - replacement = "$1" - target_label = "pod" - } - - rule { - source_labels = ["__meta_kubernetes_pod_container_name"] - target_label = "container" - } - - rule { - source_labels = ["__meta_kubernetes_node_name"] - target_label = "node_name" - } - - rule { - source_labels = [ - "__meta_kubernetes_pod_controller_name", - ] - regex = "([0-9a-z-.]+?)(-[0-9a-f]{8,10})?" - target_label = "controller_name" - } - - rule { - source_labels = [ - "__meta_kubernetes_pod_label_app_kubernetes_io_name", - "__meta_kubernetes_pod_label_app", - "controller_name", - "__meta_kubernetes_pod_name", - ] - regex = "^;*([^;]+)(;.*)?$" - target_label = "app" - } - - rule { - source_labels = [ - "__meta_kubernetes_pod_label_app_kubernetes_io_component", - "__meta_kubernetes_pod_label_component", - ] - regex = "^;*([^;]+)(;.*)?$" - target_label = "component" - } - - rule { - source_labels = ["namespace", "app"] - separator = "/" - target_label = "job" - } - - rule { - source_labels = ["job", "container"] - separator = ":" - target_label = "instance" - } - rule { - source_labels = ["__meta_kubernetes_pod_node_name"] - separator = ":" - target_label = "host" - } - } - discovery.relabel "kubelet" { targets = discovery.kubernetes.kube_nodes.targets diff --git a/services/monitoring/deploy/alloy/node-scraper/helm-values.yaml b/services/monitoring/deploy/alloy/node-scraper/helm-values.yaml index 2490b4f..77c0f24 100644 --- a/services/monitoring/deploy/alloy/node-scraper/helm-values.yaml +++ b/services/monitoring/deploy/alloy/node-scraper/helm-values.yaml @@ -129,6 +129,8 @@ alloy: } + + // ============================================ // Metrics: Prometheus connection config // ============================================