From cf054c1f791cccaa8dd67f6abb11a9d1727f8b11 Mon Sep 17 00:00:00 2001 From: John Gilden Date: Fri, 7 Apr 2017 10:02:19 +0200 Subject: [PATCH 1/2] Use the Host header from the original Kapacitor URL --- server/proxy.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/proxy.go b/server/proxy.go index 5e1a0fa850..b00709e072 100644 --- a/server/proxy.go +++ b/server/proxy.go @@ -44,6 +44,9 @@ func (h *Service) KapacitorProxy(w http.ResponseWriter, r *http.Request) { u.Path = path director := func(req *http.Request) { + // Set the Host header of the original Kapacitor URL + req.Host = u.Host + req.URL = u // Because we are acting as a proxy, kapacitor needs to have the basic auth information set as // a header directly From 3f5f82dd86b0b27373055f6a80ce755b7ea04c8f Mon Sep 17 00:00:00 2001 From: Chris Goller Date: Fri, 7 Apr 2017 08:31:44 -0500 Subject: [PATCH 2/2] Update CHANGELOG to mention fixing https://github.com/influxdata/chronograf/issues/1206 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ee73a6759..7c33f0a35d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ 1. [#1095](https://github.com/influxdata/chronograf/pull/1095): Make logout button display again 1. [#1209](https://github.com/influxdata/chronograf/pull/1209): HipChat Kapacitor config now uses only the subdomain instead of asking for the entire HipChat URL. 1. [#1219](https://github.com/influxdata/chronograf/pull/1219): Update query for default cell in new dashboard + 1. [#1206](https://github.com/influxdata/chronograf/issues/1206): Chronograf now proxies to kapacitors behind proxy using vhost correctly. ### Features 1. [#1112](https://github.com/influxdata/chronograf/pull/1112): Add ability to delete a dashboard