Set headers on influxdb_listener ping URL (influxdata#7182)

arstercz · Mar 17, 2020 · b8d18f9 · b8d18f9
1 parent d14d05c
commit b8d18f9
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/plugins/inputs/influxdb_listener/influxdb_listener.go b/plugins/inputs/influxdb_listener/influxdb_listener.go
@@ -226,7 +226,9 @@ func (h *InfluxDBListener) handlePing() http.HandlerFunc {
 		verbose := req.URL.Query().Get("verbose")
 
 		// respond to ping requests
+		res.Header().Set("X-Influxdb-Version", "1.0")
 		if verbose != "" && verbose != "0" && verbose != "false" {
+			res.Header().Set("Content-Type", "application/json")
 			res.WriteHeader(http.StatusOK)
 			b, _ := json.Marshal(map[string]string{"version": "1.0"}) // based on header set above
 			res.Write(b)

diff --git a/plugins/inputs/influxdb_listener/influxdb_listener_test.go b/plugins/inputs/influxdb_listener/influxdb_listener_test.go
@@ -477,7 +477,7 @@ func TestWriteEmpty(t *testing.T) {
 	require.EqualValues(t, 204, resp.StatusCode)
 }
 
-func TestQueryAndPing(t *testing.T) {
+func TestQuery(t *testing.T) {
 	listener := newTestListener()
 
 	acc := &testutil.Accumulator{}
@@ -490,14 +490,40 @@ func TestQueryAndPing(t *testing.T) {
 		createURL(listener, "http", "/query", "db=&q=CREATE+DATABASE+IF+NOT+EXISTS+%22mydb%22"), "", nil)
 	require.NoError(t, err)
 	require.EqualValues(t, 200, resp.StatusCode)
+}
+
+func TestPing(t *testing.T) {
+	listener := newTestListener()
+	acc := &testutil.Accumulator{}
+	require.NoError(t, listener.Init())
+	require.NoError(t, listener.Start(acc))
+	defer listener.Stop()
 
 	// post ping to listener
-	resp, err = http.Post(createURL(listener, "http", "/ping", ""), "", nil)
+	resp, err := http.Post(createURL(listener, "http", "/ping", ""), "", nil)
 	require.NoError(t, err)
+	require.Equal(t, "1.0", resp.Header["X-Influxdb-Version"][0])
+	require.Len(t, resp.Header["Content-Type"], 0)
 	resp.Body.Close()
 	require.EqualValues(t, 204, resp.StatusCode)
 }
 
+func TestPingVerbose(t *testing.T) {
+	listener := newTestListener()
+	acc := &testutil.Accumulator{}
+	require.NoError(t, listener.Init())
+	require.NoError(t, listener.Start(acc))
+	defer listener.Stop()
+
+	// post ping to listener
+	resp, err := http.Post(createURL(listener, "http", "/ping", "verbose=1"), "", nil)
+	require.NoError(t, err)
+	require.Equal(t, "1.0", resp.Header["X-Influxdb-Version"][0])
+	require.Equal(t, "application/json", resp.Header["Content-Type"][0])
+	resp.Body.Close()
+	require.EqualValues(t, 200, resp.StatusCode)
+}
+
 func TestWriteWithPrecision(t *testing.T) {
 	listener := newTestListener()