From e4991fe7e5728ce9a7945f26f9b3e09f226b8e09 Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Wed, 6 Feb 2019 14:37:10 +0100
Subject: [PATCH] kube-prometheus: Re-generate
---
manifests/prometheus-rules.yaml | 16 ++++++++--------
.../prometheus-serviceMonitorApiserver.yaml | 8 ++++++++
manifests/prometheus-serviceMonitorKubelet.yaml | 10 ++++++++++
3 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/manifests/prometheus-rules.yaml b/manifests/prometheus-rules.yaml
index aaf16ff5..a4da3102 100644
--- a/manifests/prometheus-rules.yaml
+++ b/manifests/prometheus-rules.yaml
@@ -241,25 +241,25 @@ spec:
max by (namespace, pod, device) (node_filesystem_avail_bytes{fstype=~"ext[234]|btrfs|xfs|zfs"} / node_filesystem_size_bytes{fstype=~"ext[234]|btrfs|xfs|zfs"})
record: 'node:node_filesystem_avail:'
- expr: |
- sum(irate(node_network_receive_bytes_total{job="node-exporter",device="eth0"}[1m])) +
- sum(irate(node_network_transmit_bytes_total{job="node-exporter",device="eth0"}[1m]))
+ sum(irate(node_network_receive_bytes_total{job="node-exporter",device!~"veth.+"}[1m])) +
+ sum(irate(node_network_transmit_bytes_total{job="node-exporter",device!~"veth.+"}[1m]))
record: :node_net_utilisation:sum_irate
- expr: |
sum by (node) (
- (irate(node_network_receive_bytes_total{job="node-exporter",device="eth0"}[1m]) +
- irate(node_network_transmit_bytes_total{job="node-exporter",device="eth0"}[1m]))
+ (irate(node_network_receive_bytes_total{job="node-exporter",device!~"veth.+"}[1m]) +
+ irate(node_network_transmit_bytes_total{job="node-exporter",device!~"veth.+"}[1m]))
* on (namespace, pod) group_left(node)
node_namespace_pod:kube_pod_info:
)
record: node:node_net_utilisation:sum_irate
- expr: |
- sum(irate(node_network_receive_drop_total{job="node-exporter",device="eth0"}[1m])) +
- sum(irate(node_network_transmit_drop_total{job="node-exporter",device="eth0"}[1m]))
+ sum(irate(node_network_receive_drop_total{job="node-exporter",device!~"veth.+"}[1m])) +
+ sum(irate(node_network_transmit_drop_total{job="node-exporter",device!~"veth.+"}[1m]))
record: :node_net_saturation:sum_irate
- expr: |
sum by (node) (
- (irate(node_network_receive_drop_total{job="node-exporter",device="eth0"}[1m]) +
- irate(node_network_transmit_drop_total{job="node-exporter",device="eth0"}[1m]))
+ (irate(node_network_receive_drop_total{job="node-exporter",device!~"veth.+"}[1m]) +
+ irate(node_network_transmit_drop_total{job="node-exporter",device!~"veth.+"}[1m]))
* on (namespace, pod) group_left(node)
node_namespace_pod:kube_pod_info:
)
diff --git a/manifests/prometheus-serviceMonitorApiserver.yaml b/manifests/prometheus-serviceMonitorApiserver.yaml
index 6d884a2b..5dea38e4 100644
--- a/manifests/prometheus-serviceMonitorApiserver.yaml
+++ b/manifests/prometheus-serviceMonitorApiserver.yaml
@@ -14,6 +14,14 @@ spec:
regex: etcd_(debugging|disk|request|server).*
sourceLabels:
- __name__
+ - action: drop
+ regex: apiserver_admission_controller_admission_latencies_seconds_.*
+ sourceLabels:
+ - __name__
+ - action: drop
+ regex: apiserver_admission_step_admission_latencies_seconds_.*
+ sourceLabels:
+ - __name__
port: https
scheme: https
tlsConfig:
diff --git a/manifests/prometheus-serviceMonitorKubelet.yaml b/manifests/prometheus-serviceMonitorKubelet.yaml
index 97d7f1a1..590a5cd4 100644
--- a/manifests/prometheus-serviceMonitorKubelet.yaml
+++ b/manifests/prometheus-serviceMonitorKubelet.yaml
@@ -17,6 +17,16 @@ spec:
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
honorLabels: true
interval: 30s
+ metricRelabelings:
+ - action: drop
+ regex: container_([a-z_]+);
+ sourceLabels:
+ - __name__
+ - image
+ - action: drop
+ regex: container_(network_tcp_usage_total|network_udp_usage_total|tasks_state|cpu_load_average_10s)
+ sourceLabels:
+ - __name__
path: /metrics/cadvisor
port: https-metrics
scheme: https
--
GitLab