Fix pprof endpoint

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v1.2.1 [unreleased]
+
+### Release Notes
+
+### Features
+
+### Bugfixes
+
+- [#1147](https://github.com/influxdata/kapacitor/issues/1147): Fix pprof debug endpoint
+
+
 ## v1.2.0 [2017-01-23]
 
 ### Release Notes

server/server_test.go

@@ -70,6 +70,56 @@ func TestServer_Ping(t *testing.T) {
 		t.Fatal("unexpected version", version)
 	}
 }
+
+func TestServer_Pprof_Index(t *testing.T) {
+	s, _ := OpenDefaultServer()
+	defer s.Close()
+	testCases := []struct {
+		path        string
+		code        int
+		contentType string
+	}{
+		{
+			path:        "/debug/pprof/",
+			code:        http.StatusOK,
+			contentType: "text/html; charset=utf-8",
+		},
+		{
+			path:        "/debug/pprof/block",
+			code:        http.StatusOK,
+			contentType: "text/plain; charset=utf-8",
+		},
+		{
+			path:        "/debug/pprof/goroutine",
+			code:        http.StatusOK,
+			contentType: "text/plain; charset=utf-8",
+		},
+		{
+			path:        "/debug/pprof/heap",
+			code:        http.StatusOK,
+			contentType: "text/plain; charset=utf-8",
+		},
+		{
+			path:        "/debug/pprof/threadcreate",
+			code:        http.StatusOK,
+			contentType: "text/plain; charset=utf-8",
+		},
+	}
+	for _, tc := range testCases {
+		t.Run(tc.path, func(t *testing.T) {
+			r, err := http.Get(s.URL() + tc.path)
+			if err != nil {
+				t.Fatal(err)
+			}
+			if got, exp := r.StatusCode, tc.code; got != exp {
+				t.Errorf("unexpected status code got %d exp %d", got, exp)
+			}
+			if got, exp := r.Header.Get("Content-Type"), tc.contentType; got != exp {
+				t.Errorf("unexpected content type got %s exp %s", got, exp)
+			}
+		})
+	}
+}
 func TestServer_Authenticate_Fail(t *testing.T) {
 	conf := NewConfig()
 	conf.HTTP.AuthEnabled = true

services/httpd/handler.go

@@ -200,7 +200,7 @@ func NewHandler(
 		{
 			Method:      "GET",
 			Pattern:     BasePath + "/debug/pprof/",
-			HandlerFunc: pprof.Index,
+			HandlerFunc: servePprof,
 			noJSON:      true,
 		},
 		{
@@ -523,6 +523,13 @@ func MarshalJSON(v interface{}, pretty bool) []byte {
 	return b
 }
 
+func servePprof(w http.ResponseWriter, r *http.Request) {
+	p := strings.TrimPrefix(r.URL.Path, BasePath)
+	r.URL.Path = p
+	w.Header().Set("Content-Type", "text/html; charset=utf-8")
+	pprof.Index(w, r)
+}
+
 // serveExpvar serves registered expvar information over HTTP.
 func serveExpvar(w http.ResponseWriter, r *http.Request) {
 	fmt.Fprintf(w, "{\n")