From db511e802f692a58d48a8dce58536ae91da658e0 Mon Sep 17 00:00:00 2001
From: Matt Matejczyk <mmat@google.com>
Date: Tue, 16 Apr 2019 13:42:08 +0200
Subject: [PATCH] Monitor kubemark master's components via Prometheus.

This includes kubelet, kubelet/cadvisor, kube-scheduler,
kube-controller-manager.

Ref. https://github.com/kubernetes/perf-tests/issues/503
---
 ...ts.yaml => kubemark-master-endpoints.yaml} | 12 +++++--
 ...vice.yaml => kubemark-master-service.yaml} | 12 +++++--
 .../kubemark-master-serviceMonitor.yaml       | 36 +++++++++++++++++++
 .../prometheus-serviceMonitorApiserver.yaml   | 21 -----------
 4 files changed, 54 insertions(+), 27 deletions(-)
 rename clusterloader2/pkg/prometheus/manifests/kubemark/{kube-apiserver-endpoints.yaml => kubemark-master-endpoints.yaml} (52%)
 rename clusterloader2/pkg/prometheus/manifests/kubemark/{kube-apiserver-service.yaml => kubemark-master-service.yaml} (66%)
 create mode 100644 clusterloader2/pkg/prometheus/manifests/kubemark/kubemark-master-serviceMonitor.yaml
 delete mode 100644 clusterloader2/pkg/prometheus/manifests/kubemark/prometheus-serviceMonitorApiserver.yaml

diff --git a/clusterloader2/pkg/prometheus/manifests/kubemark/kube-apiserver-endpoints.yaml b/clusterloader2/pkg/prometheus/manifests/kubemark/kubemark-master-endpoints.yaml
similarity index 52%
rename from clusterloader2/pkg/prometheus/manifests/kubemark/kube-apiserver-endpoints.yaml
rename to clusterloader2/pkg/prometheus/manifests/kubemark/kubemark-master-endpoints.yaml
index 6993b13be..3308e363e 100644
--- a/clusterloader2/pkg/prometheus/manifests/kubemark/kube-apiserver-endpoints.yaml
+++ b/clusterloader2/pkg/prometheus/manifests/kubemark/kubemark-master-endpoints.yaml
@@ -3,12 +3,18 @@ apiVersion: v1
 kind: Endpoints
 metadata:
   namespace: kubemark
-  name: kube-apiserver
+  name: kubemark-master
   labels:
-    k8s-app: kube-apiserver
+    instance: kubemark-master
 subsets:
   - addresses:
       - ip: {{.MasterIp}}
     ports:
-      - name: https
+      - name: apiserver
         port: 443
+      - name: kubelet
+        port: 10250
+      - name: kube-scheduler
+        port: 10251
+      - name: kube-controller-manager
+        port: 10252
diff --git a/clusterloader2/pkg/prometheus/manifests/kubemark/kube-apiserver-service.yaml b/clusterloader2/pkg/prometheus/manifests/kubemark/kubemark-master-service.yaml
similarity index 66%
rename from clusterloader2/pkg/prometheus/manifests/kubemark/kube-apiserver-service.yaml
rename to clusterloader2/pkg/prometheus/manifests/kubemark/kubemark-master-service.yaml
index 675abe171..8c634fd1a 100644
--- a/clusterloader2/pkg/prometheus/manifests/kubemark/kube-apiserver-service.yaml
+++ b/clusterloader2/pkg/prometheus/manifests/kubemark/kubemark-master-service.yaml
@@ -5,12 +5,18 @@ apiVersion: v1
 kind: Service
 metadata:
   namespace: kubemark
-  name: kube-apiserver
+  name: kubemark-master
   labels:
-    k8s-app: kube-apiserver
+    instance: kubemark-master
 spec:
   type: ClusterIP
   clusterIP: None
   ports:
-    - name: https
+    - name: apiserver
       port: 443
+    - name: kubelet
+      port: 10250
+    - name: kube-scheduler
+      port: 10251
+    - name: kube-controller-manager
+      port: 10252
diff --git a/clusterloader2/pkg/prometheus/manifests/kubemark/kubemark-master-serviceMonitor.yaml b/clusterloader2/pkg/prometheus/manifests/kubemark/kubemark-master-serviceMonitor.yaml
new file mode 100644
index 000000000..7203d6be2
--- /dev/null
+++ b/clusterloader2/pkg/prometheus/manifests/kubemark/kubemark-master-serviceMonitor.yaml
@@ -0,0 +1,36 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels:
+    instance: kubemark-master
+  name: kubemark-master
+  namespace: monitoring
+spec:
+  jobLabel: instance
+  namespaceSelector:
+    matchNames:
+      - kubemark
+  selector:
+    matchLabels:
+      instance: kubemark-master
+  endpoints:
+  - interval: 5s
+    port: apiserver
+    scheme: https
+    tlsConfig:
+      insecureSkipVerify: true
+  - interval: 5s
+    port: kubelet
+    scheme: https
+    tlsConfig:
+      insecureSkipVerify: true
+  - interval: 5s
+    port: kubelet
+    path: metrics/cadvisor
+    scheme: https
+    tlsConfig:
+      insecureSkipVerify: true
+  - interval: 5s
+    port: kube-scheduler
+  - interval: 5s
+    port: kube-controller-manager
diff --git a/clusterloader2/pkg/prometheus/manifests/kubemark/prometheus-serviceMonitorApiserver.yaml b/clusterloader2/pkg/prometheus/manifests/kubemark/prometheus-serviceMonitorApiserver.yaml
deleted file mode 100644
index cf83e4d88..000000000
--- a/clusterloader2/pkg/prometheus/manifests/kubemark/prometheus-serviceMonitorApiserver.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  labels:
-    k8s-app: kube-apiserver
-  name: kube-apiserver
-  namespace: monitoring
-spec:
-  endpoints:
-  - interval: 30s
-    port: https
-    scheme: https
-    tlsConfig:
-      insecureSkipVerify: true
-  jobLabel: k8s-app
-  namespaceSelector:
-    matchNames:
-      - kubemark
-  selector:
-    matchLabels:
-      k8s-app: kube-apiserver