diff --git a/examples/v2/metrics/CreateTagIndexingRule.py b/examples/v2/metrics/CreateTagIndexingRule.py index b84fcece1c..febc5cb2b1 100644 --- a/examples/v2/metrics/CreateTagIndexingRule.py +++ b/examples/v2/metrics/CreateTagIndexingRule.py @@ -7,7 +7,6 @@ from datadog_api_client.v2.model.tag_indexing_rule_create_attributes import TagIndexingRuleCreateAttributes from datadog_api_client.v2.model.tag_indexing_rule_create_data import TagIndexingRuleCreateData from datadog_api_client.v2.model.tag_indexing_rule_create_request import TagIndexingRuleCreateRequest -from datadog_api_client.v2.model.tag_indexing_rule_dynamic_tags import TagIndexingRuleDynamicTags from datadog_api_client.v2.model.tag_indexing_rule_metric_match import TagIndexingRuleMetricMatch from datadog_api_client.v2.model.tag_indexing_rule_options import TagIndexingRuleOptions from datadog_api_client.v2.model.tag_indexing_rule_options_data import TagIndexingRuleOptionsData @@ -24,10 +23,6 @@ name="my-indexing-rule", options=TagIndexingRuleOptions( data=TagIndexingRuleOptionsData( - dynamic_tags=TagIndexingRuleDynamicTags( - queried_tags_window_seconds=3600, - related_asset_tags=False, - ), manage_preexisting_metrics=True, metric_match=TagIndexingRuleMetricMatch( queried_window_seconds=3600, diff --git a/examples/v2/metrics/UpdateTagIndexingRule.py b/examples/v2/metrics/UpdateTagIndexingRule.py index 6d905fd0a8..8b7aba4973 100644 --- a/examples/v2/metrics/UpdateTagIndexingRule.py +++ b/examples/v2/metrics/UpdateTagIndexingRule.py @@ -5,7 +5,6 @@ from os import environ from datadog_api_client import ApiClient, Configuration from datadog_api_client.v2.api.metrics_api import MetricsApi -from datadog_api_client.v2.model.tag_indexing_rule_dynamic_tags import TagIndexingRuleDynamicTags from datadog_api_client.v2.model.tag_indexing_rule_metric_match import TagIndexingRuleMetricMatch from datadog_api_client.v2.model.tag_indexing_rule_options import TagIndexingRuleOptions from datadog_api_client.v2.model.tag_indexing_rule_options_data import TagIndexingRuleOptionsData @@ -27,10 +26,6 @@ name="my-indexing-rule", options=TagIndexingRuleOptions( data=TagIndexingRuleOptionsData( - dynamic_tags=TagIndexingRuleDynamicTags( - queried_tags_window_seconds=3600, - related_asset_tags=False, - ), manage_preexisting_metrics=True, metric_match=TagIndexingRuleMetricMatch( queried_window_seconds=3600, diff --git a/tests/generated-test/test-runner-data/v2/metrics/create-a-tag-indexing-rule-returns-created-response.json b/tests/generated-test/test-runner-data/v2/metrics/create-a-tag-indexing-rule-returns-created-response.json index 16a7cfeac6..ea4ccdf4a9 100644 --- a/tests/generated-test/test-runner-data/v2/metrics/create-a-tag-indexing-rule-returns-created-response.json +++ b/tests/generated-test/test-runner-data/v2/metrics/create-a-tag-indexing-rule-returns-created-response.json @@ -23,10 +23,6 @@ "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 diff --git a/tests/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-bad-request-response.json b/tests/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-bad-request-response.json index 3f00808260..a38086bf0c 100644 --- a/tests/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-bad-request-response.json +++ b/tests/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-bad-request-response.json @@ -22,10 +22,6 @@ "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 diff --git a/tests/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-not-found-response.json b/tests/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-not-found-response.json index 212adf131a..38a25da192 100644 --- a/tests/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-not-found-response.json +++ b/tests/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-not-found-response.json @@ -22,10 +22,6 @@ "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 diff --git a/tests/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-ok-response.json b/tests/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-ok-response.json index 2aa4203e1c..95259431a8 100644 --- a/tests/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-ok-response.json +++ b/tests/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-ok-response.json @@ -22,10 +22,6 @@ "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 diff --git a/tests/generated-test/test-server-data/v2/metrics.json b/tests/generated-test/test-server-data/v2/metrics.json index a8005f3eb8..3d8a8a4e80 100644 --- a/tests/generated-test/test-server-data/v2/metrics.json +++ b/tests/generated-test/test-server-data/v2/metrics.json @@ -284,7 +284,7 @@ }, { "feature": "Metrics", - "frozen_at": "2026-06-04T16:39:36.532Z", + "frozen_at": "2026-09-18T00:46:15.269Z", "interactions": [ { "request": { @@ -301,10 +301,6 @@ "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 @@ -330,7 +326,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\":\"c30f3444-62e7-4245-ab61-d7329582bd50\",\"type\":\"tag_indexing_rules\",\"attributes\":{\"created_at\":\"2026-09-18T00:46:16.397239Z\",\"created_by_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"exclude_tags_mode\":false,\"ignored_metric_name_matches\":[],\"metric_name_matches\":[\"dd.test.*\"],\"modified_at\":\"2026-09-18T00:46:16.397239Z\",\"modified_by_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"my-indexing-rule\",\"options\":{\"version\":1,\"data\":{\"override_previous_rules\":false,\"manage_preexisting_metrics\":true,\"metric_match\":{\"queried_window_seconds\":3600}}},\"rule_order\":2,\"tags\":[\"env\",\"service\"]}}}" }, "headers": { "content-type": "application/vnd.api+json" @@ -347,7 +343,7 @@ }, "content_type": "", "method": "DELETE", - "path": "/api/v2/metrics/tag-indexing-rules/b0a2d605-eee3-4c3b-89cf-51410b054ae7", + "path": "/api/v2/metrics/tag-indexing-rules/c30f3444-62e7-4245-ab61-d7329582bd50", "query": [] }, "response": { @@ -4704,7 +4700,7 @@ }, { "feature": "Metrics", - "frozen_at": "2026-06-04T16:39:37.910Z", + "frozen_at": "2026-09-18T00:46:16.863Z", "interactions": [ { "request": { @@ -4720,10 +4716,6 @@ "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 @@ -4765,7 +4757,7 @@ }, { "feature": "Metrics", - "frozen_at": "2026-06-04T16:39:37.964Z", + "frozen_at": "2026-09-18T00:46:17.002Z", "interactions": [ { "request": { @@ -4781,10 +4773,6 @@ "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 @@ -4826,7 +4814,7 @@ }, { "feature": "Metrics", - "frozen_at": "2026-06-04T16:39:38.031Z", + "frozen_at": "2026-09-18T00:46:17.114Z", "interactions": [ { "request": { @@ -4836,9 +4824,9 @@ "data": { "attributes": { "metric_name_matches": [ - "dd.TestUpdateatagindexingrulereturnsOKresponse1780591178.*" + "dd.TestUpdateatagindexingrulereturnsOKresponse1789692377.*" ], - "name": "TestUpdateatagindexingrulereturnsOKresponse1780591178", + "name": "TestUpdateatagindexingrulereturnsOKresponse1789692377", "tags": [ "env", "service" @@ -4856,7 +4844,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,\"metric_name_matches\":[\"dd.TestUpdateatagindexingrulereturnsOKresponse1780591178.*\"],\"modified_at\":\"2026-06-04T16:39:38.068057Z\",\"modified_by_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"TestUpdateatagindexingrulereturnsOKresponse1780591178\",\"options\":{\"version\":1,\"data\":{\"override_previous_rules\":false,\"manage_preexisting_metrics\":true}},\"rule_order\":1,\"tags\":[\"env\",\"service\"]}}}" + "value": "{\"data\":{\"id\":\"dae40f10-d3b9-4136-9875-013fb21ff053\",\"type\":\"tag_indexing_rules\",\"attributes\":{\"created_at\":\"2026-09-18T00:46:17.234614Z\",\"created_by_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"exclude_tags_mode\":false,\"ignored_metric_name_matches\":[],\"metric_name_matches\":[\"dd.TestUpdateatagindexingrulereturnsOKresponse1789692377.*\"],\"modified_at\":\"2026-09-18T00:46:17.234614Z\",\"modified_by_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"TestUpdateatagindexingrulereturnsOKresponse1789692377\",\"options\":{\"version\":1,\"data\":{\"override_previous_rules\":false,\"manage_preexisting_metrics\":true}},\"rule_order\":2,\"tags\":[\"env\",\"service\"]}}}" }, "headers": { "content-type": "application/vnd.api+json" @@ -4879,10 +4867,6 @@ "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 @@ -4903,13 +4887,13 @@ }, "content_type": "application/json", "method": "PUT", - "path": "/api/v2/metrics/tag-indexing-rules/c9f5704f-f5b9-4afe-9dec-69edfce00c0a", + "path": "/api/v2/metrics/tag-indexing-rules/dae40f10-d3b9-4136-9875-013fb21ff053", "query": [] }, "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\":\"dae40f10-d3b9-4136-9875-013fb21ff053\",\"type\":\"tag_indexing_rules\",\"attributes\":{\"created_at\":\"2026-09-18T00:46:17.234614Z\",\"created_by_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"exclude_tags_mode\":false,\"ignored_metric_name_matches\":[],\"metric_name_matches\":[\"dd.test.*\"],\"modified_at\":\"2026-09-18T00:46:17.390242Z\",\"modified_by_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"my-indexing-rule\",\"options\":{\"version\":1,\"data\":{\"override_previous_rules\":false,\"manage_preexisting_metrics\":true,\"metric_match\":{\"queried_window_seconds\":3600}}},\"rule_order\":2,\"tags\":[\"env\",\"service\"]}}}" }, "headers": { "content-type": "application/vnd.api+json" @@ -4926,7 +4910,7 @@ }, "content_type": "", "method": "DELETE", - "path": "/api/v2/metrics/tag-indexing-rules/c9f5704f-f5b9-4afe-9dec-69edfce00c0a", + "path": "/api/v2/metrics/tag-indexing-rules/dae40f10-d3b9-4136-9875-013fb21ff053", "query": [] }, "response": { diff --git a/tests/v2/features/metrics.feature b/tests/v2/features/metrics.feature index e5e78d4a9c..bc24633074 100644 --- a/tests/v2/features/metrics.feature +++ b/tests/v2/features/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": {"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": {"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 @@ -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": {"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": {"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