Skip to content

Commit af9591f

Browse files
authored
Merge pull request #41 from weaveworks/simplify-remote-write
Update Prometheus vendoring and simplify remote append code
2 parents f00a3e4 + 01e0f91 commit af9591f

File tree

16 files changed

+523
-131
lines changed

16 files changed

+523
-131
lines changed

ingester_client.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ func (c *IngesterClient) Append(ctx context.Context, samples []*model.Sample) er
7777
req.Timeseries = append(req.Timeseries, ts)
7878
}
7979

80-
var resp remote.WriteResponse
81-
return c.doRequest(ctx, "/push", req, &resp, true)
80+
return c.doRequest(ctx, "/push", req, nil, true)
8281
}
8382

8483
// Query implements Querier.

server.go

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -126,22 +126,6 @@ func AppenderHandler(appender SampleAppender) http.Handler {
126126
http.Error(w, err.Error(), http.StatusInternalServerError)
127127
return
128128
}
129-
130-
respBuf, err := proto.Marshal(&remote.WriteResponse{})
131-
if err != nil {
132-
log.Errorf("marshall err: %v", err)
133-
http.Error(w, err.Error(), http.StatusInternalServerError)
134-
return
135-
}
136-
137-
if _, err := snappy.NewWriter(w).Write(respBuf); err != nil {
138-
log.Errorf("write err: %v", err)
139-
http.Error(w, err.Error(), http.StatusInternalServerError)
140-
return
141-
}
142-
143-
w.Header().Add("Content-Encoding", "snappy")
144-
w.WriteHeader(http.StatusOK)
145129
})
146130
}
147131

vendor/github.com/prometheus/prometheus/config/config.go

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/prometheus/prometheus/relabel/LICENSE

Lines changed: 201 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/prometheus/prometheus/relabel/relabel.go

Lines changed: 102 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/prometheus/prometheus/storage/local/chunk/chunk.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/prometheus/prometheus/storage/local/chunk/delta.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/prometheus/prometheus/storage/local/chunk/doubledelta.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)