diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml index 81f698c5f321..e34f9cd64aa7 100644 --- a/.generator/schemas/v2/openapi.yaml +++ b/.generator/schemas/v2/openapi.yaml @@ -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. diff --git a/examples/v2/metrics/CreateTagIndexingRule.ts b/examples/v2/metrics/CreateTagIndexingRule.ts index 5d2a41cc6f59..ed67cef58090 100644 --- a/examples/v2/metrics/CreateTagIndexingRule.ts +++ b/examples/v2/metrics/CreateTagIndexingRule.ts @@ -18,10 +18,7 @@ const params: v2.MetricsApiCreateTagIndexingRuleRequest = { name: "my-indexing-rule", options: { data: { - dynamicTags: { - queriedTagsWindowSeconds: 3600, - relatedAssetTags: false, - }, + dynamicTags: {}, managePreexistingMetrics: true, metricMatch: { queriedWindowSeconds: 3600, diff --git a/examples/v2/metrics/UpdateTagIndexingRule.ts b/examples/v2/metrics/UpdateTagIndexingRule.ts index 66e2cea7612a..49d86741f4c6 100644 --- a/examples/v2/metrics/UpdateTagIndexingRule.ts +++ b/examples/v2/metrics/UpdateTagIndexingRule.ts @@ -21,10 +21,7 @@ const params: v2.MetricsApiUpdateTagIndexingRuleRequest = { name: "my-indexing-rule", options: { data: { - dynamicTags: { - queriedTagsWindowSeconds: 3600, - relatedAssetTags: false, - }, + dynamicTags: {}, managePreexistingMetrics: true, metricMatch: { queriedWindowSeconds: 3600, diff --git a/features/generated-test/test-runner-data/v2/metrics/create-a-tag-indexing-rule-returns-created-response.json b/features/generated-test/test-runner-data/v2/metrics/create-a-tag-indexing-rule-returns-created-response.json index 16a7cfeac696..2283e7871ed0 100644 --- a/features/generated-test/test-runner-data/v2/metrics/create-a-tag-indexing-rule-returns-created-response.json +++ b/features/generated-test/test-runner-data/v2/metrics/create-a-tag-indexing-rule-returns-created-response.json @@ -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 diff --git a/features/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-bad-request-response.json b/features/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-bad-request-response.json index 3f00808260c0..8c0020091b3c 100644 --- a/features/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-bad-request-response.json +++ b/features/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-bad-request-response.json @@ -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 diff --git a/features/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-not-found-response.json b/features/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-not-found-response.json index 212adf131a41..c5a188c1330c 100644 --- a/features/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-not-found-response.json +++ b/features/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-not-found-response.json @@ -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 diff --git a/features/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-ok-response.json b/features/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-ok-response.json index 2aa4203e1c49..b389c97a7783 100644 --- a/features/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-ok-response.json +++ b/features/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-ok-response.json @@ -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 diff --git a/features/generated-test/test-server-data/v2/metrics.json b/features/generated-test/test-server-data/v2/metrics.json index a8005f3eb8f4..d7e161a016bd 100644 --- a/features/generated-test/test-server-data/v2/metrics.json +++ b/features/generated-test/test-server-data/v2/metrics.json @@ -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 @@ -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" @@ -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 @@ -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 @@ -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 @@ -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" diff --git a/features/v2/metrics.feature b/features/v2/metrics.feature index e5e78d4a9c81..ae3d5eeb7e48 100644 --- a/features/v2/metrics.feature +++ b/features/v2/metrics.feature @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/packages/datadog-api-client-v2/models/TagIndexingRuleDynamicTags.ts b/packages/datadog-api-client-v2/models/TagIndexingRuleDynamicTags.ts index 96434a34e930..7baa66087389 100644 --- a/packages/datadog-api-client-v2/models/TagIndexingRuleDynamicTags.ts +++ b/packages/datadog-api-client-v2/models/TagIndexingRuleDynamicTags.ts @@ -26,14 +26,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. @@ -60,15 +52,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; }",