From 8c0867ca15685c6dc9c20c9a5aad7606eb9ed73a Mon Sep 17 00:00:00 2001
From: Pei Hsuan Tsai <phstsai@linkernetworks.com>
Date: Fri, 22 Jun 2018 13:49:07 +0800
Subject: [PATCH] modify the monitoring setting in yaml

Former-commit-id: f699059c677942ea4570bb60fd7f5f963d999a9f [formerly 72a72d436c08bfaa42e554c3557cf0ee3a8c7304]
Former-commit-id: 1794a56561292d075127d9a169e5f9229b2dec48
---
 .../monitoring/cadvisor/cadvisor-svc.yaml     |  3 +-
 .../apps/monitoring/cadvisor/cadvisor.yaml    |  2 -
 .../kube-state-metrics-deployment.yaml        |  2 -
 .../prometheus/prometheus-config.yaml         | 50 -------------------
 4 files changed, 1 insertion(+), 56 deletions(-)

diff --git a/deploy/kubernetes/apps/monitoring/cadvisor/cadvisor-svc.yaml b/deploy/kubernetes/apps/monitoring/cadvisor/cadvisor-svc.yaml
index 2d9645f1..ca2676b4 100644
--- a/deploy/kubernetes/apps/monitoring/cadvisor/cadvisor-svc.yaml
+++ b/deploy/kubernetes/apps/monitoring/cadvisor/cadvisor-svc.yaml
@@ -8,12 +8,11 @@ metadata:
   annotations:
     prometheus.io/scrape: 'true'
 spec:
-  type: NodePort
   ports:
   - name: http-metrics
     port: 8080
-    nodePort: 31194
     targetPort: http-metrics
+    protocol: TCP
   selector:
     name: cadvisor
 
diff --git a/deploy/kubernetes/apps/monitoring/cadvisor/cadvisor.yaml b/deploy/kubernetes/apps/monitoring/cadvisor/cadvisor.yaml
index 40616ac1..2bfd8068 100644
--- a/deploy/kubernetes/apps/monitoring/cadvisor/cadvisor.yaml
+++ b/deploy/kubernetes/apps/monitoring/cadvisor/cadvisor.yaml
@@ -11,8 +11,6 @@ spec:
     metadata:
       labels:
         name: cadvisor
-      annotations:
-        prometheus.io.scrape: "true"
     spec:
       containers:
       - name: cadvisor
diff --git a/deploy/kubernetes/apps/monitoring/kube-state-metrics/kube-state-metrics-deployment.yaml b/deploy/kubernetes/apps/monitoring/kube-state-metrics/kube-state-metrics-deployment.yaml
index 647216e6..0fef3564 100644
--- a/deploy/kubernetes/apps/monitoring/kube-state-metrics/kube-state-metrics-deployment.yaml
+++ b/deploy/kubernetes/apps/monitoring/kube-state-metrics/kube-state-metrics-deployment.yaml
@@ -14,8 +14,6 @@ spec:
     metadata:
       labels:
         k8s-app: kube-state-metrics
-      annotations:
-        prometheus.io.scrape: "true"
     spec:
       serviceAccountName: default
       containers:
diff --git a/deploy/kubernetes/apps/monitoring/prometheus/prometheus-config.yaml b/deploy/kubernetes/apps/monitoring/prometheus/prometheus-config.yaml
index a8f78154..aed3d878 100644
--- a/deploy/kubernetes/apps/monitoring/prometheus/prometheus-config.yaml
+++ b/deploy/kubernetes/apps/monitoring/prometheus/prometheus-config.yaml
@@ -11,56 +11,6 @@ data:
       scrape_timeout: 15s
     scrape_configs:
 
-
-    - job_name: 'kubernetes-apiservers'
-      kubernetes_sd_configs:
-      - role: endpoints
-      scheme: https
-      tls_config:
-        ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
-      bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
-      relabel_configs:
-      - source_labels: [__meta_kubernetes_namespace, __meta_kubernetes_service_name, __meta_kubernetes_endpoint_port_name]
-        action: keep
-        regex: default;kubernetes;https
-
-
-    - job_name: 'kubernetes-nodes'
-      scheme: https
-      tls_config:
-        ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
-      bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
-      kubernetes_sd_configs:
-      - role: node
-      relabel_configs:
-      - action: labelmap
-        regex: __meta_kubernetes_node_label_(.+)
-      - target_label: __address__
-        replacement: kubernetes.default.svc:443
-      - source_labels: [__meta_kubernetes_node_name]
-        regex: (.+)
-        target_label: __metrics_path__
-        replacement: /api/v1/nodes/${1}/proxy/metrics
-
-        
-    - job_name: 'kubernetes-cadvisor'
-      scheme: https
-      tls_config:
-        ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
-      bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
-      kubernetes_sd_configs:
-      - role: node
-      relabel_configs:
-      - action: labelmap
-        regex: __meta_kubernetes_node_label_(.+)
-      - target_label: __address__
-        replacement: kubernetes.default.svc:443
-      - source_labels: [__meta_kubernetes_node_name]
-        regex: (.+)
-        target_label: __metrics_path__
-        replacement: /api/v1/nodes/${1}/proxy/metrics/cadvisor
-
-
     - job_name: 'kubernetes-service-endpoints'
       kubernetes_sd_configs:
       - role: endpoints