Monitor kubemark master's components via Prometheus.

This includes kubelet, kubelet/cadvisor, kube-scheduler, kube-controller-manager. Ref. kubernetes#503
truerocha · Apr 23, 2019 · db511e8 · db511e8
1 parent 1ca76bb
commit db511e8
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 27 deletions.
diff --git a/...ts/kubemark/kube-apiserver-endpoints.yaml → ...s/kubemark/kubemark-master-endpoints.yaml b/...ts/kubemark/kube-apiserver-endpoints.yaml → ...s/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/...ests/kubemark/kube-apiserver-service.yaml → ...sts/kubemark/kubemark-master-service.yaml b/...ests/kubemark/kube-apiserver-service.yaml → ...sts/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
@@ -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