fix: correct typos in default rate limit YAML keys by michel-laterman · Pull Request #6835 · elastic/fleet-server

michel-laterman · 2026-04-14T22:28:27Z

What is the problem this PR solves?

All 6 embedded default YAML files under internal/pkg/config/defaults/ used pgp_retieval_limit (missing 'r') instead of pgp_retrieval_limit. Because the Go struct tag is config:"pgp_retrieval_limit", the YAML values never deserialized — PGP retrieval rate limits silently fell back to hardcoded defaults regardless of agent-count tier.

Additionally, lte10000_limits.yml used policy_interval instead of policy_limit, causing the same silent fallback for the policy rate limit at the 5001-10000 agent tier.

How does this PR solve the problem?

Fixes pgp_retieval_limit → pgp_retrieval_limit in all 6 default YAML files
Fixes policy_interval → policy_limit in lte10000_limits.yml
Renames lte2500_limite.yml → lte2500_limits.yml for consistency
Adds TestDefaultLimitsYAMLKeys regression test that verifies all embedded YAML files populate every limit field with non-zero values, catching future key/struct-tag mismatches

How to test this PR locally

go test ./internal/pkg/config/ -run "TestDefaultLimitsYAMLKeys" -v

Design Checklist

I have ensured my design is stateless and will work when multiple fleet-server instances are behind a load balancer.
I have or intend to scale test my changes, ensuring it will work reliably with 100K+ agents connected.
I have included fail safe mechanisms to limit the load on fleet-server: rate limiting, circuit breakers, caching, load shedding, etc.

Checklist

I have added tests that prove my fix is effective or that my feature works
I have added an entry in ./changelog/fragments using the changelog tool

The embedded default YAML files used `pgp_retieval_limit` (missing 'r') instead of `pgp_retrieval_limit`, causing the values to never deserialize into the Go struct. PGP retrieval limits silently fell back to hardcoded defaults for all agent-count tiers. Also fixes `policy_interval` -> `policy_limit` in lte10000_limits.yml and renames `lte2500_limite.yml` -> `lte2500_limits.yml`. Adds a regression test that verifies all embedded YAML files populate every limit field, catching future key/struct-tag mismatches. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

ebeahan

Are these config values only exposed internally?

I agree that these changes are a bugfix, but could any of these changes be "breaking" in the sense they are changing the current default behavior?

michel-laterman · 2026-04-15T15:04:09Z

@ebeahan, our defaults are much lower than what the fix would load

ycombinator

Thanks for catching and fixing both typos. Config keys are now properly aligned with the struct tags in config.ServerLimits.

Thanks for adding the test too. It would be nice to make this test more generic, such that it iterates over all the server_limits keys in each YAML file and, for each key, requires that there is a corresponding struct field with that struct tag. I'll push up a commit for that.

Replace manually enumerated field assertions with a reflection-based approach that reads raw YAML keys and verifies each has a matching `config` struct tag on serverLimitDefaults. This catches typos automatically without needing to update the test when fields are added. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

ycombinator · 2026-04-15T16:47:16Z

It would be nice to make this test more generic, such that it iterates over all the server_limits keys in each YAML file and, for each key, requires that there is a corresponding struct field with that struct tag. I'll push up a commit for that.

I made the test more generic using reflection, in 5ad7478. This way we don't have to enumerate all the struct fields in the assertions. But if you prefer the original implementation, feel free to revert/remove my commit.

Co-authored-by: Shaunak Kashyap <ycombinator@gmail.com>

github-actions · 2026-04-16T22:41:36Z

@Mergifyio backport 8.19 9.3 9.4

mergify · 2026-04-16T22:50:43Z

backport 8.19 9.3 9.4

✅ Backports have been created

Details

#6845 [8.19](backport #6835) fix: correct typos in default rate limit YAML keys has been created for branch 8.19
#6846 [9.3](backport #6835) fix: correct typos in default rate limit YAML keys has been created for branch 9.3
#6847 [9.4](backport #6835) fix: correct typos in default rate limit YAML keys has been created for branch 9.4

* fix: correct typos in default rate limit YAML keys The embedded default YAML files used `pgp_retieval_limit` (missing 'r') instead of `pgp_retrieval_limit`, causing the values to never deserialize into the Go struct. PGP retrieval limits silently fell back to hardcoded defaults for all agent-count tiers. Also fixes `policy_interval` -> `policy_limit` in lte10000_limits.yml and renames `lte2500_limite.yml` -> `lte2500_limits.yml`. Adds a regression test that verifies all embedded YAML files populate every limit field, catching future key/struct-tag mismatches. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * test: use reflection to validate YAML keys match struct tags Replace manually enumerated field assertions with a reflection-based approach that reads raw YAML keys and verifies each has a matching `config` struct tag on serverLimitDefaults. This catches typos automatically without needing to update the test when fields are added. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * Cleanup test code * Update internal/pkg/config/env_defaults_test.go Co-authored-by: Shaunak Kashyap <ycombinator@gmail.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: Shaunak Kashyap <ycombinator@gmail.com> (cherry picked from commit 47b6210)

