Add prometheus monitoring for tiler

cmd/tiller/probes.go

@@ -18,6 +18,8 @@ package main
 
 import (
 	"net/http"
+
+	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
 func readinessProbe(w http.ResponseWriter, r *http.Request) {
@@ -34,3 +36,8 @@ func newProbesMux() *http.ServeMux {
 	mux.HandleFunc("/liveness", livenessProbe)
 	return mux
 }
+
+func addPrometheusHandler(mux *http.ServeMux) {
+	// Register HTTP handler for the global Prometheus registry.
+	mux.Handle("/metrics", promhttp.Handler())
+}

cmd/tiller/probes_test.go

@@ -42,3 +42,17 @@ func TestProbesServer(t *testing.T) {
 		t.Fatalf("GET /liveness returned status code %d, expected %d", resp.StatusCode, http.StatusOK)
 	}
 }
+
+func TestPrometheus(t *testing.T) {
+	mux := http.NewServeMux()
+	addPrometheusHandler(mux)
+	srv := httptest.NewServer(mux)
+	defer srv.Close()
+	resp, err := http.Get(srv.URL + "/metrics")
+	if err != nil {
+		t.Fatalf("GET /metrics returned an error (%s)", err)
+	}
+	if resp.StatusCode != http.StatusOK {
+		t.Fatalf("GET /metrics returned status code %d, expected %d", resp.StatusCode, http.StatusOK)
+	}
+}

cmd/tiller/tiller.go

@@ -27,6 +27,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	goprom "github.com/grpc-ecosystem/go-grpc-prometheus"
 	"github.com/spf13/cobra"
 
 	"google.golang.org/grpc"
@@ -181,6 +182,11 @@ func start(c *cobra.Command, args []string) {
 
 	go func() {
 		mux := newProbesMux()
+
+		// Register gRPC server to prometheus to initialized matrix
+		goprom.Register(rootServer)
+		addPrometheusHandler(mux)
+
 		if err := http.ListenAndServe(probeAddr, mux); err != nil {
 			probeErrCh <- err
 		}

glide.yaml

@@ -43,6 +43,8 @@ import:
 - package: github.com/naoina/go-stringutil
   version: ~0.1.0
 - package: github.com/chai2010/gettext-go
+- package: github.com/prometheus/client_golang
+  version: v0.8.0
 testImports:
 - package: github.com/stretchr/testify
   version: ^1.1.4

pkg/tiller/server.go

@@ -21,6 +21,7 @@ import (
 	"log"
 	"strings"
 
+	goprom "github.com/grpc-ecosystem/go-grpc-prometheus"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
@@ -55,7 +56,7 @@ func newUnaryInterceptor() grpc.UnaryServerInterceptor {
 				return nil, err
 			}
 		}
-		return handler(ctx, req)
+		return goprom.UnaryServerInterceptor(ctx, req, info, handler)
 	}
 }
 
@@ -65,7 +66,7 @@ func newStreamInterceptor() grpc.StreamServerInterceptor {
 			log.Println(err)
 			return err
 		}
-		return handler(srv, ss)
+		return goprom.StreamServerInterceptor(srv, ss, info, handler)
 	}
 }