Ma test fixes (Azure#20946)

* fix dimension filter

* update tests

* updates

* update

Author: xiangyan99

sdk/metricsadvisor/azure-ai-metricsadvisor/README.md

@@ -153,7 +153,7 @@ data_feed = client.create_data_feed(
         ],
         dimensions=[
             DataFeedDimension(name="category", display_name="Category"),
-            DataFeedDimension(name="city", display_name="City")
+            DataFeedDimension(name="region", display_name="region")
         ],
         timestamp_column="Timestamp"
     ),

sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_metrics_advisor_client.py

@@ -537,7 +537,7 @@ def list_anomaly_dimension_values(
 
         skip = kwargs.pop("skip", None)
         dimension = kwargs.pop("dimension_filter", None)
-        dimension_filter = DimensionGroupIdentity(dimension=dimension)
+        dimension_filter = DimensionGroupIdentity(dimension=dimension) if dimension else None
         converted_start_time = convert_datetime(start_time)
         converted_end_time = convert_datetime(end_time)
         anomaly_dimension_query = AnomalyDimensionQuery(

sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/aio/_metrics_advisor_client_async.py

@@ -532,7 +532,7 @@ def list_anomaly_dimension_values(
 
         skip = kwargs.pop("skip", None)
         dimension = kwargs.pop("dimension_filter", None)
-        dimension_filter = DimensionGroupIdentity(dimension=dimension)
+        dimension_filter = DimensionGroupIdentity(dimension=dimension) if dimension else None
         converted_start_time = convert_datetime(start_time)
         converted_end_time = convert_datetime(end_time)
         anomaly_dimension_query = AnomalyDimensionQuery(

sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_alert_configuration_async.py

@@ -255,7 +255,7 @@ async def sample_update_alert_config_async(alert_config):
         detection_configuration_id=detection_configuration_id,
         alert_scope=MetricAnomalyAlertScope(
             scope_type="SeriesGroup",
-            series_group_in_scope={'city': 'Shenzhen'}
+            series_group_in_scope={'region': 'Shenzhen'}
         ),
         alert_conditions=MetricAnomalyAlertConditions(
             metric_boundary_condition=MetricBoundaryCondition(

sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_data_feeds_async.py

@@ -66,7 +66,7 @@ async def sample_create_data_feed_async():
                 ],
                 dimensions=[
                     DataFeedDimension(name="category", display_name="Category"),
-                    DataFeedDimension(name="city", display_name="City")
+                    DataFeedDimension(name="region", display_name="region")
                 ],
                 timestamp_column="Timestamp"
             ),

sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_detection_configuration_async.py

@@ -203,13 +203,13 @@ async def sample_update_detection_config_async(detection_config):
             detection_config,
             series_group_detection_conditions=[
                 MetricSeriesGroupDetectionCondition(
-                    series_group_key={"city": "Seoul"},
+                    series_group_key={"region": "Seoul"},
                     smart_detection_condition=smart_detection_condition
                 )
             ],
             series_detection_conditions=[
                 MetricSingleSeriesDetectionCondition(
-                    series_key={"city": "Osaka", "category": "Cell Phones"},
+                    series_key={"region": "Osaka", "category": "Cell Phones"},
                     smart_detection_condition=smart_detection_condition
                 )
             ]

sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_queries_async.py

@@ -42,7 +42,7 @@ async def sample_list_metric_enriched_series_data_async():
     subscription_key = os.getenv("METRICS_ADVISOR_SUBSCRIPTION_KEY")
     api_key = os.getenv("METRICS_ADVISOR_API_KEY")
     detection_configuration_id = os.getenv("METRICS_ADVISOR_DETECTION_CONFIGURATION_ID")
-    series_identity = {"city": "Los Angeles"}
+    series_identity = {"region": "Los Angeles"}
 
     client = MetricsAdvisorClient(service_endpoint,
                                   MetricsAdvisorKeyCredential(subscription_key, api_key))
@@ -69,7 +69,7 @@ async def sample_list_anomaly_dimension_values_async():
     subscription_key = os.getenv("METRICS_ADVISOR_SUBSCRIPTION_KEY")
     api_key = os.getenv("METRICS_ADVISOR_API_KEY")
     detection_configuration_id = os.getenv("METRICS_ADVISOR_DETECTION_CONFIGURATION_ID")
-    dimension_name = "city"
+    dimension_name = "region"
 
     client = MetricsAdvisorClient(service_endpoint,
                                   MetricsAdvisorKeyCredential(subscription_key, api_key))
@@ -95,7 +95,7 @@ async def sample_list_metric_dimension_values_async():
     subscription_key = os.getenv("METRICS_ADVISOR_SUBSCRIPTION_KEY")
     api_key = os.getenv("METRICS_ADVISOR_API_KEY")
     metric_id = os.getenv("METRICS_ADVISOR_METRIC_ID")
-    dimension_name = "city"
+    dimension_name = "region"
 
     client = MetricsAdvisorClient(service_endpoint,
                                   MetricsAdvisorKeyCredential(subscription_key, api_key))
@@ -130,7 +130,7 @@ async def sample_list_metric_series_data_async():
                 start_time=datetime.datetime(2020, 1, 1),
                 end_time=datetime.datetime(2020, 10, 21),
                 series_keys=[
-                    {"city": "Los Angeles", "category": "Homemade"}
+                    {"region": "Los Angeles", "category": "Homemade"}
                 ]
             )
         async for result in results:

sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_alert_configuration.py

@@ -184,8 +184,8 @@ def sample_list_alerts(alert_config_id):
 
     results = client.list_alerts(
         alert_configuration_id=alert_config_id,
-        start_time=datetime.datetime(2020, 1, 1),
-        end_time=datetime.datetime(2020, 9, 9),
+        start_time=datetime.datetime(2021, 1, 1),
+        end_time=datetime.datetime(2021, 9, 9),
         time_mode="AnomalyTime",
     )
 
@@ -243,7 +243,7 @@ def sample_update_alert_config(alert_config):
         detection_configuration_id=detection_configuration_id,
         alert_scope=MetricAnomalyAlertScope(
             scope_type="SeriesGroup",
-            series_group_in_scope={'city': 'Shenzhen'}
+            series_group_in_scope={'region': 'Shenzhen'}
         ),
         alert_conditions=MetricAnomalyAlertConditions(
             metric_boundary_condition=MetricBoundaryCondition(
@@ -304,6 +304,7 @@ def sample_delete_alert_config(alert_config_id):
     if len(alerts) > 0:
         print("\n---Query anomalies using alert id...")
         alert_id = alerts[0].id
+        print("alert_id: " + alert_id)
         sample_list_anomalies_for_alert(alert_config.id, alert_id)
     print("\n---Update an anomaly alert configuration...")
     sample_update_alert_config(alert_config)

sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_data_feeds.py

@@ -64,7 +64,7 @@ def sample_create_data_feed():
             ],
             dimensions=[
                 DataFeedDimension(name="category", display_name="Category"),
-                DataFeedDimension(name="city", display_name="City")
+                DataFeedDimension(name="region", display_name="region")
             ],
             timestamp_column="Timestamp"
         ),

sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_detection_configuration.py

@@ -194,13 +194,13 @@ def sample_update_detection_config(detection_config):
         detection_config,
         series_group_detection_conditions=[
             MetricSeriesGroupDetectionCondition(
-                series_group_key={"city": "Seoul"},
+                series_group_key={"region": "Seoul"},
                 smart_detection_condition=smart_detection_condition
             )
         ],
         series_detection_conditions=[
             MetricSingleSeriesDetectionCondition(
-                series_key={"city": "Osaka", "category": "Cell Phones"},
+                series_key={"region": "Osaka", "category": "Cell Phones"},
                 smart_detection_condition=smart_detection_condition
             )
         ]