fix prom startup and add block profiling

m-lab · Oct 28, 2019 · a2fe94b · a2fe94b
1 parent 7901d44
commit a2fe94b
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 0 deletions.
diff --git a/cmd/gardener/gardener.go b/cmd/gardener/gardener.go
@@ -338,9 +338,24 @@ func init() {
 }
 
 func main() {
+	flag.Parse()
+
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
+	if env.Error != nil {
+		log.Println(env.Error)
+		log.Println(env)
+		os.Exit(1)
+	}
+
+	// Enable block profiling
+	runtime.SetBlockProfileRate(1000000) // One event per msec.
+
+	// Expose prometheus and pprof metrics on a separate port.
+	prometheusx.MustServeMetrics()
+
+
 	// Check if invoked as a service.
 	isService, _ := strconv.ParseBool(os.Getenv("GARDENER_SERVICE"))
 	if isService {

diff --git a/k8s/data-processing-cluster/deployments/etl-gardener-disco.yml b/k8s/data-processing-cluster/deployments/etl-gardener-disco.yml
@@ -36,6 +36,7 @@ spec:
       containers:
       - image: gcr.io/{{GCLOUD_PROJECT}}/github-m-lab-etl-gardener:{{GIT_COMMIT}}
         name: etl-gardener
+        args: ["--prometheusx.listen-address=:9090"]
         env:
         - name: GARDENER_SERVICE
           value: "true"

diff --git a/k8s/data-processing-cluster/deployments/etl-gardener-ndt.yml b/k8s/data-processing-cluster/deployments/etl-gardener-ndt.yml
@@ -36,6 +36,7 @@ spec:
       containers:
       - image: gcr.io/{{GCLOUD_PROJECT}}/github-m-lab-etl-gardener:{{GIT_COMMIT}}
         name: etl-gardener
+        args: ["--prometheusx.listen-address=:9090"]
         env:
         - name: GARDENER_SERVICE
           value: "true"

diff --git a/k8s/data-processing-cluster/deployments/etl-gardener-ndt5.yml b/k8s/data-processing-cluster/deployments/etl-gardener-ndt5.yml
@@ -36,6 +36,7 @@ spec:
       containers:
       - image: gcr.io/{{GCLOUD_PROJECT}}/github-m-lab-etl-gardener:{{GIT_COMMIT}}
         name: etl-gardener
+        args: ["--prometheusx.listen-address=:9090"]
         env:
         - name: GARDENER_SERVICE
           value: "true"

diff --git a/k8s/data-processing-cluster/deployments/etl-gardener-scamper.yml b/k8s/data-processing-cluster/deployments/etl-gardener-scamper.yml
@@ -36,6 +36,7 @@ spec:
       containers:
       - image: gcr.io/{{GCLOUD_PROJECT}}/github-m-lab-etl-gardener:{{GIT_COMMIT}}
         name: etl-gardener
+        args: ["--prometheusx.listen-address=:9090"]
         env:
         - name: GARDENER_SERVICE
           value: "true"

diff --git a/k8s/data-processing-cluster/deployments/etl-gardener-sidestream.yml b/k8s/data-processing-cluster/deployments/etl-gardener-sidestream.yml
@@ -36,6 +36,7 @@ spec:
       containers:
       - image: gcr.io/{{GCLOUD_PROJECT}}/github-m-lab-etl-gardener:{{GIT_COMMIT}}
         name: etl-gardener
+        args: ["--prometheusx.listen-address=:9090"]
         env:
         - name: GARDENER_SERVICE
           value: "true"

diff --git a/k8s/data-processing-cluster/deployments/etl-gardener-tcpinfo.yml b/k8s/data-processing-cluster/deployments/etl-gardener-tcpinfo.yml
@@ -36,6 +36,7 @@ spec:
       containers:
       - image: gcr.io/{{GCLOUD_PROJECT}}/github-m-lab-etl-gardener:{{GIT_COMMIT}}
         name: etl-gardener
+        args: ["--prometheusx.listen-address=:9090"]
         env:
         - name: GARDENER_SERVICE
           value: "true"

diff --git a/k8s/data-processing-cluster/deployments/etl-gardener-traceroute.yml b/k8s/data-processing-cluster/deployments/etl-gardener-traceroute.yml
@@ -36,6 +36,7 @@ spec:
       containers:
       - image: gcr.io/{{GCLOUD_PROJECT}}/github-m-lab-etl-gardener:{{GIT_COMMIT}}
         name: etl-gardener
+        args: ["--prometheusx.listen-address=:9090"]
         env:
         - name: GARDENER_SERVICE
           value: "true"