diff --git a/k8s-peterg/alloy/configmap.yaml b/k8s-peterg/alloy/configmap.yaml index 5e55a0c..79cbcf5 100644 --- a/k8s-peterg/alloy/configmap.yaml +++ b/k8s-peterg/alloy/configmap.yaml @@ -24,14 +24,6 @@ data: role = "endpoints" } - discovery.kubernetes "kubernetes_service_endpoints_slow" { - role = "endpoints" - } - - discovery.kubernetes "prometheus_pushgateway" { - role = "service" - } - discovery.kubernetes "kubernetes_services" { role = "service" } @@ -40,10 +32,6 @@ data: role = "pod" } - discovery.kubernetes "kubernetes_pods_slow" { - role = "pod" - } - discovery.kubernetes "pod_logs" { role = "pod" } @@ -109,12 +97,6 @@ data: action = "keep" } - rule { - source_labels = ["__meta_kubernetes_service_annotation_prometheus_io_scrape_slow"] - regex = "true" - action = "drop" - } - rule { source_labels = ["__meta_kubernetes_service_annotation_prometheus_io_scheme"] regex = "(https?)" @@ -161,71 +143,6 @@ data: } } - discovery.relabel "kubernetes_service_endpoints_slow" { - targets = discovery.kubernetes.kubernetes_service_endpoints_slow.targets - - rule { - source_labels = ["__meta_kubernetes_service_annotation_prometheus_io_scrape_slow"] - regex = "true" - action = "keep" - } - - rule { - source_labels = ["__meta_kubernetes_service_annotation_prometheus_io_scheme"] - regex = "(https?)" - target_label = "__scheme__" - } - - rule { - source_labels = ["__meta_kubernetes_service_annotation_prometheus_io_path"] - regex = "(.+)" - target_label = "__metrics_path__" - } - - rule { - source_labels = ["__address__", "__meta_kubernetes_service_annotation_prometheus_io_port"] - regex = "(.+?)(?::\\d+)?;(\\d+)" - target_label = "__address__" - replacement = "$1:$2" - } - - rule { - regex = "__meta_kubernetes_service_annotation_prometheus_io_param_(.+)" - replacement = "__param_$1" - action = "labelmap" - } - - rule { - regex = "__meta_kubernetes_service_label_(.+)" - action = "labelmap" - } - - rule { - source_labels = ["__meta_kubernetes_namespace"] - target_label = "namespace" - } - - rule { - source_labels = ["__meta_kubernetes_service_name"] - target_label = "service" - } - - rule { - source_labels = ["__meta_kubernetes_pod_node_name"] - target_label = "node" - } - } - - discovery.relabel "prometheus_pushgateway" { - targets = discovery.kubernetes.prometheus_pushgateway.targets - - rule { - source_labels = ["__meta_kubernetes_service_annotation_prometheus_io_probe"] - regex = "pushgateway" - action = "keep" - } - } - discovery.relabel "kubernetes_services" { targets = discovery.kubernetes.kubernetes_services.targets @@ -275,80 +192,6 @@ data: action = "keep" } - rule { - source_labels = ["__meta_kubernetes_pod_annotation_prometheus_io_scrape_slow"] - regex = "true" - action = "drop" - } - - rule { - source_labels = ["__meta_kubernetes_pod_annotation_prometheus_io_scheme"] - regex = "(https?)" - target_label = "__scheme__" - } - - rule { - source_labels = ["__meta_kubernetes_pod_annotation_prometheus_io_path"] - regex = "(.+)" - target_label = "__metrics_path__" - } - - rule { - source_labels = ["__meta_kubernetes_pod_annotation_prometheus_io_port", "__meta_kubernetes_pod_ip"] - regex = "(\\d+);(([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4})" - target_label = "__address__" - replacement = "[$2]:$1" - } - - rule { - source_labels = ["__meta_kubernetes_pod_annotation_prometheus_io_port", "__meta_kubernetes_pod_ip"] - regex = "(\\d+);((([0-9]+?)(\\.|$)){4})" - target_label = "__address__" - replacement = "$2:$1" - } - - rule { - regex = "__meta_kubernetes_pod_annotation_prometheus_io_param_(.+)" - replacement = "__param_$1" - action = "labelmap" - } - - rule { - regex = "__meta_kubernetes_pod_label_(.+)" - action = "labelmap" - } - - rule { - source_labels = ["__meta_kubernetes_namespace"] - target_label = "namespace" - } - - rule { - source_labels = ["__meta_kubernetes_pod_name"] - target_label = "pod" - } - - rule { - source_labels = ["__meta_kubernetes_pod_phase"] - regex = "Pending|Succeeded|Failed|Completed" - action = "drop" - } - - rule { - source_labels = ["__meta_kubernetes_pod_node_name"] - target_label = "node" - } - } - - discovery.relabel "kubernetes_pods_slow" { - targets = discovery.kubernetes.kubernetes_pods_slow.targets - - rule { - source_labels = ["__meta_kubernetes_pod_annotation_prometheus_io_scrape_slow"] - regex = "true" - action = "keep" - } - rule { source_labels = ["__meta_kubernetes_pod_annotation_prometheus_io_scheme"] regex = "(https?)" @@ -533,22 +376,6 @@ data: honor_labels = true } - prometheus.scrape "kubernetes_service_endpoints_slow" { - targets = discovery.relabel.kubernetes_service_endpoints_slow.output - forward_to = [prometheus.remote_write.default.receiver] - job_name = "kubernetes-service-endpoints-slow" - honor_labels = true - scrape_interval = "5m0s" - scrape_timeout = "30s" - } - - prometheus.scrape "prometheus_pushgateway" { - targets = discovery.relabel.prometheus_pushgateway.output - forward_to = [prometheus.remote_write.default.receiver] - job_name = "prometheus-pushgateway" - honor_labels = true - } - prometheus.scrape "kubernetes_services" { targets = discovery.relabel.kubernetes_services.output forward_to = [prometheus.remote_write.default.receiver] @@ -567,15 +394,6 @@ data: honor_labels = true } - prometheus.scrape "kubernetes_pods_slow" { - targets = discovery.relabel.kubernetes_pods_slow.output - forward_to = [prometheus.remote_write.default.receiver] - job_name = "kubernetes-pods-slow" - honor_labels = true - scrape_interval = "5m0s" - scrape_timeout = "30s" - } - loki.process "pod_logs" { forward_to = [loki.write.default.receiver] diff --git a/k8s-wheatley/alloy/configmap.yaml b/k8s-wheatley/alloy/configmap.yaml index 9bb9a11..9aadde5 100644 --- a/k8s-wheatley/alloy/configmap.yaml +++ b/k8s-wheatley/alloy/configmap.yaml @@ -23,14 +23,6 @@ data: role = "endpoints" } - discovery.kubernetes "kubernetes_service_endpoints_slow" { - role = "endpoints" - } - - discovery.kubernetes "prometheus_pushgateway" { - role = "service" - } - discovery.kubernetes "kubernetes_services" { role = "service" } @@ -39,10 +31,6 @@ data: role = "pod" } - discovery.kubernetes "kubernetes_pods_slow" { - role = "pod" - } - discovery.kubernetes "pod_logs" { role = "pod" } @@ -120,12 +108,6 @@ data: action = "keep" } - rule { - source_labels = ["__meta_kubernetes_service_annotation_prometheus_io_scrape_slow"] - regex = "true" - action = "drop" - } - rule { source_labels = ["__meta_kubernetes_service_annotation_prometheus_io_scheme"] regex = "(https?)" @@ -172,71 +154,6 @@ data: } } - discovery.relabel "kubernetes_service_endpoints_slow" { - targets = discovery.kubernetes.kubernetes_service_endpoints_slow.targets - - rule { - source_labels = ["__meta_kubernetes_service_annotation_prometheus_io_scrape_slow"] - regex = "true" - action = "keep" - } - - rule { - source_labels = ["__meta_kubernetes_service_annotation_prometheus_io_scheme"] - regex = "(https?)" - target_label = "__scheme__" - } - - rule { - source_labels = ["__meta_kubernetes_service_annotation_prometheus_io_path"] - regex = "(.+)" - target_label = "__metrics_path__" - } - - rule { - source_labels = ["__address__", "__meta_kubernetes_service_annotation_prometheus_io_port"] - regex = "(.+?)(?::\\d+)?;(\\d+)" - target_label = "__address__" - replacement = "$1:$2" - } - - rule { - regex = "__meta_kubernetes_service_annotation_prometheus_io_param_(.+)" - replacement = "__param_$1" - action = "labelmap" - } - - rule { - regex = "__meta_kubernetes_service_label_(.+)" - action = "labelmap" - } - - rule { - source_labels = ["__meta_kubernetes_namespace"] - target_label = "namespace" - } - - rule { - source_labels = ["__meta_kubernetes_service_name"] - target_label = "service" - } - - rule { - source_labels = ["__meta_kubernetes_pod_node_name"] - target_label = "node" - } - } - - discovery.relabel "prometheus_pushgateway" { - targets = discovery.kubernetes.prometheus_pushgateway.targets - - rule { - source_labels = ["__meta_kubernetes_service_annotation_prometheus_io_probe"] - regex = "pushgateway" - action = "keep" - } - } - discovery.relabel "kubernetes_services" { targets = discovery.kubernetes.kubernetes_services.targets @@ -286,80 +203,6 @@ data: action = "keep" } - rule { - source_labels = ["__meta_kubernetes_pod_annotation_prometheus_io_scrape_slow"] - regex = "true" - action = "drop" - } - - rule { - source_labels = ["__meta_kubernetes_pod_annotation_prometheus_io_scheme"] - regex = "(https?)" - target_label = "__scheme__" - } - - rule { - source_labels = ["__meta_kubernetes_pod_annotation_prometheus_io_path"] - regex = "(.+)" - target_label = "__metrics_path__" - } - - rule { - source_labels = ["__meta_kubernetes_pod_annotation_prometheus_io_port", "__meta_kubernetes_pod_ip"] - regex = "(\\d+);(([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4})" - target_label = "__address__" - replacement = "[$2]:$1" - } - - rule { - source_labels = ["__meta_kubernetes_pod_annotation_prometheus_io_port", "__meta_kubernetes_pod_ip"] - regex = "(\\d+);((([0-9]+?)(\\.|$)){4})" - target_label = "__address__" - replacement = "$2:$1" - } - - rule { - regex = "__meta_kubernetes_pod_annotation_prometheus_io_param_(.+)" - replacement = "__param_$1" - action = "labelmap" - } - - rule { - regex = "__meta_kubernetes_pod_label_(.+)" - action = "labelmap" - } - - rule { - source_labels = ["__meta_kubernetes_namespace"] - target_label = "namespace" - } - - rule { - source_labels = ["__meta_kubernetes_pod_name"] - target_label = "pod" - } - - rule { - source_labels = ["__meta_kubernetes_pod_phase"] - regex = "Pending|Succeeded|Failed|Completed" - action = "drop" - } - - rule { - source_labels = ["__meta_kubernetes_pod_node_name"] - target_label = "node" - } - } - - discovery.relabel "kubernetes_pods_slow" { - targets = discovery.kubernetes.kubernetes_pods_slow.targets - - rule { - source_labels = ["__meta_kubernetes_pod_annotation_prometheus_io_scrape_slow"] - regex = "true" - action = "keep" - } - rule { source_labels = ["__meta_kubernetes_pod_annotation_prometheus_io_scheme"] regex = "(https?)" @@ -556,28 +399,6 @@ data: } } - prometheus.scrape "kubernetes_service_endpoints_slow" { - targets = discovery.relabel.kubernetes_service_endpoints_slow.output - forward_to = [prometheus.remote_write.default.receiver] - job_name = "kubernetes-service-endpoints-slow" - honor_labels = true - scrape_interval = "5m0s" - scrape_timeout = "30s" - clustering { - enabled = true - } - } - - prometheus.scrape "prometheus_pushgateway" { - targets = discovery.relabel.prometheus_pushgateway.output - forward_to = [prometheus.remote_write.default.receiver] - job_name = "prometheus-pushgateway" - honor_labels = true - clustering { - enabled = true - } - } - prometheus.scrape "kubernetes_services" { targets = discovery.relabel.kubernetes_services.output forward_to = [prometheus.remote_write.default.receiver] @@ -602,18 +423,6 @@ data: } } - prometheus.scrape "kubernetes_pods_slow" { - targets = discovery.relabel.kubernetes_pods_slow.output - forward_to = [prometheus.remote_write.default.receiver] - job_name = "kubernetes-pods-slow" - honor_labels = true - scrape_interval = "5m0s" - scrape_timeout = "30s" - clustering { - enabled = true - } - } - loki.process "pod_logs" { forward_to = [loki.write.default.receiver]