From 4d6e3d5c199b20d7b8b22f16665f1e95a00dd40f Mon Sep 17 00:00:00 2001
From: Abu Kashem <akashem@redhat.com>
Date: Fri, 3 Jul 2020 09:49:56 -0400
Subject: [PATCH] enable etcd latency metrics in kube-apiserver

kube-apiserver has a histogram etcd_request_duration_seconds that
measures latency between the kube-apiserver and etcd instance.
This metrics is currently dropped by cluster-prometheus. Enable
this metrics so we have visibility into etcd latency.

We ensured that this does not enable other unwanted metrcis

count by(name) ({name=~"etcd_request.+"})

etcd_request_duration_seconds_bucket
etcd_request_duration_seconds_count
etcd_request_duration_seconds_sum
---
 jsonnet/kube-prometheus/prometheus/prometheus.libsonnet | 2 +-
 manifests/prometheus-serviceMonitorApiserver.yaml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
index 14a3ab0d..17e8bff7 100644
--- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
@@ -407,7 +407,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
               metricRelabelings: (import 'kube-prometheus/dropping-deprecated-metrics-relabelings.libsonnet') + [
                 {
                   sourceLabels: ['__name__'],
-                  regex: 'etcd_(debugging|disk|request|server).*',
+                  regex: 'etcd_(debugging|disk|server).*',
                   action: 'drop',
                 },
                 {
diff --git a/manifests/prometheus-serviceMonitorApiserver.yaml b/manifests/prometheus-serviceMonitorApiserver.yaml
index 500c0d3e..1ff61fe9 100644
--- a/manifests/prometheus-serviceMonitorApiserver.yaml
+++ b/manifests/prometheus-serviceMonitorApiserver.yaml
@@ -43,7 +43,7 @@ spec:
       sourceLabels:
       - __name__
     - action: drop
-      regex: etcd_(debugging|disk|request|server).*
+      regex: etcd_(debugging|disk|server).*
       sourceLabels:
       - __name__
     - action: drop
-- 
GitLab