From 08163c67736c94c247e472bfdd7e428c3d1c334c Mon Sep 17 00:00:00 2001
From: YingTao <15600685705@163.com>
Date: Thu, 13 Dec 2018 16:18:44 +0800
Subject: [PATCH] Update prometheus-configmap.yaml

---
 prometheus-configmap.yaml | 54 +++++++++++++++++++++++++++------------
 1 file changed, 38 insertions(+), 16 deletions(-)

diff --git a/prometheus-configmap.yaml b/prometheus-configmap.yaml
index b25463b..5697c96 100644
--- a/prometheus-configmap.yaml
+++ b/prometheus-configmap.yaml
@@ -14,18 +14,35 @@ data:
       - '/etc/prometheus-rules/*.rules'
 
     scrape_configs:
-      - job_name: 'kubernetes-etcd'
-        static_configs:
-          - targets: ['192.168.3.99:2379','192.168.3.95:2379','192.168.3.96:2379']
-
-      - job_name: 'kubernetes-scheduler'
-        static_configs:
-          - targets: ['192.168.3.99:10251']
-
-      - job_name: 'kubernetes-controller-manager'
-        static_configs:
-          - targets: ['192.168.3.99:10252']      
-
+      - job_name: 'ingress-nginx-endpoints'
+        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: pod
+            namespaces:
+              names:
+              - ingress-nginx
+        relabel_configs:
+          - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
+            action: keep
+            regex: true
+          - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scheme]
+            action: replace
+            target_label: __scheme__
+            regex: (https?)
+          - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_path]
+            action: replace
+            target_label: __metrics_path__
+            regex: (.+)
+          - source_labels: [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port]
+            action: replace
+            target_label: __address__
+            regex: ([^:]+)(?::\d+)?;(\d+)
+            replacement: $1:$2
+          - source_labels: [__meta_kubernetes_service_name]
+            regex: prometheus-server
+            action: drop
       # https://github.com/prometheus/prometheus/blob/master/documentation/examples/prometheus-kubernetes.yml#L14
       - job_name: 'kubernetes-apiservers'
         tls_config:
@@ -54,16 +71,21 @@ data:
       
       # https://github.com/prometheus/prometheus/blob/master/documentation/examples/prometheus-kubernetes.yml#L54
       - 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:
-          - source_labels: [__meta_kubernetes_node_address_InternalIP]
-            regex: '(.*)'
-            replacement: '$1:4194'
-            target_label: __address__
+          - 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
 
       # https://github.com/prometheus/prometheus/blob/master/documentation/examples/prometheus-kubernetes.yml#L79
       - job_name: 'kubernetes-endpoints'