Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/prometheus/hack.prometheus.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ serverFiles:
metric_relabel_configs:
# Keep only the specific metrics we need for network I/O monitoring
- source_labels: [__name__]
regex: "container_network_(receive|transmit)_(bytes|packets|errors|packets_dropped)_total|container_fs_(reads|writes)_(bytes_)?total|kubelet_volume_stats_(used|capacity|available)_bytes"
regex: "container_network_(receive|transmit)_(bytes|packets|errors|packets_dropped)_total|container_fs_(reads|writes)_(bytes_)?total|kubelet_volume_stats_(used|capacity|available)_bytes|container_cpu_cfs_(throttled_)?periods_total"
action: keep
# Drop all other container metrics (saves ~90% of cAdvisor metrics)
# Drop high-cardinality labels we don't use
Expand Down
2 changes: 1 addition & 1 deletion dist/backend-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ data:
- role: node
metric_relabel_configs:
- action: keep
regex: container_network_(receive|transmit)_(bytes|packets|errors|packets_dropped)_total|container_fs_(reads|writes)_(bytes_)?total|kubelet_volume_stats_(used|capacity|available)_bytes
regex: container_network_(receive|transmit)_(bytes|packets|errors|packets_dropped)_total|container_fs_(reads|writes)_(bytes_)?total|kubelet_volume_stats_(used|capacity|available)_bytes|container_cpu_cfs_(throttled_)?periods_total
source_labels:
- __name__
- action: labeldrop
Expand Down
2 changes: 1 addition & 1 deletion dist/install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ data:
- role: node
metric_relabel_configs:
- action: keep
regex: container_network_(receive|transmit)_(bytes|packets|errors|packets_dropped)_total|container_fs_(reads|writes)_(bytes_)?total|kubelet_volume_stats_(used|capacity|available)_bytes
regex: container_network_(receive|transmit)_(bytes|packets|errors|packets_dropped)_total|container_fs_(reads|writes)_(bytes_)?total|kubelet_volume_stats_(used|capacity|available)_bytes|container_cpu_cfs_(throttled_)?periods_total
source_labels:
- __name__
- action: labeldrop
Expand Down
2 changes: 1 addition & 1 deletion dist/installer_updater.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ data:
- role: node
metric_relabel_configs:
- action: keep
regex: container_network_(receive|transmit)_(bytes|packets|errors|packets_dropped)_total|container_fs_(reads|writes)_(bytes_)?total|kubelet_volume_stats_(used|capacity|available)_bytes
regex: container_network_(receive|transmit)_(bytes|packets|errors|packets_dropped)_total|container_fs_(reads|writes)_(bytes_)?total|kubelet_volume_stats_(used|capacity|available)_bytes|container_cpu_cfs_(throttled_)?periods_total
source_labels:
- __name__
- action: labeldrop
Expand Down
2 changes: 1 addition & 1 deletion dist/prometheus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ data:
- role: node
metric_relabel_configs:
- action: keep
regex: container_network_(receive|transmit)_(bytes|packets|errors|packets_dropped)_total|container_fs_(reads|writes)_(bytes_)?total|kubelet_volume_stats_(used|capacity|available)_bytes
regex: container_network_(receive|transmit)_(bytes|packets|errors|packets_dropped)_total|container_fs_(reads|writes)_(bytes_)?total|kubelet_volume_stats_(used|capacity|available)_bytes|container_cpu_cfs_(throttled_)?periods_total
source_labels:
- __name__
- action: labeldrop
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/zxporter/templates/prometheus-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ data:
ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
metric_relabel_configs:
- action: keep
regex: 'container_network_(receive|transmit)_(bytes|packets|errors|packets_dropped)_total|container_fs_(reads|writes)_(bytes_)?total|kubelet_volume_stats_(used|capacity|available)_bytes'
regex: 'container_network_(receive|transmit)_(bytes|packets|errors|packets_dropped)_total|container_fs_(reads|writes)_(bytes_)?total|kubelet_volume_stats_(used|capacity|available)_bytes|container_cpu_cfs_(throttled_)?periods_total'
source_labels:
- __name__
- action: labeldrop
Expand Down
3 changes: 3 additions & 0 deletions internal/server/mpa_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,9 @@ func (sm *SubscriptionManager) Broadcast(data *collector.ContainerMetricsSnapsho
MemoryLimitBytes: data.MemoryLimitBytes,
// CPU throttle fraction from CFS bandwidth controller
CpuThrottleFraction: data.CpuThrottledFraction,
// Network metrics (bytes/sec from Prometheus rate queries)
NetworkReceiveBytesPerSec: int64(data.NetworkReceiveBytes),
NetworkTransmitBytesPerSec: int64(data.NetworkTransmitBytes),
}

batch := &gen.ContainerMetricsBatch{
Expand Down
Loading