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

resource_pools_config: support fixed_values allocation and deprecating default pool allocation #74

Merged
merged 12 commits into from
Aug 28, 2024
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@

Added:
* Add `high_priority_filter` and `low_priority_filter` to unstable `chronosphere_log_allocation_config`.
* Add `fixed_value` in v1 `chronosphere_resource_pools_config.pools[].allocation`.

Fixed:
* Remove invalid fields from `chronosphere_dataset`, `chronosphere_trace_tail_sampling_rules`, `chronosphere_trace_metrics_rule` resources.

Deprecated:
* `allocation` in v1 `chronosphere_resource_pools_config.default_pool`, as this can be derived instead.

## v1.4.0

Added:
Expand Down
8 changes: 7 additions & 1 deletion chronosphere/intschema/shared_schemas.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

103 changes: 103 additions & 0 deletions chronosphere/pkg/configv1/models/allocation_fixed_value.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

81 changes: 78 additions & 3 deletions chronosphere/pkg/configv1/models/resource_pools_allocation.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

84 changes: 84 additions & 0 deletions chronosphere/pkg/configv1/models/resource_pools_license.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 29 additions & 1 deletion chronosphere/pkg/configv1/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
"application/json"
],
"definitions": {
"AllocationFixedValue": {
"properties": {
"license": {
"$ref": "#/definitions/ResourcePoolsLicense"
},
"value": {
"format": "int64",
"type": "string"
}
},
"type": "object"
},
"ConditionOp": {
"enum": [
"GEQ",
Expand Down Expand Up @@ -1456,9 +1468,16 @@
"ResourcePoolsAllocation": {
"properties": {
"percent_of_license": {
"description": "Percentage of the license to allocate to this pool. Must be between 0\nand 100 inclusive. The percent_of_license values across all pools\n(including the default pool) must add up to exactly 100.",
"description": "Percent of the license to allocate to this pool. Must be between 0\nand 100 inclusive. The percent_of_license values across all pools\n(excluding the default pool) must be \u003c= 100. default_pool need not specify\nan allocation, and implicitly receives any remaining allocation. If default_pool does\nexplicitly specify an allocation, the sum of percent_of_license across all pools\n(including the default pool) must exactly equal 100.",
"format": "double",
"type": "number"
},
"fixed_values": {
"description": "Fixed values optionally override percent_of_license allocations for specific licenses.\nWhen specifying fixed values for a license, all pools must have an explicit fixed value\nspecification for that given license. Default pool receives all remaining quota left\nwithin the license after subtracting the sum of fixed values across pools for that license.",
"items": {
"$ref": "#/definitions/AllocationFixedValue"
},
"type": "array"
}
},
"type": "object"
Expand All @@ -1474,6 +1493,15 @@
},
"type": "object"
},
"ResourcePoolsLicense": {
"enum": [
"PERSISTED_WRITES_STANDARD",
"PERSISTED_WRITES_HISTOGRAM",
"MATCHED_WRITES_STANDARD",
"MATCHED_WRITES_HISTOGRAM"
],
"type": "string"
},
"ResourcePoolsPool": {
"properties": {
"name": {
Expand Down
Loading
Loading