enable node-export and cadvistor

yunlzheng · May 9, 2017 · 5be2ad7 · 5be2ad7
1 parent 7e319c0
commit 5be2ad7
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 31 deletions.
diff --git a/main.go b/main.go
@@ -16,7 +16,7 @@ var cfg = struct {
 
 func init() {
 	flag.StringVar(
-		&cfg.configFile, "config.file", "prometheus.yml",
+		&cfg.configFile, "config.file", "prometheus_pusher.yml",
 		"Prometheus configuration file name.",
 	)
 }

diff --git a/prometheus.yml b/prometheus.yml
@@ -3,37 +3,17 @@ global:
   evaluation_interval: 15s
   external_labels:                                                              
       monitor: 'exporter-metrics'                                                
-                                                                                
+
 scrape_configs:
 
-- job_name: 'HostsMetrics'
+- job_name: 'push-metrics'
   dns_sd_configs:
   - names:
-    - node-exporter
+    - pushgateway
     refresh_interval: 15s
     type: A
     port: 9100
 
-- job_name: 'ContainerMetrics'
-  static_configs:
-    - targets:
-      - 'rancher-server:9108'
-- job_name: 'RancherServerMetrics'
-  dns_sd_configs:
-  - names:
-    - cadvisor
-    refresh_interval: 15s
-    type: A
-    port: 8080
-
-- job_name: 'RancherApi'
-  dns_sd_configs:
-  - names:
-    - 'prometheus-rancher-exporter'
-    refresh_interval: 15s
-    type: A
-    port: 9173
-
 - job_name: 'Prometheus'
   static_configs:
     - targets:

diff --git a/prometheus_pusher.yml b/prometheus_pusher.yml
@@ -0,0 +1,36 @@
+global:                                                                         
+  scrape_interval:     15s
+  evaluation_interval: 15s
+  external_labels:                                                              
+      monitor: 'exporter-metrics'                                                
+
+scrape_configs:
+
+- job_name: 'HostsMetrics'
+  dns_sd_configs:
+  - names:
+    - node-exporter
+    refresh_interval: 15s
+    type: A
+    port: 9100
+
+- job_name: 'RancherServerMetrics'
+  dns_sd_configs:
+  - names:
+    - cadvisor
+    refresh_interval: 15s
+    type: A
+    port: 9120
+
+#- job_name: 'RancherApi'
+#  dns_sd_configs:
+#  - names:
+#    - 'prometheus-rancher-exporter'
+#    refresh_interval: 15s
+#    type: A
+#    port: 9173
+#
+#- job_name: 'ContainerMetrics'
+#  static_configs:
+#    - targets:
+#      - 'rancher-server:9108'
diff --git a/scrape/exporterscrape.go b/scrape/exporterscrape.go
@@ -13,8 +13,8 @@ import (
 	"io"
 	"bytes"
 	"strings"
-	"io/ioutil"
 	"os"
+	"io/ioutil"
 )
 
 var pushGateway string
@@ -86,10 +86,6 @@ var userAgentHeader = fmt.Sprintf("Prometheus/%s", version.Version)
 
 func (endpoint *jobEndpoint) scrape(jobName string) error {
 
-	if jobName!="HostsMetrics" {
-		return nil
-	}
-
 	req, err := http.NewRequest("GET", endpoint.Endpoint, nil)
 	if err != nil {
 		return err
@@ -143,12 +139,12 @@ func (endpoint *jobEndpoint) scrape(jobName string) error {
 
 	for _, sample := range allSamples {
 		metric := fmt.Sprintf("%s %s\n", sample.Metric, sample.Value)
-		if !strings.Contains(metric, "go_") && !strings.Contains(metric, "http_") {
+		if strings.Contains(metric, "node_") || strings.Contains(metric, "container_") {
 			buffer.WriteString(metric)
 		}
 	}
 
-	url := fmt.Sprintf("%s/metrics/job/%s", pushGateway, jobName)
+	url := fmt.Sprintf("%s/metrics/job/%s/instance/%s", pushGateway, jobName, jobName)
 	fmt.Println("send data to pushgateway :" + url)
 
 	post, err := http.NewRequest("POST", url, strings.NewReader(buffer.String()))