Merge branch 'master' of github.com:prometheus/prometheus

zhuceusage · Sep 17, 2015 · fd26b5b · fd26b5b
2 parents 568c2c4 + 704d723
commit fd26b5b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/web/api/v1/api.go b/web/api/v1/api.go
@@ -16,6 +16,7 @@ import (
 	"github.com/prometheus/prometheus/promql"
 	"github.com/prometheus/prometheus/storage/local"
 	"github.com/prometheus/prometheus/storage/metric"
+	"github.com/prometheus/prometheus/util/httputil"
 	"github.com/prometheus/prometheus/util/route"
 	"github.com/prometheus/prometheus/util/strutil"
 )
@@ -79,14 +80,15 @@ func (api *API) Register(r *route.Router) {
 	}
 
 	instr := func(name string, f apiFunc) http.HandlerFunc {
-		return prometheus.InstrumentHandlerFunc(name, func(w http.ResponseWriter, r *http.Request) {
+		hf := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			setCORS(w)
 			if data, err := f(r); err != nil {
 				respondError(w, err, data)
 			} else {
 				respond(w, data)
 			}
 		})
+		return prometheus.InstrumentHandler(name, httputil.CompressionHandler{hf})
 	}
 
 	r.Get("/query", instr("query", api.query))

diff --git a/web/web.go b/web/web.go
@@ -41,6 +41,7 @@ import (
 	"github.com/prometheus/prometheus/rules"
 	"github.com/prometheus/prometheus/storage/local"
 	"github.com/prometheus/prometheus/template"
+	"github.com/prometheus/prometheus/util/httputil"
 	"github.com/prometheus/prometheus/util/route"
 	"github.com/prometheus/prometheus/version"
 	"github.com/prometheus/prometheus/web/api/legacy"
@@ -155,8 +156,12 @@ func New(st local.Storage, qe *promql.Engine, rm *rules.Manager, status *Prometh
 		router = router.WithPrefix(o.ExternalURL.Path)
 	}
 
-	instrf := prometheus.InstrumentHandlerFunc
-	instrh := prometheus.InstrumentHandler
+	instrh := func(name string, h http.Handler) http.HandlerFunc {
+		return prometheus.InstrumentHandler(name, httputil.CompressionHandler{h})
+	}
+	instrf := func(name string, f http.HandlerFunc) http.HandlerFunc {
+		return instrh(name, f)
+	}
 
 	router.Get("/", func(w http.ResponseWriter, r *http.Request) {
 		http.Redirect(w, r, "/graph", http.StatusFound)