diff --git a/deploy/dev/resources/prometheus.yaml b/deploy/dev/resources/prometheus.yaml index 72ccdf2..597fefb 100644 --- a/deploy/dev/resources/prometheus.yaml +++ b/deploy/dev/resources/prometheus.yaml @@ -1,3 +1,6 @@ +# This file is based on the default configuration file generated by the +# Prometheus helm chart. It is overridden here to avoid re-inflating the Helm +# chart to update configuration. global: evaluation_interval: 1m scrape_interval: 1m @@ -87,7 +90,7 @@ scrape_configs: - __meta_kubernetes_service_annotation_prometheus_io_path target_label: __metrics_path__ - action: replace - regex: ([^:]+)(?::\d+)?;(\d+) + regex: (.+?)(?::\d+)?;(\d+) replacement: $1:$2 source_labels: - __address__ @@ -130,7 +133,7 @@ scrape_configs: - __meta_kubernetes_service_annotation_prometheus_io_path target_label: __metrics_path__ - action: replace - regex: ([^:]+)(?::\d+)?;(\d+) + regex: (.+?)(?::\d+)?;(\d+) replacement: $1:$2 source_labels: - __address__ @@ -217,11 +220,18 @@ scrape_configs: - __meta_kubernetes_pod_annotation_prometheus_io_path target_label: __metrics_path__ - action: replace - regex: ([^:]+)(?::\d+)?;(\d+) - replacement: $1:$2 + regex: (\d+);(([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4}) + replacement: '[$2]:$1' source_labels: - - __address__ - __meta_kubernetes_pod_annotation_prometheus_io_port + - __meta_kubernetes_pod_ip + target_label: __address__ + - action: replace + regex: (\d+);((([0-9]+?)(\.|$)){4}) + replacement: $2:$1 + source_labels: + - __meta_kubernetes_pod_annotation_prometheus_io_port + - __meta_kubernetes_pod_ip target_label: __address__ - action: labelmap regex: __meta_kubernetes_pod_annotation_prometheus_io_param_(.+) @@ -240,6 +250,10 @@ scrape_configs: regex: Pending|Succeeded|Failed|Completed source_labels: - __meta_kubernetes_pod_phase + - action: replace + source_labels: + - __meta_kubernetes_pod_node_name + target_label: node - honor_labels: true job_name: kubernetes-pods-slow kubernetes_sd_configs: @@ -260,11 +274,18 @@ scrape_configs: - __meta_kubernetes_pod_annotation_prometheus_io_path target_label: __metrics_path__ - action: replace - regex: ([^:]+)(?::\d+)?;(\d+) - replacement: $1:$2 + regex: (\d+);(([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4}) + replacement: '[$2]:$1' source_labels: - - __address__ - __meta_kubernetes_pod_annotation_prometheus_io_port + - __meta_kubernetes_pod_ip + target_label: __address__ + - action: replace + regex: (\d+);((([0-9]+?)(\.|$)){4}) + replacement: $2:$1 + source_labels: + - __meta_kubernetes_pod_annotation_prometheus_io_port + - __meta_kubernetes_pod_ip target_label: __address__ - action: labelmap regex: __meta_kubernetes_pod_annotation_prometheus_io_param_(.+) @@ -283,6 +304,10 @@ scrape_configs: regex: Pending|Succeeded|Failed|Completed source_labels: - __meta_kubernetes_pod_phase + - action: replace + source_labels: + - __meta_kubernetes_pod_node_name + target_label: node scrape_interval: 5m scrape_timeout: 30s alerting: diff --git a/deploy/prod/resources/prometheus.yaml b/deploy/prod/resources/prometheus.yaml index 3302944..3c696e5 100644 --- a/deploy/prod/resources/prometheus.yaml +++ b/deploy/prod/resources/prometheus.yaml @@ -1,3 +1,6 @@ +# This file is based on the default configuration file generated by the +# Prometheus helm chart. It is overridden here to avoid re-inflating the Helm +# chart to update configuration. global: evaluation_interval: 1m scrape_interval: 15s @@ -87,7 +90,7 @@ scrape_configs: - __meta_kubernetes_service_annotation_prometheus_io_path target_label: __metrics_path__ - action: replace - regex: ([^:]+)(?::\d+)?;(\d+) + regex: (.+?)(?::\d+)?;(\d+) replacement: $1:$2 source_labels: - __address__ @@ -130,7 +133,7 @@ scrape_configs: - __meta_kubernetes_service_annotation_prometheus_io_path target_label: __metrics_path__ - action: replace - regex: ([^:]+)(?::\d+)?;(\d+) + regex: (.+?)(?::\d+)?;(\d+) replacement: $1:$2 source_labels: - __address__ @@ -217,11 +220,18 @@ scrape_configs: - __meta_kubernetes_pod_annotation_prometheus_io_path target_label: __metrics_path__ - action: replace - regex: ([^:]+)(?::\d+)?;(\d+) - replacement: $1:$2 + regex: (\d+);(([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4}) + replacement: '[$2]:$1' source_labels: - - __address__ - __meta_kubernetes_pod_annotation_prometheus_io_port + - __meta_kubernetes_pod_ip + target_label: __address__ + - action: replace + regex: (\d+);((([0-9]+?)(\.|$)){4}) + replacement: $2:$1 + source_labels: + - __meta_kubernetes_pod_annotation_prometheus_io_port + - __meta_kubernetes_pod_ip target_label: __address__ - action: labelmap regex: __meta_kubernetes_pod_annotation_prometheus_io_param_(.+) @@ -240,6 +250,10 @@ scrape_configs: regex: Pending|Succeeded|Failed|Completed source_labels: - __meta_kubernetes_pod_phase + - action: replace + source_labels: + - __meta_kubernetes_pod_node_name + target_label: node - honor_labels: true job_name: kubernetes-pods-slow kubernetes_sd_configs: @@ -260,11 +274,18 @@ scrape_configs: - __meta_kubernetes_pod_annotation_prometheus_io_path target_label: __metrics_path__ - action: replace - regex: ([^:]+)(?::\d+)?;(\d+) - replacement: $1:$2 + regex: (\d+);(([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4}) + replacement: '[$2]:$1' source_labels: - - __address__ - __meta_kubernetes_pod_annotation_prometheus_io_port + - __meta_kubernetes_pod_ip + target_label: __address__ + - action: replace + regex: (\d+);((([0-9]+?)(\.|$)){4}) + replacement: $2:$1 + source_labels: + - __meta_kubernetes_pod_annotation_prometheus_io_port + - __meta_kubernetes_pod_ip target_label: __address__ - action: labelmap regex: __meta_kubernetes_pod_annotation_prometheus_io_param_(.+) @@ -283,6 +304,10 @@ scrape_configs: regex: Pending|Succeeded|Failed|Completed source_labels: - __meta_kubernetes_pod_phase + - action: replace + source_labels: + - __meta_kubernetes_pod_node_name + target_label: node scrape_interval: 5m scrape_timeout: 30s - job_name: "node"