Merge pull request #27 from linkernetworks/phstsai/monitoring

DEV: Modify the monitoring setting in yaml Former-commit-id: ded5ad9f154a0040a7eef9abc502ae6104a84606 [formerly 05ef242] Former-commit-id: 10c89f8210cd39420bbb95aeb71b0cc54e1c681e
linkernetworks · Jun 22, 2018 · 7b8b9b0 · 7b8b9b0
2 parents b17c1cd + 8c0867c
commit 7b8b9b0
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 56 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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