Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding ready route to inputs.influxdb_v2_listener #8133

Merged
merged 1 commit into from Sep 17, 2020
Merged

Adding ready route to inputs.influxdb_v2_listener #8133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 18 additions & 0 deletions plugins/inputs/influxdb_v2_listener/influxdb_v2_listener.go
View file
Open in desktop
Expand Up @@ -53,6 +53,7 @@ type InfluxDBV2Listener struct {
bytesRecv selfstat.Stat
requestsServed selfstat.Stat
writesServed selfstat.Stat
readysServed selfstat.Stat
requestsRecv selfstat.Stat
notFoundsServed selfstat.Stat
authFailures selfstat.Stat
Expand Down Expand Up @@ -115,6 +116,7 @@ func (h *InfluxDBV2Listener) routes() {
)

h.mux.Handle("/api/v2/write", authHandler(h.handleWrite()))
h.mux.Handle("/api/v2/ready", h.handleReady())
h.mux.Handle("/", authHandler(h.handleDefault()))
}

Expand All @@ -125,6 +127,7 @@ func (h *InfluxDBV2Listener) Init() error {
h.bytesRecv = selfstat.Register("influxdb_v2_listener", "bytes_received", tags)
h.requestsServed = selfstat.Register("influxdb_v2_listener", "requests_served", tags)
h.writesServed = selfstat.Register("influxdb_v2_listener", "writes_served", tags)
h.readysServed = selfstat.Register("influxdb_v2_listener", "readys_served", tags)
h.requestsRecv = selfstat.Register("influxdb_v2_listener", "requests_received", tags)
h.notFoundsServed = selfstat.Register("influxdb_v2_listener", "not_founds_served", tags)
h.authFailures = selfstat.Register("influxdb_v2_listener", "auth_failures", tags)
Expand Down Expand Up @@ -195,6 +198,21 @@ func (h *InfluxDBV2Listener) ServeHTTP(res http.ResponseWriter, req *http.Reques
h.requestsServed.Incr(1)
}

func (h *InfluxDBV2Listener) handleReady() http.HandlerFunc {
return func(res http.ResponseWriter, req *http.Request) {
defer h.readysServed.Incr(1)

// respond to ready requests
res.Header().Set("Content-Type", "application/json")
res.WriteHeader(http.StatusOK)
b, _ := json.Marshal(map[string]string{
"started": h.startTime.Format(time.RFC3339Nano),
"status": "ready",
"up": h.timeFunc().Sub(h.startTime).String()})
res.Write(b)
}
}

func (h *InfluxDBV2Listener) handleDefault() http.HandlerFunc {
return func(res http.ResponseWriter, req *http.Request) {
defer h.notFoundsServed.Incr(1)
Expand Down
21 changes: 21 additions & 0 deletions plugins/inputs/influxdb_v2_listener/influxdb_v2_listener_test.go
View file
Open in desktop
Expand Up @@ -465,6 +465,27 @@ func TestWriteEmpty(t *testing.T) {
require.EqualValues(t, 204, resp.StatusCode)
}

func TestReady(t *testing.T) {
listener := newTestListener()
listener.timeFunc = func() time.Time {
return time.Unix(42, 123456789)
}
acc := &testutil.Accumulator{}
require.NoError(t, listener.Init())
require.NoError(t, listener.Start(acc))
defer listener.Stop()

// post ping to listener
resp, err := http.Get(createURL(listener, "http", "/api/v2/ready", ""))
require.NoError(t, err)
require.Equal(t, "application/json", resp.Header["Content-Type"][0])
bodyBytes, err := ioutil.ReadAll(resp.Body)
require.NoError(t, err)
require.Contains(t, string(bodyBytes), "\"status\":\"ready\"")
resp.Body.Close()
require.EqualValues(t, 200, resp.StatusCode)
}

func TestWriteWithPrecision(t *testing.T) {
listener := newTestListener()

Expand Down