-
Notifications
You must be signed in to change notification settings - Fork 804
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.
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
Allow HTTP pushes directly to ingesters. #1491
Conversation
We should drop that "billing" stuff. Unfortunately I probably need to put something else in its place or I'll spook the natives. |
Agreed re: billing. We use the per-user metrics for billing now. |
7d75297
to
98db9d1
Compare
@bboreham I've remove the billing code, WDYT? |
I’m still at “ need to put something else in its place”. |
e010af7
to
2556d88
Compare
Do you want us to wait? When do you think you'll have a chance to do this? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changes LGTM. I've just a concern about the API path (see the comment), everything else looks good.
@@ -341,6 +342,7 @@ func (t *Cortex) initIngester(cfg *Config) (err error) { | |||
t.server.HTTP.Path("/ready").Handler(http.HandlerFunc(t.ingester.ReadinessHandler)) | |||
t.server.HTTP.Path("/flush").Handler(http.HandlerFunc(t.ingester.FlushHandler)) | |||
t.server.HTTP.Path("/shutdown").Handler(http.HandlerFunc(t.ingester.ShutdownHandler)) | |||
t.server.HTTP.Handle("/push", t.httpAuthMiddleware.Wrap(push.Handler(cfg.Distributor, t.ingester.Push))) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Two things:
- I'm a bit concerned about the inconsistency in the path between distributors (
/api/prom/push
) and ingesters (/push
). Have you thought about it? - Could you document it to
docs/apis.md
, please?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm a bit concerned about the inconsistency in the path between distributors (/api/prom/push) and ingesters (/push). Have you thought about it?
Yeah, we can have them at the same path as the paths will collide in the single binary case.
I put it at /push
to indicate its a private API; the /api/prom is for public endpoints.
I have written the program. I don't think it's essential that you wait. |
…sters. Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
Signed-off-by: Tom Wilkie <tom@grafana.com>
Signed-off-by: Tom Wilkie <tom@grafana.com>
Signed-off-by: Tom Wilkie <tom@grafana.com>
c7a3956
to
1b1c147
Compare
This is mostly for benchmark comparisons.
Signed-off-by: Tom Wilkie tom.wilkie@gmail.com