4658:add custom model rules resource #2338
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
In order to lower resource usage and have a faster runtime, PRs will not run Cloud tests automatically. |
matt-metivier
force-pushed
the
asserts-custom-model-rules
branch
from
2355088 to
a339fc4
Compare
|
|
matt-metivier
force-pushed
the
asserts-custom-model-rules
branch
from
8137144 to
dc9331d
Compare
Base automatically changed from
asserts-update-dependencies
to
asserts-refactor-common-utilities
September 5, 2025 22:23
matt-metivier
force-pushed
the
asserts-refactor-common-utilities
branch
from
9668de8 to
e742667
Compare
matt-metivier
force-pushed
the
asserts-custom-model-rules
branch
from
e1d0bb4 to
2fe501d
Compare
matt-metivier
force-pushed
the
asserts-refactor-common-utilities
branch
from
e742667 to
4ea55ad
Compare
matt-metivier
force-pushed
the
asserts-custom-model-rules
branch
from
2fe501d to
f9c1ffc
Compare
Alex3k
reviewed
Sep 9, 2025
matt-metivier
requested review from
jgehrett,
arramos84,
drmdrew,
nandadev and
FCalero
matt-metivier
force-pushed
the
asserts-custom-model-rules
branch
2 times, most recently
from
6acbf8e to
7a37321
Compare
feat(asserts): make custom model rules resource more Terraform native - Replace YAML string with structured blocks for better UX - Add conversion functions between Terraform blocks and API DTOs - Update schema to use nested blocks (rules -> entity -> defined_by) - Provide better IDE support, validation, and type safety - Update tests, documentation, and examples to use new format - Follow Terraform conventions similar to Kubernetes provider This addresses the PR feedback from Alex3k to make the resource more idiomatic and user-friendly while maintaining API compatibility. test: add stress test flag to control eventual consistency tests - Add CheckStressTestsEnabled function to testutils package - Update all stress tests to require TF_ACC_STRESS environment variable - Stress tests will now be skipped unless explicitly enabled - This prevents flaky stress test failures in CI while still allowing developers to run them when needed for testing eventual consistency feat(asserts): add custom model rules resource - Add grafana_asserts_custom_model_rules resource for managing Asserts custom model rules - Implement full CRUD operations with proper retry logic using shared utilities - Add comprehensive tests including stress tests for eventual consistency - Add documentation and usage examples - Update catalog configuration for the new resource - Register the new resource in the asserts resources list This resource allows users to define custom entity types and their detection rules using YAML configuration, enabling flexible monitoring model customization.
matt-metivier
force-pushed
the
asserts-custom-model-rules
branch
from
abb0ca5 to
afcecc7
Compare
matt-metivier
changed the title
matt-metivier
changed the title
matt-metivier
force-pushed
the
asserts-custom-model-rules
branch
from
9531ad4 to
e262306
Compare
egovova11
reviewed
Sep 24, 2025
egovova11
approved these changes
Sep 24, 2025
jgehrett
reviewed
Sep 24, 2025
| Optional: | ||
|
|
||
| - `disabled` (Boolean) Whether this entity is disabled. | ||
| - `enriched_by` (List of String) List of enrichment sources for the entity. |
There was a problem hiding this comment.
enriched_by has the same schema as defined_by.
It's a PropertyRule
| "enriched_by": { | ||
| Type: schema.TypeList, | ||
| Optional: true, | ||
| Description: "List of enrichment sources for the entity.", |
There was a problem hiding this comment.
I think this should be similar to defined_by.
Something like:
List of queries that enrich entities of this type.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR introduces a new Terraform resource for managing Asserts custom model rules, enabling users to define custom entity types and their detection rules using YAML configuration.
Changes
New Resource:
grafana_asserts_custom_model_rulesKey Features
Technical Details
The resource implements proper retry logic using shared utilities to handle eventual consistency issues common with distributed systems. The implementation includes conversion functions between Terraform schema and API DTOs, ensuring proper data transformation and validation.
Testing
Breaking Changes
None. This is a new resource addition with no impact on existing functionality.