* fix: correct typos in default rate limit YAML keys The embedded default YAML files used `pgp_retieval_limit` (missing 'r') instead of `pgp_retrieval_limit`, causing the values to never deserialize into the Go struct. PGP retrieval limits silently fell back to hardcoded defaults for all agent-count tiers. Also fixes `policy_interval` -> `policy_limit` in lte10000_limits.yml and renames `lte2500_limite.yml` -> `lte2500_limits.yml`. Adds a regression test that verifies all embedded YAML files populate every limit field, catching future key/struct-tag mismatches. * test: use reflection to validate YAML keys match struct tags Replace manually enumerated field assertions with a reflection-based approach that reads raw YAML keys and verifies each has a matching `config` struct tag on serverLimitDefaults. This catches typos automatically without needing to update the test when fields are added. * Cleanup test code * Update internal/pkg/config/env_defaults_test.go --------- (cherry picked from commit 47b6210) Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: Shaunak Kashyap <ycombinator@gmail.com>

michel-laterman added bug Something isn't working Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team backport-active-all Automated backport with mergify to all the active branches labels Apr 14, 2026

michel-laterman self-assigned this Apr 14, 2026

michel-laterman force-pushed the bug/pgp-defaults branch from 3b20013 to 29269d3 Compare April 14, 2026 22:41

michel-laterman marked this pull request as ready for review April 14, 2026 22:43

michel-laterman requested a review from a team as a code owner April 14, 2026 22:43

michel-laterman requested review from samuelvl and ycombinator April 14, 2026 22:43

ebeahan reviewed Apr 15, 2026

View reviewed changes

ycombinator reviewed Apr 15, 2026

View reviewed changes

ycombinator previously approved these changes Apr 15, 2026

View reviewed changes

Cleanup test code

0eba80c

michel-laterman dismissed ycombinator’s stale review via 0eba80c April 15, 2026 17:26

michel-laterman requested a review from ycombinator April 15, 2026 17:26

ycombinator reviewed Apr 16, 2026

View reviewed changes

Comment thread internal/pkg/config/env_defaults_test.go Outdated

Update internal/pkg/config/env_defaults_test.go

772b043

Co-authored-by: Shaunak Kashyap <ycombinator@gmail.com>

ycombinator approved these changes Apr 16, 2026

View reviewed changes

Merge branch 'main' into bug/pgp-defaults

5692fa5

michel-laterman merged commit 47b6210 into elastic:main Apr 16, 2026
10 checks passed

michel-laterman deleted the bug/pgp-defaults branch April 16, 2026 22:41

mergify bot mentioned this pull request Apr 16, 2026

[8.19](backport #6835) fix: correct typos in default rate limit YAML keys #6845

Merged

5 tasks

mergify bot mentioned this pull request Apr 16, 2026

[9.3](backport #6835) fix: correct typos in default rate limit YAML keys #6846

Merged

5 tasks

mergify bot mentioned this pull request Apr 16, 2026

[9.4](backport #6835) fix: correct typos in default rate limit YAML keys #6847

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: correct typos in default rate limit YAML keys#6835

fix: correct typos in default rate limit YAML keys#6835
michel-laterman merged 5 commits intoelastic:mainfrom
michel-laterman:bug/pgp-defaults

michel-laterman commented Apr 14, 2026

Uh oh!

ebeahan left a comment

Uh oh!

michel-laterman commented Apr 15, 2026

Uh oh!

ycombinator left a comment •

edited

Loading

Uh oh!

ycombinator commented Apr 15, 2026

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Apr 16, 2026

Uh oh!

mergify bot commented Apr 16, 2026 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

michel-laterman commented Apr 14, 2026

What is the problem this PR solves?

How does this PR solve the problem?

How to test this PR locally

Design Checklist

Checklist

Uh oh!

ebeahan left a comment

Choose a reason for hiding this comment

Uh oh!

michel-laterman commented Apr 15, 2026

Uh oh!

ycombinator left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ycombinator commented Apr 15, 2026

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Apr 16, 2026

Uh oh!

mergify bot commented Apr 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Backports have been created

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

ycombinator left a comment •

edited

Loading

mergify bot commented Apr 16, 2026 •

edited

Loading