Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .generator/schemas/v2/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -118794,15 +118794,6 @@ components:
Tags not used in any dashboards, monitors, notebooks, or SLOs are excluded from indexing.
example: false
type: boolean
queried_tags_window_seconds:
description: Window in seconds for evaluating queried tags.
example: 3600
format: int64
type: integer
related_asset_tags:
description: When true, tags from related assets are included.
example: false
type: boolean
type: object
TagIndexingRuleExemptionAttributes:
description: Attributes of a tag indexing rule exemption.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@
"name": "my-indexing-rule",
"options": {
"data": {
"dynamic_tags": {
"queried_tags_window_seconds": 3600,
"related_asset_tags": false
},
"dynamic_tags": {},
"manage_preexisting_metrics": true,
"metric_match": {
"queried_window_seconds": 3600
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@
"name": "my-indexing-rule",
"options": {
"data": {
"dynamic_tags": {
"queried_tags_window_seconds": 3600,
"related_asset_tags": false
},
"dynamic_tags": {},
"manage_preexisting_metrics": true,
"metric_match": {
"queried_window_seconds": 3600
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@
"name": "my-indexing-rule",
"options": {
"data": {
"dynamic_tags": {
"queried_tags_window_seconds": 3600,
"related_asset_tags": false
},
"dynamic_tags": {},
"manage_preexisting_metrics": true,
"metric_match": {
"queried_window_seconds": 3600
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@
"name": "my-indexing-rule",
"options": {
"data": {
"dynamic_tags": {
"queried_tags_window_seconds": 3600,
"related_asset_tags": false
},
"dynamic_tags": {},
"manage_preexisting_metrics": true,
"metric_match": {
"queried_window_seconds": 3600
Expand Down
24 changes: 6 additions & 18 deletions features/generated-test/test-server-data/v2/metrics.json
Original file line number Diff line number Diff line change
Expand Up @@ -301,10 +301,7 @@
"name": "my-indexing-rule",
"options": {
"data": {
"dynamic_tags": {
"queried_tags_window_seconds": 3600,
"related_asset_tags": false
},
"dynamic_tags": {},
"manage_preexisting_metrics": true,
"metric_match": {
"queried_window_seconds": 3600
Expand All @@ -330,7 +327,7 @@
"response": {
"body": {
"encoding": "text",
"value": "{\"data\":{\"id\":\"b0a2d605-eee3-4c3b-89cf-51410b054ae7\",\"type\":\"tag_indexing_rules\",\"attributes\":{\"created_at\":\"2026-06-04T16:39:36.579331Z\",\"created_by_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"exclude_tags_mode\":false,\"ignored_metric_name_matches\":[],\"metric_name_matches\":[\"dd.test.*\"],\"modified_at\":\"2026-06-04T16:39:36.579331Z\",\"modified_by_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"my-indexing-rule\",\"options\":{\"version\":1,\"data\":{\"override_previous_rules\":false,\"manage_preexisting_metrics\":true,\"dynamic_tags\":{\"queried_tags_window_seconds\":3600},\"metric_match\":{\"queried_window_seconds\":3600}}},\"rule_order\":1,\"tags\":[\"env\",\"service\"]}}}"
"value": "{\"data\":{\"id\":\"b0a2d605-eee3-4c3b-89cf-51410b054ae7\",\"type\":\"tag_indexing_rules\",\"attributes\":{\"created_at\":\"2026-06-04T16:39:36.579331Z\",\"created_by_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"exclude_tags_mode\":false,\"ignored_metric_name_matches\":[],\"metric_name_matches\":[\"dd.test.*\"],\"modified_at\":\"2026-06-04T16:39:36.579331Z\",\"modified_by_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"my-indexing-rule\",\"options\":{\"version\":1,\"data\":{\"override_previous_rules\":false,\"manage_preexisting_metrics\":true,\"dynamic_tags\":{},\"metric_match\":{\"queried_window_seconds\":3600}}},\"rule_order\":1,\"tags\":[\"env\",\"service\"]}}}"
},
"headers": {
"content-type": "application/vnd.api+json"
Expand Down Expand Up @@ -4720,10 +4717,7 @@
"name": "my-indexing-rule",
"options": {
"data": {
"dynamic_tags": {
"queried_tags_window_seconds": 3600,
"related_asset_tags": false
},
"dynamic_tags": {},
"manage_preexisting_metrics": true,
"metric_match": {
"queried_window_seconds": 3600
Expand Down Expand Up @@ -4781,10 +4775,7 @@
"name": "my-indexing-rule",
"options": {
"data": {
"dynamic_tags": {
"queried_tags_window_seconds": 3600,
"related_asset_tags": false
},
"dynamic_tags": {},
"manage_preexisting_metrics": true,
"metric_match": {
"queried_window_seconds": 3600
Expand Down Expand Up @@ -4879,10 +4870,7 @@
"name": "my-indexing-rule",
"options": {
"data": {
"dynamic_tags": {
"queried_tags_window_seconds": 3600,
"related_asset_tags": false
},
"dynamic_tags": {},
"manage_preexisting_metrics": true,
"metric_match": {
"queried_window_seconds": 3600
Expand All @@ -4909,7 +4897,7 @@
"response": {
"body": {
"encoding": "text",
"value": "{\"data\":{\"id\":\"c9f5704f-f5b9-4afe-9dec-69edfce00c0a\",\"type\":\"tag_indexing_rules\",\"attributes\":{\"created_at\":\"2026-06-04T16:39:38.068057Z\",\"created_by_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"exclude_tags_mode\":false,\"ignored_metric_name_matches\":[],\"metric_name_matches\":[\"dd.test.*\"],\"modified_at\":\"2026-06-04T16:39:38.137079Z\",\"modified_by_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"my-indexing-rule\",\"options\":{\"version\":1,\"data\":{\"override_previous_rules\":false,\"manage_preexisting_metrics\":true,\"dynamic_tags\":{\"queried_tags_window_seconds\":3600},\"metric_match\":{\"queried_window_seconds\":3600}}},\"rule_order\":2,\"tags\":[\"env\",\"service\"]}}}"
"value": "{\"data\":{\"id\":\"c9f5704f-f5b9-4afe-9dec-69edfce00c0a\",\"type\":\"tag_indexing_rules\",\"attributes\":{\"created_at\":\"2026-06-04T16:39:38.068057Z\",\"created_by_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"exclude_tags_mode\":false,\"ignored_metric_name_matches\":[],\"metric_name_matches\":[\"dd.test.*\"],\"modified_at\":\"2026-06-04T16:39:38.137079Z\",\"modified_by_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"my-indexing-rule\",\"options\":{\"version\":1,\"data\":{\"override_previous_rules\":false,\"manage_preexisting_metrics\":true,\"dynamic_tags\":{},\"metric_match\":{\"queried_window_seconds\":3600}}},\"rule_order\":2,\"tags\":[\"env\",\"service\"]}}}"
},
"headers": {
"content-type": "application/vnd.api+json"
Expand Down
10 changes: 5 additions & 5 deletions features/v2/metrics.feature
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Feature: Metrics
Given a valid "appKeyAuth" key in the system
And operation "CreateTagIndexingRule" enabled
And new "CreateTagIndexingRule" request
And body with value {"data": {"attributes": {"exclude_tags_mode": false, "ignored_metric_name_matches": [], "metric_name_matches": ["dd.test.*"], "name": "my-indexing-rule", "options": {"data": {"dynamic_tags": {"queried_tags_window_seconds": 3600, "related_asset_tags": false}, "manage_preexisting_metrics": true, "metric_match": {"queried_window_seconds": 3600}, "override_previous_rules": false}, "version": 1}, "tags": ["env", "service"]}, "type": "tag_indexing_rules"}}
And body with value {"data": {"attributes": {"exclude_tags_mode": false, "ignored_metric_name_matches": [], "metric_name_matches": ["dd.test.*"], "name": "my-indexing-rule", "options": {"data": {"dynamic_tags": {}, "manage_preexisting_metrics": true, "metric_match": {"queried_window_seconds": 3600}, "override_previous_rules": false}, "version": 1}, "tags": ["env", "service"]}, "type": "tag_indexing_rules"}}
When the request is sent
Then the response status is 201 Created

Expand Down Expand Up @@ -1111,7 +1111,7 @@ Feature: Metrics
And operation "UpdateTagIndexingRule" enabled
And new "UpdateTagIndexingRule" request
And request contains "id" parameter with value "not-a-valid-uuid"
And body with value {"data": {"attributes": {"ignored_metric_name_matches": [], "metric_name_matches": ["dd.test.*"], "name": "my-indexing-rule", "options": {"data": {"dynamic_tags": {"queried_tags_window_seconds": 3600, "related_asset_tags": false}, "manage_preexisting_metrics": true, "metric_match": {"queried_window_seconds": 3600}, "override_previous_rules": false}, "version": 1}, "rule_order": 2, "tags": ["env", "service"]}, "type": "tag_indexing_rules"}}
And body with value {"data": {"attributes": {"ignored_metric_name_matches": [], "metric_name_matches": ["dd.test.*"], "name": "my-indexing-rule", "options": {"data": {"dynamic_tags": {}, "manage_preexisting_metrics": true, "metric_match": {"queried_window_seconds": 3600}, "override_previous_rules": false}, "version": 1}, "rule_order": 2, "tags": ["env", "service"]}, "type": "tag_indexing_rules"}}
When the request is sent
Then the response status is 400 Bad Request

Expand All @@ -1121,7 +1121,7 @@ Feature: Metrics
And operation "UpdateTagIndexingRule" enabled
And new "UpdateTagIndexingRule" request
And request contains "id" parameter from "REPLACE.ME"
And body with value {"data": {"attributes": {"ignored_metric_name_matches": [], "metric_name_matches": ["dd.test.*"], "name": "my-indexing-rule", "options": {"data": {"dynamic_tags": {"exclude_not_queried_window_seconds": 3600, "exclude_not_used_in_assets": false, "queried_tags_window_seconds": 3600, "related_asset_tags": false}, "manage_preexisting_metrics": true, "metric_match": {"queried_window_seconds": 3600}, "override_previous_rules": false}, "version": 1}, "rule_order": 2, "tags": ["env", "service"]}, "type": "tag_indexing_rules"}}
And body with value {"data": {"attributes": {"ignored_metric_name_matches": [], "metric_name_matches": ["dd.test.*"], "name": "my-indexing-rule", "options": {"data": {"dynamic_tags": {"exclude_not_queried_window_seconds": 3600, "exclude_not_used_in_assets": false}, "manage_preexisting_metrics": true, "metric_match": {"queried_window_seconds": 3600}, "override_previous_rules": false}, "version": 1}, "rule_order": 2, "tags": ["env", "service"]}, "type": "tag_indexing_rules"}}
When the request is sent
Then the response status is 409 Conflict

Expand All @@ -1131,7 +1131,7 @@ Feature: Metrics
And operation "UpdateTagIndexingRule" enabled
And new "UpdateTagIndexingRule" request
And request contains "id" parameter with value "00000000-0000-0000-0000-000000000000"
And body with value {"data": {"attributes": {"ignored_metric_name_matches": [], "metric_name_matches": ["dd.test.*"], "name": "my-indexing-rule", "options": {"data": {"dynamic_tags": {"queried_tags_window_seconds": 3600, "related_asset_tags": false}, "manage_preexisting_metrics": true, "metric_match": {"queried_window_seconds": 3600}, "override_previous_rules": false}, "version": 1}, "rule_order": 2, "tags": ["env", "service"]}, "type": "tag_indexing_rules"}}
And body with value {"data": {"attributes": {"ignored_metric_name_matches": [], "metric_name_matches": ["dd.test.*"], "name": "my-indexing-rule", "options": {"data": {"dynamic_tags": {}, "manage_preexisting_metrics": true, "metric_match": {"queried_window_seconds": 3600}, "override_previous_rules": false}, "version": 1}, "rule_order": 2, "tags": ["env", "service"]}, "type": "tag_indexing_rules"}}
When the request is sent
Then the response status is 404 Not Found

Expand All @@ -1142,7 +1142,7 @@ Feature: Metrics
And there is a valid "tag_indexing_rule" in the system
And new "UpdateTagIndexingRule" request
And request contains "id" parameter from "tag_indexing_rule.data.id"
And body with value {"data": {"attributes": {"ignored_metric_name_matches": [], "metric_name_matches": ["dd.test.*"], "name": "my-indexing-rule", "options": {"data": {"dynamic_tags": {"queried_tags_window_seconds": 3600, "related_asset_tags": false}, "manage_preexisting_metrics": true, "metric_match": {"queried_window_seconds": 3600}, "override_previous_rules": false}, "version": 1}, "rule_order": 2, "tags": ["env", "service"]}, "type": "tag_indexing_rules"}}
And body with value {"data": {"attributes": {"ignored_metric_name_matches": [], "metric_name_matches": ["dd.test.*"], "name": "my-indexing-rule", "options": {"data": {"dynamic_tags": {}, "manage_preexisting_metrics": true, "metric_match": {"queried_window_seconds": 3600}, "override_previous_rules": false}, "version": 1}, "rule_order": 2, "tags": ["env", "service"]}, "type": "tag_indexing_rules"}}
When the request is sent
Then the response status is 200 OK

Expand Down
17 changes: 0 additions & 17 deletions services/metrics/src/v2/models/TagIndexingRuleDynamicTags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,6 @@ export class TagIndexingRuleDynamicTags {
* Tags not used in any dashboards, monitors, notebooks, or SLOs are excluded from indexing.
*/
"excludeNotUsedInAssets"?: boolean;
/**
* Window in seconds for evaluating queried tags.
*/
"queriedTagsWindowSeconds"?: number;
/**
* When true, tags from related assets are included.
*/
"relatedAssetTags"?: boolean;
/**
* A container for additional, undeclared properties.
* This is a holder for any undeclared properties as specified with
Expand All @@ -52,15 +44,6 @@ export class TagIndexingRuleDynamicTags {
baseName: "exclude_not_used_in_assets",
type: "boolean",
},
queriedTagsWindowSeconds: {
baseName: "queried_tags_window_seconds",
type: "number",
format: "int64",
},
relatedAssetTags: {
baseName: "related_asset_tags",
type: "boolean",
},
additionalProperties: {
baseName: "additionalProperties",
type: "{ [key: string]: any; }",
Expand Down
Loading