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.

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

Distributors rings status #4151

Merged

Conversation

ethervoid
Copy link
Contributor

What this PR does:

Now we're able to see the ring status for the distributor when the ingestion-rate-limit-strategy
the setting is set to global

Screenshot from 2021-04-30 18-58-34
Screenshot from 2021-04-30 18-57-59
Screenshot from 2021-04-30 18-57-48

Which issue(s) this PR fixes:
Fixes #3656

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

@ethervoid
Copy link
Contributor Author

@pracucci Finally I've been able to do it 😄 , hopefully, I haven't done something totally weird that is not what we want

Copy link
Contributor

@pracucci pracucci left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job, LGTM! (modulo a couple of nits)

Copy link
Contributor

@pstibrany pstibrany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks (let's please fix prometheus.DefaultRegisterer that @pracucci pointed out).

Comment on lines 1056 to 1057
w.WriteHeader(http.StatusOK)
_, err := w.Write([]byte(unshardedPage))
if err != nil {
level.Error(d.log).Log("msg", "unable to serve status page", "err", err)
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this worth moving to WriteHTMLResponse in pkg/util/http.go?

Also there is no need to log the error while writing response. It's likely that client has disconnected, at that point, we cannot do anything about it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah it makes sense so I've created that method and now we're using it in rules and distributor :)

ethervoid added 5 commits May 6, 2021 10:20
Now we're able to see the ring status for the distributor when the ingestion-rate-limit-strategy
setting is set to global

Signed-off-by: Mario de Frutos <[email protected]>
Signed-off-by: Mario de Frutos <[email protected]>
Signed-off-by: Mario de Frutos <[email protected]>
@ethervoid ethervoid force-pushed the 3656_ring_status_distributors branch from 10f894a to 90fd9b3 Compare May 6, 2021 08:50
@ethervoid
Copy link
Contributor Author

All changes tackled :)

@pstibrany
Copy link
Contributor

Thanks for addressing our feedback!

@pstibrany pstibrany enabled auto-merge (squash) May 6, 2021 08:58
@pstibrany pstibrany merged commit 5d55a28 into cortexproject:master May 6, 2021
@ethervoid ethervoid deleted the 3656_ring_status_distributors branch May 6, 2021 09:22
@pracucci pracucci mentioned this pull request May 10, 2021
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"Ring status" for distributors
3 participants