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

Add overrides configmap to querier, update docs for new limit #1153

Merged
merged 8 commits into from
Dec 6, 2021

Conversation

annanay25
Copy link
Contributor

@annanay25 annanay25 commented Dec 3, 2021

Signed-off-by: Annanay [email protected]

What this PR does:

  • [Jsonnet] Add overrides confimap to the querier
  • [Docs] Add docs for the new limit and revamp the overrides section a bit
  • Splits CI runners for unit and integration tests
  • Optimised integration tests a little

Before:

--- PASS: TestCompression (17.20s)
--- PASS: TestAllInOne (91.78s)
    --- PASS: TestAllInOne/s3 (31.36s)
    --- PASS: TestAllInOne/azure (35.26s)
    --- PASS: TestAllInOne/gcs (25.16s)
--- PASS: TestMicroservices (122.80s)
--- PASS: TestScalableSingleBinary (152.11s)
--- PASS: TestLimits (17.05s)

After

--- PASS: TestCompression (17.63s)
--- PASS: TestAllInOne (77.20s)
    --- PASS: TestAllInOne/s3 (24.66s)
    --- PASS: TestAllInOne/azure (28.47s)
    --- PASS: TestAllInOne/gcs (24.07s)
--- PASS: TestMicroservices (66.50s)
--- PASS: TestScalableSingleBinary (65.11s)
--- PASS: TestLimits (16.73s)

Ok, the machine used in second run might have been better but still reductions in TestMicroservices and TestScalableSingleBinary.

Which issue(s) this PR fixes:
Follow up from #1068

Marking draft because this is 100% going to collide with #1129

Checklist

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

@annanay25 annanay25 marked this pull request as ready for review December 3, 2021 10:17
Copy link
Member

@mapno mapno left a comment

Choose a reason for hiding this comment

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

LGTM

docs/tempo/website/configuration/_index.md Outdated Show resolved Hide resolved
docs/tempo/website/configuration/_index.md Outdated Show resolved Hide resolved
docs/tempo/website/configuration/_index.md Outdated Show resolved Hide resolved
docs/tempo/website/configuration/_index.md Outdated Show resolved Hide resolved
docs/tempo/website/configuration/_index.md Outdated Show resolved Hide resolved
@annanay25 annanay25 enabled auto-merge (squash) December 6, 2021 10:30
@annanay25 annanay25 disabled auto-merge December 6, 2021 10:31
@annanay25
Copy link
Contributor Author

annanay25 commented Dec 6, 2021

@KMiller-Grafana Thanks for the review. I'm going to merge this one as I have addressed your comments. There were no other docs changes.

Edit: Oh I can't merge until you approve. I'll wait :)

@annanay25 annanay25 enabled auto-merge (squash) December 6, 2021 11:27
Copy link
Contributor

@KMiller-Grafana KMiller-Grafana left a comment

Choose a reason for hiding this comment

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

Docs look good to me now. Thanks for the changes.

@annanay25 annanay25 merged commit 1899be3 into grafana:main Dec 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants