From e6b011718a931d583216f92af57bba7db4c3d416 Mon Sep 17 00:00:00 2001 From: Sameeksha Vaity Date: Tue, 20 Oct 2020 16:36:00 -0700 Subject: [PATCH 1/9] renaming quick fixes --- .../MetricsAdvisorAsyncClient.java | 16 +++--- .../metricsadvisor/MetricsAdvisorClient.java | 18 +++---- ...tricsAdvisorAdministrationAsyncClient.java | 8 +-- .../util/AlertConfigurationTransforms.java | 2 +- .../util/DataFeedTransforms.java | 8 +-- .../DataFeedMissingDataPointFillSettings.java | 6 +-- .../DataFeedMissingDataPointFillType.java | 31 +++++++++++ .../models/DataFeedOptions.java | 37 ++++++------- .../models/DataFeedRollupSettings.java | 17 ++---- .../DataSourceMissingDataPointFillType.java | 38 ------------- .../metricsadvisor/models/DimensionKey.java | 6 +-- .../azure/ai/metricsadvisor/models/Hook.java | 2 +- .../models/ListAnomaliesDetectedFilter.java | 13 ++--- ...tDimensionValuesWithAnomaliesOptions.java} | 18 +++---- .../models/MetricAnomalyAlertConditions.java | 4 +- .../models/MetricEnrichedSeriesData.java | 40 +++++++------- .../models/MetricSeriesData.java | 18 +++---- .../models/MetricSeriesDefinition.java | 4 +- .../ListEnrichedSeriesAsyncSample.java | 10 ++-- .../ListEnrichedSeriesSample.java | 10 ++-- .../ListSeriesDataForMetricAsyncSample.java | 4 +- .../ListSeriesDataForMetricSample.java | 4 +- ...AdvisorAsyncClientJavaDocCodeSnippets.java | 28 +++++----- ...tricsAdvisorClientJavaDocCodeSnippets.java | 54 +++++++++---------- .../ai/metricsadvisor/ReadmeSamples.java | 6 +-- .../administration/DatafeedAsyncSample.java | 4 +- .../administration/DatafeedSample.java | 4 +- ...trationAsyncClientJavaDocCodeSnippets.java | 8 +-- ...ministrationClientJavaDocCodeSnippets.java | 8 +-- ...omalyAlertConfigOperationsAsyncSample.java | 2 +- ...icsAnomalyAlertConfigOperationsSample.java | 2 +- .../ai/metricsadvisor/DataFeedTestBase.java | 8 +-- .../azure/ai/metricsadvisor/HookTestBase.java | 4 +- .../MetricEnrichedSeriesDataTestBase.java | 2 +- .../MetricsSeriesAsyncTest.java | 4 +- .../ai/metricsadvisor/MetricsSeriesTest.java | 4 +- ...luesOfDimensionWithAnomaliesAsyncTest.java | 2 +- .../ValuesOfDimensionWithAnomaliesTest.java | 2 +- ...aluesOfDimensionWithAnomaliesTestBase.java | 2 +- 39 files changed, 222 insertions(+), 236 deletions(-) create mode 100644 sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedMissingDataPointFillType.java delete mode 100644 sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataSourceMissingDataPointFillType.java rename sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/{ListValuesOfDimensionWithAnomaliesOptions.java => ListDimensionValuesWithAnomaliesOptions.java} (81%) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClient.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClient.java index b3e766b291ea..9bacf65f2b9f 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClient.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClient.java @@ -46,6 +46,7 @@ import com.azure.ai.metricsadvisor.models.ListAlertOptions; import com.azure.ai.metricsadvisor.models.ListAnomaliesAlertedOptions; import com.azure.ai.metricsadvisor.models.ListAnomaliesDetectedOptions; +import com.azure.ai.metricsadvisor.models.ListDimensionValuesWithAnomaliesOptions; import com.azure.ai.metricsadvisor.models.ListIncidentsAlertedOptions; import com.azure.ai.metricsadvisor.models.ListIncidentsDetectedOptions; import com.azure.ai.metricsadvisor.models.ListMetricDimensionValuesOptions; @@ -53,7 +54,6 @@ import com.azure.ai.metricsadvisor.models.ListMetricFeedbackOptions; import com.azure.ai.metricsadvisor.models.ListMetricSeriesDataOptions; import com.azure.ai.metricsadvisor.models.ListMetricSeriesDefinitionOptions; -import com.azure.ai.metricsadvisor.models.ListValuesOfDimensionWithAnomaliesOptions; import com.azure.ai.metricsadvisor.models.MetricAnomalyFeedback; import com.azure.ai.metricsadvisor.models.MetricChangePointFeedback; import com.azure.ai.metricsadvisor.models.MetricCommentFeedback; @@ -836,7 +836,7 @@ private Mono> listIncidentRootCausesInternal(In * Fetch the values of a dimension that have anomalies. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listValuesOfDimensionWithAnomalies#String-String-ListValuesOfDimensionWithAnomaliesOptions} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listDimensionValuesWithAnomalies#String-String-ListDimensionValuesWithAnomaliesOptions} * * @param detectionConfigurationId Identifies the configuration used to detect the anomalies. * @param dimensionName The dimension name to retrieve the values for. @@ -848,10 +848,10 @@ private Mono> listIncidentRootCausesInternal(In * or {@code options} or {@code options.startTime} or {@code options.endTime} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedFlux listValuesOfDimensionWithAnomalies( + public PagedFlux listDimensionValuesWithAnomalies( String detectionConfigurationId, String dimensionName, - ListValuesOfDimensionWithAnomaliesOptions options) { + ListDimensionValuesWithAnomaliesOptions options) { try { return new PagedFlux<>(() -> withContext(context -> @@ -869,10 +869,10 @@ public PagedFlux listValuesOfDimensionWithAnomalies( } } - PagedFlux listValuesOfDimensionWithAnomalies( + PagedFlux listDimensionValuesWithAnomalies( String detectionConfigurationId, String dimensionName, - ListValuesOfDimensionWithAnomaliesOptions options, + ListDimensionValuesWithAnomaliesOptions options, Context context) { return new PagedFlux<>(() -> listValuesOfDimensionWithAnomaliesSinglePageAsync(detectionConfigurationId, @@ -889,7 +889,7 @@ PagedFlux listValuesOfDimensionWithAnomalies( private Mono> listValuesOfDimensionWithAnomaliesSinglePageAsync( String detectionConfigurationId, String dimensionName, - ListValuesOfDimensionWithAnomaliesOptions options, + ListDimensionValuesWithAnomaliesOptions options, Context context) { Objects.requireNonNull(detectionConfigurationId, "'detectionConfigurationId' is required."); Objects.requireNonNull(dimensionName, "'dimensionName' is required."); @@ -921,7 +921,7 @@ private Mono> listValuesOfDimensionWithAnomaliesSinglePage private Mono> listValuesOfDimensionWithAnomaliesNextPageAsync( String nextPageLink, String dimensionName, - ListValuesOfDimensionWithAnomaliesOptions options, + ListDimensionValuesWithAnomaliesOptions options, Context context) { if (CoreUtils.isNullOrEmpty(nextPageLink)) { return Mono.empty(); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorClient.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorClient.java index 1c3e1acd4f37..8d6e7db0bf85 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorClient.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorClient.java @@ -21,7 +21,7 @@ import com.azure.ai.metricsadvisor.models.ListMetricFeedbackOptions; import com.azure.ai.metricsadvisor.models.ListMetricSeriesDataOptions; import com.azure.ai.metricsadvisor.models.ListMetricSeriesDefinitionOptions; -import com.azure.ai.metricsadvisor.models.ListValuesOfDimensionWithAnomaliesOptions; +import com.azure.ai.metricsadvisor.models.ListDimensionValuesWithAnomaliesOptions; import com.azure.ai.metricsadvisor.models.MetricEnrichedSeriesData; import com.azure.ai.metricsadvisor.models.MetricFeedback; import com.azure.ai.metricsadvisor.models.MetricSeriesData; @@ -425,7 +425,7 @@ public PagedIterable listIncidentRootCauses(Incident incident * Fetch the values of a dimension that have anomalies. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listValuesOfDimensionWithAnomalies#String-String-ListValuesOfDimensionWithAnomaliesOptions} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listDimensionValuesWithAnomalies#String-String-ListDimensionValuesWithAnomaliesOptions} * * @param detectionConfigurationId Identifies the configuration used to detect the anomalies. * @param dimensionName The dimension name to retrieve the values for. @@ -438,11 +438,11 @@ public PagedIterable listIncidentRootCauses(Incident incident * or {@code options} or {@code options.startTime} or {@code options.endTime} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable listValuesOfDimensionWithAnomalies( + public PagedIterable listDimensionValuesWithAnomalies( String detectionConfigurationId, String dimensionName, - ListValuesOfDimensionWithAnomaliesOptions options) { - return listValuesOfDimensionWithAnomalies(detectionConfigurationId, + ListDimensionValuesWithAnomaliesOptions options) { + return listDimensionValuesWithAnomalies(detectionConfigurationId, dimensionName, options, Context.NONE); } @@ -450,7 +450,7 @@ public PagedIterable listValuesOfDimensionWithAnomalies( * Fetch the values of a dimension that have anomalies. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listValuesOfDimensionWithAnomalies#String-String-ListValuesOfDimensionWithAnomaliesOptions-Context} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listDimensionValuesWithAnomalies#String-String-ListDimensionValuesWithAnomaliesOptions-Context} * * @param detectionConfigurationId Identifies the configuration used to detect the anomalies. * @param dimensionName The dimension name to retrieve the values for. @@ -464,11 +464,11 @@ public PagedIterable listValuesOfDimensionWithAnomalies( * or {@code options} or {@code options.startTime} or {@code options.endTime} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable listValuesOfDimensionWithAnomalies( + public PagedIterable listDimensionValuesWithAnomalies( String detectionConfigurationId, String dimensionName, - ListValuesOfDimensionWithAnomaliesOptions options, Context context) { - return new PagedIterable<>(client.listValuesOfDimensionWithAnomalies(detectionConfigurationId, + ListDimensionValuesWithAnomaliesOptions options, Context context) { + return new PagedIterable<>(client.listDimensionValuesWithAnomalies(detectionConfigurationId, dimensionName, options, context == null ? Context.NONE : context)); } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClient.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClient.java index b7b9d6eba695..51de0bea4ae7 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClient.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClient.java @@ -238,8 +238,8 @@ Mono> createDataFeedWithResponse(String dataFeedName, .setFillMissingPointValue(dataFeedMissingDataPointFillSettings.getCustomFillValue()) .setViewMode(ViewMode.fromString(finalDataFeedOptions.getAccessMode() == null ? null : finalDataFeedOptions.getAccessMode().toString())) - .setViewers(finalDataFeedOptions.getViewers()) - .setAdmins(finalDataFeedOptions.getAdmins()) + .setViewers(finalDataFeedOptions.getViewerEmails()) + .setAdmins(finalDataFeedOptions.getAdminEmails()) .setActionLinkTemplate(finalDataFeedOptions.getActionLinkTemplate()), withTracing) .flatMap(createDataFeedResponse -> { final String dataFeedId = @@ -365,8 +365,8 @@ Mono> updateDataFeedWithResponse(DataFeed dataFeed, Context c .setFillMissingPointForAdValue(dataFeedMissingDataPointFillSettings.getCustomFillValue()) .setViewMode(DataFeedDetailPatchViewMode.fromString(dataFeedOptions.getAccessMode() == null ? null : dataFeedOptions.getAccessMode().toString())) - .setViewers(dataFeedOptions.getViewers()) - .setAdmins(dataFeedOptions.getAdmins()) + .setViewers(dataFeedOptions.getViewerEmails()) + .setAdmins(dataFeedOptions.getAdminEmails()) .setStatus(DataFeedDetailPatchStatus.fromString(dataFeed.getStatus().toString())) .setActionLinkTemplate(dataFeedOptions.getActionLinkTemplate()), withTracing) .flatMap(updatedDataFeedResponse -> getDataFeedWithResponse(dataFeed.getId())); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/AlertConfigurationTransforms.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/AlertConfigurationTransforms.java index 8abaebab1eed..0719dcc930dc 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/AlertConfigurationTransforms.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/AlertConfigurationTransforms.java @@ -223,7 +223,7 @@ public static AnomalyAlertConfiguration fromInner( || innerMetricAlertConfiguration.getValueFilter() != null) { MetricAnomalyAlertConditions alertConditions = new MetricAnomalyAlertConditions(); // Set severity based condition. - alertConditions.setSeverityCondition(innerMetricAlertConfiguration.getSeverityFilter()); + alertConditions.setSeverityRangeCondition(innerMetricAlertConfiguration.getSeverityFilter()); // Set boundary based condition. ValueCondition innerValueCondition = innerMetricAlertConfiguration.getValueFilter(); if (innerValueCondition != null) { diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/DataFeedTransforms.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/DataFeedTransforms.java index cd4c7429e650..3afb682f42d7 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/DataFeedTransforms.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/DataFeedTransforms.java @@ -61,7 +61,7 @@ import com.azure.ai.metricsadvisor.models.DataFeedSource; import com.azure.ai.metricsadvisor.models.DataFeedSourceType; import com.azure.ai.metricsadvisor.models.DataFeedStatus; -import com.azure.ai.metricsadvisor.models.DataSourceMissingDataPointFillType; +import com.azure.ai.metricsadvisor.models.DataFeedMissingDataPointFillType; import com.azure.ai.metricsadvisor.models.ElasticsearchDataFeedSource; import com.azure.ai.metricsadvisor.models.HttpRequestDataFeedSource; import com.azure.ai.metricsadvisor.models.InfluxDBDataFeedSource; @@ -110,17 +110,17 @@ public static DataFeed fromInner(final DataFeedDetail dataFeedDetail) { .setDescription(dataFeedDetail.getDataFeedDescription()) .setMissingDataPointFillSettings(new DataFeedMissingDataPointFillSettings() .setCustomFillValue(dataFeedDetail.getFillMissingPointValue()) - .setFillType(DataSourceMissingDataPointFillType.fromString( + .setFillType(DataFeedMissingDataPointFillType.fromString( dataFeedDetail.getFillMissingPointType().toString()))) .setAccessMode(DataFeedAccessMode.fromString(dataFeedDetail.getViewMode().toString())) - .setAdmins(dataFeedDetail.getAdmins()) + .setAdminEmails(dataFeedDetail.getAdmins()) .setRollupSettings(new DataFeedRollupSettings() .setAlreadyRollup(dataFeedDetail.getAllUpIdentification()) .setAutoRollup(DataFeedAutoRollUpMethod.fromString(dataFeedDetail.getRollUpMethod().toString()), dataFeedDetail.getRollUpColumns()) .setRollupType(DataFeedRollupType.fromString(dataFeedDetail.getNeedRollup().toString()))) .setActionLinkTemplate(dataFeedDetail.getActionLinkTemplate()) - .setViewers(dataFeedDetail.getViewers())); + .setViewerEmails(dataFeedDetail.getViewers())); DataFeedHelper.setId(dataFeed, dataFeedDetail.getDataFeedId().toString()); DataFeedHelper.setCreatedTime(dataFeed, dataFeedDetail.getCreatedTime()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedMissingDataPointFillSettings.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedMissingDataPointFillSettings.java index 0c20dce66acb..77ba495cc678 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedMissingDataPointFillSettings.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedMissingDataPointFillSettings.java @@ -10,7 +10,7 @@ */ @Fluent public final class DataFeedMissingDataPointFillSettings { - private DataSourceMissingDataPointFillType fillType; + private DataFeedMissingDataPointFillType fillType; private Double customFillValue; /** @@ -18,7 +18,7 @@ public final class DataFeedMissingDataPointFillSettings { * * @return the type of fill missing point for anomaly detection. */ - public DataSourceMissingDataPointFillType getFillType() { + public DataFeedMissingDataPointFillType getFillType() { return this.fillType; } @@ -38,7 +38,7 @@ public Double getCustomFillValue() { * * @return the DataFeedMissingDataPointFillSettings object itself. */ - public DataFeedMissingDataPointFillSettings setFillType(DataSourceMissingDataPointFillType fillMissingPointType) { + public DataFeedMissingDataPointFillSettings setFillType(DataFeedMissingDataPointFillType fillMissingPointType) { this.fillType = fillMissingPointType; return this; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedMissingDataPointFillType.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedMissingDataPointFillType.java new file mode 100644 index 000000000000..f020d54e9225 --- /dev/null +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedMissingDataPointFillType.java @@ -0,0 +1,31 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.ai.metricsadvisor.models; + +import com.azure.core.util.ExpandableStringEnum; + +/** Defines values for DataFeedMissingDataPointFillType. */ +public final class DataFeedMissingDataPointFillType extends ExpandableStringEnum { + /** Static value SmartFilling for DataFeedMissingDataPointFillType. */ + public static final DataFeedMissingDataPointFillType SMART_FILLING = fromString("SmartFilling"); + + /** Static value PreviousValue for DataFeedMissingDataPointFillType. */ + public static final DataFeedMissingDataPointFillType PREVIOUS_VALUE = fromString("PreviousValue"); + + /** Static value CustomValue for DataFeedMissingDataPointFillType. */ + public static final DataFeedMissingDataPointFillType CUSTOM_VALUE = fromString("CustomValue"); + + /** Static value NoFilling for DataFeedMissingDataPointFillType. */ + public static final DataFeedMissingDataPointFillType NO_FILLING = fromString("NoFilling"); + + /** + * Creates or finds a DataFeedMissingDataPointFillType from its string representation. + * + * @param name a name to look for. + * @return the corresponding DataFeedMissingDataPointFillType. + */ + public static DataFeedMissingDataPointFillType fromString(String name) { + return fromString(name, DataFeedMissingDataPointFillType.class); + } +} diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedOptions.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedOptions.java index c7a234fca1f0..2c3704c8a8aa 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedOptions.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedOptions.java @@ -5,6 +5,7 @@ import com.azure.core.annotation.Fluent; +import java.util.Collections; import java.util.List; /** @@ -16,8 +17,8 @@ public final class DataFeedOptions { private DataFeedRollupSettings dataFeedRollupSettings; private DataFeedMissingDataPointFillSettings dataFeedMissingDataPointFillSettings; private DataFeedAccessMode dataFeedAccessMode; - private List admins; - private List viewers; + private List adminEmails; + private List viewerEmails; private String actionLinkTemplate; /** @@ -85,44 +86,44 @@ public DataFeedOptions setAccessMode(DataFeedAccessMode dataFeedAccessMode) { } /** - * Get the admins property: data feed administrator. + * Get the list of data feed administrator emails. * - * @return the admins value. + * @return the adminEmails value. */ - public List getAdmins() { - return this.admins; + public List getAdminEmails() { + return Collections.unmodifiableList(this.adminEmails); } /** - * Set the admins property: data feed administrator. + * Set the list of data feed administrator emails. * - * @param admins the admins value to set. + * @param adminEmails the adminEmails value to set. * * @return the DataFeedOptions object itself. */ - public DataFeedOptions setAdmins(List admins) { - this.admins = admins; + public DataFeedOptions setAdminEmails(List adminEmails) { + this.adminEmails = adminEmails; return this; } /** - * Get the viewers property: data feed viewer. + * Get the list of data feed viewer emails. * - * @return the viewers value. + * @return the viewerEmails value. */ - public List getViewers() { - return this.viewers; + public List getViewerEmails() { + return Collections.unmodifiableList(this.viewerEmails); } /** - * Set the viewers property: data feed viewer. + * Set the list of data feed viewer emails. * - * @param viewers the viewers value to set. + * @param viewerEmails the viewerEmails value to set. * * @return the DataFeedOptions object itself. */ - public DataFeedOptions setViewers(List viewers) { - this.viewers = viewers; + public DataFeedOptions setViewerEmails(List viewerEmails) { + this.viewerEmails = viewerEmails; return this; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedRollupSettings.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedRollupSettings.java index 7110e14b4f5f..00a79f75c412 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedRollupSettings.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedRollupSettings.java @@ -35,15 +35,6 @@ public List getAutoRollupGroupByColumnNames() { return this.autoRollupGroupByColumnNames; } - /** - * Get the auto rollup raw grouo by column value. - * - * @return the alreadyRollupIdentificationValue value. - */ - public String getAutoRollupRawGroupByColumnValue() { - return this.rollupIdentificationValue; - } - /** * Get the identification value when using auto rollup. * @@ -95,21 +86,21 @@ public DataFeedRollupSettings setAutoRollup(DataFeedAutoRollUpMethod rollUpMetho * * @param rollUpMethod the rollup method value to set. * @param groupByColumnNames the column names for the group by. - * @param generatedRawGroupByColumnValue the raw group column value. + * @param rollupIdentificationValue the raw group column value. * * @return the DataFeedRollupSettings object itself. */ public DataFeedRollupSettings setAutoRollup(DataFeedAutoRollUpMethod rollUpMethod, List groupByColumnNames, - String generatedRawGroupByColumnValue) { + String rollupIdentificationValue) { this.autoRollupGroupByColumnNames = groupByColumnNames; - this.rollupIdentificationValue = generatedRawGroupByColumnValue; + this.rollupIdentificationValue = rollupIdentificationValue; this.dataFeedRollupType = DataFeedRollupType.AUTO_ROLLUP; return this; } /** - * Set the identification value when rollup settings set to Auto. + * Set the identification value when rollup settings set to Auto or AlreadyRollUp. * * @param identificationValue the identification value to set. * diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataSourceMissingDataPointFillType.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataSourceMissingDataPointFillType.java deleted file mode 100644 index fb54408678bc..000000000000 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataSourceMissingDataPointFillType.java +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.ai.metricsadvisor.models; - -import com.azure.core.util.ExpandableStringEnum; - -import java.util.Collection; - -/** Defines values for DataSourceMissingDataPointFillType. */ -public final class DataSourceMissingDataPointFillType extends ExpandableStringEnum { - /** Static value SmartFilling for DataSourceMissingDataPointFillType. */ - public static final DataSourceMissingDataPointFillType SMART_FILLING = fromString("SmartFilling"); - - /** Static value PreviousValue for DataSourceMissingDataPointFillType. */ - public static final DataSourceMissingDataPointFillType PREVIOUS_VALUE = fromString("PreviousValue"); - - /** Static value CustomValue for DataSourceMissingDataPointFillType. */ - public static final DataSourceMissingDataPointFillType CUSTOM_VALUE = fromString("CustomValue"); - - /** Static value NoFilling for DataSourceMissingDataPointFillType. */ - public static final DataSourceMissingDataPointFillType NO_FILLING = fromString("NoFilling"); - - /** - * Creates or finds a DataSourceMissingDataPointFillType from its string representation. - * - * @param name a name to look for. - * @return the corresponding DataSourceMissingDataPointFillType. - */ - public static DataSourceMissingDataPointFillType fromString(String name) { - return fromString(name, DataSourceMissingDataPointFillType.class); - } - - /** @return known DataSourceMissingDataPointFillType values. */ - public static Collection values() { - return values(DataSourceMissingDataPointFillType.class); - } -} diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DimensionKey.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DimensionKey.java index 22661371b77d..a1ab3a4d2a29 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DimensionKey.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DimensionKey.java @@ -50,10 +50,10 @@ public DimensionKey() { * Creates a new instance of DimensionKey that is initialized with * the provided map of dimension name-value pairs. * - * @param nameValueMap The map of dimension name values. + * @param dimensionNameValue The map of dimension name values. */ - public DimensionKey(Map nameValueMap) { - this.dimensions = new HashMap<>(nameValueMap); + public DimensionKey(Map dimensionNameValue) { + this.dimensions = new HashMap<>(dimensionNameValue); } /** diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Hook.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Hook.java index d736c2a5ab57..dfbfd697dd3a 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Hook.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Hook.java @@ -67,4 +67,4 @@ void setId(String id) { void setAdmins(List admins) { this.admins = admins; } -} +} \ No newline at end of file diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListAnomaliesDetectedFilter.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListAnomaliesDetectedFilter.java index a2f1648811bc..40ad234ef85e 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListAnomaliesDetectedFilter.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListAnomaliesDetectedFilter.java @@ -48,21 +48,22 @@ public List getSeriesKeys() { * @param max The maximum severity. * @return The ListAnomaliesDetectedFilter object itself. */ - public ListAnomaliesDetectedFilter setSeverity(Severity min, Severity max) { + public ListAnomaliesDetectedFilter setSeverityRange(Severity min, Severity max) { this.minSeverity = min; this.maxSeverity = max; return this; } /** - * Sets the time series keys, indicating that retrieve the anomalies occurred - * in these time series. + * Sets the severity range to be the equal and over the specified severity for the + * anomalies to be retrieved. * - * @param seriesKeys The series keys. + * @param minSeverity The minimum severity. * @return The ListAnomaliesDetectedFilter object itself. */ - public ListAnomaliesDetectedFilter setSeriesKeys(List seriesKeys) { - this.seriesKeys = seriesKeys; + public ListAnomaliesDetectedFilter setSeverity(Severity minSeverity) { + this.minSeverity = minSeverity; + this.maxSeverity = minSeverity; return this; } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListValuesOfDimensionWithAnomaliesOptions.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListDimensionValuesWithAnomaliesOptions.java similarity index 81% rename from sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListValuesOfDimensionWithAnomaliesOptions.java rename to sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListDimensionValuesWithAnomaliesOptions.java index 3d99059004ea..2db411214d0e 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListValuesOfDimensionWithAnomaliesOptions.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListDimensionValuesWithAnomaliesOptions.java @@ -8,7 +8,7 @@ /** * Describes the additional parameters for the API to list values of a dimension that have anomalies. */ -public final class ListValuesOfDimensionWithAnomaliesOptions { +public final class ListDimensionValuesWithAnomaliesOptions { private final OffsetDateTime startTime; private final OffsetDateTime endTime; private Integer top; @@ -16,12 +16,12 @@ public final class ListValuesOfDimensionWithAnomaliesOptions { private DimensionKey dimensionToFilter; /** - * Creates a new instance of ListValuesOfDimensionWithAnomaliesOptions. + * Creates a new instance of ListDimensionValuesWithAnomaliesOptions. * * @param startTime The start time of the time range within which the anomalies were identified. * @param endTime The end time of the time range within which the anomalies were identified. */ - public ListValuesOfDimensionWithAnomaliesOptions(OffsetDateTime startTime, + public ListDimensionValuesWithAnomaliesOptions(OffsetDateTime startTime, OffsetDateTime endTime) { this.startTime = startTime; this.endTime = endTime; @@ -77,9 +77,9 @@ public DimensionKey getDimensionToFilter() { * Sets limit indicating the number of items to be included in a service returned page. * * @param top The top value. - * @return The ListValuesOfDimensionWithAnomaliesOptions object itself. + * @return The ListDimensionValuesWithAnomaliesOptions object itself. */ - public ListValuesOfDimensionWithAnomaliesOptions setTop(int top) { + public ListDimensionValuesWithAnomaliesOptions setTop(int top) { this.top = top; return this; } @@ -89,9 +89,9 @@ public ListValuesOfDimensionWithAnomaliesOptions setTop(int top) { * in the returned result. * * @param skip The skip value. - * @return ListValuesOfDimensionWithAnomaliesOptions object itself. + * @return ListDimensionValuesWithAnomaliesOptions object itself. */ - public ListValuesOfDimensionWithAnomaliesOptions setSkip(int skip) { + public ListDimensionValuesWithAnomaliesOptions setSkip(int skip) { this.skip = skip; return this; } @@ -107,9 +107,9 @@ public ListValuesOfDimensionWithAnomaliesOptions setSkip(int skip) { * * @param dimensionToFilter The dimension filter. * - * @return ListValuesOfDimensionWithAnomaliesOptions object itself. + * @return ListDimensionValuesWithAnomaliesOptions object itself. */ - public ListValuesOfDimensionWithAnomaliesOptions setDimensionToFilter(DimensionKey dimensionToFilter) { + public ListDimensionValuesWithAnomaliesOptions setDimensionToFilter(DimensionKey dimensionToFilter) { this.dimensionToFilter = dimensionToFilter; return this; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricAnomalyAlertConditions.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricAnomalyAlertConditions.java index 774fd9e3c691..b076a13a8177 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricAnomalyAlertConditions.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricAnomalyAlertConditions.java @@ -52,7 +52,7 @@ public MetricAnomalyAlertConditions setMetricBoundaryCondition(MetricBoundaryCon * @return The MetricAnomalyAlertConditions object itself. */ public MetricAnomalyAlertConditions setSeverityCondition(Severity min, Severity max) { - return setSeverityCondition(new SeverityCondition() + return setSeverityRangeCondition(new SeverityCondition() .setMinAlertSeverity(min) .setMaxAlertSeverity(max)); } @@ -64,7 +64,7 @@ public MetricAnomalyAlertConditions setSeverityCondition(Severity min, Severity * @param severityCondition The condition based on severity of anomalies. * @return The MetricAnomalyAlertConditions object itself. */ - public MetricAnomalyAlertConditions setSeverityCondition(SeverityCondition severityCondition) { + public MetricAnomalyAlertConditions setSeverityRangeCondition(SeverityCondition severityCondition) { this.severityCondition = severityCondition; return this; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricEnrichedSeriesData.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricEnrichedSeriesData.java index 0478f3990dba..cd7421898f05 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricEnrichedSeriesData.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricEnrichedSeriesData.java @@ -16,13 +16,13 @@ */ public final class MetricEnrichedSeriesData { private DimensionKey seriesKey; - private List timestampList; - private List valueList; - private List isAnomalyList; - private List periodList; - private List expectedValueList; - private List lowerBoundaryList; - private List upperBoundaryList; + private List timestamps; + private List metricValues; + private List isAnomaly; + private List periods; + private List expectedMetricValues; + private List lowerBoundaryValues; + private List upperBoundaryValues; static { MetricEnrichedSeriesDataHelper @@ -83,8 +83,8 @@ public DimensionKey getSeriesKey() { * * @return The timestamps. */ - public List getTimestampList() { - return Collections.unmodifiableList(this.timestampList); + public List getTimestamps() { + return Collections.unmodifiableList(this.timestamps); } /** @@ -92,8 +92,8 @@ public List getTimestampList() { * * @return The values. */ - public List getValueList() { - return Collections.unmodifiableList(this.valueList); + public List getMetricValues() { + return Collections.unmodifiableList(this.metricValues); } /** @@ -102,7 +102,7 @@ public List getValueList() { * @return The anomaly statuses. */ public List isAnomalyList() { - return Collections.unmodifiableList(this.isAnomalyList); + return Collections.unmodifiableList(this.isAnomaly); } /** @@ -110,8 +110,8 @@ public List isAnomalyList() { * * @return The periods. */ - public List getPeriodList() { - return Collections.unmodifiableList(this.periodList); + public List getPeriods() { + return Collections.unmodifiableList(this.periods); } /** @@ -119,8 +119,8 @@ public List getPeriodList() { * * @return The expected values. */ - public List getExpectedValueList() { - return Collections.unmodifiableList(this.expectedValueList); + public List getExpectedMetricValues() { + return Collections.unmodifiableList(this.expectedMetricValues); } /** @@ -128,8 +128,8 @@ public List getExpectedValueList() { * * @return The lower bound values. */ - public List getLowerBoundaryList() { - return Collections.unmodifiableList(this.lowerBoundaryList); + public List getLowerBoundaryValues() { + return Collections.unmodifiableList(this.lowerBoundaryValues); } /** @@ -137,8 +137,8 @@ public List getLowerBoundaryList() { * * @return The upper bound values. */ - public List getUpperBoundaryList() { - return Collections.unmodifiableList(this.upperBoundaryList); + public List getUpperBoundaryValues() { + return Collections.unmodifiableList(this.upperBoundaryValues); } void setSeriesKey(DimensionKey seriesKey) { diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricSeriesData.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricSeriesData.java index 0218cc97ebec..b5bfa272cdd1 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricSeriesData.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricSeriesData.java @@ -23,12 +23,12 @@ public final class MetricSeriesData { /* * timestamps of the data related to this time series */ - private List timestampList; + private List timestamps; /* * values of the data related to this time series */ - private List valueList; + private List metricValues; static { MetricSeriesDataHelper.setAccessor(new MetricSeriesDataHelper.MetricSeriesDataAccessor() { @@ -55,7 +55,7 @@ public void setValueList(MetricSeriesData seriesData, List valueList) { } /** - * Get the metricId property: metric unique id. + * Get the metric unique id. * * @return the metricId value. */ @@ -76,21 +76,21 @@ public DimensionKey getSeriesKey() { } /** - * Get the timestampList property: timestamps of the data related to this time series. + * Get the timestamps of the data related to this time series. * * @return the timestampList value. */ - public List getTimestampList() { - return this.timestampList; + public List getTimestamps() { + return this.timestamps; } /** - * Get the valueList property: values of the data related to this time series. + * Get the values of the data related to this time series. * * @return the valueList value. */ - public List getValueList() { - return this.valueList; + public List getMetricValues() { + return this.metricValues; } void setMetricId(String metricId) { diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricSeriesDefinition.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricSeriesDefinition.java index ea8450ff474e..b4868e41c754 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricSeriesDefinition.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricSeriesDefinition.java @@ -33,7 +33,7 @@ public void setSeriesKey(MetricSeriesDefinition seriesDefinition, DimensionKey s } /** - * Get the metricId property: metric unique id. + * Get the metric unique id. * * @return the metricId value. */ @@ -42,7 +42,7 @@ public String getMetricId() { } /** - * Get the dimension property: dimension name and value pair. + * Get the dimension name and value pair. * * @return the dimension value. */ diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichedSeriesAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichedSeriesAsyncSample.java index d2dd51ef18ec..c7643650b84b 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichedSeriesAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichedSeriesAsyncSample.java @@ -38,15 +38,15 @@ public static void main(String[] args) { enrichedDataFlux.doOnNext(enrichedData -> { System.out.printf("Series Key %s%n:", enrichedData.getSeriesKey().asMap()); System.out.println("List of data points for this series"); - System.out.println(enrichedData.getValueList()); + System.out.println(enrichedData.getMetricValues()); System.out.println("Timestamps of the data related to this time series:"); - System.out.println(enrichedData.getTimestampList()); + System.out.println(enrichedData.getTimestamps()); System.out.println("The expected values of the data points calculated by the smart detector:"); - System.out.println(enrichedData.getExpectedValueList()); + System.out.println(enrichedData.getExpectedMetricValues()); System.out.println("The lower boundary values of the data points calculated by smart detector:"); - System.out.println(enrichedData.getLowerBoundaryList()); + System.out.println(enrichedData.getLowerBoundaryValues()); System.out.println("the periods calculated for the data points in the time series:"); - System.out.println(enrichedData.getPeriodList()); + System.out.println(enrichedData.getPeriods()); }).blockLast(); /* 'blockLast()' will block until all the above CRUD on operation on detection is completed. diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichedSeriesSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichedSeriesSample.java index cdab8d321e91..b13a51554f18 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichedSeriesSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichedSeriesSample.java @@ -38,15 +38,15 @@ public static void main(String[] args) { for (MetricEnrichedSeriesData enrichedData : enrichedDataIterable) { System.out.printf("Series Key %s%n:", enrichedData.getSeriesKey().asMap()); System.out.println("List of data points for this series"); - System.out.println(enrichedData.getValueList()); + System.out.println(enrichedData.getMetricValues()); System.out.println("Timestamps of the data related to this time series:"); - System.out.println(enrichedData.getTimestampList()); + System.out.println(enrichedData.getTimestamps()); System.out.println("The expected values of the data points calculated by the smart detector:"); - System.out.println(enrichedData.getExpectedValueList()); + System.out.println(enrichedData.getExpectedMetricValues()); System.out.println("The lower boundary values of the data points calculated by smart detector:"); - System.out.println(enrichedData.getLowerBoundaryList()); + System.out.println(enrichedData.getLowerBoundaryValues()); System.out.println("the periods calculated for the data points in the time series:"); - System.out.println(enrichedData.getPeriodList()); + System.out.println(enrichedData.getPeriods()); } } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDataForMetricAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDataForMetricAsyncSample.java index ef7939b5f77a..6fb7cc80a8d0 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDataForMetricAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDataForMetricAsyncSample.java @@ -29,9 +29,9 @@ public static void main(String[] args) { new ListMetricSeriesDataOptions(startTime, endTime)) .doOnNext(metricSeriesData -> { System.out.println("List of data points for this series:"); - System.out.println(metricSeriesData.getValueList()); + System.out.println(metricSeriesData.getMetricValues()); System.out.println("Timestamps of the data related to this time series:"); - System.out.println(metricSeriesData.getTimestampList()); + System.out.println(metricSeriesData.getTimestamps()); System.out.printf("Series Key: %s%n", metricSeriesData.getSeriesKey().asMap()); }).blockLast(); /* diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDataForMetricSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDataForMetricSample.java index 27261d0d3c07..b815af4b1ab1 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDataForMetricSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDataForMetricSample.java @@ -29,9 +29,9 @@ public static void main(String[] args) { new ListMetricSeriesDataOptions(startTime, endTime)) .forEach(metricSeriesData -> { System.out.println("List of data points for this series:"); - System.out.println(metricSeriesData.getValueList()); + System.out.println(metricSeriesData.getMetricValues()); System.out.println("Timestamps of the data related to this time series:"); - System.out.println(metricSeriesData.getTimestampList()); + System.out.println(metricSeriesData.getTimestamps()); System.out.printf("Series Key: %s%n", metricSeriesData.getSeriesKey().asMap()); }); } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClientJavaDocCodeSnippets.java index 91fdd2dc87c9..2b0cba834842 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClientJavaDocCodeSnippets.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClientJavaDocCodeSnippets.java @@ -11,6 +11,7 @@ import com.azure.ai.metricsadvisor.models.ListAnomaliesAlertedOptions; import com.azure.ai.metricsadvisor.models.ListAnomaliesDetectedFilter; import com.azure.ai.metricsadvisor.models.ListAnomaliesDetectedOptions; +import com.azure.ai.metricsadvisor.models.ListDimensionValuesWithAnomaliesOptions; import com.azure.ai.metricsadvisor.models.ListIncidentsAlertedOptions; import com.azure.ai.metricsadvisor.models.ListIncidentsDetectedOptions; import com.azure.ai.metricsadvisor.models.ListMetricDimensionValuesOptions; @@ -19,7 +20,6 @@ import com.azure.ai.metricsadvisor.models.ListMetricFeedbackOptions; import com.azure.ai.metricsadvisor.models.ListMetricSeriesDataOptions; import com.azure.ai.metricsadvisor.models.ListMetricSeriesDefinitionOptions; -import com.azure.ai.metricsadvisor.models.ListValuesOfDimensionWithAnomaliesOptions; import com.azure.ai.metricsadvisor.models.MetricAnomalyFeedback; import com.azure.ai.metricsadvisor.models.MetricChangePointFeedback; import com.azure.ai.metricsadvisor.models.MetricCommentFeedback; @@ -124,9 +124,9 @@ public void listMetricSeriesData() { metricAdvisorAsyncClient.listMetricSeriesData(metricId, seriesKeyFilter, options) .subscribe(metricSeriesData -> { System.out.println("List of data points for this series:"); - System.out.println(metricSeriesData.getValueList()); + System.out.println(metricSeriesData.getMetricValues()); System.out.println("Timestamps of the data related to this time series:"); - System.out.println(metricSeriesData.getTimestampList()); + System.out.println(metricSeriesData.getTimestamps()); System.out.printf("Series Key:"); System.out.println(metricSeriesData.getSeriesKey().asMap()); }); @@ -263,25 +263,25 @@ public void listAlertForAlertConfiguration() { } /** - * Code snippet for {@link MetricsAdvisorAsyncClient#listValuesOfDimensionWithAnomalies(String, String, ListValuesOfDimensionWithAnomaliesOptions)}. + * Code snippet for {@link MetricsAdvisorAsyncClient#listDimensionValuesWithAnomalies(String, String, ListDimensionValuesWithAnomaliesOptions)}. */ public void listValuesOfDimensionWithAnomalies() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listValuesOfDimensionWithAnomalies#String-String-ListValuesOfDimensionWithAnomaliesOptions + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listDimensionValuesWithAnomalies#String-String-ListDimensionValuesWithAnomaliesOptions final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8"; final String dimensionName = "Dim1"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); - final ListValuesOfDimensionWithAnomaliesOptions options - = new ListValuesOfDimensionWithAnomaliesOptions(startTime, endTime) + final ListDimensionValuesWithAnomaliesOptions options + = new ListDimensionValuesWithAnomaliesOptions(startTime, endTime) .setTop(10); - metricAdvisorAsyncClient.listValuesOfDimensionWithAnomalies(detectionConfigurationId, + metricAdvisorAsyncClient.listDimensionValuesWithAnomalies(detectionConfigurationId, dimensionName, options) .subscribe(dimensionValue -> { System.out.printf("Dimension Value: %s%n", dimensionValue); }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listValuesOfDimensionWithAnomalies#String-String-ListValuesOfDimensionWithAnomaliesOptions + // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listDimensionValuesWithAnomalies#String-String-ListDimensionValuesWithAnomaliesOptions } /** @@ -610,15 +610,15 @@ public void listEnrichedSeries() { enrichedDataFlux.subscribe(enrichedData -> { System.out.printf("Series Key %s%n:", enrichedData.getSeriesKey().asMap()); System.out.println("List of data points for this series"); - System.out.println(enrichedData.getValueList()); + System.out.println(enrichedData.getMetricValues()); System.out.println("Timestamps of the data related to this time series:"); - System.out.println(enrichedData.getTimestampList()); + System.out.println(enrichedData.getTimestamps()); System.out.println("The expected values of the data points calculated by the smart detector:"); - System.out.println(enrichedData.getExpectedValueList()); + System.out.println(enrichedData.getExpectedMetricValues()); System.out.println("The lower boundary values of the data points calculated by smart detector:"); - System.out.println(enrichedData.getLowerBoundaryList()); + System.out.println(enrichedData.getLowerBoundaryValues()); System.out.println("the periods calculated for the data points in the time series:"); - System.out.println(enrichedData.getPeriodList()); + System.out.println(enrichedData.getPeriods()); }); // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricEnrichedSeriesData#List-String-OffsetDateTime-OffsetDateTime } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java index 42f0427cda94..6de0a95ad7eb 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java @@ -14,6 +14,7 @@ import com.azure.ai.metricsadvisor.models.ListAnomaliesAlertedOptions; import com.azure.ai.metricsadvisor.models.ListAnomaliesDetectedFilter; import com.azure.ai.metricsadvisor.models.ListAnomaliesDetectedOptions; +import com.azure.ai.metricsadvisor.models.ListDimensionValuesWithAnomaliesOptions; import com.azure.ai.metricsadvisor.models.ListIncidentsAlertedOptions; import com.azure.ai.metricsadvisor.models.ListIncidentsDetectedOptions; import com.azure.ai.metricsadvisor.models.ListMetricDimensionValuesOptions; @@ -22,7 +23,6 @@ import com.azure.ai.metricsadvisor.models.ListMetricFeedbackOptions; import com.azure.ai.metricsadvisor.models.ListMetricSeriesDataOptions; import com.azure.ai.metricsadvisor.models.ListMetricSeriesDefinitionOptions; -import com.azure.ai.metricsadvisor.models.ListValuesOfDimensionWithAnomaliesOptions; import com.azure.ai.metricsadvisor.models.MetricAnomalyFeedback; import com.azure.ai.metricsadvisor.models.MetricChangePointFeedback; import com.azure.ai.metricsadvisor.models.MetricCommentFeedback; @@ -150,9 +150,9 @@ public void listMetricSeriesData() { OffsetDateTime.parse("2020-09-09T00:00:00Z"))) .forEach(metricSeriesData -> { System.out.println("List of data points for this series:"); - System.out.println(metricSeriesData.getValueList()); + System.out.println(metricSeriesData.getMetricValues()); System.out.println("Timestamps of the data related to this time series:"); - System.out.println(metricSeriesData.getTimestampList()); + System.out.println(metricSeriesData.getTimestamps()); System.out.printf("Series Key:"); System.out.println(metricSeriesData.getSeriesKey().asMap()); }); @@ -174,8 +174,8 @@ public void listMetricSeriesDataWithContext() { .forEach(metricSeriesData -> { System.out.printf("Data feed Id: %s%n", metricSeriesData.getMetricId()); System.out.printf("Data feed description: %s%n", metricSeriesData.getSeriesKey()); - System.out.printf("Data feed source type: %.2f%n", metricSeriesData.getTimestampList()); - System.out.printf("Data feed creator: %.2f%n", metricSeriesData.getValueList()); + System.out.printf("Data feed source type: %.2f%n", metricSeriesData.getTimestamps()); + System.out.printf("Data feed creator: %.2f%n", metricSeriesData.getMetricValues()); }); // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesData#String-List-ListMetricSeriesDataOptions-Context } @@ -390,44 +390,44 @@ public void listAlertForAlertConfigurationWithContext() { } /** - * Code snippet for {@link MetricsAdvisorClient#listValuesOfDimensionWithAnomalies(String, String, ListValuesOfDimensionWithAnomaliesOptions)}. + * Code snippet for {@link MetricsAdvisorClient#listDimensionValuesWithAnomalies(String, String, ListDimensionValuesWithAnomaliesOptions)}. */ public void listValuesOfDimensionWithAnomalies() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listValuesOfDimensionWithAnomalies#String-String-ListValuesOfDimensionWithAnomaliesOptions + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listDimensionValuesWithAnomalies#String-String-ListDimensionValuesWithAnomaliesOptions final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8"; final String dimensionName = "Dim1"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); - final ListValuesOfDimensionWithAnomaliesOptions options - = new ListValuesOfDimensionWithAnomaliesOptions(startTime, endTime) + final ListDimensionValuesWithAnomaliesOptions options + = new ListDimensionValuesWithAnomaliesOptions(startTime, endTime) .setTop(10); PagedIterable dimensionValueIterable - = metricAdvisorClient.listValuesOfDimensionWithAnomalies(detectionConfigurationId, + = metricAdvisorClient.listDimensionValuesWithAnomalies(detectionConfigurationId, dimensionName, options); for (String dimensionValue : dimensionValueIterable) { System.out.printf("Dimension Value: %s%n", dimensionValue); } - // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listValuesOfDimensionWithAnomalies#String-String-ListValuesOfDimensionWithAnomaliesOptions + // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listDimensionValuesWithAnomalies#String-String-ListDimensionValuesWithAnomaliesOptions } /** - * Code snippet for {@link MetricsAdvisorClient#listValuesOfDimensionWithAnomalies(String, String, ListValuesOfDimensionWithAnomaliesOptions, Context)}. + * Code snippet for {@link MetricsAdvisorClient#listDimensionValuesWithAnomalies(String, String, ListDimensionValuesWithAnomaliesOptions, Context)}. */ public void listValuesOfDimensionWithAnomaliesWithContext() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listValuesOfDimensionWithAnomalies#String-String-ListValuesOfDimensionWithAnomaliesOptions-Context + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listDimensionValuesWithAnomalies#String-String-ListDimensionValuesWithAnomaliesOptions-Context final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8"; final String dimensionName = "Dim1"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); - final ListValuesOfDimensionWithAnomaliesOptions options - = new ListValuesOfDimensionWithAnomaliesOptions(startTime, endTime) + final ListDimensionValuesWithAnomaliesOptions options + = new ListDimensionValuesWithAnomaliesOptions(startTime, endTime) .setTop(10); PagedIterable dimensionValueIterable - = metricAdvisorClient.listValuesOfDimensionWithAnomalies(detectionConfigurationId, + = metricAdvisorClient.listDimensionValuesWithAnomalies(detectionConfigurationId, dimensionName, options, Context.NONE); @@ -441,7 +441,7 @@ public void listValuesOfDimensionWithAnomaliesWithContext() { System.out.printf("Dimension Value: %s%n", dimensionValue); } }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listValuesOfDimensionWithAnomalies#String-String-ListValuesOfDimensionWithAnomaliesOptions-Context + // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listDimensionValuesWithAnomalies#String-String-ListDimensionValuesWithAnomaliesOptions-Context } /** @@ -885,15 +885,15 @@ public void listEnrichedSeries() { for (MetricEnrichedSeriesData enrichedData : enrichedDataIterable) { System.out.printf("Series Key %s%n:", enrichedData.getSeriesKey().asMap()); System.out.println("List of data points for this series"); - System.out.println(enrichedData.getValueList()); + System.out.println(enrichedData.getMetricValues()); System.out.println("Timestamps of the data related to this time series:"); - System.out.println(enrichedData.getTimestampList()); + System.out.println(enrichedData.getTimestamps()); System.out.println("The expected values of the data points calculated by the smart detector:"); - System.out.println(enrichedData.getExpectedValueList()); + System.out.println(enrichedData.getExpectedMetricValues()); System.out.println("The lower boundary values of the data points calculated by smart detector:"); - System.out.println(enrichedData.getLowerBoundaryList()); + System.out.println(enrichedData.getLowerBoundaryValues()); System.out.println("the periods calculated for the data points in the time series:"); - System.out.println(enrichedData.getPeriodList()); + System.out.println(enrichedData.getPeriods()); } // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricEnrichedSeriesData#List-String-OffsetDateTime-OffsetDateTime } @@ -925,15 +925,15 @@ public void listEnrichedSeriesWithContext() { for (MetricEnrichedSeriesData enrichedData : pageElements) { System.out.printf("Series Key %s%n:", enrichedData.getSeriesKey().asMap()); System.out.println("List of data points for this series"); - System.out.println(enrichedData.getValueList()); + System.out.println(enrichedData.getMetricValues()); System.out.println("Timestamps of the data related to this time series:"); - System.out.println(enrichedData.getTimestampList()); + System.out.println(enrichedData.getTimestamps()); System.out.println("The expected values of the data points calculated by the smart detector:"); - System.out.println(enrichedData.getExpectedValueList()); + System.out.println(enrichedData.getExpectedMetricValues()); System.out.println("The lower boundary values of the data points calculated by smart detector:"); - System.out.println(enrichedData.getLowerBoundaryList()); + System.out.println(enrichedData.getLowerBoundaryValues()); System.out.println("the periods calculated for the data points in the time series:"); - System.out.println(enrichedData.getPeriodList()); + System.out.println(enrichedData.getPeriods()); } }); // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricEnrichedSeriesData#List-String-OffsetDateTime-OffsetDateTime-Context diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java index 970cdd6ef65b..839c65a27dc5 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java @@ -16,10 +16,10 @@ import com.azure.ai.metricsadvisor.models.DataFeedGranularityType; import com.azure.ai.metricsadvisor.models.DataFeedIngestionSettings; import com.azure.ai.metricsadvisor.models.DataFeedMissingDataPointFillSettings; +import com.azure.ai.metricsadvisor.models.DataFeedMissingDataPointFillType; import com.azure.ai.metricsadvisor.models.DataFeedOptions; import com.azure.ai.metricsadvisor.models.DataFeedRollupSettings; import com.azure.ai.metricsadvisor.models.DataFeedSchema; -import com.azure.ai.metricsadvisor.models.DataSourceMissingDataPointFillType; import com.azure.ai.metricsadvisor.models.DetectionConditionsOperator; import com.azure.ai.metricsadvisor.models.Dimension; import com.azure.ai.metricsadvisor.models.EmailHook; @@ -104,7 +104,7 @@ public void createDataFeed() { .setAutoRollup(DataFeedAutoRollUpMethod.SUM, Arrays.asList("cost"), "__CUSTOM_SUM__")) .setMissingDataPointFillSettings( new DataFeedMissingDataPointFillSettings() - .setFillType(DataSourceMissingDataPointFillType.SMART_FILLING)) + .setFillType(DataFeedMissingDataPointFillType.SMART_FILLING)) .setAccessMode(DataFeedAccessMode.PUBLIC)); System.out.printf("Data feed Id : %s%n", createdSqlDataFeed.getId()); @@ -219,7 +219,7 @@ public void configureAlert() { new MetricAnomalyAlertConfiguration(detectionConfigurationId2, MetricAnomalyAlertScope.forWholeSeries()) .setAlertConditions(new MetricAnomalyAlertConditions() - .setSeverityCondition(new SeverityCondition() + .setSeverityRangeCondition(new SeverityCondition() .setMaxAlertSeverity(Severity.HIGH))) )) .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.AND) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedAsyncSample.java index 5957d6204341..a01b849ab482 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedAsyncSample.java @@ -85,14 +85,14 @@ public static void main(String[] args) { Mono updateDataFeedMono = fetchDataFeedMono .flatMap(dataFeed -> { return advisorAdministrationAsyncClient.updateDataFeed(dataFeed - .setOptions(new DataFeedOptions().setAdmins(Arrays.asList("admin1@admin.com")))) + .setOptions(new DataFeedOptions().setAdminEmails(Arrays.asList("admin1@admin.com")))) .doOnSubscribe(__ -> System.out.printf("Updating data feed: %s%n", dataFeed.getId())) .doOnSuccess(config -> { System.out.printf("Updated data feed%n"); - System.out.printf("Updated data feed admin list: %s%n", dataFeed.getOptions().getAdmins()); + System.out.printf("Updated data feed admin list: %s%n", dataFeed.getOptions().getAdminEmails()); }); }); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedSample.java index a2681a04a264..67ef45592b06 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedSample.java @@ -68,8 +68,8 @@ public static void main(String[] args) { // Update the data feed. System.out.printf("Updating data feed: %s%n", dataFeed.getId()); dataFeed = advisorAdministrationClient.updateDataFeed(dataFeed - .setOptions(new DataFeedOptions().setAdmins(Arrays.asList("admin1@admin.com")))); - System.out.printf("Updated data feed admin list: %s%n", dataFeed.getOptions().getAdmins()); + .setOptions(new DataFeedOptions().setAdminEmails(Arrays.asList("admin1@admin.com")))); + System.out.printf("Updated data feed admin list: %s%n", dataFeed.getOptions().getAdminEmails()); // Delete the data feed. System.out.printf("Deleting data feed: %s%n", dataFeed.getId()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets.java index 423cd6be19f7..3ea520204e93 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets.java @@ -491,7 +491,7 @@ public void listHooksWithOptions() { System.out.printf("Hook Description: %s%n", emailHook.getDescription()); System.out.printf("Hook External Link: %s%n", emailHook.getExternalLink()); System.out.printf("Hook Emails: %s%n", String.join(",", emailHook.getEmailsToAlert())); - System.out.printf("Hook Admins: %s%n", String.join(",", emailHook.getAdmins())); + System.out.printf("Hook Admins: %s%n", String.join(",", emailHook.getAdminEmails())); } else if (hook instanceof WebHook) { WebHook webHook = (WebHook) hook; System.out.printf("Hook Id: %s%n", webHook.getId()); @@ -500,7 +500,7 @@ public void listHooksWithOptions() { System.out.printf("Hook External Link: %s%n", webHook.getExternalLink()); System.out.printf("Hook Endpoint: %s%n", webHook.getEndpoint()); System.out.printf("Hook Headers: %s%n", webHook.getHttpHeaders()); - System.out.printf("Hook Admins: %s%n", String.join(",", webHook.getAdmins())); + System.out.printf("Hook Admins: %s%n", String.join(",", webHook.getAdminEmails())); } } }); @@ -1155,7 +1155,7 @@ public void createAnomalyAlertConfiguration() { new MetricAnomalyAlertConfiguration(detectionConfigurationId2, MetricAnomalyAlertScope.forWholeSeries()) .setAlertConditions(new MetricAnomalyAlertConditions() - .setSeverityCondition(new SeverityCondition().setMaxAlertSeverity(Severity.HIGH))))) + .setSeverityRangeCondition(new SeverityCondition().setMaxAlertSeverity(Severity.HIGH))))) .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.AND) .setIdOfHooksToAlert(Arrays.asList(hookId1, hookId2))) .subscribe(anomalyAlertConfiguration -> { @@ -1190,7 +1190,7 @@ public void createAnomalyAlertConfigurationWithResponse() { new MetricAnomalyAlertConfiguration(detectionConfigurationId2, MetricAnomalyAlertScope.forWholeSeries()) .setAlertConditions(new MetricAnomalyAlertConditions() - .setSeverityCondition(new SeverityCondition().setMaxAlertSeverity(Severity.HIGH))))) + .setSeverityRangeCondition(new SeverityCondition().setMaxAlertSeverity(Severity.HIGH))))) .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.AND) .setIdOfHooksToAlert(Arrays.asList(hookId1, hookId2))) .subscribe(alertConfigurationResponse -> { diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClientJavaDocCodeSnippets.java index abe458b125a7..bb693cd0c535 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClientJavaDocCodeSnippets.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClientJavaDocCodeSnippets.java @@ -484,7 +484,7 @@ public void listHooksWithOptions() { System.out.printf("Hook Description: %s%n", emailHook.getDescription()); System.out.printf("Hook External Link: %s%n", emailHook.getExternalLink()); System.out.printf("Hook Emails: %s%n", String.join(",", emailHook.getEmailsToAlert())); - System.out.printf("Hook Admins: %s%n", String.join(",", emailHook.getAdmins())); + System.out.printf("Hook Admins: %s%n", String.join(",", emailHook.getAdminEmails())); } else if (hook instanceof WebHook) { WebHook webHook = (WebHook) hook; System.out.printf("Hook Id: %s%n", webHook.getId()); @@ -493,7 +493,7 @@ public void listHooksWithOptions() { System.out.printf("Hook External Link: %s%n", webHook.getExternalLink()); System.out.printf("Hook Endpoint: %s%n", webHook.getEndpoint()); System.out.printf("Hook Headers: %s%n", webHook.getHttpHeaders()); - System.out.printf("Hook Admins: %s%n", String.join(",", webHook.getAdmins())); + System.out.printf("Hook Admins: %s%n", String.join(",", webHook.getAdminEmails())); } } }); @@ -1184,7 +1184,7 @@ public void createAnomalyAlertConfiguration() { new MetricAnomalyAlertConfiguration(detectionConfigurationId2, MetricAnomalyAlertScope.forWholeSeries()) .setAlertConditions(new MetricAnomalyAlertConditions() - .setSeverityCondition(new SeverityCondition().setMaxAlertSeverity(Severity.HIGH))))) + .setSeverityRangeCondition(new SeverityCondition().setMaxAlertSeverity(Severity.HIGH))))) .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.AND) .setIdOfHooksToAlert(Arrays.asList(hookId1, hookId2))); @@ -1218,7 +1218,7 @@ public void createAnomalyAlertConfigurationWithResponse() { new MetricAnomalyAlertConfiguration(detectionConfigurationId2, MetricAnomalyAlertScope.forWholeSeries()) .setAlertConditions(new MetricAnomalyAlertConditions() - .setSeverityCondition(new SeverityCondition().setMaxAlertSeverity(Severity.HIGH))))) + .setSeverityRangeCondition(new SeverityCondition().setMaxAlertSeverity(Severity.HIGH))))) .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.AND) .setIdOfHooksToAlert(Arrays.asList(hookId1, hookId2)), Context.NONE); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAnomalyAlertConfigOperationsAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAnomalyAlertConfigOperationsAsyncSample.java index add80da936e7..7c5cd5d36798 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAnomalyAlertConfigOperationsAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAnomalyAlertConfigOperationsAsyncSample.java @@ -43,7 +43,7 @@ public static void main(String[] args) { new MetricAnomalyAlertConfiguration(detectionConfigurationId2, MetricAnomalyAlertScope.forWholeSeries()) .setAlertConditions(new MetricAnomalyAlertConditions() - .setSeverityCondition(new SeverityCondition().setMaxAlertSeverity(Severity.HIGH))))) + .setSeverityRangeCondition(new SeverityCondition().setMaxAlertSeverity(Severity.HIGH))))) .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.AND) .setIdOfHooksToAlert(Arrays.asList(hookId1, hookId2))); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAnomalyAlertConfigOperationsSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAnomalyAlertConfigOperationsSample.java index bbf3c75164c5..a5586306e893 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAnomalyAlertConfigOperationsSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAnomalyAlertConfigOperationsSample.java @@ -43,7 +43,7 @@ public static void main(String[] args) { new MetricAnomalyAlertConfiguration(detectionConfigurationId2, MetricAnomalyAlertScope.forWholeSeries()) .setAlertConditions(new MetricAnomalyAlertConditions() - .setSeverityCondition(new SeverityCondition().setMaxAlertSeverity(Severity.HIGH))))) + .setSeverityRangeCondition(new SeverityCondition().setMaxAlertSeverity(Severity.HIGH))))) .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.AND) .setIdOfHooksToAlert(Arrays.asList(hookId1, hookId2))); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedTestBase.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedTestBase.java index 1db081ee976b..f2171b0a6e57 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedTestBase.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedTestBase.java @@ -20,7 +20,7 @@ import com.azure.ai.metricsadvisor.models.DataFeedRollupType; import com.azure.ai.metricsadvisor.models.DataFeedSchema; import com.azure.ai.metricsadvisor.models.DataFeedSourceType; -import com.azure.ai.metricsadvisor.models.DataSourceMissingDataPointFillType; +import com.azure.ai.metricsadvisor.models.DataFeedMissingDataPointFillType; import com.azure.ai.metricsadvisor.models.Dimension; import com.azure.ai.metricsadvisor.models.ElasticsearchDataFeedSource; import com.azure.ai.metricsadvisor.models.HttpRequestDataFeedSource; @@ -335,8 +335,8 @@ private void validateDataFeedOptions(DataFeedOptions expectedOptions, DataFeedOp if (expectedOptions != null) { assertEquals(expectedOptions.getDescription(), actualOptions.getDescription()); assertEquals(expectedOptions.getActionLinkTemplate(), actualOptions.getActionLinkTemplate()); - assertIterableEquals(expectedOptions.getAdmins(), actualOptions.getAdmins()); - assertIterableEquals(expectedOptions.getViewers(), actualOptions.getViewers()); + assertIterableEquals(expectedOptions.getAdminEmails(), actualOptions.getAdminEmails()); + assertIterableEquals(expectedOptions.getViewerEmails(), actualOptions.getViewerEmails()); assertNotNull(actualOptions.getAccessMode()); if (expectedOptions.getAccessMode() != null) { assertEquals(expectedOptions.getAccessMode(), actualOptions.getAccessMode()); @@ -350,7 +350,7 @@ private void validateDataFeedOptions(DataFeedOptions expectedOptions, DataFeedOp validateRollUpSettings(new DataFeedRollupSettings().setRollupType(DataFeedRollupType.NO_ROLLUP), actualOptions.getRollupSettings()); validateFillSettings(new DataFeedMissingDataPointFillSettings() - .setFillType(DataSourceMissingDataPointFillType.PREVIOUS_VALUE).setCustomFillValue(0.0), + .setFillType(DataFeedMissingDataPointFillType.PREVIOUS_VALUE).setCustomFillValue(0.0), actualOptions.getMissingDataPointFillSettings()); } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/HookTestBase.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/HookTestBase.java index e59903cb9081..697940100d79 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/HookTestBase.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/HookTestBase.java @@ -41,7 +41,7 @@ protected void assertCreateEmailHookOutput(Hook hook) { Assertions.assertTrue(hook instanceof EmailHook); EmailHook emailHook = (EmailHook) hook; Assertions.assertNotNull(emailHook.getId()); - Assertions.assertNotNull(emailHook.getAdmins()); + Assertions.assertNotNull(emailHook.getAdminEmails()); Assertions.assertNotNull(emailHook.getName()); Assertions.assertEquals(CreateEmailHookInput.INSTANCE.description, emailHook.getDescription()); Assertions.assertEquals(CreateEmailHookInput.INSTANCE.externalLink, emailHook.getExternalLink()); @@ -80,7 +80,7 @@ protected void assertCreateWebHookOutput(Hook hook) { Assertions.assertTrue(hook instanceof WebHook); WebHook webHook = (WebHook) hook; Assertions.assertNotNull(webHook.getId()); - Assertions.assertNotNull(webHook.getAdmins()); + Assertions.assertNotNull(webHook.getAdminEmails()); Assertions.assertNotNull(webHook.getName()); Assertions.assertEquals(CreateWebHookInput.INSTANCE.description, webHook.getDescription()); Assertions.assertEquals(CreateWebHookInput.INSTANCE.externalLink, webHook.getExternalLink()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricEnrichedSeriesDataTestBase.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricEnrichedSeriesDataTestBase.java index a0115f9c86ff..c1471723accf 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricEnrichedSeriesDataTestBase.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricEnrichedSeriesDataTestBase.java @@ -39,7 +39,7 @@ protected void assertGetEnrichedSeriesDataOutput(MetricEnrichedSeriesData enrich Assertions.assertNotNull(enrichedSeriesKey); Assertions.assertTrue(GetEnrichedSeriesDataInput.INSTANCE.seriesKey.equals(enrichedSeriesKey)); // Fixed test data has exactly 27 data points in the time range. - List timestamps = enrichedSeriesData.getTimestampList(); + List timestamps = enrichedSeriesData.getTimestamps(); Assertions.assertEquals(30, timestamps.size()); // Ensure the received data points are in requested range. for (OffsetDateTime timestamp : timestamps) { diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesAsyncTest.java index cf4d9ad83eb4..c1a180d9f12a 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesAsyncTest.java @@ -88,8 +88,8 @@ public void listMetricSeriesData(HttpClient httpClient, MetricsAdvisorServiceVer assertEquals(METRIC_ID, metricSeriesData.getMetricId()); assertNotNull(metricSeriesData.getSeriesKey()); assertEquals(SERIES_KEY_FILTER, metricSeriesData.getSeriesKey().asMap()); - assertNotNull(metricSeriesData.getTimestampList()); - assertNotNull(metricSeriesData.getValueList()); + assertNotNull(metricSeriesData.getTimestamps()); + assertNotNull(metricSeriesData.getMetricValues()); }) .verifyComplete(); } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesTest.java index bd547bbeae3b..169cc47d8818 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesTest.java @@ -82,8 +82,8 @@ public void listMetricSeriesData(HttpClient httpClient, MetricsAdvisorServiceVer .forEach(metricSeriesData -> { assertEquals(METRIC_ID, metricSeriesData.getMetricId()); assertEquals(SERIES_KEY_FILTER, metricSeriesData.getSeriesKey().asMap()); - assertNotNull(metricSeriesData.getTimestampList()); - assertNotNull(metricSeriesData.getValueList()); + assertNotNull(metricSeriesData.getTimestamps()); + assertNotNull(metricSeriesData.getMetricValues()); }); } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesAsyncTest.java index 2c45bb6ebb0e..09f6c173fab8 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesAsyncTest.java @@ -37,7 +37,7 @@ public void listValuesOfDimensionWithAnomalies(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { MetricsAdvisorAsyncClient client = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildAsyncClient(); - PagedFlux dimensionValuesFlux = client.listValuesOfDimensionWithAnomalies( + PagedFlux dimensionValuesFlux = client.listDimensionValuesWithAnomalies( ListValuesOfDimensionWithAnomaliesInput.INSTANCE.detectionConfigurationId, ListValuesOfDimensionWithAnomaliesInput.INSTANCE.dimensionName, ListValuesOfDimensionWithAnomaliesInput.INSTANCE.options); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesTest.java index 1da0ea3fcf71..03613a87a796 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesTest.java @@ -20,7 +20,7 @@ public void listValuesOfDimensionWithAnomalies(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { MetricsAdvisorClient client = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildClient(); - PagedIterable dimensionValuesIterable = client.listValuesOfDimensionWithAnomalies( + PagedIterable dimensionValuesIterable = client.listDimensionValuesWithAnomalies( ListValuesOfDimensionWithAnomaliesInput.INSTANCE.detectionConfigurationId, ListValuesOfDimensionWithAnomaliesInput.INSTANCE.dimensionName, ListValuesOfDimensionWithAnomaliesInput.INSTANCE.options); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesTestBase.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesTestBase.java index e3a7c5306f9c..f7c7d3cbdf0c 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesTestBase.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesTestBase.java @@ -3,7 +3,7 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.ListValuesOfDimensionWithAnomaliesOptions; +import com.azure.ai.metricsadvisor.models.ListDimensionValuesWithAnomaliesOptions; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; import org.junit.jupiter.api.Assertions; From 638443269baf547fa4f70daf04d68732ff4a4d3c Mon Sep 17 00:00:00 2001 From: Sameeksha Vaity Date: Thu, 22 Oct 2020 21:43:39 -0700 Subject: [PATCH 2/9] create data feed update --- .../azure-ai-metricsadvisor/CHANGELOG.md | 9 + ...tricsAdvisorAdministrationAsyncClient.java | 74 ++--- .../MetricsAdvisorAdministrationClient.java | 48 +--- .../models/DataFeedOptions.java | 6 +- ...nomaliesForDetectionConfigAsyncSample.java | 2 +- ...istsAnomaliesForDetectionConfigSample.java | 2 +- ...AdvisorAsyncClientJavaDocCodeSnippets.java | 2 +- ...tricsAdvisorClientJavaDocCodeSnippets.java | 4 +- .../ai/metricsadvisor/ReadmeSamples.java | 59 ++-- .../administration/DatafeedAsyncSample.java | 24 +- .../administration/DatafeedSample.java | 24 +- ...trationAsyncClientJavaDocCodeSnippets.java | 271 ++++++++++-------- ...ministrationClientJavaDocCodeSnippets.java | 249 ++++++++-------- .../AnomalyForDetectionConfigTestBase.java | 2 +- .../DataFeedAsyncClientTest.java | 134 ++------- .../ai/metricsadvisor/DataFeedClientTest.java | 176 +++--------- .../ai/metricsadvisor/DataFeedTestBase.java | 3 +- .../DetectionConfigurationTestBase.java | 9 +- .../azure/ai/metricsadvisor/TestUtils.java | 6 +- 19 files changed, 465 insertions(+), 639 deletions(-) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md b/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md index 9448a68274e5..6dca182adf17 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md @@ -2,6 +2,15 @@ ## 1.0.0-beta.2 (Unreleased) +### Breaking changes +- Updated `createdDataFeed` method to take one `DataFeed` object. +- Renamed `listValuesOfDimensionWithAnomalies` method to `listDimensionValuesWithAnomalies`. +- Renamed model `ListValuesOfDimensionWithAnomaliesOptions` method to `ListDimensionValuesWithAnomaliesOptions`. +- Renamed properties `viewers` , `admins` and their accessors to `viewerEmails` and `adminEmails` respectively on +`DataFeedOptions` model. +- Renamed model `DataSourceMissingDataPointFillType` to `DataFeedMissingDataPointFillType`. +- Renamed properties on `MetricEnrichedSeriesData` and `MetricSeriesData` model. +- Renamed method `setSeverity` to `setSeverityRangeCondition` on `MetricAnomalyAlertConditions` model. ## 1.0.0-beta.1 (2020-10-07) Version 1.0.0-beta.1 is a preview of our efforts in creating a Azure Metrics Advisor client library that is developer-friendly diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClient.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClient.java index 51de0bea4ae7..b4e954e23378 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClient.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClient.java @@ -38,7 +38,6 @@ import com.azure.ai.metricsadvisor.models.DataFeedOptions; import com.azure.ai.metricsadvisor.models.DataFeedRollupSettings; import com.azure.ai.metricsadvisor.models.DataFeedSchema; -import com.azure.ai.metricsadvisor.models.DataFeedSource; import com.azure.ai.metricsadvisor.models.Hook; import com.azure.ai.metricsadvisor.models.ListDataFeedFilter; import com.azure.ai.metricsadvisor.models.ListDataFeedIngestionOptions; @@ -105,71 +104,46 @@ public class MetricsAdvisorAdministrationAsyncClient { * Create a new data feed. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createDataFeed#String-DataFeedSource-DataFeedGranularity-DataFeedSchema-DataFeedIngestionSettings-DataFeedOptions} - * - * @param dataFeedName the name of the data feed. - * @param dataFeedSource the source of the data feed. - * @param dataFeedGranularity the granularity details of the data feed. - * @param dataFeedSchema the schema detail properties of the data feed. - * @param dataFeedIngestionSettings the data feed ingestion properties. - * @param dataFeedOptions the additional options to configure the data feed. + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createDataFeed#DataFeed} * + * @param dataFeed The data feed to be created. * @return A {@link Mono} containing the created data feed. - * @throws NullPointerException If {@code dataFeedName}, {@code dataFeedSource}, {@code metrics}, + * @throws NullPointerException If {@code dataFeed}, {@code dataFeedName}, {@code dataFeedSource}, {@code metrics}, * {@code granularityType} or {@code ingestionStartTime} is null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono createDataFeed(String dataFeedName, - DataFeedSource dataFeedSource, - DataFeedGranularity dataFeedGranularity, - DataFeedSchema dataFeedSchema, - DataFeedIngestionSettings dataFeedIngestionSettings, - DataFeedOptions dataFeedOptions) { - return createDataFeedWithResponse(dataFeedName, dataFeedSource, dataFeedGranularity, dataFeedSchema, - dataFeedIngestionSettings, dataFeedOptions).flatMap(FluxUtil::toMono); + public Mono createDataFeed(DataFeed dataFeed) { + return createDataFeedWithResponse(dataFeed).flatMap(FluxUtil::toMono); } /** * Create a new data feed with REST response. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createDataFeedWithResponse#String-DataFeedSource-DataFeedGranularity-DataFeedSchema-DataFeedIngestionSettings-DataFeedOptions} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createDataFeedWithResponse#DataFeed} * - * @param dataFeedName the name of the data feed. - * @param dataFeedSource the source of the data feed. - * @param dataFeedGranularity the granularity details of the data feed. - * @param dataFeedSchema the schema detail properties of the data feed. - * @param dataFeedIngestionSettings the data feed ingestion properties. - * @param dataFeedOptions the additional options to configure the data feed. * + * @param dataFeed The data feed to be created. * @return A {@link Response} of a {@link Mono} containing the created {@link DataFeed data feed}. - * @throws NullPointerException If {@code dataFeedName}, {@code dataFeedSource}, {@code metrics}, + * @throws NullPointerException If {@code dataFeed}, {@code dataFeedName}, {@code dataFeedSource}, {@code metrics}, * {@code granularityType} or {@code ingestionStartTime} is null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> createDataFeedWithResponse(String dataFeedName, - DataFeedSource dataFeedSource, - DataFeedGranularity dataFeedGranularity, - DataFeedSchema dataFeedSchema, - DataFeedIngestionSettings dataFeedIngestionSettings, - DataFeedOptions dataFeedOptions) { + public Mono> createDataFeedWithResponse(DataFeed dataFeed) { try { - return withContext(context -> createDataFeedWithResponse(dataFeedName, dataFeedSource, - dataFeedGranularity, dataFeedSchema, - dataFeedIngestionSettings, dataFeedOptions, context)); + return withContext(context -> createDataFeedWithResponse(dataFeed, context)); } catch (RuntimeException ex) { return monoError(logger, ex); } } - Mono> createDataFeedWithResponse(String dataFeedName, - DataFeedSource dataFeedSource, - DataFeedGranularity dataFeedGranularity, - DataFeedSchema dataFeedSchema, - DataFeedIngestionSettings dataFeedIngestionSettings, - DataFeedOptions dataFeedOptions, Context context) { - Objects.requireNonNull(dataFeedSource, "'dataFeedSource' cannot be null or empty."); - Objects.requireNonNull(dataFeedName, "'dataFeedName' cannot be null or empty."); + Mono> createDataFeedWithResponse(DataFeed dataFeed, Context context) { + Objects.requireNonNull(dataFeed, "'dataFeed' is required and cannot be null."); + Objects.requireNonNull(dataFeed.getSource(), "'dataFeedSource' is required and cannot be null."); + Objects.requireNonNull(dataFeed.getName(), "'dataFeedName' cannot be null or empty."); + final DataFeedSchema dataFeedSchema = dataFeed.getSchema(); + final DataFeedGranularity dataFeedGranularity = dataFeed.getGranularity(); + final DataFeedIngestionSettings dataFeedIngestionSettings = dataFeed.getIngestionSettings(); if (dataFeedSchema == null) { throw logger.logExceptionAsError( @@ -181,7 +155,7 @@ Mono> createDataFeedWithResponse(String dataFeedName, if (dataFeedGranularity == null) { throw logger.logExceptionAsError( - new NullPointerException("'dataFeedGranularity.granularityType' cannot be null or empty.")); + new NullPointerException("'dataFeedGranularity.granularityType' is required and cannot be null.")); } else { Objects.requireNonNull(dataFeedGranularity.getGranularityType(), @@ -194,13 +168,15 @@ Mono> createDataFeedWithResponse(String dataFeedName, if (dataFeedIngestionSettings == null) { throw logger.logExceptionAsError( - new NullPointerException("'dataFeedIngestionSettings.ingestionStartTime' cannot be null or empty.")); + new NullPointerException( + "'dataFeedIngestionSettings.ingestionStartTime' is required and cannot be null.")); } else { Objects.requireNonNull(dataFeedIngestionSettings.getIngestionStartTime(), - "'dataFeedIngestionSettings.ingestionStartTime' cannot be null or empty."); + "'dataFeedIngestionSettings.ingestionStartTime' is required and cannot be null."); } - final DataFeedOptions finalDataFeedOptions = dataFeedOptions == null ? new DataFeedOptions() : dataFeedOptions; + final DataFeedOptions finalDataFeedOptions = dataFeed.getOptions() == null + ? new DataFeedOptions() : dataFeed.getOptions(); final DataFeedRollupSettings dataFeedRollupSettings = finalDataFeedOptions.getRollupSettings() == null ? new DataFeedRollupSettings() : finalDataFeedOptions.getRollupSettings(); final DataFeedMissingDataPointFillSettings dataFeedMissingDataPointFillSettings = @@ -208,8 +184,8 @@ Mono> createDataFeedWithResponse(String dataFeedName, ? new DataFeedMissingDataPointFillSettings() : finalDataFeedOptions.getMissingDataPointFillSettings(); final Context withTracing = context.addData(AZ_TRACING_NAMESPACE_KEY, METRICS_ADVISOR_TRACING_NAMESPACE_VALUE); - return service.createDataFeedWithResponseAsync(DataFeedTransforms.toDataFeedDetailSource(dataFeedSource) - .setDataFeedName(dataFeedName) + return service.createDataFeedWithResponseAsync(DataFeedTransforms.toDataFeedDetailSource(dataFeed.getSource()) + .setDataFeedName(dataFeed.getName()) .setDataFeedDescription(finalDataFeedOptions.getDescription()) .setGranularityName(Granularity.fromString(dataFeedGranularity.getGranularityType() == null ? null : dataFeedGranularity.getGranularityType().toString())) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClient.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClient.java index 559adb7a9ae2..744dbf4b578e 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClient.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClient.java @@ -5,13 +5,8 @@ import com.azure.ai.metricsadvisor.models.AnomalyAlertConfiguration; import com.azure.ai.metricsadvisor.models.DataFeed; -import com.azure.ai.metricsadvisor.models.DataFeedGranularity; import com.azure.ai.metricsadvisor.models.DataFeedIngestionProgress; -import com.azure.ai.metricsadvisor.models.DataFeedIngestionSettings; import com.azure.ai.metricsadvisor.models.DataFeedIngestionStatus; -import com.azure.ai.metricsadvisor.models.DataFeedOptions; -import com.azure.ai.metricsadvisor.models.DataFeedSchema; -import com.azure.ai.metricsadvisor.models.DataFeedSource; import com.azure.ai.metricsadvisor.models.Hook; import com.azure.ai.metricsadvisor.models.ListDataFeedIngestionOptions; import com.azure.ai.metricsadvisor.models.ListDataFeedOptions; @@ -52,57 +47,34 @@ public final class MetricsAdvisorAdministrationClient { * Create a new data feed. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createDataFeed#String-DataFeedSource-DataFeedGranularity-DataFeedSchema-DataFeedIngestionSettings-DataFeedOptions} - * - * @param dataFeedName the name of the data feed. - * @param dataFeedSource the source of the data feed. - * @param dataFeedGranularity the granularity details of the time series. - * @param dataFeedSchema the schema detail properties of the data feed. - * @param dataFeedIngestionSettings the data feed ingestion properties. - * @param dataFeedOptions the additional options to configure the data feed. + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createDataFeed#DataFeed} * + * @param dataFeed The data feed to be created. * @return The created data feed. - * @throws NullPointerException If {@code dataFeedName}, {@code dataFeedSource}, {@code metricColumns}, + * @throws NullPointerException If {@code dataFeed}, {@code dataFeedName}, {@code dataFeedSource}, {@code metrics}, * {@code granularityType} or {@code ingestionStartTime} is null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public DataFeed createDataFeed(String dataFeedName, - DataFeedSource dataFeedSource, - DataFeedGranularity dataFeedGranularity, - DataFeedSchema dataFeedSchema, - DataFeedIngestionSettings dataFeedIngestionSettings, - DataFeedOptions dataFeedOptions) { - return createDataFeedWithResponse(dataFeedName, dataFeedSource, dataFeedGranularity, dataFeedSchema, - dataFeedIngestionSettings, dataFeedOptions, Context.NONE).getValue(); + public DataFeed createDataFeed(DataFeed dataFeed) { + return createDataFeedWithResponse(dataFeed, Context.NONE).getValue(); } /** * Create a new data feed with REST response. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createDataFeedWithResponse#String-DataFeedSource-DataFeedGranularity-DataFeedSchema-DataFeedIngestionSettings-DataFeedOptions-Context} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createDataFeedWithResponse#DataFeed-Context} * - * @param dataFeedName the name of the data feed. - * @param dataFeedSource the source of the data feed. - * @param dataFeedGranularity the granularity details of the time series. - * @param dataFeedSchema the schema detail properties of the data feed. - * @param dataFeedIngestionSettings the data feed ingestion properties. - * @param dataFeedOptions the additional options to configure the data feed. + * @param dataFeed The data feed to be created. * @param context Additional context that is passed through the HTTP pipeline during the service call. * * @return A {@link Response} containing the created data feed. - * @throws NullPointerException If {@code dataFeedName}, {@code dataFeedSource}, {@code metricColumns}, + * @throws NullPointerException If {@code dataFeed}, {@code dataFeedName}, {@code dataFeedSource}, {@code metrics}, * {@code granularityType} or {@code ingestionStartTime} is null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response createDataFeedWithResponse(String dataFeedName, - DataFeedSource dataFeedSource, - DataFeedGranularity dataFeedGranularity, - DataFeedSchema dataFeedSchema, - DataFeedIngestionSettings dataFeedIngestionSettings, - DataFeedOptions dataFeedOptions, Context context) { - return client.createDataFeedWithResponse(dataFeedName, dataFeedSource, dataFeedGranularity, dataFeedSchema, - dataFeedIngestionSettings, dataFeedOptions, context).block(); + public Response createDataFeedWithResponse(DataFeed dataFeed, Context context) { + return client.createDataFeedWithResponse(dataFeed, context).block(); } /** diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedOptions.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedOptions.java index 2c3704c8a8aa..1de83da3e92a 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedOptions.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedOptions.java @@ -91,7 +91,8 @@ public DataFeedOptions setAccessMode(DataFeedAccessMode dataFeedAccessMode) { * @return the adminEmails value. */ public List getAdminEmails() { - return Collections.unmodifiableList(this.adminEmails); + return this.adminEmails == null + ? null : Collections.unmodifiableList(this.adminEmails); } /** @@ -112,7 +113,8 @@ public DataFeedOptions setAdminEmails(List adminEmails) { * @return the viewerEmails value. */ public List getViewerEmails() { - return Collections.unmodifiableList(this.viewerEmails); + return this.viewerEmails == null + ? null : Collections.unmodifiableList(this.viewerEmails); } /** diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigAsyncSample.java index 62b071ea6669..318064538bf0 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigAsyncSample.java @@ -25,7 +25,7 @@ public static void main(String[] args) { final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); final ListAnomaliesDetectedFilter filter = new ListAnomaliesDetectedFilter() - .setSeverity(Severity.LOW, Severity.MEDIUM); + .setSeverityRange(Severity.LOW, Severity.MEDIUM); final ListAnomaliesDetectedOptions options = new ListAnomaliesDetectedOptions(startTime, endTime) .setTop(10) .setFilter(filter); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigSample.java index be551a989c55..1ba624405da5 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigSample.java @@ -27,7 +27,7 @@ public static void main(String[] args) { final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); final ListAnomaliesDetectedFilter filter = new ListAnomaliesDetectedFilter() - .setSeverity(Severity.LOW, Severity.MEDIUM); + .setSeverityRange(Severity.LOW, Severity.MEDIUM); final ListAnomaliesDetectedOptions options = new ListAnomaliesDetectedOptions(startTime, endTime) .setTop(10) .setFilter(filter); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClientJavaDocCodeSnippets.java index 2b0cba834842..b585739885ed 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClientJavaDocCodeSnippets.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClientJavaDocCodeSnippets.java @@ -319,7 +319,7 @@ public void listAnomaliesForDetectionConfiguration() { final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); final ListAnomaliesDetectedFilter filter = new ListAnomaliesDetectedFilter() - .setSeverity(Severity.LOW, Severity.MEDIUM); + .setSeverityRange(Severity.LOW, Severity.MEDIUM); final ListAnomaliesDetectedOptions options = new ListAnomaliesDetectedOptions(startTime, endTime) .setTop(10) .setFilter(filter); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java index 6de0a95ad7eb..958d9c41cf4f 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java @@ -515,7 +515,7 @@ public void listAnomaliesForDetectionConfiguration() { final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); final ListAnomaliesDetectedFilter filter = new ListAnomaliesDetectedFilter() - .setSeverity(Severity.LOW, Severity.MEDIUM); + .setSeverityRange(Severity.LOW, Severity.MEDIUM); final ListAnomaliesDetectedOptions options = new ListAnomaliesDetectedOptions(startTime, endTime) .setTop(10) .setFilter(filter); @@ -543,7 +543,7 @@ public void listAnomaliesForDetectionConfigurationWithContext() { final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); final ListAnomaliesDetectedFilter filter = new ListAnomaliesDetectedFilter() - .setSeverity(Severity.LOW, Severity.MEDIUM); + .setSeverityRange(Severity.LOW, Severity.MEDIUM); final ListAnomaliesDetectedOptions options = new ListAnomaliesDetectedOptions(startTime, endTime) .setTop(10) .setFilter(filter); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java index 839c65a27dc5..5aee50a05723 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java @@ -10,18 +10,14 @@ import com.azure.ai.metricsadvisor.models.AnomalyDetectorDirection; import com.azure.ai.metricsadvisor.models.ChangeThresholdCondition; import com.azure.ai.metricsadvisor.models.DataFeed; -import com.azure.ai.metricsadvisor.models.DataFeedAccessMode; -import com.azure.ai.metricsadvisor.models.DataFeedAutoRollUpMethod; import com.azure.ai.metricsadvisor.models.DataFeedGranularity; import com.azure.ai.metricsadvisor.models.DataFeedGranularityType; import com.azure.ai.metricsadvisor.models.DataFeedIngestionSettings; -import com.azure.ai.metricsadvisor.models.DataFeedMissingDataPointFillSettings; -import com.azure.ai.metricsadvisor.models.DataFeedMissingDataPointFillType; import com.azure.ai.metricsadvisor.models.DataFeedOptions; import com.azure.ai.metricsadvisor.models.DataFeedRollupSettings; +import com.azure.ai.metricsadvisor.models.DataFeedRollupType; import com.azure.ai.metricsadvisor.models.DataFeedSchema; import com.azure.ai.metricsadvisor.models.DetectionConditionsOperator; -import com.azure.ai.metricsadvisor.models.Dimension; import com.azure.ai.metricsadvisor.models.EmailHook; import com.azure.ai.metricsadvisor.models.HardThresholdCondition; import com.azure.ai.metricsadvisor.models.Hook; @@ -34,6 +30,7 @@ import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertScope; import com.azure.ai.metricsadvisor.models.MetricWholeSeriesDetectionCondition; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; +import com.azure.ai.metricsadvisor.models.MySqlDataFeedSource; import com.azure.ai.metricsadvisor.models.SQLServerDataFeedSource; import com.azure.ai.metricsadvisor.models.Severity; import com.azure.ai.metricsadvisor.models.SeverityCondition; @@ -56,7 +53,7 @@ */ public class ReadmeSamples { private MetricsAdvisorClient metricsAdvisorClient = new MetricsAdvisorClientBuilder().buildClient(); - private MetricsAdvisorAdministrationClient metricsAdvisorAdministrationClient = + private MetricsAdvisorAdministrationClient metricsAdvisorAdminClient = new MetricsAdvisorAdministrationClientBuilder().buildClient(); /** @@ -75,7 +72,7 @@ public void useMetricsAdvisorKeyCredential() { */ public void getMetricsAdvisorAdministrationClient() { MetricsAdvisorKeyCredential credential = new MetricsAdvisorKeyCredential("subscription_key", "api_key"); - MetricsAdvisorAdministrationClient metricsAdvisorAdministrationClient = + MetricsAdvisorAdministrationClient metricsAdvisorAdminClient = new MetricsAdvisorAdministrationClientBuilder() .endpoint("{endpoint}") .credential(credential) @@ -86,26 +83,22 @@ public void getMetricsAdvisorAdministrationClient() { * Code snippet for creating a data feed. */ public void createDataFeed() { - final DataFeed createdSqlDataFeed = metricsAdvisorAdministrationClient.createDataFeed( - "My data feed name", - new SQLServerDataFeedSource("sql_server_connection_string", "query"), - new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY), - new DataFeedSchema(Arrays.asList( - new Metric().setName("cost"), - new Metric().setName("revenue"))) - .setDimensions(Arrays.asList( - new Dimension().setName("category"), - new Dimension().setName("city"))), - new DataFeedIngestionSettings(OffsetDateTime.parse("2020-01-01T00:00:00Z")), - new DataFeedOptions() - .setDescription("My data feed description") - .setRollupSettings( - new DataFeedRollupSettings() - .setAutoRollup(DataFeedAutoRollUpMethod.SUM, Arrays.asList("cost"), "__CUSTOM_SUM__")) - .setMissingDataPointFillSettings( - new DataFeedMissingDataPointFillSettings() - .setFillType(DataFeedMissingDataPointFillType.SMART_FILLING)) - .setAccessMode(DataFeedAccessMode.PUBLIC)); + DataFeed dataFeed = new DataFeed() + .setName("dataFeedName") + .setSource(new MySqlDataFeedSource("conn-string", "query")) + .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) + .setSchema(new DataFeedSchema( + Arrays.asList( + new Metric().setName("metric1"), + new Metric().setName("metric2") + ) + )) + .setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse("2020-01-01T00:00:00Z"))) + .setOptions(new DataFeedOptions() + .setDescription("data feed description") + .setRollupSettings(new DataFeedRollupSettings() + .setRollupType(DataFeedRollupType.AUTO_ROLLUP))); + final DataFeed createdSqlDataFeed = metricsAdvisorAdminClient.createDataFeed(dataFeed); System.out.printf("Data feed Id : %s%n", createdSqlDataFeed.getId()); System.out.printf("Data feed name : %s%n", createdSqlDataFeed.getName()); @@ -116,10 +109,10 @@ public void createDataFeed() { System.out.printf("Data feed granularity value : %d%n", createdSqlDataFeed.getGranularity().getCustomGranularityValue()); System.out.println("Data feed related metric Ids:"); - createdSqlDataFeed.getMetricIds().forEach(metricId -> System.out.println(metricId)); + createdSqlDataFeed.getMetricIds().forEach(System.out::println); System.out.printf("Data feed source type: %s%n", createdSqlDataFeed.getSourceType()); - if (SQL_SERVER_DB.equals(createdSqlDataFeed.getSourceType())) { + if (SQL_SERVER_DB == createdSqlDataFeed.getSourceType()) { System.out.printf("Data feed sql server query: %s%n", ((SQLServerDataFeedSource) createdSqlDataFeed.getSource()).getQuery()); } @@ -132,7 +125,7 @@ public void checkIngestionStatus() { String dataFeedId = "3d48er30-6e6e-4391-b78f-b00dfee1e6f5"; - metricsAdvisorAdministrationClient.listDataFeedIngestionStatus( + metricsAdvisorAdminClient.listDataFeedIngestionStatus( dataFeedId, new ListDataFeedIngestionOptions( OffsetDateTime.parse("2020-01-01T00:00:00Z"), @@ -168,7 +161,7 @@ public void configureAnomalyDetection() { .setSuppressCondition(new SuppressCondition().setMinNumber(1).setMinRatio(2)); final AnomalyDetectionConfiguration anomalyDetectionConfiguration = - metricsAdvisorAdministrationClient.createMetricAnomalyDetectionConfiguration( + metricsAdvisorAdminClient.createMetricAnomalyDetectionConfiguration( metricId, new AnomalyDetectionConfiguration("My Anomaly detection configuration") .setDescription("anomaly detection config description") @@ -190,7 +183,7 @@ public void createHook() { .addEmailToAlert("alertme@alertme.com") .setExternalLink("https://adwiki.azurewebsites.net/articles/howto/alerts/create-hooks.html"); - final Hook hook = metricsAdvisorAdministrationClient.createHook(emailHook); + final Hook hook = metricsAdvisorAdminClient.createHook(emailHook); EmailHook createdEmailHook = (EmailHook) hook; System.out.printf("Hook Id: %s%n", createdEmailHook.getId()); System.out.printf("Hook Name: %s%n", createdEmailHook.getName()); @@ -209,7 +202,7 @@ public void configureAlert() { String hookId2 = "8i48er30-6e6e-4391-b78f-b00dfee1e6f5"; final AnomalyAlertConfiguration anomalyAlertConfiguration - = metricsAdvisorAdministrationClient.createAnomalyAlertConfiguration( + = metricsAdvisorAdminClient.createAnomalyAlertConfiguration( new AnomalyAlertConfiguration("My Alert config name") .setDescription("alert config description") .setMetricAlertConfigurations( diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedAsyncSample.java index a01b849ab482..3567946affbf 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedAsyncSample.java @@ -32,14 +32,24 @@ public static void main(String[] args) { // Create Data feed System.out.printf("Creating Data feed%n"); + DataFeed appInsightsDataFeed = new DataFeed() + .setName("sample_db") + .setSource(new AzureAppInsightsDataFeedSource("application_id", "api_key", "azure_Cloud", "query")) + .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) + .setSchema( + new DataFeedSchema( + Arrays.asList( + new Metric().setName("cost"), + new Metric().setName("revenue") + )).setDimensions( + Arrays.asList( + new Dimension().setName("city"), + new Dimension().setName("category") + )) + ).setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse("2020-07-01T00:00:00Z"))); + final Mono createdDataFeedMono = advisorAdministrationAsyncClient - .createDataFeed("sample_db", - new AzureAppInsightsDataFeedSource("application_id", "api_key", "azure_Cloud", "query"), - new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY), - new DataFeedSchema(Arrays.asList(new Metric().setName("cost"), new Metric().setName( - "revenue"))).setDimensions(Arrays.asList(new Dimension().setName("city"), - new Dimension().setName("category"))), - new DataFeedIngestionSettings(OffsetDateTime.parse("2020-07-01T00:00:00Z")), null); + .createDataFeed(appInsightsDataFeed); createdDataFeedMono .doOnSubscribe(__ -> diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedSample.java index 67ef45592b06..4c4b3cd16701 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedSample.java @@ -31,14 +31,24 @@ public static void main(String[] args) { // Create Data feed System.out.printf("Creating Data feed%n"); + DataFeed appInsightsDataFeed = new DataFeed() + .setName("sample_db") + .setSource(new AzureAppInsightsDataFeedSource("application_id", "api_key", "azure_Cloud", "query")) + .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) + .setSchema( + new DataFeedSchema( + Arrays.asList( + new Metric().setName("cost"), + new Metric().setName("revenue") + )).setDimensions( + Arrays.asList( + new Dimension().setName("city"), + new Dimension().setName("category") + )) + ).setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse("2020-07-01T00:00:00Z"))); + DataFeed dataFeed = advisorAdministrationClient - .createDataFeed("sample_db", - new AzureAppInsightsDataFeedSource("application_id", "api_key", "azure_Cloud", "query"), - new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY), - new DataFeedSchema(Arrays.asList(new Metric().setName("cost"), new Metric().setName( - "revenue"))).setDimensions(Arrays.asList(new Dimension().setName("city"), - new Dimension().setName("category"))), - new DataFeedIngestionSettings(OffsetDateTime.parse("2020-07-01T00:00:00Z")), null); + .createDataFeed(appInsightsDataFeed); System.out.printf("Created data feed: %s%n", dataFeed.getId()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets.java index 3ea520204e93..970a293411d2 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets.java @@ -16,7 +16,6 @@ import com.azure.ai.metricsadvisor.models.DataFeedRollupSettings; import com.azure.ai.metricsadvisor.models.DataFeedRollupType; import com.azure.ai.metricsadvisor.models.DataFeedSchema; -import com.azure.ai.metricsadvisor.models.DataFeedSource; import com.azure.ai.metricsadvisor.models.DataFeedStatus; import com.azure.ai.metricsadvisor.models.DetectionConditionsOperator; import com.azure.ai.metricsadvisor.models.DimensionKey; @@ -54,7 +53,7 @@ * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient} */ public class MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets { - MetricsAdvisorAdministrationAsyncClient metricAdvisorAdministrationAsyncClient = + MetricsAdvisorAdministrationAsyncClient metricsAdvisorAdminAsyncClient = new MetricsAdvisorAdministrationClientBuilder().buildAsyncClient(); /** @@ -62,7 +61,7 @@ public class MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets { */ public void createMetricAdvisorAdministrationAsyncClient() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.instantiation - MetricsAdvisorAdministrationAsyncClient metricAdvisorAdministrationAsyncClient = + MetricsAdvisorAdministrationAsyncClient metricsAdvisorAdminAsyncClient = new MetricsAdvisorAdministrationClientBuilder() .credential(new MetricsAdvisorKeyCredential("{subscription_key}", "{api_key}")) .endpoint("{endpoint}") @@ -79,7 +78,7 @@ public void createMetricAdvisorAdministrationAsyncClientWithPipeline() { .policies(/* add policies */) .build(); - MetricsAdvisorAdministrationAsyncClient metricAdvisorAdministrationAsyncClient = + MetricsAdvisorAdministrationAsyncClient metricAdvisorAdminAsyncClient = new MetricsAdvisorAdministrationClientBuilder() .credential(new MetricsAdvisorKeyCredential("{subscription_key}", "{api_key}")) .endpoint("{endpoint}") @@ -91,53 +90,67 @@ public void createMetricAdvisorAdministrationAsyncClientWithPipeline() { // Create Data Feed /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#createDataFeed(String, - * DataFeedSource, DataFeedGranularity, DataFeedSchema, DataFeedIngestionSettings, DataFeedOptions)} + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#createDataFeed(DataFeed)} */ public void createDataFeed() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createDataFeed#String-DataFeedSource-DataFeedGranularity-DataFeedSchema-DataFeedIngestionSettings-DataFeedOptions - - metricAdvisorAdministrationAsyncClient.createDataFeed( - "dataFeedName", - new MySqlDataFeedSource("conn-string", "query"), - new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY), - new DataFeedSchema(Arrays.asList(new Metric().setName("metric1"), new Metric().setName("metric2"))), - new DataFeedIngestionSettings(OffsetDateTime.parse("")), - new DataFeedOptions().setDescription("data feed description") - .setRollupSettings(new DataFeedRollupSettings().setRollupType(DataFeedRollupType.AUTO_ROLLUP))) - .subscribe(dataFeed -> { - System.out.printf("Data feed Id: %s%n", dataFeed.getId()); - System.out.printf("Data feed description: %s%n", dataFeed.getOptions().getDescription()); - System.out.printf("Data feed source type: %.2f%n", dataFeed.getSourceType()); - System.out.printf("Data feed creator: %.2f%n", dataFeed.getCreator()); + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createDataFeed#DataFeed + DataFeed dataFeed = new DataFeed() + .setName("dataFeedName") + .setSource(new MySqlDataFeedSource("conn-string", "query")) + .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) + .setSchema(new DataFeedSchema( + Arrays.asList( + new Metric().setName("metric1"), + new Metric().setName("metric2") + ) + )) + .setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse("2020-01-01T00:00:00Z"))) + .setOptions(new DataFeedOptions() + .setDescription("data feed description") + .setRollupSettings(new DataFeedRollupSettings() + .setRollupType(DataFeedRollupType.AUTO_ROLLUP))); + + metricsAdvisorAdminAsyncClient.createDataFeed(dataFeed) + .subscribe(createdDataFeed -> { + System.out.printf("Data feed Id: %s%n", createdDataFeed.getId()); + System.out.printf("Data feed description: %s%n", createdDataFeed.getOptions().getDescription()); + System.out.printf("Data feed source type: %s%n", createdDataFeed.getSourceType()); + System.out.printf("Data feed creator: %s%n", createdDataFeed.getCreator()); }); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createDataFeed#String-DataFeedSource-DataFeedGranularity-DataFeedSchema-DataFeedIngestionSettings-DataFeedOptions + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createDataFeed#DataFeed } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#createDataFeedWithResponse(String, - * DataFeedSource, DataFeedGranularity, DataFeedSchema, DataFeedIngestionSettings, DataFeedOptions)} + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#createDataFeedWithResponse(DataFeed)} */ public void createDataFeedWithResponse() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createDataFeedWithResponse#String-DataFeedSource-DataFeedGranularity-DataFeedSchema-DataFeedIngestionSettings-DataFeedOptions - - metricAdvisorAdministrationAsyncClient.createDataFeedWithResponse( - "dataFeedName", - new MySqlDataFeedSource("conn-string", "query"), - new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY), - new DataFeedSchema(Arrays.asList(new Metric().setName("metric1"), new Metric().setName("metric2"))), - new DataFeedIngestionSettings(OffsetDateTime.parse("")), - new DataFeedOptions().setDescription("data feed description") - .setRollupSettings(new DataFeedRollupSettings().setRollupType(DataFeedRollupType.AUTO_ROLLUP))) + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createDataFeedWithResponse#DataFeed + DataFeed dataFeed = new DataFeed() + .setName("dataFeedName") + .setSource(new MySqlDataFeedSource("conn-string", "query")) + .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) + .setSchema(new DataFeedSchema( + Arrays.asList( + new Metric().setName("metric1"), + new Metric().setName("metric2") + ) + )) + .setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse("2020-01-01T00:00:00Z"))) + .setOptions(new DataFeedOptions() + .setDescription("data feed description") + .setRollupSettings(new DataFeedRollupSettings() + .setRollupType(DataFeedRollupType.AUTO_ROLLUP))); + + metricsAdvisorAdminAsyncClient.createDataFeedWithResponse(dataFeed) .subscribe(dataFeedResponse -> { System.out.printf("Data feed create operation status: %s%n", dataFeedResponse.getStatusCode()); - DataFeed dataFeed = dataFeedResponse.getValue(); - System.out.printf("Data feed Id: %s%n", dataFeed.getId()); - System.out.printf("Data feed description: %s%n", dataFeed.getOptions().getDescription()); - System.out.printf("Data feed source type: %.2f%n", dataFeed.getSourceType()); - System.out.printf("Data feed creator: %.2f%n", dataFeed.getCreator()); + DataFeed createdDataFeed = dataFeedResponse.getValue(); + System.out.printf("Data feed Id: %s%n", createdDataFeed.getId()); + System.out.printf("Data feed description: %s%n", createdDataFeed.getOptions().getDescription()); + System.out.printf("Data feed source type: %s%n", createdDataFeed.getSourceType()); + System.out.printf("Data feed creator: %s%n", createdDataFeed.getCreator()); }); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createDataFeedWithResponse#String-DataFeedSource-DataFeedGranularity-DataFeedSchema-DataFeedIngestionSettings-DataFeedOptions + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createDataFeedWithResponse#DataFeed } /** @@ -145,13 +158,13 @@ public void createDataFeedWithResponse() { */ public void getDataFeed() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getDataFeed#String - - metricAdvisorAdministrationAsyncClient.getDataFeed("dataFeedId") + final String dataFeedId = "r47053f1-9080-09lo-bacf-8dccf2e86f"; + metricsAdvisorAdminAsyncClient.getDataFeed(dataFeedId) .subscribe(dataFeed -> { System.out.printf("Data feed Id: %s%n", dataFeed.getId()); System.out.printf("Data feed description: %s%n", dataFeed.getOptions().getDescription()); - System.out.printf("Data feed source type: %.2f%n", dataFeed.getSourceType()); - System.out.printf("Data feed creator: %.2f%n", dataFeed.getCreator()); + System.out.printf("Data feed source type: %s%n", dataFeed.getSourceType()); + System.out.printf("Data feed creator: %s%n", dataFeed.getCreator()); }); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getDataFeed#String } @@ -161,15 +174,15 @@ public void getDataFeed() { */ public void getDataFeedWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getDataFeedWithResponse#String - - metricAdvisorAdministrationAsyncClient.getDataFeedWithResponse("dataFeedId") + final String dataFeedId = "r47053f1-9080-09lo-bacf-8dccf2e86f"; + metricsAdvisorAdminAsyncClient.getDataFeedWithResponse(dataFeedId) .subscribe(dataFeedResponse -> { - System.out.printf("Data feed create operation status: %s%n", dataFeedResponse.getStatusCode()); + System.out.printf("Data feed get operation status: %s%n", dataFeedResponse.getStatusCode()); DataFeed dataFeed = dataFeedResponse.getValue(); System.out.printf("Data feed Id: %s%n", dataFeed.getId()); System.out.printf("Data feed description: %s%n", dataFeed.getOptions().getDescription()); - System.out.printf("Data feed source type: %.2f%n", dataFeed.getSourceType()); - System.out.printf("Data feed creator: %.2f%n", dataFeed.getCreator()); + System.out.printf("Data feed source type: %s%n", dataFeed.getSourceType()); + System.out.printf("Data feed creator: %s%n", dataFeed.getCreator()); }); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getDataFeedWithResponse#String } @@ -179,12 +192,18 @@ public void getDataFeedWithResponse() { */ public void updateDataFeed() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateDataFeed#DataFeed - DataFeed existingDataFeed = new DataFeed(); - metricAdvisorAdministrationAsyncClient.updateDataFeed( - existingDataFeed.setOptions(new DataFeedOptions().setDescription("set updated description"))) - .subscribe(dataFeed -> { - System.out.printf("Data feed Id: %s%n", dataFeed.getId()); - System.out.printf("Data feed updated description: %s%n", dataFeed.getOptions().getDescription()); + final String dataFeedId = "r47053f1-9080-09lo-bacf-8dccf2e86f"; + metricsAdvisorAdminAsyncClient.getDataFeed(dataFeedId) + .flatMap(existingDataFeed -> { + return metricsAdvisorAdminAsyncClient.updateDataFeed( + existingDataFeed + .setOptions(new DataFeedOptions() + .setDescription("set updated description")) + ); + }) + .subscribe(updatedDataFeed -> { + System.out.printf("Data feed Id: %s%n", updatedDataFeed.getId()); + System.out.printf("Data feed updated description: %s%n", updatedDataFeed.getOptions().getDescription()); }); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateDataFeed#DataFeed } @@ -194,14 +213,20 @@ public void updateDataFeed() { */ public void updateDataFeedWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateDataFeedWithResponse#DataFeed - DataFeed existingDataFeed = new DataFeed(); - metricAdvisorAdministrationAsyncClient.updateDataFeedWithResponse( - existingDataFeed.setOptions(new DataFeedOptions().setDescription("set updated description"))) + final String dataFeedId = "r47053f1-9080-09lo-bacf-8dccf2e86f"; + metricsAdvisorAdminAsyncClient.getDataFeed(dataFeedId) + .flatMap(existingDataFeed -> { + return metricsAdvisorAdminAsyncClient.updateDataFeedWithResponse( + existingDataFeed + .setOptions(new DataFeedOptions() + .setDescription("set updated description")) + ); + }) .subscribe(dataFeedResponse -> { System.out.printf("Data feed update operation status: %s%n", dataFeedResponse.getStatusCode()); - DataFeed dataFeed = dataFeedResponse.getValue(); - System.out.printf("Data feed Id: %s%n", dataFeed.getId()); - System.out.printf("Data feed updated description: %s%n", dataFeed.getOptions().getDescription()); + DataFeed updatedDataFeed = dataFeedResponse.getValue(); + System.out.printf("Data feed Id: %s%n", updatedDataFeed.getId()); + System.out.printf("Data feed updated description: %s%n", updatedDataFeed.getOptions().getDescription()); }); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateDataFeedWithResponse#DataFeed } @@ -211,7 +236,8 @@ public void updateDataFeedWithResponse() { */ public void deleteDataFeed() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteDataFeed#String - metricAdvisorAdministrationAsyncClient.deleteDataFeed("dataFeedId"); + final String dataFeedId = "t00853f1-9080-447f-bacf-8dccf2e86f"; + metricsAdvisorAdminAsyncClient.deleteDataFeed(dataFeedId); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteDataFeed#String } @@ -220,10 +246,10 @@ public void deleteDataFeed() { */ public void deleteDataFeedWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteDataFeedWithResponse#String - metricAdvisorAdministrationAsyncClient.deleteDataFeedWithResponse("dataFeedId") - .subscribe(response -> { - System.out.printf("Data feed delete operation status : %s%n", response.getStatusCode()); - }); + final String dataFeedId = "eh0854f1-8927-447f-bacf-8dccf2e86fwe"; + metricsAdvisorAdminAsyncClient.deleteDataFeedWithResponse(dataFeedId) + .subscribe(response -> + System.out.printf("Data feed delete operation status : %s%n", response.getStatusCode())); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteDataFeedWithResponse#String } @@ -232,12 +258,12 @@ public void deleteDataFeedWithResponse() { */ public void listDataFeeds() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listDataFeeds - metricAdvisorAdministrationAsyncClient.listDataFeeds() + metricsAdvisorAdminAsyncClient.listDataFeeds() .subscribe(dataFeed -> { System.out.printf("Data feed Id: %s%n", dataFeed.getId()); System.out.printf("Data feed description: %s%n", dataFeed.getOptions().getDescription()); - System.out.printf("Data feed source type: %.2f%n", dataFeed.getSourceType()); - System.out.printf("Data feed creator: %.2f%n", dataFeed.getCreator()); + System.out.printf("Data feed source type: %s%n", dataFeed.getSourceType()); + System.out.printf("Data feed creator: %s%n", dataFeed.getCreator()); }); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listDataFeeds } @@ -247,7 +273,7 @@ public void listDataFeeds() { */ public void listDataFeedWithOptions() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listDataFeeds#ListDataFeedOptions - metricAdvisorAdministrationAsyncClient.listDataFeeds( + metricsAdvisorAdminAsyncClient.listDataFeeds( new ListDataFeedOptions() .setListDataFeedFilter( new ListDataFeedFilter() @@ -257,10 +283,10 @@ public void listDataFeedWithOptions() { .subscribe(dataFeed -> { System.out.printf("Data feed Id: %s%n", dataFeed.getId()); System.out.printf("Data feed description: %s%n", dataFeed.getOptions().getDescription()); - System.out.printf("Data feed source type: %.2f%n", dataFeed.getSourceType()); - System.out.printf("Data feed creator: %.2f%n", dataFeed.getCreator()); - System.out.printf("Data feed status: %.2f%n", dataFeed.getStatus()); - System.out.printf("Data feed granularity type: %.2f%n", dataFeed.getGranularity().getGranularityType()); + System.out.printf("Data feed source type: %s%n", dataFeed.getSourceType()); + System.out.printf("Data feed creator: %s%n", dataFeed.getCreator()); + System.out.printf("Data feed status: %s%n", dataFeed.getStatus()); + System.out.printf("Data feed granularity type: %s%n", dataFeed.getGranularity().getGranularityType()); }); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listDataFeeds#ListDataFeedOptions } @@ -275,7 +301,7 @@ public void createHook() { .addEmailToAlert("alertme@alertme.com") .setExternalLink("https://adwiki.azurewebsites.net/articles/howto/alerts/create-hooks.html"); - metricAdvisorAdministrationAsyncClient.createHook(emailHook) + metricsAdvisorAdminAsyncClient.createHook(emailHook) .subscribe(hook -> { EmailHook createdEmailHook = (EmailHook) hook; System.out.printf("Hook Id: %s%n", createdEmailHook.getId()); @@ -297,7 +323,7 @@ public void createHookWithResponse() { .addEmailToAlert("alertme@alertme.com") .setExternalLink("https://adwiki.azurewebsites.net/articles/howto/alerts/create-hooks.html"); - metricAdvisorAdministrationAsyncClient.createHookWithResponse(emailHook) + metricsAdvisorAdminAsyncClient.createHookWithResponse(emailHook) .subscribe(response -> { System.out.printf("Response statusCode: %d%n", response.getStatusCode()); EmailHook createdEmailHook = (EmailHook) response.getValue(); @@ -316,7 +342,7 @@ public void createHookWithResponse() { public void getHook() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getHook#String final String hookId = "f00853f1-6627-447f-bacf-8dccf2e86fed"; - metricAdvisorAdministrationAsyncClient.getHook(hookId) + metricsAdvisorAdminAsyncClient.getHook(hookId) .subscribe(hook -> { if (hook instanceof EmailHook) { EmailHook emailHook = (EmailHook) hook; @@ -344,9 +370,9 @@ public void getHook() { public void getHookWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getHookWithResponse#String final String hookId = "f00853f1-6627-447f-bacf-8dccf2e86fed"; - metricAdvisorAdministrationAsyncClient.getHookWithResponse(hookId) + metricsAdvisorAdminAsyncClient.getHookWithResponse(hookId) .subscribe(response -> { - System.out.printf("Response statusCode: %d%n", response.getStatusCode()); + System.out.printf("Response status code: %d%n", response.getStatusCode()); Hook hook = response.getValue(); if (hook instanceof EmailHook) { EmailHook emailHook = (EmailHook) hook; @@ -374,14 +400,14 @@ public void getHookWithResponse() { public void updateHook() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateHook#Hook final String emailHookId = "f00853f1-6627-447f-bacf-8dccf2e86fed"; - metricAdvisorAdministrationAsyncClient.getHook(emailHookId) + metricsAdvisorAdminAsyncClient.getHook(emailHookId) .flatMap(hook -> { EmailHook emailHook = (EmailHook) hook; emailHook .removeEmailToAlert("alertme@alertme.com") .addEmailToAlert("alertme2@alertme.com") .addEmailToAlert("alertme3@alertme.com"); - return metricAdvisorAdministrationAsyncClient.updateHook(emailHook); + return metricsAdvisorAdminAsyncClient.updateHook(emailHook); }) .subscribe(hook -> { EmailHook emailHook = (EmailHook) hook; @@ -400,14 +426,14 @@ public void updateHook() { public void updateHookWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateHookWithResponse#Hook final String emailHookId = "f00853f1-6627-447f-bacf-8dccf2e86fed"; - metricAdvisorAdministrationAsyncClient.getHookWithResponse(emailHookId) + metricsAdvisorAdminAsyncClient.getHookWithResponse(emailHookId) .flatMap(response -> { EmailHook emailHook = (EmailHook) response.getValue(); emailHook .removeEmailToAlert("alertme@alertme.com") .addEmailToAlert("alertme2@alertme.com") .addEmailToAlert("alertme3@alertme.com"); - return metricAdvisorAdministrationAsyncClient.updateHookWithResponse(emailHook); + return metricsAdvisorAdminAsyncClient.updateHookWithResponse(emailHook); }) .subscribe(response -> { System.out.printf("Response statusCode: %d%n", response.getStatusCode()); @@ -427,7 +453,7 @@ public void updateHookWithResponse() { public void deleteHook() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteHook#String final String emailHookId = "f00853f1-6627-447f-bacf-8dccf2e86fed"; - metricAdvisorAdministrationAsyncClient.deleteHook(emailHookId); + metricsAdvisorAdminAsyncClient.deleteHook(emailHookId); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteHook#String } @@ -437,7 +463,7 @@ public void deleteHook() { public void deleteHookWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteHookWithResponse#String final String emailHookId = "f00853f1-6627-447f-bacf-8dccf2e86fed"; - metricAdvisorAdministrationAsyncClient.deleteHookWithResponse(emailHookId) + metricsAdvisorAdminAsyncClient.deleteHookWithResponse(emailHookId) .subscribe(response -> { System.out.printf("Response statusCode: %d%n", response.getStatusCode()); }); @@ -449,7 +475,7 @@ public void deleteHookWithResponse() { */ public void listHooks() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listHooks - metricAdvisorAdministrationAsyncClient.listHooks() + metricsAdvisorAdminAsyncClient.listHooks() .subscribe(hook -> { if (hook instanceof EmailHook) { EmailHook emailHook = (EmailHook) hook; @@ -480,7 +506,7 @@ public void listHooksWithOptions() { .setSkip(100) .setTop(20); int[] pageCount = new int[1]; - metricAdvisorAdministrationAsyncClient.listHooks(options).byPage() + metricsAdvisorAdminAsyncClient.listHooks(options).byPage() .subscribe(hookPage -> { System.out.printf("Page: %d%n", pageCount[0]++); for (Hook hook : hookPage.getElements()) { @@ -516,7 +542,7 @@ public void listDataFeedIngestionStatus() { final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final ListDataFeedIngestionOptions options = new ListDataFeedIngestionOptions(startTime, endTime); - metricAdvisorAdministrationAsyncClient.listDataFeedIngestionStatus(dataFeedId, options) + metricsAdvisorAdminAsyncClient.listDataFeedIngestionStatus(dataFeedId, options) .subscribe(ingestionStatus -> { System.out.printf("Timestamp: %s%n", ingestionStatus.getTimestamp()); System.out.printf("Status: %s%n", ingestionStatus.getStatus()); @@ -533,7 +559,7 @@ public void refreshDataFeedIngestion() { final String dataFeedId = "4957a2f7-a0f4-4fc0-b8d7-d866c1df0f4c"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-03-03T00:00:00Z"); - metricAdvisorAdministrationAsyncClient.refreshDataFeedIngestion(dataFeedId, + metricsAdvisorAdminAsyncClient.refreshDataFeedIngestion(dataFeedId, startTime, endTime).subscribe(); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.refreshDataFeedIngestion#String-OffsetDateTime-OffsetDateTime @@ -547,7 +573,7 @@ public void refreshDataFeedIngestionWithResponse() { final String dataFeedId = "4957a2f7-a0f4-4fc0-b8d7-d866c1df0f4c"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-03-03T00:00:00Z"); - metricAdvisorAdministrationAsyncClient.refreshDataFeedIngestionWithResponse(dataFeedId, + metricsAdvisorAdminAsyncClient.refreshDataFeedIngestionWithResponse(dataFeedId, startTime, endTime) .subscribe(response -> { @@ -562,7 +588,7 @@ public void refreshDataFeedIngestionWithResponse() { public void getDataFeedIngestionProgress() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getDataFeedIngestionProgress#String final String dataFeedId = "4957a2f7-a0f4-4fc0-b8d7-d866c1df0f4c"; - metricAdvisorAdministrationAsyncClient.getDataFeedIngestionProgress(dataFeedId) + metricsAdvisorAdminAsyncClient.getDataFeedIngestionProgress(dataFeedId) .subscribe(ingestionProgress -> { System.out.printf("Latest active timestamp: %s%n", ingestionProgress.getLatestActiveTimestamp()); System.out.printf("Latest successful timestamp: %s%n", ingestionProgress.getLatestSuccessTimestamp()); @@ -576,7 +602,7 @@ public void getDataFeedIngestionProgress() { public void getDataFeedIngestionProgressWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getDataFeedIngestionProgressWithResponse#String final String dataFeedId = "4957a2f7-a0f4-4fc0-b8d7-d866c1df0f4c"; - metricAdvisorAdministrationAsyncClient.getDataFeedIngestionProgressWithResponse(dataFeedId, Context.NONE) + metricsAdvisorAdminAsyncClient.getDataFeedIngestionProgressWithResponse(dataFeedId, Context.NONE) .subscribe(response -> { System.out.printf("Response statusCode: %d%n", response.getStatusCode()); DataFeedIngestionProgress ingestionProgress = response.getValue(); @@ -617,7 +643,7 @@ public void createDetectionConfiguration() { .setWholeSeriesDetectionCondition(wholeSeriesCondition); final String metricId = "0b836da8-10e6-46cd-8f4f-28262e113a62"; - metricAdvisorAdministrationAsyncClient + metricsAdvisorAdminAsyncClient .createMetricAnomalyDetectionConfiguration(metricId, detectionConfig) .subscribe(createdDetectionConfig -> { System.out.printf("Detection config Id: %s%n", createdDetectionConfig.getId()); @@ -659,7 +685,7 @@ public void createDetectionConfigurationWithResponse() { .setWholeSeriesDetectionCondition(wholeSeriesCondition); final String metricId = "0b836da8-10e6-46cd-8f4f-28262e113a62"; - metricAdvisorAdministrationAsyncClient + metricsAdvisorAdminAsyncClient .createMetricAnomalyDetectionConfigurationWithResponse(metricId, detectionConfig) .subscribe(response -> { System.out.printf("Response statusCode: %d%n", response.getStatusCode()); @@ -678,7 +704,7 @@ public void createDetectionConfigurationWithResponse() { public void getDetectionConfiguration() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getMetricAnomalyDetectionConfiguration#String final String detectionConfigId = "7b8069a1-1564-46da-9f50-b5d0dd9129ab"; - metricAdvisorAdministrationAsyncClient + metricsAdvisorAdminAsyncClient .getMetricAnomalyDetectionConfiguration(detectionConfigId) .subscribe(detectionConfig -> { System.out.printf("Detection config Id: %s%n", detectionConfig.getId()); @@ -855,7 +881,7 @@ public void getDetectionConfiguration() { public void getDetectionConfigurationWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getMetricAnomalyDetectionConfigurationWithResponse#String final String detectionConfigId = "7b8069a1-1564-46da-9f50-b5d0dd9129ab"; - metricAdvisorAdministrationAsyncClient + metricsAdvisorAdminAsyncClient .getMetricAnomalyDetectionConfigurationWithResponse(detectionConfigId) .subscribe(response -> { System.out.printf("Response statusCode: %d%n", response.getStatusCode()); @@ -1035,7 +1061,7 @@ public void getDetectionConfigurationWithResponse() { public void listDetectionConfigurations() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listMetricAnomalyDetectionConfigurations#String final String metricId = "0b836da8-10e6-46cd-8f4f-28262e113a62"; - metricAdvisorAdministrationAsyncClient.listMetricAnomalyDetectionConfigurations(metricId) + metricsAdvisorAdminAsyncClient.listMetricAnomalyDetectionConfigurations(metricId) .subscribe(detectionConfig -> { System.out.printf("Detection config Id: %s%n", detectionConfig.getId()); System.out.printf("Name: %s%n", detectionConfig.getName()); @@ -1051,7 +1077,7 @@ public void listDetectionConfigurations() { public void updateDetectionConfiguration() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateMetricAnomalyDetectionConfiguration#AnomalyDetectionConfiguration final String detectionConfigId = "7b8069a1-1564-46da-9f50-b5d0dd9129ab"; - metricAdvisorAdministrationAsyncClient + metricsAdvisorAdminAsyncClient .getMetricAnomalyDetectionConfiguration(detectionConfigId) .flatMap(detectionConfig -> { detectionConfig.setName("updated config name"); @@ -1065,7 +1091,7 @@ public void updateDetectionConfiguration() { .setSensitivity(10.0) .setAnomalyDetectorDirection(AnomalyDetectorDirection.UP) .setSuppressCondition(new SuppressCondition().setMinNumber(2).setMinRatio(2)))); - return metricAdvisorAdministrationAsyncClient + return metricsAdvisorAdminAsyncClient .updateMetricAnomalyDetectionConfiguration(detectionConfig); }) .subscribe(updatedDetectionConfig -> { @@ -1083,7 +1109,7 @@ public void updateDetectionConfiguration() { public void updateDetectionConfigurationWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateMetricAnomalyDetectionConfigurationWithResponse#AnomalyDetectionConfiguration final String detectionConfigId = "7b8069a1-1564-46da-9f50-b5d0dd9129ab"; - metricAdvisorAdministrationAsyncClient + metricsAdvisorAdminAsyncClient .getMetricAnomalyDetectionConfigurationWithResponse(detectionConfigId) .flatMap(response -> { AnomalyDetectionConfiguration detectionConfig = response.getValue(); @@ -1097,7 +1123,7 @@ public void updateDetectionConfigurationWithResponse() { .setSensitivity(10.0) .setAnomalyDetectorDirection(AnomalyDetectorDirection.UP) .setSuppressCondition(new SuppressCondition().setMinNumber(2).setMinRatio(2)))); - return metricAdvisorAdministrationAsyncClient + return metricsAdvisorAdminAsyncClient .updateMetricAnomalyDetectionConfigurationWithResponse(detectionConfig); }) .subscribe(response -> { @@ -1116,7 +1142,7 @@ public void updateDetectionConfigurationWithResponse() { public void deleteDetectionConfiguration() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteMetricAnomalyDetectionConfiguration#String final String detectionConfigId = "7b8069a1-1564-46da-9f50-b5d0dd9129ab"; - metricAdvisorAdministrationAsyncClient + metricsAdvisorAdminAsyncClient .deleteMetricAnomalyDetectionConfiguration(detectionConfigId) .subscribe(); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteMetricAnomalyDetectionConfiguration#String @@ -1128,11 +1154,10 @@ public void deleteDetectionConfiguration() { public void deleteDetectionConfigurationWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteMetricAnomalyDetectionConfigurationWithResponse#String final String detectionConfigId = "7b8069a1-1564-46da-9f50-b5d0dd9129ab"; - metricAdvisorAdministrationAsyncClient + metricsAdvisorAdminAsyncClient .deleteMetricAnomalyDetectionConfigurationWithResponse(detectionConfigId) - .subscribe(response -> { - System.out.printf("Response statusCode: %d%n", response.getStatusCode()); - }); + .subscribe(response -> + System.out.printf("Response statusCode: %d%n", response.getStatusCode())); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteMetricAnomalyDetectionConfigurationWithResponse#String } @@ -1146,7 +1171,7 @@ public void createAnomalyAlertConfiguration() { String hookId1 = "5f48er30-6e6e-4391-b78f-b00dfee1e6f5"; String hookId2 = "8i48er30-6e6e-4391-b78f-b00dfee1e6f5"; - metricAdvisorAdministrationAsyncClient.createAnomalyAlertConfiguration( + metricsAdvisorAdminAsyncClient.createAnomalyAlertConfiguration( new AnomalyAlertConfiguration("My Alert config name") .setDescription("alert config description") .setMetricAlertConfigurations(Arrays.asList( @@ -1162,7 +1187,7 @@ public void createAnomalyAlertConfiguration() { System.out.printf("Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); System.out.printf("Anomaly alert configuration description: %s%n", anomalyAlertConfiguration.getDescription()); - System.out.printf("Anomaly alert configuration hook ids: %.2f%n", + System.out.printf("Anomaly alert configuration hook ids: %s%n", anomalyAlertConfiguration.getIdOfHooksToAlert()); System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", anomalyAlertConfiguration.getCrossMetricsOperator().toString()); @@ -1181,7 +1206,7 @@ public void createAnomalyAlertConfigurationWithResponse() { String hookId1 = "5f48er30-6e6e-4391-b78f-b00dfee1e6f5"; String hookId2 = "8i48er30-6e6e-4391-b78f-b00dfee1e6f5"; - metricAdvisorAdministrationAsyncClient.createAnomalyAlertConfigurationWithResponse( + metricsAdvisorAdminAsyncClient.createAnomalyAlertConfigurationWithResponse( new AnomalyAlertConfiguration("My Alert config name") .setDescription("alert config description") .setMetricAlertConfigurations(Arrays.asList( @@ -1215,12 +1240,12 @@ public void getAnomalyAlertConfiguration() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getAnomalyAlertConfiguration#String String alertConfigId = "1p0f8er30-6e6e-4391-b78f-bpfdfee1e6f5"; - metricAdvisorAdministrationAsyncClient.getAnomalyAlertConfiguration(alertConfigId) + metricsAdvisorAdminAsyncClient.getAnomalyAlertConfiguration(alertConfigId) .subscribe(anomalyAlertConfiguration -> { System.out.printf("Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); System.out.printf("Anomaly alert configuration description: %s%n", anomalyAlertConfiguration.getDescription()); - System.out.printf("Anomaly alert configuration hook ids: %.2f%n", + System.out.printf("Anomaly alert configuration hook ids: %s%n", anomalyAlertConfiguration.getIdOfHooksToAlert()); System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", anomalyAlertConfiguration.getCrossMetricsOperator().toString()); @@ -1235,7 +1260,7 @@ public void getAnomalyAlertConfigurationWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getAnomalyAlertConfigurationWithResponse#String String alertConfigId = "1p0f8er30-6e6e-4391-b78f-bpfdfee1e6f5"; - metricAdvisorAdministrationAsyncClient.getAnomalyAlertConfigurationWithResponse(alertConfigId) + metricsAdvisorAdminAsyncClient.getAnomalyAlertConfigurationWithResponse(alertConfigId) .subscribe(alertConfigurationResponse -> { System.out.printf("Anomaly alert creation operation status: %s%n", alertConfigurationResponse.getStatusCode()); @@ -1243,7 +1268,7 @@ public void getAnomalyAlertConfigurationWithResponse() { System.out.printf("Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); System.out.printf("Anomaly alert configuration description: %s%n", anomalyAlertConfiguration.getDescription()); - System.out.printf("Anomaly alert configuration hook ids: %.2f%n", + System.out.printf("Anomaly alert configuration hook ids: %s%n", anomalyAlertConfiguration.getIdOfHooksToAlert()); System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", anomalyAlertConfiguration.getCrossMetricsOperator().toString()); @@ -1260,9 +1285,9 @@ public void updateAnomalyAlertConfiguration() { String alertConfigId = "1p0f8er30-6e6e-4391-b78f-bpfdfee1e6f5"; String additionalHookId = "2gh8er30-6e6e-4391-b78f-bpfdfee1e6f5"; - metricAdvisorAdministrationAsyncClient.getAnomalyAlertConfiguration(alertConfigId) + metricsAdvisorAdminAsyncClient.getAnomalyAlertConfiguration(alertConfigId) .flatMap(existingAnomalyConfig -> { - return metricAdvisorAdministrationAsyncClient.updateAnomalyAlertConfiguration( + return metricsAdvisorAdminAsyncClient.updateAnomalyAlertConfiguration( existingAnomalyConfig .addIdOfHookToAlert(additionalHookId) .setDescription("updated to add more hook ids")); @@ -1271,7 +1296,7 @@ public void updateAnomalyAlertConfiguration() { updateAnomalyAlertConfiguration.getId()); System.out.printf("Updated anomaly alert configuration description: %s%n", updateAnomalyAlertConfiguration.getDescription()); - System.out.printf("Updated anomaly alert configuration hook ids: %.2f%n", + System.out.printf("Updated anomaly alert configuration hook ids: %s%n", updateAnomalyAlertConfiguration.getIdOfHooksToAlert()); }); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateAnomalyAlertConfiguration#AnomalyAlertConfiguration @@ -1286,9 +1311,9 @@ public void updateAnomalyAlertConfigurationWithResponse() { String alertConfigId = "1p0f8er30-6e6e-4391-b78f-bpfdfee1e6f5"; String additionalHookId = "2gh8er30-6e6e-4391-b78f-bpfdfee1e6f5"; - metricAdvisorAdministrationAsyncClient.getAnomalyAlertConfiguration(alertConfigId) + metricsAdvisorAdminAsyncClient.getAnomalyAlertConfiguration(alertConfigId) .flatMap(existingAnomalyConfig -> { - return metricAdvisorAdministrationAsyncClient.updateAnomalyAlertConfigurationWithResponse( + return metricsAdvisorAdminAsyncClient.updateAnomalyAlertConfigurationWithResponse( existingAnomalyConfig .addIdOfHookToAlert(additionalHookId) .setDescription("updated to add more hook ids")); @@ -1300,7 +1325,7 @@ public void updateAnomalyAlertConfigurationWithResponse() { updatAnomalyAlertConfiguration.getId()); System.out.printf("Updated anomaly alert configuration description: %s%n", updatAnomalyAlertConfiguration.getDescription()); - System.out.printf("Updated anomaly alert configuration hook ids: %.2f%n", + System.out.printf("Updated anomaly alert configuration hook ids: %s%n", updatAnomalyAlertConfiguration.getIdOfHooksToAlert()); }); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateAnomalyAlertConfigurationWithResponse#AnomalyAlertConfiguration @@ -1312,7 +1337,7 @@ public void updateAnomalyAlertConfigurationWithResponse() { public void deleteAnomalyAlertConfiguration() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteAnomalyAlertConfiguration#String String alertConfigId = "1p0f8er30-6e6e-4391-b78f-bpfdfee1e6f5"; - metricAdvisorAdministrationAsyncClient.deleteAnomalyAlertConfiguration(alertConfigId); + metricsAdvisorAdminAsyncClient.deleteAnomalyAlertConfiguration(alertConfigId); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteAnomalyAlertConfiguration#String } @@ -1323,7 +1348,7 @@ public void deleteAnomalyAlertConfigurationWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteAnomalyAlertConfigurationWithResponse#String String alertConfigId = "1p0f8er30-6e6e-4391-b78f-bpfdfee1e6f5"; - metricAdvisorAdministrationAsyncClient.deleteAnomalyAlertConfigurationWithResponse(alertConfigId) + metricsAdvisorAdminAsyncClient.deleteAnomalyAlertConfigurationWithResponse(alertConfigId) .subscribe(response -> { System.out.printf("Anomaly alert config delete operation status : %s%n", response.getStatusCode()); }); @@ -1336,12 +1361,12 @@ public void deleteAnomalyAlertConfigurationWithResponse() { public void listAnomalyAlertConfigurations() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listAnomalyAlertConfigurations#String String detectionConfigId = "3rt98er30-6e6e-4391-b78f-bpfdfee1e6f5"; - metricAdvisorAdministrationAsyncClient.listAnomalyAlertConfigurations(detectionConfigId) + metricsAdvisorAdminAsyncClient.listAnomalyAlertConfigurations(detectionConfigId) .subscribe(anomalyAlertConfiguration -> { System.out.printf("Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); System.out.printf("Anomaly alert configuration description: %s%n", anomalyAlertConfiguration.getDescription()); - System.out.printf("Anomaly alert configuration hook ids: %.2f%n", + System.out.printf("Anomaly alert configuration hook ids: %s%n", anomalyAlertConfiguration.getIdOfHooksToAlert()); System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", anomalyAlertConfiguration.getCrossMetricsOperator().toString()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClientJavaDocCodeSnippets.java index bb693cd0c535..abc9eafa5bd1 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClientJavaDocCodeSnippets.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClientJavaDocCodeSnippets.java @@ -17,7 +17,6 @@ import com.azure.ai.metricsadvisor.models.DataFeedRollupSettings; import com.azure.ai.metricsadvisor.models.DataFeedRollupType; import com.azure.ai.metricsadvisor.models.DataFeedSchema; -import com.azure.ai.metricsadvisor.models.DataFeedSource; import com.azure.ai.metricsadvisor.models.DataFeedStatus; import com.azure.ai.metricsadvisor.models.DetectionConditionsOperator; import com.azure.ai.metricsadvisor.models.DimensionKey; @@ -60,7 +59,7 @@ * Code snippet for {@link MetricsAdvisorAdministrationClient} */ public class MetricsAdvisorAdministrationClientJavaDocCodeSnippets { - private MetricsAdvisorAdministrationClient metricsAdvisorAdministrationClient = + private MetricsAdvisorAdministrationClient metricsAdvisorAdminClient = new MetricsAdvisorAdministrationClientBuilder().buildClient(); /** @@ -68,7 +67,7 @@ public class MetricsAdvisorAdministrationClientJavaDocCodeSnippets { */ public void createMetricsAdvisorAdministrationClient() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.instantiation - MetricsAdvisorAdministrationClient metricsAdvisorAdministrationClient = + MetricsAdvisorAdministrationClient metricsAdvisorAdminClient = new MetricsAdvisorAdministrationClientBuilder() .credential(new MetricsAdvisorKeyCredential("{subscription_key}", "{api_key}")) .endpoint("{endpoint}") @@ -97,55 +96,66 @@ public void createMetricsAdvisorAdministrationClientWithPipeline() { // Create Data Feed /** - * Code snippet for {@link MetricsAdvisorAdministrationClient#createDataFeed(String, DataFeedSource, - * DataFeedGranularity, DataFeedSchema, DataFeedIngestionSettings, DataFeedOptions)} + * Code snippet for {@link MetricsAdvisorAdministrationClient#createDataFeed(DataFeed)} */ public void createDataFeed() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createDataFeed#String-DataFeedSource-DataFeedGranularity-DataFeedSchema-DataFeedIngestionSettings-DataFeedOptions - - DataFeed createdDataFeed = metricsAdvisorAdministrationClient.createDataFeed( - "dataFeedName", - new MySqlDataFeedSource("conn-string", "query"), - new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY), - new DataFeedSchema(Arrays.asList(new Metric().setName("metric1"), new Metric().setName( - "metric2"))), - new DataFeedIngestionSettings(OffsetDateTime.parse("")), - new DataFeedOptions().setDescription("data feed description") - .setRollupSettings(new DataFeedRollupSettings().setRollupType(DataFeedRollupType.AUTO_ROLLUP))); + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createDataFeed#DataFeed + DataFeed dataFeed = new DataFeed() + .setName("dataFeedName") + .setSource(new MySqlDataFeedSource("conn-string", "query")) + .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) + .setSchema(new DataFeedSchema( + Arrays.asList( + new Metric().setName("metric1"), + new Metric().setName("metric2") + ) + )) + .setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse("2020-01-01T00:00:00Z"))) + .setOptions(new DataFeedOptions() + .setDescription("data feed description") + .setRollupSettings(new DataFeedRollupSettings() + .setRollupType(DataFeedRollupType.AUTO_ROLLUP))); + + DataFeed createdDataFeed = metricsAdvisorAdminClient.createDataFeed(dataFeed); System.out.printf("Data feed Id: %s%n", createdDataFeed.getId()); System.out.printf("Data feed description: %s%n", createdDataFeed.getOptions().getDescription()); - System.out.printf("Data feed source type: %.2f%n", createdDataFeed.getSourceType()); - System.out.printf("Data feed creator: %.2f%n", createdDataFeed.getCreator()); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createDataFeed#String-DataFeedSource-DataFeedGranularity-DataFeedSchema-DataFeedIngestionSettings-DataFeedOptions + System.out.printf("Data feed source type: %s%n", createdDataFeed.getSourceType()); + System.out.printf("Data feed creator: %s%n", createdDataFeed.getCreator()); + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createDataFeed#DataFeed } /** - * Code snippet for {@link MetricsAdvisorAdministrationClient#createDataFeedWithResponse(String, - * DataFeedSource, DataFeedGranularity, DataFeedSchema, DataFeedIngestionSettings, DataFeedOptions, Context)} + * Code snippet for {@link MetricsAdvisorAdministrationClient#createDataFeedWithResponse(DataFeed, Context)} */ public void createDataFeedWithResponse() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createDataFeedWithResponse#String-DataFeedSource-DataFeedGranularity-DataFeedSchema-DataFeedIngestionSettings-DataFeedOptions-Context + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createDataFeedWithResponse#DataFeed-Context + DataFeed dataFeed = new DataFeed() + .setName("dataFeedName") + .setSource(new MySqlDataFeedSource("conn-string", "query")) + .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) + .setSchema(new DataFeedSchema( + Arrays.asList( + new Metric().setName("metric1"), + new Metric().setName("metric2") + ) + )) + .setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse("2020-01-01T00:00:00Z"))) + .setOptions(new DataFeedOptions() + .setDescription("data feed description") + .setRollupSettings(new DataFeedRollupSettings() + .setRollupType(DataFeedRollupType.AUTO_ROLLUP))); final Response createdDataFeedResponse = - metricsAdvisorAdministrationClient.createDataFeedWithResponse( - "dataFeedName", - new MySqlDataFeedSource("conn-string", "query"), - new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY), - new DataFeedSchema(Arrays.asList(new Metric().setName("metric1"), new Metric().setName( - "metric2"))), - new DataFeedIngestionSettings(OffsetDateTime.parse("")), - new DataFeedOptions().setDescription("data feed description") - .setRollupSettings(new DataFeedRollupSettings().setRollupType(DataFeedRollupType.AUTO_ROLLUP)), - Context.NONE); + metricsAdvisorAdminClient.createDataFeedWithResponse(dataFeed, Context.NONE); System.out.printf("Data feed create operation status: %s%n", createdDataFeedResponse.getStatusCode()); - DataFeed dataFeed = createdDataFeedResponse.getValue(); - System.out.printf("Data feed Id: %s%n", dataFeed.getId()); - System.out.printf("Data feed description: %s%n", dataFeed.getOptions().getDescription()); - System.out.printf("Data feed source type: %.2f%n", dataFeed.getSourceType()); - System.out.printf("Data feed creator: %.2f%n", dataFeed.getCreator()); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createDataFeedWithResponse#String-DataFeedSource-DataFeedGranularity-DataFeedSchema-DataFeedIngestionSettings-DataFeedOptions-Context + DataFeed createdDataFeed = createdDataFeedResponse.getValue(); + System.out.printf("Data feed Id: %s%n", createdDataFeed.getId()); + System.out.printf("Data feed description: %s%n", createdDataFeed.getOptions().getDescription()); + System.out.printf("Data feed source type: %s%n", createdDataFeed.getSourceType()); + System.out.printf("Data feed creator: %s%n", createdDataFeed.getCreator()); + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createDataFeedWithResponse#DataFeed-Context } /** @@ -153,12 +163,12 @@ public void createDataFeedWithResponse() { */ public void getDataFeed() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getDataFeed#String - - DataFeed dataFeed = metricsAdvisorAdministrationClient.getDataFeed("dataFeedId"); + final String dataFeedId = "r47053f1-9080-09lo-bacf-8dccf2e86f"; + DataFeed dataFeed = metricsAdvisorAdminClient.getDataFeed(dataFeedId); System.out.printf("Data feed Id: %s%n", dataFeed.getId()); System.out.printf("Data feed description: %s%n", dataFeed.getOptions().getDescription()); - System.out.printf("Data feed source type: %.2f%n", dataFeed.getSourceType()); - System.out.printf("Data feed creator: %.2f%n", dataFeed.getCreator()); + System.out.printf("Data feed source type: %s%n", dataFeed.getSourceType()); + System.out.printf("Data feed creator: %s%n", dataFeed.getCreator()); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getDataFeed#String } @@ -167,16 +177,16 @@ public void getDataFeed() { */ public void getDataFeedWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getDataFeedWithResponse#String-Context - + final String dataFeedId = "r47053f1-9080-09lo-bacf-8dccf2e86f"; final Response dataFeedResponse = - metricsAdvisorAdministrationClient.getDataFeedWithResponse("dataFeedId", Context.NONE); + metricsAdvisorAdminClient.getDataFeedWithResponse(dataFeedId, Context.NONE); - System.out.printf("Data feed create operation status: %s%n", dataFeedResponse.getStatusCode()); + System.out.printf("Data feed get operation status: %s%n", dataFeedResponse.getStatusCode()); DataFeed dataFeed = dataFeedResponse.getValue(); System.out.printf("Data feed Id: %s%n", dataFeed.getId()); System.out.printf("Data feed description: %s%n", dataFeed.getOptions().getDescription()); - System.out.printf("Data feed source type: %.2f%n", dataFeed.getSourceType()); - System.out.printf("Data feed creator: %.2f%n", dataFeed.getCreator()); + System.out.printf("Data feed source type: %s%n", dataFeed.getSourceType()); + System.out.printf("Data feed creator: %s%n", dataFeed.getCreator()); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getDataFeedWithResponse#String-Context } @@ -187,7 +197,7 @@ public void updateDataFeed() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateDataFeed#DataFeed DataFeed existingDataFeed = new DataFeed(); - final DataFeed updatedDataFeed = metricsAdvisorAdministrationClient.updateDataFeed( + final DataFeed updatedDataFeed = metricsAdvisorAdminClient.updateDataFeed( existingDataFeed.setOptions(new DataFeedOptions().setDescription("set updated description"))); System.out.printf("Data feed Id: %s%n", updatedDataFeed.getId()); @@ -202,7 +212,7 @@ public void updateDataFeedWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateDataFeedWithResponse#DataFeed-Context DataFeed existingDataFeed = new DataFeed(); final Response updateDataFeedWithResponse = - metricsAdvisorAdministrationClient.updateDataFeedWithResponse( + metricsAdvisorAdminClient.updateDataFeedWithResponse( existingDataFeed.setOptions(new DataFeedOptions().setDescription("set updated description")), Context.NONE); @@ -218,7 +228,8 @@ public void updateDataFeedWithResponse() { */ public void deleteDataFeed() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteDataFeed#String - metricsAdvisorAdministrationClient.deleteDataFeed("dataFeedId"); + final String dataFeedId = "r47053f1-9080-09lo-bacf-8dccf2e86f"; + metricsAdvisorAdminClient.deleteDataFeed(dataFeedId); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteDataFeed#String } @@ -227,9 +238,9 @@ public void deleteDataFeed() { */ public void deleteDataFeedWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteDataFeedWithResponse#String-Context - final Response response = metricsAdvisorAdministrationClient.deleteDataFeedWithResponse("dataFeedId", - Context.NONE); - + final String dataFeedId = "r47053f1-9080-09lo-bacf-8dccf2e86f"; + final Response response = metricsAdvisorAdminClient + .deleteDataFeedWithResponse(dataFeedId, Context.NONE); System.out.printf("Data feed delete operation status : %s%n", response.getStatusCode()); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteDataFeedWithResponse#String-Context } @@ -239,12 +250,12 @@ public void deleteDataFeedWithResponse() { */ public void listDataFeeds() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listDataFeeds - metricsAdvisorAdministrationClient.listDataFeeds() + metricsAdvisorAdminClient.listDataFeeds() .forEach(dataFeed -> { System.out.printf("Data feed Id: %s%n", dataFeed.getId()); System.out.printf("Data feed description: %s%n", dataFeed.getOptions().getDescription()); - System.out.printf("Data feed source type: %.2f%n", dataFeed.getSourceType()); - System.out.printf("Data feed creator: %.2f%n", dataFeed.getCreator()); + System.out.printf("Data feed source type: %s%n", dataFeed.getSourceType()); + System.out.printf("Data feed creator: %s%n", dataFeed.getCreator()); }); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listDataFeeds } @@ -255,7 +266,7 @@ public void listDataFeeds() { */ public void listDataFeedWithOptions() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listDataFeeds#ListDataFeedOptions-Context - metricsAdvisorAdministrationClient.listDataFeeds( + metricsAdvisorAdminClient.listDataFeeds( new ListDataFeedOptions() .setListDataFeedFilter( new ListDataFeedFilter() @@ -265,10 +276,10 @@ public void listDataFeedWithOptions() { .forEach(dataFeed -> { System.out.printf("Data feed Id: %s%n", dataFeed.getId()); System.out.printf("Data feed description: %s%n", dataFeed.getOptions().getDescription()); - System.out.printf("Data feed source type: %.2f%n", dataFeed.getSourceType()); - System.out.printf("Data feed creator: %.2f%n", dataFeed.getCreator()); - System.out.printf("Data feed status: %.2f%n", dataFeed.getStatus()); - System.out.printf("Data feed granularity type: %.2f%n", dataFeed.getGranularity().getGranularityType()); + System.out.printf("Data feed source type: %s%n", dataFeed.getSourceType()); + System.out.printf("Data feed creator: %s%n", dataFeed.getCreator()); + System.out.printf("Data feed status: %s%n", dataFeed.getStatus()); + System.out.printf("Data feed granularity type: %s%n", dataFeed.getGranularity().getGranularityType()); }); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listDataFeeds#ListDataFeedOptions-Context } @@ -283,7 +294,7 @@ public void createHook() { .addEmailToAlert("alertme@alertme.com") .setExternalLink("https://adwiki.azurewebsites.net/articles/howto/alerts/create-hooks.html"); - Hook hook = metricsAdvisorAdministrationClient.createHook(emailHook); + Hook hook = metricsAdvisorAdminClient.createHook(emailHook); EmailHook createdEmailHook = (EmailHook) hook; System.out.printf("Hook Id: %s%n", createdEmailHook.getId()); System.out.printf("Hook Name: %s%n", createdEmailHook.getName()); @@ -303,7 +314,7 @@ public void createHookWithResponse() { .addEmailToAlert("alertme@alertme.com") .setExternalLink("https://adwiki.azurewebsites.net/articles/howto/alerts/create-hooks.html"); - Response response = metricsAdvisorAdministrationClient.createHookWithResponse(emailHook, Context.NONE); + Response response = metricsAdvisorAdminClient.createHookWithResponse(emailHook, Context.NONE); System.out.printf("Response statusCode: %d%n", response.getStatusCode()); EmailHook createdEmailHook = (EmailHook) response.getValue(); System.out.printf("Hook Id: %s%n", createdEmailHook.getId()); @@ -320,7 +331,7 @@ public void createHookWithResponse() { public void getHook() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getHook#String final String hookId = "f00853f1-6627-447f-bacf-8dccf2e86fed"; - Hook hook = metricsAdvisorAdministrationClient.getHook(hookId); + Hook hook = metricsAdvisorAdminClient.getHook(hookId); if (hook instanceof EmailHook) { EmailHook emailHook = (EmailHook) hook; System.out.printf("Hook Id: %s%n", emailHook.getId()); @@ -346,7 +357,7 @@ public void getHook() { public void getHookWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getHookWithResponse#String-Context final String hookId = "f00853f1-6627-447f-bacf-8dccf2e86fed"; - Response response = metricsAdvisorAdministrationClient.getHookWithResponse(hookId, Context.NONE); + Response response = metricsAdvisorAdminClient.getHookWithResponse(hookId, Context.NONE); System.out.printf("Response statusCode: %d%n", response.getStatusCode()); Hook hook = response.getValue(); if (hook instanceof EmailHook) { @@ -374,13 +385,13 @@ public void getHookWithResponse() { public void updateHook() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateHook#Hook final String emailHookId = "f00853f1-6627-447f-bacf-8dccf2e86fed"; - Hook hook = metricsAdvisorAdministrationClient.getHook(emailHookId); + Hook hook = metricsAdvisorAdminClient.getHook(emailHookId); EmailHook emailHook = (EmailHook) hook; emailHook .removeEmailToAlert("alertme@alertme.com") .addEmailToAlert("alertme2@alertme.com") .addEmailToAlert("alertme3@alertme.com"); - Hook updatedHook = metricsAdvisorAdministrationClient.updateHook(emailHook); + Hook updatedHook = metricsAdvisorAdminClient.updateHook(emailHook); EmailHook updatedEmailHook = (EmailHook) updatedHook; System.out.printf("Hook Id: %s%n", updatedEmailHook.getId()); System.out.printf("Hook Name: %s%n", updatedEmailHook.getName()); @@ -397,14 +408,14 @@ public void updateHookWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateHookWithResponse#Hook-Context final String emailHookId = "f00853f1-6627-447f-bacf-8dccf2e86fed"; Response response - = metricsAdvisorAdministrationClient.getHookWithResponse(emailHookId, Context.NONE); + = metricsAdvisorAdminClient.getHookWithResponse(emailHookId, Context.NONE); EmailHook emailHook = (EmailHook) response.getValue(); emailHook .removeEmailToAlert("alertme@alertme.com") .addEmailToAlert("alertme2@alertme.com") .addEmailToAlert("alertme3@alertme.com"); Response updateResponse - = metricsAdvisorAdministrationClient.updateHookWithResponse(emailHook, Context.NONE); + = metricsAdvisorAdminClient.updateHookWithResponse(emailHook, Context.NONE); EmailHook updatedEmailHook = (EmailHook) updateResponse.getValue(); System.out.printf("Hook Id: %s%n", updatedEmailHook.getId()); System.out.printf("Hook Name: %s%n", updatedEmailHook.getName()); @@ -420,7 +431,7 @@ public void updateHookWithResponse() { public void deleteHook() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteHook#String final String emailHookId = "f00853f1-6627-447f-bacf-8dccf2e86fed"; - metricsAdvisorAdministrationClient.deleteHook(emailHookId); + metricsAdvisorAdminClient.deleteHook(emailHookId); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteHook#String } @@ -431,8 +442,8 @@ public void deleteHookWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteHookWithResponse#String-Context final String emailHookId = "f00853f1-6627-447f-bacf-8dccf2e86fed"; Response response - = metricsAdvisorAdministrationClient.deleteHookWithResponse(emailHookId, Context.NONE); - System.out.printf("Response statusCode: %d%n", response.getStatusCode()); + = metricsAdvisorAdminClient.deleteHookWithResponse(emailHookId, Context.NONE); + System.out.printf("Response status code: %d%n", response.getStatusCode()); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteHookWithResponse#String-Context } @@ -441,7 +452,7 @@ public void deleteHookWithResponse() { */ public void listHooks() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listHooks - PagedIterable hooks = metricsAdvisorAdministrationClient.listHooks(); + PagedIterable hooks = metricsAdvisorAdminClient.listHooks(); for (Hook hook : hooks) { if (hook instanceof EmailHook) { EmailHook emailHook = (EmailHook) hook; @@ -471,7 +482,7 @@ public void listHooksWithOptions() { ListHookOptions options = new ListHookOptions() .setSkip(100) .setTop(20); - PagedIterable hooks = metricsAdvisorAdministrationClient.listHooks(options, Context.NONE); + PagedIterable hooks = metricsAdvisorAdminClient.listHooks(options, Context.NONE); Stream> hooksPageStream = hooks.streamByPage(); int[] pageCount = new int[1]; hooksPageStream.forEach(hookPage -> { @@ -510,7 +521,7 @@ public void listDataFeedIngestionStatus() { final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final ListDataFeedIngestionOptions options = new ListDataFeedIngestionOptions(startTime, endTime); PagedIterable ingestionStatuses - = metricsAdvisorAdministrationClient.listDataFeedIngestionStatus(dataFeedId, options); + = metricsAdvisorAdminClient.listDataFeedIngestionStatus(dataFeedId, options); for (DataFeedIngestionStatus ingestionStatus : ingestionStatuses) { System.out.printf("Timestamp: %s%n", ingestionStatus.getTimestamp()); @@ -530,7 +541,7 @@ public void listDataFeedIngestionStatusWithContext() { final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final ListDataFeedIngestionOptions options = new ListDataFeedIngestionOptions(startTime, endTime); PagedIterable ingestionStatuses - = metricsAdvisorAdministrationClient.listDataFeedIngestionStatus(dataFeedId, options, Context.NONE); + = metricsAdvisorAdminClient.listDataFeedIngestionStatus(dataFeedId, options, Context.NONE); Stream> ingestionStatusPageStream = ingestionStatuses.streamByPage(); int[] pageCount = new int[1]; ingestionStatusPageStream.forEach(ingestionStatusPage -> { @@ -552,7 +563,7 @@ public void refreshDataFeedIngestion() { final String dataFeedId = "4957a2f7-a0f4-4fc0-b8d7-d866c1df0f4c"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-03-03T00:00:00Z"); - metricsAdvisorAdministrationClient.refreshDataFeedIngestion(dataFeedId, + metricsAdvisorAdminClient.refreshDataFeedIngestion(dataFeedId, startTime, endTime); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.refreshDataFeedIngestion#String-OffsetDateTime-OffsetDateTime @@ -566,7 +577,7 @@ public void refreshDataFeedIngestionWithResponse() { final String dataFeedId = "4957a2f7-a0f4-4fc0-b8d7-d866c1df0f4c"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-03-03T00:00:00Z"); - Response response = metricsAdvisorAdministrationClient.refreshDataFeedIngestionWithResponse(dataFeedId, + Response response = metricsAdvisorAdminClient.refreshDataFeedIngestionWithResponse(dataFeedId, startTime, endTime, Context.NONE); @@ -581,7 +592,7 @@ public void getDataFeedIngestionProgress() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getDataFeedIngestionProgress#String final String dataFeedId = "4957a2f7-a0f4-4fc0-b8d7-d866c1df0f4c"; DataFeedIngestionProgress ingestionProgress - = metricsAdvisorAdministrationClient.getDataFeedIngestionProgress(dataFeedId); + = metricsAdvisorAdminClient.getDataFeedIngestionProgress(dataFeedId); System.out.printf("Latest active timestamp: %s%n", ingestionProgress.getLatestActiveTimestamp()); System.out.printf("Latest successful timestamp: %s%n", ingestionProgress.getLatestSuccessTimestamp()); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getDataFeedIngestionProgress#String @@ -594,7 +605,7 @@ public void getDataFeedIngestionProgressWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getDataFeedIngestionProgressWithResponse#String-Context final String dataFeedId = "4957a2f7-a0f4-4fc0-b8d7-d866c1df0f4c"; Response response - = metricsAdvisorAdministrationClient.getDataFeedIngestionProgressWithResponse(dataFeedId, Context.NONE); + = metricsAdvisorAdminClient.getDataFeedIngestionProgressWithResponse(dataFeedId, Context.NONE); System.out.printf("Response statusCode: %d%n", response.getStatusCode()); DataFeedIngestionProgress ingestionProgress = response.getValue(); System.out.printf("Latest active timestamp: %s%n", ingestionProgress.getLatestActiveTimestamp()); @@ -633,7 +644,7 @@ public void createDetectionConfiguration() { .setWholeSeriesDetectionCondition(wholeSeriesCondition); final String metricId = "0b836da8-10e6-46cd-8f4f-28262e113a62"; - AnomalyDetectionConfiguration createdDetectionConfig = metricsAdvisorAdministrationClient + AnomalyDetectionConfiguration createdDetectionConfig = metricsAdvisorAdminClient .createMetricAnomalyDetectionConfiguration(metricId, detectionConfig); System.out.printf("Detection config Id: %s%n", createdDetectionConfig.getId()); System.out.printf("Name: %s%n", createdDetectionConfig.getName()); @@ -674,7 +685,7 @@ public void createDetectionConfigurationWithResponse() { .setWholeSeriesDetectionCondition(wholeSeriesCondition); final String metricId = "0b836da8-10e6-46cd-8f4f-28262e113a62"; - Response response = metricsAdvisorAdministrationClient + Response response = metricsAdvisorAdminClient .createMetricAnomalyDetectionConfigurationWithResponse(metricId, detectionConfig, Context.NONE); System.out.printf("Response statusCode: %d%n", response.getStatusCode()); AnomalyDetectionConfiguration createdDetectionConfig = response.getValue(); @@ -691,7 +702,7 @@ public void createDetectionConfigurationWithResponse() { public void getDetectionConfiguration() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getMetricAnomalyDetectionConfiguration#String final String detectionConfigId = "7b8069a1-1564-46da-9f50-b5d0dd9129ab"; - AnomalyDetectionConfiguration detectionConfig = metricsAdvisorAdministrationClient + AnomalyDetectionConfiguration detectionConfig = metricsAdvisorAdminClient .getMetricAnomalyDetectionConfiguration(detectionConfigId); System.out.printf("Detection config Id: %s%n", detectionConfig.getId()); System.out.printf("Name: %s%n", detectionConfig.getName()); @@ -755,8 +766,8 @@ public void getDetectionConfiguration() { for (MetricSingleSeriesDetectionCondition seriesDetectionCondition : seriesDetectionConditions) { DimensionKey seriesKey = seriesDetectionCondition.getSeriesKey(); final String seriesKeyStr - = Arrays.toString(seriesKey.asMap().entrySet().stream().toArray()); - System.out.printf("- Series Key:%n", seriesKeyStr); + = Arrays.toString(seriesKey.asMap().entrySet().toArray()); + System.out.printf("- Series Key:%s%n", seriesKeyStr); System.out.printf(" - Use %s operator for multiple detection conditions:%n", seriesDetectionCondition.getCrossConditionsOperator()); @@ -810,8 +821,8 @@ public void getDetectionConfiguration() { : seriesGroupDetectionConditions) { DimensionKey seriesGroupKey = seriesGroupDetectionCondition.getSeriesGroupKey(); final String seriesGroupKeyStr - = Arrays.toString(seriesGroupKey.asMap().entrySet().stream().toArray()); - System.out.printf("- Series Group Key:%n", seriesGroupKeyStr); + = Arrays.toString(seriesGroupKey.asMap().entrySet().toArray()); + System.out.printf("- Series Group Key:%s%n", seriesGroupKeyStr); System.out.printf(" - Use %s operator for multiple detection conditions:%n", seriesGroupDetectionCondition.getCrossConditionsOperator()); @@ -866,7 +877,7 @@ public void getDetectionConfiguration() { public void getDetectionConfigurationWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getMetricAnomalyDetectionConfigurationWithResponse#String-Context final String detectionConfigId = "7b8069a1-1564-46da-9f50-b5d0dd9129ab"; - Response response = metricsAdvisorAdministrationClient + Response response = metricsAdvisorAdminClient .getMetricAnomalyDetectionConfigurationWithResponse(detectionConfigId, Context.NONE); System.out.printf("Response statusCode: %d%n", response.getStatusCode()); AnomalyDetectionConfiguration detectionConfig = response.getValue(); @@ -932,8 +943,8 @@ public void getDetectionConfigurationWithResponse() { for (MetricSingleSeriesDetectionCondition seriesDetectionCondition : seriesDetectionConditions) { DimensionKey seriesKey = seriesDetectionCondition.getSeriesKey(); final String seriesKeyStr - = Arrays.toString(seriesKey.asMap().entrySet().stream().toArray()); - System.out.printf("- Series Key:%n", seriesKeyStr); + = Arrays.toString(seriesKey.asMap().entrySet().toArray()); + System.out.printf("- Series Key:%s%n", seriesKeyStr); System.out.printf(" - Use %s operator for multiple detection conditions:%n", seriesDetectionCondition.getCrossConditionsOperator()); @@ -987,8 +998,8 @@ public void getDetectionConfigurationWithResponse() { : seriesGroupDetectionConditions) { DimensionKey seriesGroupKey = seriesGroupDetectionCondition.getSeriesGroupKey(); final String seriesGroupKeyStr - = Arrays.toString(seriesGroupKey.asMap().entrySet().stream().toArray()); - System.out.printf("- Series Group Key:%n", seriesGroupKeyStr); + = Arrays.toString(seriesGroupKey.asMap().entrySet().toArray()); + System.out.printf("- Series Group Key:%s%n", seriesGroupKeyStr); System.out.printf(" - Use %s operator for multiple detection conditions:%n", seriesGroupDetectionCondition.getCrossConditionsOperator()); @@ -1044,7 +1055,7 @@ public void listDetectionConfigurations() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listMetricAnomalyDetectionConfigurations#String final String metricId = "0b836da8-10e6-46cd-8f4f-28262e113a62"; PagedIterable configsIterable - = metricsAdvisorAdministrationClient.listMetricAnomalyDetectionConfigurations(metricId); + = metricsAdvisorAdminClient.listMetricAnomalyDetectionConfigurations(metricId); for (AnomalyDetectionConfiguration detectionConfig : configsIterable) { System.out.printf("Detection config Id: %s%n", detectionConfig.getId()); @@ -1062,7 +1073,7 @@ public void listDetectionConfigurationsWithContext() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listMetricAnomalyDetectionConfigurations#String-Context final String metricId = "0b836da8-10e6-46cd-8f4f-28262e113a62"; PagedIterable configsIterable - = metricsAdvisorAdministrationClient.listMetricAnomalyDetectionConfigurations(metricId, Context.NONE); + = metricsAdvisorAdminClient.listMetricAnomalyDetectionConfigurations(metricId, Context.NONE); Stream> configByPageStream = configsIterable.streamByPage(); @@ -1085,7 +1096,7 @@ public void listDetectionConfigurationsWithContext() { public void updateDetectionConfiguration() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateMetricAnomalyDetectionConfiguration#AnomalyDetectionConfiguration final String detectionConfigId = "7b8069a1-1564-46da-9f50-b5d0dd9129ab"; - AnomalyDetectionConfiguration detectionConfig = metricsAdvisorAdministrationClient + AnomalyDetectionConfiguration detectionConfig = metricsAdvisorAdminClient .getMetricAnomalyDetectionConfiguration(detectionConfigId); detectionConfig.setName("updated config name"); @@ -1099,7 +1110,7 @@ public void updateDetectionConfiguration() { .setAnomalyDetectorDirection(AnomalyDetectorDirection.UP) .setSuppressCondition(new SuppressCondition().setMinNumber(2).setMinRatio(2)))); - AnomalyDetectionConfiguration updatedDetectionConfig = metricsAdvisorAdministrationClient + AnomalyDetectionConfiguration updatedDetectionConfig = metricsAdvisorAdminClient .updateMetricAnomalyDetectionConfiguration(detectionConfig); System.out.printf("Detection config Id: %s%n", updatedDetectionConfig.getId()); @@ -1115,7 +1126,7 @@ public void updateDetectionConfiguration() { public void updateDetectionConfigurationWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateMetricAnomalyDetectionConfigurationWithResponse#AnomalyDetectionConfiguration-Context final String detectionConfigId = "7b8069a1-1564-46da-9f50-b5d0dd9129ab"; - Response getResponse = metricsAdvisorAdministrationClient + Response getResponse = metricsAdvisorAdminClient .getMetricAnomalyDetectionConfigurationWithResponse(detectionConfigId, Context.NONE); AnomalyDetectionConfiguration detectionConfig = getResponse.getValue(); detectionConfig.setName("updated config name"); @@ -1129,7 +1140,7 @@ public void updateDetectionConfigurationWithResponse() { .setAnomalyDetectorDirection(AnomalyDetectorDirection.UP) .setSuppressCondition(new SuppressCondition().setMinNumber(2).setMinRatio(2)))); - Response updateResponse = metricsAdvisorAdministrationClient + Response updateResponse = metricsAdvisorAdminClient .updateMetricAnomalyDetectionConfigurationWithResponse(detectionConfig, Context.NONE); System.out.printf("Response StatusCode: %s%n", updateResponse.getStatusCode()); @@ -1147,7 +1158,7 @@ public void updateDetectionConfigurationWithResponse() { public void deleteDetectionConfiguration() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteMetricAnomalyDetectionConfiguration#String final String detectionConfigId = "7b8069a1-1564-46da-9f50-b5d0dd9129ab"; - metricsAdvisorAdministrationClient + metricsAdvisorAdminClient .deleteMetricAnomalyDetectionConfiguration(detectionConfigId); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteMetricAnomalyDetectionConfiguration#String } @@ -1158,7 +1169,7 @@ public void deleteDetectionConfiguration() { public void deleteDetectionConfigurationWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteMetricAnomalyDetectionConfigurationWithResponse#String-Context final String detectionConfigId = "7b8069a1-1564-46da-9f50-b5d0dd9129ab"; - Response response = metricsAdvisorAdministrationClient + Response response = metricsAdvisorAdminClient .deleteMetricAnomalyDetectionConfigurationWithResponse(detectionConfigId, Context.NONE); System.out.printf("Response Status Code: %s%n", response.getStatusCode()); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteMetricAnomalyDetectionConfigurationWithResponse#String-Context @@ -1175,7 +1186,7 @@ public void createAnomalyAlertConfiguration() { String hookId2 = "8i48er30-6e6e-4391-b78f-b00dfee1e6f5"; final AnomalyAlertConfiguration anomalyAlertConfiguration - = metricsAdvisorAdministrationClient.createAnomalyAlertConfiguration( + = metricsAdvisorAdminClient.createAnomalyAlertConfiguration( new AnomalyAlertConfiguration("My Alert config name") .setDescription("alert config description") .setMetricAlertConfigurations(Arrays.asList( @@ -1190,7 +1201,7 @@ public void createAnomalyAlertConfiguration() { System.out.printf("Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); System.out.printf("Anomaly alert configuration description: %s%n", anomalyAlertConfiguration.getDescription()); - System.out.printf("Anomaly alert configuration hook ids: %.2f%n", + System.out.printf("Anomaly alert configuration hook ids: %s%n", anomalyAlertConfiguration.getIdOfHooksToAlert()); System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", anomalyAlertConfiguration.getCrossMetricsOperator().toString()); @@ -1209,7 +1220,7 @@ public void createAnomalyAlertConfigurationWithResponse() { String hookId2 = "8i48er30-6e6e-4391-b78f-b00dfee1e6f5"; final Response alertConfigurationResponse - = metricsAdvisorAdministrationClient.createAnomalyAlertConfigurationWithResponse( + = metricsAdvisorAdminClient.createAnomalyAlertConfigurationWithResponse( new AnomalyAlertConfiguration("My Alert config name") .setDescription("alert config description") .setMetricAlertConfigurations(Arrays.asList( @@ -1226,7 +1237,7 @@ public void createAnomalyAlertConfigurationWithResponse() { final AnomalyAlertConfiguration anomalyAlertConfiguration = alertConfigurationResponse.getValue(); System.out.printf("Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); System.out.printf("Anomaly alert configuration description: %s%n", anomalyAlertConfiguration.getDescription()); - System.out.printf("Anomaly alert configuration hook ids: %.2f%n", + System.out.printf("Anomaly alert configuration hook ids: %s%n", anomalyAlertConfiguration.getIdOfHooksToAlert()); System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", anomalyAlertConfiguration.getCrossMetricsOperator().toString()); @@ -1241,10 +1252,10 @@ public void getAnomalyAlertConfiguration() { String alertConfigId = "1p0f8er30-6e6e-4391-b78f-bpfdfee1e6f5"; AnomalyAlertConfiguration anomalyAlertConfiguration - = metricsAdvisorAdministrationClient.getAnomalyAlertConfiguration(alertConfigId); + = metricsAdvisorAdminClient.getAnomalyAlertConfiguration(alertConfigId); System.out.printf("Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); System.out.printf("Anomaly alert configuration description: %s%n", anomalyAlertConfiguration.getDescription()); - System.out.printf("Anomaly alert configuration hook ids: %.2f%n", + System.out.printf("Anomaly alert configuration hook ids: %s%n", anomalyAlertConfiguration.getIdOfHooksToAlert()); System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", anomalyAlertConfiguration.getCrossMetricsOperator().toString()); @@ -1259,13 +1270,13 @@ public void getAnomalyAlertConfigurationWithResponse() { String alertConfigId = "1p0f8er30-6e6e-4391-b78f-bpfdfee1e6f5"; Response alertConfigurationResponse - = metricsAdvisorAdministrationClient.getAnomalyAlertConfigurationWithResponse(alertConfigId, Context.NONE); + = metricsAdvisorAdminClient.getAnomalyAlertConfigurationWithResponse(alertConfigId, Context.NONE); System.out.printf("Anomaly alert creation operation status: %s%n", alertConfigurationResponse.getStatusCode()); final AnomalyAlertConfiguration anomalyAlertConfiguration = alertConfigurationResponse.getValue(); System.out.printf("Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); System.out.printf("Anomaly alert configuration description: %s%n", anomalyAlertConfiguration.getDescription()); - System.out.printf("Anomaly alert configuration hook ids: %.2f%n", + System.out.printf("Anomaly alert configuration hook ids: %s%n", anomalyAlertConfiguration.getIdOfHooksToAlert()); System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", anomalyAlertConfiguration.getCrossMetricsOperator().toString()); @@ -1282,9 +1293,9 @@ public void updateAnomalyAlertConfiguration() { String additionalHookId = "2gh8er30-6e6e-4391-b78f-bpfdfee1e6f5"; AnomalyAlertConfiguration existingAnomalyConfig - = metricsAdvisorAdministrationClient.getAnomalyAlertConfiguration(alertConfigId); + = metricsAdvisorAdminClient.getAnomalyAlertConfiguration(alertConfigId); final AnomalyAlertConfiguration updatAnomalyAlertConfiguration - = metricsAdvisorAdministrationClient.updateAnomalyAlertConfiguration( + = metricsAdvisorAdminClient.updateAnomalyAlertConfiguration( existingAnomalyConfig .addIdOfHookToAlert(additionalHookId) .setDescription("updated to add more hook ids") @@ -1293,7 +1304,7 @@ public void updateAnomalyAlertConfiguration() { System.out.printf("Updated anomaly alert configuration Id: %s%n", updatAnomalyAlertConfiguration.getId()); System.out.printf("Updated anomaly alert configuration description: %s%n", updatAnomalyAlertConfiguration.getDescription()); - System.out.printf("Updated anomaly alert configuration hook ids: %.2f%n", + System.out.printf("Updated anomaly alert configuration hook ids: %s%n", updatAnomalyAlertConfiguration.getIdOfHooksToAlert()); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateAnomalyAlertConfiguration#AnomalyAlertConfiguration } @@ -1308,9 +1319,9 @@ public void updateAnomalyAlertConfigurationWithResponse() { String additionalHookId = "2gh8er30-6e6e-4391-b78f-bpfdfee1e6f5"; AnomalyAlertConfiguration existingAnomalyConfig - = metricsAdvisorAdministrationClient.getAnomalyAlertConfiguration(alertConfigId); + = metricsAdvisorAdminClient.getAnomalyAlertConfiguration(alertConfigId); final Response alertConfigurationResponse - = metricsAdvisorAdministrationClient.updateAnomalyAlertConfigurationWithResponse( + = metricsAdvisorAdminClient.updateAnomalyAlertConfigurationWithResponse( existingAnomalyConfig .addIdOfHookToAlert(additionalHookId) .setDescription("updated to add more hook ids"), Context.NONE); @@ -1331,7 +1342,7 @@ public void updateAnomalyAlertConfigurationWithResponse() { public void deleteAnomalyAlertConfiguration() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteAnomalyAlertConfiguration#String String alertConfigId = "1p0f8er30-6e6e-4391-b78f-bpfdfee1e6f5"; - metricsAdvisorAdministrationClient.deleteAnomalyAlertConfiguration(alertConfigId); + metricsAdvisorAdminClient.deleteAnomalyAlertConfiguration(alertConfigId); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteAnomalyAlertConfiguration#String } @@ -1342,7 +1353,7 @@ public void deleteAnomalyAlertConfigurationWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteAnomalyAlertConfigurationWithResponse#String-Context String alertConfigId = "1p0f8er30-6e6e-4391-b78f-bpfdfee1e6f5"; final Response response = - metricsAdvisorAdministrationClient.deleteAnomalyAlertConfigurationWithResponse(alertConfigId, Context.NONE); + metricsAdvisorAdminClient.deleteAnomalyAlertConfigurationWithResponse(alertConfigId, Context.NONE); System.out.printf("Anomaly alert config delete operation status : %s%n", response.getStatusCode()); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteAnomalyAlertConfigurationWithResponse#String-Context @@ -1354,12 +1365,12 @@ public void deleteAnomalyAlertConfigurationWithResponse() { public void listAnomalyAlertConfigurations() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listAnomalyAlertConfigurations#String String detectionConfigId = "3rt98er30-6e6e-4391-b78f-bpfdfee1e6f5"; - metricsAdvisorAdministrationClient.listAnomalyAlertConfigurations(detectionConfigId) + metricsAdvisorAdminClient.listAnomalyAlertConfigurations(detectionConfigId) .forEach(anomalyAlertConfiguration -> { System.out.printf("Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); System.out.printf("Anomaly alert configuration description: %s%n", anomalyAlertConfiguration.getDescription()); - System.out.printf("Anomaly alert configuration hook ids: %.2f%n", + System.out.printf("Anomaly alert configuration hook ids: %s%n", anomalyAlertConfiguration.getIdOfHooksToAlert()); System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", anomalyAlertConfiguration.getCrossMetricsOperator().toString()); @@ -1373,12 +1384,12 @@ public void listAnomalyAlertConfigurations() { public void listAnomalyAlertConfigurationsWithContext() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listAnomalyAlertConfigurations#String-Context String detectionConfigId = "3rt98er30-6e6e-4391-b78f-bpfdfee1e6f5"; - metricsAdvisorAdministrationClient.listAnomalyAlertConfigurations(detectionConfigId, Context.NONE) + metricsAdvisorAdminClient.listAnomalyAlertConfigurations(detectionConfigId, Context.NONE) .forEach(anomalyAlertConfiguration -> { System.out.printf("Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); System.out.printf("Anomaly alert configuration description: %s%n", anomalyAlertConfiguration.getDescription()); - System.out.printf("Anomaly alert configuration hook ids: %.2f%n", + System.out.printf("Anomaly alert configuration hook ids: %s%n", anomalyAlertConfiguration.getIdOfHooksToAlert()); System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", anomalyAlertConfiguration.getCrossMetricsOperator().toString()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForDetectionConfigTestBase.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForDetectionConfigTestBase.java index 7cccb0218614..d666344e03b2 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForDetectionConfigTestBase.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForDetectionConfigTestBase.java @@ -28,7 +28,7 @@ protected static class ListAnomaliesForDetectionConfigInput { final OffsetDateTime startTime = TIME_SERIES_START_TIME; final OffsetDateTime endTime = TIME_SERIES_END_TIME; final ListAnomaliesDetectedFilter filter = new ListAnomaliesDetectedFilter() - .setSeverity(Severity.LOW, Severity.MEDIUM); + .setSeverityRange(Severity.LOW, Severity.MEDIUM); final ListAnomaliesDetectedOptions options = new ListAnomaliesDetectedOptions(startTime, endTime) .setTop(10) .setFilter(filter); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedAsyncClientTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedAsyncClientTest.java index 0ec51d53b38f..7e65f0bd9005 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedAsyncClientTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedAsyncClientTest.java @@ -83,12 +83,7 @@ void testListDataFeed(HttpClient httpClient, MetricsAdvisorServiceVersion servic listDataFeedRunner(inputDataFeedList -> { List actualDataFeedList = new ArrayList<>(); List expectedDataFeedList = - inputDataFeedList.stream().map(dataFeed -> client.createDataFeed(dataFeed.getName(), - dataFeed.getSource(), - dataFeed.getGranularity(), - dataFeed.getSchema(), - dataFeed.getIngestionSettings(), - dataFeed.getOptions()).block()) + inputDataFeedList.stream().map(dataFeed -> client.createDataFeed(dataFeed).block()) .collect(Collectors.toList()); // Act @@ -149,12 +144,7 @@ void testListDataFeedFilterByCreator(HttpClient httpClient, MetricsAdvisorServic client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); creatDataFeedRunner(expectedDataFeed -> { // Act & Assert - final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions()) + final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed) .block(); assertNotNull(createdDataFeed); @@ -162,7 +152,6 @@ void testListDataFeedFilterByCreator(HttpClient httpClient, MetricsAdvisorServic // Act & Assert - assert createdDataFeed != null; StepVerifier.create(client.listDataFeeds(new ListDataFeedOptions() .setListDataFeedFilter(new ListDataFeedFilter() .setCreator(createdDataFeed.getCreator())))) @@ -270,12 +259,7 @@ void testListDataFeedFilterByName(HttpClient httpClient, MetricsAdvisorServiceVe // Arrange String filterName = "test_filter_by_name"; creatDataFeedRunner(inputDataFeed -> { - final DataFeed createdDataFeed = client.createDataFeed(filterName, - inputDataFeed.getSource(), - inputDataFeed.getGranularity(), - inputDataFeed.getSchema(), - inputDataFeed.getIngestionSettings(), - inputDataFeed.getOptions()).block(); + final DataFeed createdDataFeed = client.createDataFeed(inputDataFeed.setName(filterName)).block(); assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -343,12 +327,7 @@ public void getDataFeedValidId(HttpClient httpClient, MetricsAdvisorServiceVersi client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); // Arrange creatDataFeedRunner(dataFeed -> { - final DataFeed createdDataFeed = client.createDataFeed(dataFeed.getName(), - dataFeed.getSource(), - dataFeed.getGranularity(), - dataFeed.getSchema(), - dataFeed.getIngestionSettings(), - dataFeed.getOptions()).block(); + final DataFeed createdDataFeed = client.createDataFeed(dataFeed).block(); assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -384,12 +363,7 @@ public void createSQLServerDataFeed(HttpClient httpClient, MetricsAdvisorService creatDataFeedRunner(expectedDataFeed -> // Act & Assert - StepVerifier.create(client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions())) + StepVerifier.create(client.createDataFeed(expectedDataFeed)) .assertNext(createdDataFeed -> { dataFeedId.set(createdDataFeed.getId()); validateDataFeedResult(expectedDataFeed, createdDataFeed, SQL_SERVER_DB); @@ -417,12 +391,7 @@ public void createBlobDataFeed(HttpClient httpClient, MetricsAdvisorServiceVersi client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); creatDataFeedRunner(expectedDataFeed -> // Act & Assert - StepVerifier.create(client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions())) + StepVerifier.create(client.createDataFeed(expectedDataFeed)) .assertNext(createdDataFeed -> { assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -451,12 +420,7 @@ public void createCosmosDataFeed(HttpClient httpClient, MetricsAdvisorServiceVer client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); creatDataFeedRunner(expectedDataFeed -> // Act & Assert - StepVerifier.create(client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions())) + StepVerifier.create(client.createDataFeed(expectedDataFeed)) .assertNext(createdDataFeed -> { assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -484,12 +448,7 @@ public void createAppInsightsDataFeed(HttpClient httpClient, MetricsAdvisorServi client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); creatDataFeedRunner(expectedDataFeed -> // Act & Assert - StepVerifier.create(client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions())) + StepVerifier.create(client.createDataFeed(expectedDataFeed)) .assertNext(createdDataFeed -> { assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -517,12 +476,7 @@ public void createExplorerDataFeed(HttpClient httpClient, MetricsAdvisorServiceV client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); creatDataFeedRunner(expectedDataFeed -> // Act & Assert - StepVerifier.create(client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions())) + StepVerifier.create(client.createDataFeed(expectedDataFeed)) .assertNext(createdDataFeed -> { assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -551,12 +505,7 @@ public void createAzureTableDataFeed(HttpClient httpClient, MetricsAdvisorServic creatDataFeedRunner(expectedDataFeed -> // Act & Assert - StepVerifier.create(client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions())) + StepVerifier.create(client.createDataFeed(expectedDataFeed)) .assertNext(createdDataFeed -> { assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -584,12 +533,7 @@ public void createHttpRequestDataFeed(HttpClient httpClient, MetricsAdvisorServi client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); creatDataFeedRunner(expectedDataFeed -> // Act & Assert - StepVerifier.create(client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions())) + StepVerifier.create(client.createDataFeed(expectedDataFeed)) .assertNext(createdDataFeed -> { assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -618,12 +562,7 @@ public void createInfluxDataFeed(HttpClient httpClient, MetricsAdvisorServiceVer try { creatDataFeedRunner(expectedDataFeed -> // Act & Assert - StepVerifier.create(client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions())) + StepVerifier.create(client.createDataFeed(expectedDataFeed)) .assertNext(createdDataFeed -> { assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -653,12 +592,7 @@ public void createMongoDBDataFeed(HttpClient httpClient, MetricsAdvisorServiceVe creatDataFeedRunner(expectedDataFeed -> // Act & Assert - StepVerifier.create(client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions())) + StepVerifier.create(client.createDataFeed(expectedDataFeed)) .assertNext(createdDataFeed -> { assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -687,12 +621,7 @@ public void createMYSQLDataFeed(HttpClient httpClient, MetricsAdvisorServiceVers client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); creatDataFeedRunner(expectedDataFeed -> // Act & Assert - StepVerifier.create(client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions())) + StepVerifier.create(client.createDataFeed(expectedDataFeed)) .assertNext(createdDataFeed -> { assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -722,12 +651,7 @@ public void createPostgreSQLDataFeed(HttpClient httpClient, MetricsAdvisorServic creatDataFeedRunner(expectedDataFeed -> // Act & Assert - StepVerifier.create(client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions())) + StepVerifier.create(client.createDataFeed(expectedDataFeed)) .assertNext(createdDataFeed -> { assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -757,12 +681,7 @@ public void createDataLakeStorageDataFeed(HttpClient httpClient, MetricsAdvisorS creatDataFeedRunner(expectedDataFeed -> // Act & Assert - StepVerifier.create(client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions())) + StepVerifier.create(client.createDataFeed(expectedDataFeed)) .assertNext(createdDataFeed -> { assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -791,12 +710,7 @@ public void createElasticsearchDataFeed(HttpClient httpClient, MetricsAdvisorSer creatDataFeedRunner(expectedDataFeed -> // Act & Assert - StepVerifier.create(client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions())) + StepVerifier.create(client.createDataFeed(expectedDataFeed)) .assertNext(createdDataFeed -> { assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -839,12 +753,7 @@ public void deleteDataFeedIdWithResponse(HttpClient httpClient, MetricsAdvisorSe // Arrange client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); creatDataFeedRunner(dataFeed -> { - final DataFeed createdDataFeed = client.createDataFeed(dataFeed.getName(), - dataFeed.getSource(), - dataFeed.getGranularity(), - dataFeed.getSchema(), - dataFeed.getIngestionSettings(), - dataFeed.getOptions()).block(); + final DataFeed createdDataFeed = client.createDataFeed(dataFeed).block(); assertNotNull(createdDataFeed); StepVerifier.create(client.deleteDataFeedWithResponse(createdDataFeed.getId())) @@ -876,12 +785,7 @@ public void updateDataFeedHappyPath(HttpClient httpClient, MetricsAdvisorService // Arrange client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); creatDataFeedRunner(expectedDataFeed -> { - final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions()) + final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed) .block(); assertNotNull(createdDataFeed); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedClientTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedClientTest.java index e48a7751061b..0b1bb26887c7 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedClientTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedClientTest.java @@ -5,14 +5,18 @@ import com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient; import com.azure.ai.metricsadvisor.models.DataFeed; +import com.azure.ai.metricsadvisor.models.DataFeedGranularity; import com.azure.ai.metricsadvisor.models.DataFeedGranularityType; +import com.azure.ai.metricsadvisor.models.DataFeedSchema; import com.azure.ai.metricsadvisor.models.DataFeedSourceType; import com.azure.ai.metricsadvisor.models.DataFeedStatus; import com.azure.ai.metricsadvisor.models.ErrorCode; import com.azure.ai.metricsadvisor.models.ErrorCodeException; import com.azure.ai.metricsadvisor.models.ListDataFeedFilter; import com.azure.ai.metricsadvisor.models.ListDataFeedOptions; +import com.azure.ai.metricsadvisor.models.Metric; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; +import com.azure.ai.metricsadvisor.models.PostgreSqlDataFeedSource; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.PagedResponse; import com.azure.core.http.rest.Response; @@ -28,6 +32,7 @@ import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; @@ -84,9 +89,7 @@ void testListDataFeed(HttpClient httpClient, MetricsAdvisorServiceVersion servic listDataFeedRunner(inputDataFeedList -> { List actualDataFeedList = new ArrayList<>(); List expectedDataFeedList = - inputDataFeedList.stream().map(dataFeed -> client.createDataFeed(dataFeed.getName(), - dataFeed.getSource(), dataFeed.getGranularity(), - dataFeed.getSchema(), dataFeed.getIngestionSettings(), dataFeed.getOptions())) + inputDataFeedList.stream().map(dataFeed -> client.createDataFeed(dataFeed)) .collect(Collectors.toList()); // Act & Assert @@ -147,9 +150,7 @@ void testListDataFeedFilterByCreator(HttpClient httpClient, MetricsAdvisorServic client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); creatDataFeedRunner(expectedDataFeed -> { // Act & Assert - final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), expectedDataFeed.getIngestionSettings(), expectedDataFeed.getOptions()); + final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed); assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -254,12 +255,7 @@ void testListDataFeedFilterByName(HttpClient httpClient, MetricsAdvisorServiceVe // Arrange client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); creatDataFeedRunner(inputDataFeed -> { - final DataFeed createdDataFeed = client.createDataFeed(filterName, - inputDataFeed.getSource(), - inputDataFeed.getGranularity(), - inputDataFeed.getSchema(), - inputDataFeed.getIngestionSettings(), - inputDataFeed.getOptions()); + final DataFeed createdDataFeed = client.createDataFeed(inputDataFeed.setName(filterName)); assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -321,12 +317,7 @@ public void getDataFeedValidId(HttpClient httpClient, MetricsAdvisorServiceVersi // Arrange client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); creatDataFeedRunner(dataFeed -> { - final DataFeed createdDataFeed = client.createDataFeed(dataFeed.getName(), - dataFeed.getSource(), - dataFeed.getGranularity(), - dataFeed.getSchema(), - dataFeed.getIngestionSettings(), - dataFeed.getOptions()); + final DataFeed createdDataFeed = client.createDataFeed(dataFeed); assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -358,12 +349,7 @@ public void createSQLServerDataFeed(HttpClient httpClient, MetricsAdvisorService client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); creatDataFeedRunner(expectedDataFeed -> { // Act & Assert - final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions()); + final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed); assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -389,12 +375,7 @@ public void createBlobDataFeed(HttpClient httpClient, MetricsAdvisorServiceVersi // Arrange creatDataFeedRunner(expectedDataFeed -> { // Act & Assert - final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions()); + final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed); assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -421,12 +402,7 @@ public void createCosmosDataFeed(HttpClient httpClient, MetricsAdvisorServiceVer creatDataFeedRunner(expectedDataFeed -> { // Act & Assert - final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions()); + final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed); assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -453,12 +429,7 @@ public void createAppInsightsDataFeed(HttpClient httpClient, MetricsAdvisorServi creatDataFeedRunner(expectedDataFeed -> { // Act & Assert - final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions()); + final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed); assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -484,12 +455,7 @@ public void createExplorerDataFeed(HttpClient httpClient, MetricsAdvisorServiceV // Arrange creatDataFeedRunner(expectedDataFeed -> { // Act & Assert - final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions()); + final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed); assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -515,12 +481,7 @@ public void createAzureTableDataFeed(HttpClient httpClient, MetricsAdvisorServic // Arrange creatDataFeedRunner(expectedDataFeed -> { // Act & Assert - final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions()); + final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed); assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -546,12 +507,7 @@ public void createHttpRequestDataFeed(HttpClient httpClient, MetricsAdvisorServi // Arrange creatDataFeedRunner(expectedDataFeed -> { // Act & Assert - final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions()); + final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed); assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -577,12 +533,7 @@ public void createInfluxDataFeed(HttpClient httpClient, MetricsAdvisorServiceVer // Arrange creatDataFeedRunner(expectedDataFeed -> { // Act & Assert - final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions()); + final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed); assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -608,12 +559,7 @@ public void createMongoDBDataFeed(HttpClient httpClient, MetricsAdvisorServiceVe // Arrange creatDataFeedRunner(expectedDataFeed -> { // Act & Assert - final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions()); + final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed); assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -640,12 +586,7 @@ public void createMYSQLDataFeed(HttpClient httpClient, MetricsAdvisorServiceVers creatDataFeedRunner(expectedDataFeed -> { // Act & Assert - final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions()); + final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed); assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -671,12 +612,7 @@ public void createPostgreSQLDataFeed(HttpClient httpClient, MetricsAdvisorServic client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); creatDataFeedRunner(expectedDataFeed -> { // Act & Assert - final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions()); + final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed); assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -702,12 +638,7 @@ public void createDataLakeStorageDataFeed(HttpClient httpClient, MetricsAdvisorS client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); creatDataFeedRunner(expectedDataFeed -> { // Act & Assert - final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions()); + final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed); assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -733,12 +664,7 @@ public void createElasticsearchDataFeed(HttpClient httpClient, MetricsAdvisorSer client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); creatDataFeedRunner(expectedDataFeed -> { // Act & Assert - final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions()); + final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed); assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); @@ -762,29 +688,31 @@ void createDataFeedRequiredParams(HttpClient httpClient, MetricsAdvisorServiceVe client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); creatDataFeedRunner(expectedDataFeed -> { // Act & Assert - Exception ex = assertThrows(NullPointerException.class, () -> client.createDataFeed(null, - expectedDataFeed.getSource(), expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), expectedDataFeed.getIngestionSettings(), expectedDataFeed.getOptions())); - assertEquals("'dataFeedName' cannot be null or empty.", ex.getMessage()); - - ex = assertThrows(NullPointerException.class, () -> client.createDataFeed(expectedDataFeed.getName(), - null, expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), expectedDataFeed.getIngestionSettings(), expectedDataFeed.getOptions())); - assertEquals("'dataFeedSource' cannot be null or empty.", ex.getMessage()); - - ex = assertThrows(NullPointerException.class, () -> client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), null, - expectedDataFeed.getSchema(), expectedDataFeed.getIngestionSettings(), expectedDataFeed.getOptions())); - assertEquals("'dataFeedGranularity.granularityType' cannot be null or empty.", ex.getMessage()); - - ex = assertThrows(NullPointerException.class, () -> client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), expectedDataFeed.getGranularity(), - null, expectedDataFeed.getIngestionSettings(), expectedDataFeed.getOptions())); + Exception ex = assertThrows(NullPointerException.class, () -> client.createDataFeed(null)); + assertEquals("'dataFeed' is required and cannot be null.", ex.getMessage()); + + ex = assertThrows(NullPointerException.class, () -> client.createDataFeed( + new DataFeed().setName("name"))); + assertEquals("'dataFeedSource' is required and cannot be null.", ex.getMessage()); + + ex = assertThrows(NullPointerException.class, () -> client.createDataFeed( + new DataFeed().setName("name") + .setSource(new PostgreSqlDataFeedSource("conn-string", "query")))); assertEquals("'dataFeedSchema.metrics' cannot be null or empty.", ex.getMessage()); - ex = assertThrows(NullPointerException.class, () -> client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), null, expectedDataFeed.getOptions())); + ex = assertThrows(NullPointerException.class, () -> client.createDataFeed( + new DataFeed() + .setName("name") + .setSource(new PostgreSqlDataFeedSource("conn-string", "query")) + .setSchema(new DataFeedSchema(Collections.singletonList(new Metric().setName("name")))))); + assertEquals("'dataFeedGranularity.granularityType' is required and cannot be null.", ex.getMessage()); + + ex = assertThrows(NullPointerException.class, () -> client.createDataFeed( + new DataFeed() + .setName("name") + .setSource(new PostgreSqlDataFeedSource("conn-string", "query")) + .setSchema(new DataFeedSchema(Collections.singletonList(new Metric().setName("name")))) + .setGranularity(new DataFeedGranularity().setGranularityType(DAILY)))); assertEquals("'dataFeedIngestionSettings.ingestionStartTime' cannot be null or empty.", ex.getMessage()); @@ -817,12 +745,7 @@ public void deleteDataFeedIdWithResponse(HttpClient httpClient, MetricsAdvisorSe // Arrange client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); creatDataFeedRunner(dataFeed -> { - final DataFeed createdDataFeed = client.createDataFeed(dataFeed.getName(), - dataFeed.getSource(), - dataFeed.getGranularity(), - dataFeed.getSchema(), - dataFeed.getIngestionSettings(), - dataFeed.getOptions()); + final DataFeed createdDataFeed = client.createDataFeed(dataFeed); assertEquals(HttpResponseStatus.NO_CONTENT.code(), client.deleteDataFeedWithResponse(createdDataFeed.getId(), Context.NONE).getStatusCode()); @@ -850,12 +773,7 @@ public void updateDataFeedHappyPath(HttpClient httpClient, MetricsAdvisorService client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); // Arrange creatDataFeedRunner(expectedDataFeed -> { - final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed.getName(), - expectedDataFeed.getSource(), - expectedDataFeed.getGranularity(), - expectedDataFeed.getSchema(), - expectedDataFeed.getIngestionSettings(), - expectedDataFeed.getOptions()); + final DataFeed createdDataFeed = client.createDataFeed(expectedDataFeed); assertNotNull(createdDataFeed); dataFeedId.set(createdDataFeed.getId()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedTestBase.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedTestBase.java index f2171b0a6e57..7c99c645b8f4 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedTestBase.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedTestBase.java @@ -36,7 +36,6 @@ import org.junit.jupiter.api.Test; import java.time.Duration; -import java.time.OffsetDateTime; import java.util.Arrays; import java.util.Comparator; import java.util.List; @@ -179,7 +178,7 @@ void creatDataFeedRunner(Consumer testRunner, DataFeedSourceType dataF new Dimension().setName("category").setDisplayName("category")))) .setName("java_create_data_feed_test_sample" + UUID.randomUUID()) .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) - .setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse(INGESTION_START_TIME)))); + .setIngestionSettings(new DataFeedIngestionSettings(INGESTION_START_TIME))); } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationTestBase.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationTestBase.java index 06db9dca9764..0abfa559ca23 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationTestBase.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationTestBase.java @@ -27,7 +27,6 @@ import com.azure.core.http.HttpClient; import org.junit.jupiter.api.Assertions; -import java.time.OffsetDateTime; import java.util.Arrays; import java.util.Optional; import java.util.UUID; @@ -800,12 +799,10 @@ protected DataFeed createDataFeed(HttpClient httpClient, new Dimension().setName("category").setDisplayName("category")))) .setName("java_data_feed_for_detection" + UUID.randomUUID()) .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) - .setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse(INGESTION_START_TIME))); + .setIngestionSettings(new DataFeedIngestionSettings(INGESTION_START_TIME)); - return client.createDataFeed(dataFeed.getName(), - dataFeed.getSource(), dataFeed.getGranularity(), - dataFeed.getSchema(), dataFeed.getIngestionSettings(), - dataFeed.getOptions()); + return client.createDataFeed( + dataFeed); } protected void assertUpdateDetectionConfigurationOutput( diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/TestUtils.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/TestUtils.java index f60b8cda7267..252614603177 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/TestUtils.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/TestUtils.java @@ -38,9 +38,9 @@ public final class TestUtils { static final String INCORRECT_UUID = "a0a3998a-4c4affe66b7"; static final String INCORRECT_UUID_ERROR = "Invalid UUID string: " + INCORRECT_UUID; static final String DATAFEED_ID_REQUIRED_ERROR = "'dataFeedId' cannot be null."; + static final OffsetDateTime INGESTION_START_TIME = OffsetDateTime.parse("2019-10-01T00:00:00Z"); public static final String AZURE_METRICS_ADVISOR_ENDPOINT = "AZURE_METRICS_ADVISOR_ENDPOINT"; - protected static final String INGESTION_START_TIME = "2019-10-01T00:00:00Z"; static final String TEMPLATE_QUERY = "select * from adsample2 where Timestamp = @StartTime"; static final String TABLE_QUERY = "PartitionKey ge '@StartTime' and PartitionKey lt '@EndTime'"; @@ -136,7 +136,7 @@ static DataFeed getSQLDataFeedSample() { new Dimension().setName("category")))) .setName("java_SQL_create_data_feed_test_sample" + UUID.randomUUID()) .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) - .setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse(INGESTION_START_TIME))); + .setIngestionSettings(new DataFeedIngestionSettings(INGESTION_START_TIME)); } static DataFeed getAzureBlobDataFeedSample() { @@ -149,7 +149,7 @@ static DataFeed getAzureBlobDataFeedSample() { new Dimension().setName("category")))) .setName("java_BLOB_create_data_feed_test_sample" + UUID.randomUUID()) .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) - .setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse(INGESTION_START_TIME))); + .setIngestionSettings(new DataFeedIngestionSettings(INGESTION_START_TIME)); } /** From c4233fa072296eb4ec0961253cc1d74cf69c2f02 Mon Sep 17 00:00:00 2001 From: Sameeksha Vaity Date: Thu, 22 Oct 2020 21:54:21 -0700 Subject: [PATCH 3/9] update readme --- .../azure-ai-metricsadvisor/README.md | 73 +++++++++---------- .../ai/metricsadvisor/ReadmeSamples.java | 1 - 2 files changed, 35 insertions(+), 39 deletions(-) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md b/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md index 70bfec8d0c20..6cf67084f02a 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md @@ -3,7 +3,7 @@ Azure Metrics Advisor is a new Cognitive Service that uses time series based de trouble shooting the incidents of online services, and monitor the business health by automating the slice and dice of business metrics. -[Source code][source_code] | [Package (Maven)] | [API reference documentation][api_reference_doc] | [Product Documentation][product_documentation] | [Samples][samples] +[Source code][source_code] | [Package (Maven)][mvn_package] | [API reference documentation][api_reference_doc] | [Product Documentation][product_documentation] | [Samples][samples] ## Getting started @@ -44,7 +44,7 @@ az cognitiveservices account show --name "resource-name" --resource-group "resou ``` #### Create a Metrics Advisor client using MetricsAdvisorKeyCredential - + ```java MetricsAdvisorKeyCredential credential = new MetricsAdvisorKeyCredential("subscription_key", "api_key"); MetricsAdvisorClient metricsAdvisorClient = new MetricsAdvisorClientBuilder() @@ -54,10 +54,10 @@ MetricsAdvisorClient metricsAdvisorClient = new MetricsAdvisorClientBuilder() ``` #### Create a Metrics Administration client using MetricsAdvisorKeyCredential - + ```java MetricsAdvisorKeyCredential credential = new MetricsAdvisorKeyCredential("subscription_key", "api_key"); -MetricsAdvisorAdministrationClient metricsAdvisorAdministrationClient = +MetricsAdvisorAdministrationClient metricsAdvisorAdminClient = new MetricsAdvisorAdministrationClientBuilder() .endpoint("{endpoint}") .credential(credential) @@ -118,28 +118,24 @@ An `anomaly detection configuration` is a configuration supplied for a time seri #### Add a data feed from a sample or data source This example ingests the user specified `SQLServerDataFeedSource` data feed source data to the service. - + ```java -final DataFeed createdSqlDataFeed = metricsAdvisorAdministrationClient.createDataFeed( - "My data feed name", - new SQLServerDataFeedSource("sql_server_connection_string", "query"), - new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY), - new DataFeedSchema(Arrays.asList( - new Metric().setName("cost"), - new Metric().setName("revenue"))) - .setDimensions(Arrays.asList( - new Dimension().setName("category"), - new Dimension().setName("city"))), - new DataFeedIngestionSettings(OffsetDateTime.parse("2020-01-01T00:00:00Z")), - new DataFeedOptions() - .setDescription("My data feed description") - .setRollupSettings( - new DataFeedRollupSettings() - .setAutoRollup(DataFeedAutoRollUpMethod.SUM, Arrays.asList("cost"), "__CUSTOM_SUM__")) - .setMissingDataPointFillSettings( - new DataFeedMissingDataPointFillSettings() - .setFillType(DataSourceMissingDataPointFillType.SMART_FILLING)) - .setAccessMode(DataFeedAccessMode.PUBLIC)); +DataFeed dataFeed = new DataFeed() + .setName("dataFeedName") + .setSource(new MySqlDataFeedSource("conn-string", "query")) + .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) + .setSchema(new DataFeedSchema( + Arrays.asList( + new Metric().setName("metric1"), + new Metric().setName("metric2") + ) + )) + .setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse("2020-01-01T00:00:00Z"))) + .setOptions(new DataFeedOptions() + .setDescription("data feed description") + .setRollupSettings(new DataFeedRollupSettings() + .setRollupType(DataFeedRollupType.AUTO_ROLLUP))); +final DataFeed createdSqlDataFeed = metricsAdvisorAdminClient.createDataFeed(dataFeed); System.out.printf("Data feed Id : %s%n", createdSqlDataFeed.getId()); System.out.printf("Data feed name : %s%n", createdSqlDataFeed.getName()); @@ -150,10 +146,10 @@ System.out.printf("Data feed granularity type : %s%n", System.out.printf("Data feed granularity value : %d%n", createdSqlDataFeed.getGranularity().getCustomGranularityValue()); System.out.println("Data feed related metric Ids:"); -createdSqlDataFeed.getMetricIds().forEach(metricId -> System.out.println(metricId)); +createdSqlDataFeed.getMetricIds().forEach(System.out::println); System.out.printf("Data feed source type: %s%n", createdSqlDataFeed.getSourceType()); -if (SQL_SERVER_DB.equals(createdSqlDataFeed.getSourceType())) { +if (SQL_SERVER_DB == createdSqlDataFeed.getSourceType()) { System.out.printf("Data feed sql server query: %s%n", ((SQLServerDataFeedSource) createdSqlDataFeed.getSource()).getQuery()); } @@ -161,11 +157,11 @@ if (SQL_SERVER_DB.equals(createdSqlDataFeed.getSourceType())) { #### Check ingestion status This example checks the ingestion status of a previously provided data feed source. - + ```java String dataFeedId = "3d48er30-6e6e-4391-b78f-b00dfee1e6f5"; -metricsAdvisorAdministrationClient.listDataFeedIngestionStatus( +metricsAdvisorAdminClient.listDataFeedIngestionStatus( dataFeedId, new ListDataFeedIngestionOptions( OffsetDateTime.parse("2020-01-01T00:00:00Z"), @@ -179,7 +175,7 @@ metricsAdvisorAdministrationClient.listDataFeedIngestionStatus( #### Configure anomaly detection configuration This example demonstrates how a user can configure an anomaly detection configuration for their data. - + ```java String metricId = "3d48er30-6e6e-4391-b78f-b00dfee1e6f5"; @@ -201,7 +197,7 @@ SmartDetectionCondition smartDetectionCondition = new SmartDetectionCondition() .setSuppressCondition(new SuppressCondition().setMinNumber(1).setMinRatio(2)); final AnomalyDetectionConfiguration anomalyDetectionConfiguration = - metricsAdvisorAdministrationClient.createMetricAnomalyDetectionConfiguration( + metricsAdvisorAdminClient.createMetricAnomalyDetectionConfiguration( metricId, new AnomalyDetectionConfiguration("My Anomaly detection configuration") .setDescription("anomaly detection config description") @@ -216,14 +212,14 @@ final AnomalyDetectionConfiguration anomalyDetectionConfiguration = ### Add hooks for receiving anomaly alerts This example creates an email hook that receives anomaly incident alerts. - + ```java Hook emailHook = new EmailHook("email hook") .setDescription("my email hook") .addEmailToAlert("alertme@alertme.com") .setExternalLink("https://adwiki.azurewebsites.net/articles/howto/alerts/create-hooks.html"); -final Hook hook = metricsAdvisorAdministrationClient.createHook(emailHook); +final Hook hook = metricsAdvisorAdminClient.createHook(emailHook); EmailHook createdEmailHook = (EmailHook) hook; System.out.printf("Hook Id: %s%n", createdEmailHook.getId()); System.out.printf("Hook Name: %s%n", createdEmailHook.getName()); @@ -235,7 +231,7 @@ System.out.printf("Hook Emails: %s%n", String.join(",", createdEmailHook.getEmai #### Configure alert configuration This example demonstrates how a user can configure an alerting configuration for detected anomalies in their data. - + ```java String detectionConfigurationId1 = "9ol48er30-6e6e-4391-b78f-b00dfee1e6f5"; String detectionConfigurationId2 = "3e58er30-6e6e-4391-b78f-b00dfee1e6f5"; @@ -243,7 +239,7 @@ String hookId1 = "5f48er30-6e6e-4391-b78f-b00dfee1e6f5"; String hookId2 = "8i48er30-6e6e-4391-b78f-b00dfee1e6f5"; final AnomalyAlertConfiguration anomalyAlertConfiguration - = metricsAdvisorAdministrationClient.createAnomalyAlertConfiguration( + = metricsAdvisorAdminClient.createAnomalyAlertConfiguration( new AnomalyAlertConfiguration("My Alert config name") .setDescription("alert config description") .setMetricAlertConfigurations( @@ -253,7 +249,7 @@ final AnomalyAlertConfiguration anomalyAlertConfiguration new MetricAnomalyAlertConfiguration(detectionConfigurationId2, MetricAnomalyAlertScope.forWholeSeries()) .setAlertConditions(new MetricAnomalyAlertConditions() - .setSeverityCondition(new SeverityCondition() + .setSeverityRangeCondition(new SeverityCondition() .setMaxAlertSeverity(Severity.HIGH))) )) .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.AND) @@ -293,7 +289,7 @@ Metrics Advisor clients raises `HttpResponseException` [exceptions][http_respons to provide a non existing feedback Id an `HttpResponseException` would be raised with an error indicating the failure cause. In the following code snippet, the error is handled gracefully by catching the exception and display the additional information about the error. - + ```java try { metricsAdvisorClient.getMetricFeedback("non_existing_feedback_id"); @@ -319,7 +315,7 @@ For more details see the [samples README][samples_readme]. #### Async APIs All the examples shown so far have been using synchronous APIs, but we provide full support for async APIs as well. You'll need to use `MetricsAdvisorAsyncClient` - + ```java MetricsAdvisorKeyCredential credential = new MetricsAdvisorKeyCredential("subscription_key", "api_key"); MetricsAdvisorAsyncClient metricsAdvisorAsyncClient = new MetricsAdvisorClientBuilder() @@ -358,6 +354,7 @@ This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For m [jdk_link]: https://docs.microsoft.com/java/azure/jdk/?view=azure-java-stable [metrics_advisor_account]: https://ms.portal.azure.com/#create/Microsoft.CognitiveServicesMetricsAdvisor [metrics_advisor_doc]: https://docs.microsoft.com/en-gb/azure/cognitive-services/metrics-advisor/glossary +[mvn_package]: https://search.maven.org/artifact/com.azure/azure-ai-metricsadvisor/1.0.0-beta.1/jar [product_documentation]: https://docs.microsoft.com/azure/cognitive-services/metrics-advisor/overview [source_code]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/metricsadvisor/azure-ai-metricsadvisor/src [samples]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java index 5aee50a05723..bda7cd546417 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java @@ -122,7 +122,6 @@ public void createDataFeed() { * Code snippet for checking ingestion status. */ public void checkIngestionStatus() { - String dataFeedId = "3d48er30-6e6e-4391-b78f-b00dfee1e6f5"; metricsAdvisorAdminClient.listDataFeedIngestionStatus( From 0e1ac965014adf0078c60b8cd9a5aa8c12fd718f Mon Sep 17 00:00:00 2001 From: Sameeksha Vaity Date: Mon, 26 Oct 2020 01:18:41 -0700 Subject: [PATCH 4/9] renames --- .../azure-ai-metricsadvisor/CHANGELOG.md | 3 + .../azure-ai-metricsadvisor/README.md | 134 ++--- .../MetricsAdvisorAsyncClient.java | 177 ++++--- .../metricsadvisor/MetricsAdvisorClient.java | 79 +-- ...tricsAdvisorAdministrationAsyncClient.java | 278 +++++----- .../MetricsAdvisorAdministrationClient.java | 204 +++---- ...iceMetricsAdvisorRestAPIOpenAPIV2Impl.java | 18 +- .../models/AlertResultList.java | 9 +- .../models/AlertingResultQuery.java | 8 +- .../models/AnomalyProperty.java | 8 +- .../implementation/models/AnomalyScope.java | 4 +- .../implementation/models/DataFeedDetail.java | 22 +- .../models/IncidentProperty.java | 14 +- .../implementation/models/SeriesResult.java | 6 +- .../models/SeverityFilterCondition.java | 14 +- .../util/AlertConfigurationTransforms.java | 4 +- .../implementation/util/AnomalyHelper.java | 42 +- .../util/AnomalyTransforms.java | 52 +- .../util/DataFeedTransforms.java | 4 +- .../implementation/util/HookHelper.java | 18 +- .../implementation/util/HookTransforms.java | 73 +-- .../implementation/util/IncidentHelper.java | 44 +- .../util/IncidentRootCauseHelper.java | 6 +- .../util/IncidentRootCauseTransforms.java | 2 +- .../util/IncidentTransforms.java | 28 +- .../util/MetricEnrichedSeriesDataHelper.java | 42 +- ...tricEnrichedSeriesDataTransformations.java | 12 +- .../models/AlertQueryTimeMode.java | 37 ++ .../models/{Alert.java => AnomalyAlert.java} | 2 +- .../{Incident.java => AnomalyIncident.java} | 30 +- .../models/AnomalyIncidentStatus.java | 34 ++ .../models/AnomalySeverity.java | 37 ++ ...{Dimension.java => DataFeedDimension.java} | 12 +- .../{Metric.java => DataFeedMetric.java} | 16 +- .../metricsadvisor/models/DataFeedSchema.java | 28 +- .../{Anomaly.java => DataPointAnomaly.java} | 24 +- .../metricsadvisor/models/DimensionKey.java | 2 +- ...ilHook.java => EmailNotificationHook.java} | 36 +- .../models/IncidentRootCause.java | 16 +- .../metricsadvisor/models/IncidentStatus.java | 34 -- .../models/ListAlertOptions.java | 10 +- .../models/ListAnomaliesDetectedFilter.java | 24 +- .../models/ListMetricSeriesDataOptions.java | 92 ---- .../models/MetricAnomalyAlertConditions.java | 2 +- .../models/MetricEnrichedSeriesData.java | 61 ++- .../models/MetricSeriesData.java | 20 +- .../{Hook.java => NotificationHook.java} | 32 +- .../ai/metricsadvisor/models/Severity.java | 37 -- .../models/SeverityCondition.java | 12 +- .../ai/metricsadvisor/models/SnoozeScope.java | 4 +- .../ai/metricsadvisor/models/TimeMode.java | 37 -- ...{WebHook.java => WebNotificationHook.java} | 34 +- .../src/samples/README.md | 6 +- .../metricsadvisor/ListAlertsAsyncSample.java | 6 +- .../ai/metricsadvisor/ListAlertsSample.java | 16 +- ...tEnrichmentStatusForMetricAsyncSample.java | 6 +- .../ListEnrichmentStatusForMetricSample.java | 6 +- .../ListIncidentRootCausesAsyncSample.java | 4 +- .../ListIncidentRootCausesSample.java | 4 +- .../ListIncidentsAlertedAsyncSample.java | 16 +- .../ListIncidentsAlertedSample.java | 20 +- .../ListIncidentsDetectedAsyncSample.java | 18 +- .../ListIncidentsDetectedSample.java | 22 +- .../ListSeriesDataForMetricAsyncSample.java | 3 +- .../ListSeriesDataForMetricSample.java | 3 +- ...SeriesDefinitionsForMetricAsyncSample.java | 2 +- .../ListSeriesDefinitionsForMetricSample.java | 2 +- .../ListsAnomaliesForAlertsAsyncSample.java | 10 +- .../ListsAnomaliesForAlertsSample.java | 20 +- ...nomaliesForDetectionConfigAsyncSample.java | 8 +- ...istsAnomaliesForDetectionConfigSample.java | 16 +- .../MetricFeedbackAsyncSample.java | 52 +- .../metricsadvisor/MetricFeedbackSample.java | 50 +- ...AdvisorAsyncClientJavaDocCodeSnippets.java | 217 ++++---- ...tricsAdvisorClientJavaDocCodeSnippets.java | 406 +++++++------- .../ai/metricsadvisor/ReadmeSamples.java | 59 ++- ...malyDetectionConfigurationAsyncSample.java | 8 +- .../AnomalyDetectionConfigurationSample.java | 10 +- .../administration/DatafeedAsyncSample.java | 12 +- .../administration/DatafeedSample.java | 12 +- .../administration/HookAsyncSample.java | 84 +-- .../administration/HookSample.java | 98 ++-- ...trationAsyncClientJavaDocCodeSnippets.java | 436 +++++++-------- ...ministrationClientJavaDocCodeSnippets.java | 498 +++++++++--------- ...omalyAlertConfigOperationsAsyncSample.java | 60 +-- ...icsAnomalyAlertConfigOperationsSample.java | 58 +- .../ai/metricsadvisor/AlertAsyncTest.java | 4 +- .../azure/ai/metricsadvisor/AlertTest.java | 6 +- .../ai/metricsadvisor/AlertTestBase.java | 29 +- .../metricsadvisor/AnomalyAlertAsyncTest.java | 70 +-- .../ai/metricsadvisor/AnomalyAlertTest.java | 76 +-- .../AnomalyForAlertTestBase.java | 24 +- .../AnomalyForDetectionConfigTestBase.java | 18 +- ... => AnomalyIncidentDetectedAsyncTest.java} | 8 +- ....java => AnomalyIncidentDetectedTest.java} | 12 +- ... => AnomalyIncidentForAlertAsyncTest.java} | 6 +- ....java => AnomalyIncidentForAlertTest.java} | 10 +- ...=> AnomalyIncidentRootCauseAsyncTest.java} | 2 +- ...java => AnomalyIncidentRootCauseTest.java} | 2 +- .../ai/metricsadvisor/DataFeedClientTest.java | 6 +- ...ts.java => DataFeedDimensionKeyTests.java} | 2 +- .../ai/metricsadvisor/DataFeedTestBase.java | 28 +- .../DataPointAnomalyAlertAsyncTest.java | 315 +++++++++++ .../DataPointAnomalyAlertTest.java | 304 +++++++++++ ...=> DataPointAnomalyForAlertAsyncTest.java} | 6 +- ...java => DataPointAnomalyForAlertTest.java} | 10 +- ...ntAnomalyForDetectionConfigAsyncTest.java} | 14 +- ...taPointAnomalyForDetectionConfigTest.java} | 12 +- .../DetectionConfigurationAsyncTest.java | 30 +- .../DetectionConfigurationTest.java | 38 +- .../DetectionConfigurationTestBase.java | 12 +- .../IncidentDetectedTestBase.java | 20 +- .../IncidentForAlertTestBase.java | 4 +- .../IncidentRootCauseTestBase.java | 2 +- .../MetricsSeriesAsyncTest.java | 4 +- .../ai/metricsadvisor/MetricsSeriesTest.java | 6 +- ...st.java => NotificationHookAsyncTest.java} | 16 +- ...ookTest.java => NotificationHookTest.java} | 34 +- ...ase.java => NotificationHookTestBase.java} | 64 +-- .../azure/ai/metricsadvisor/TestUtils.java | 20 +- .../azure-ai-metricsadvisor/swagger/README.md | 8 +- 121 files changed, 3004 insertions(+), 2444 deletions(-) create mode 100644 sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/AlertQueryTimeMode.java rename sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/{Alert.java => AnomalyAlert.java} (98%) rename sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/{Incident.java => AnomalyIncident.java} (77%) create mode 100644 sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/AnomalyIncidentStatus.java create mode 100644 sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/AnomalySeverity.java rename sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/{Dimension.java => DataFeedDimension.java} (81%) rename sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/{Metric.java => DataFeedMetric.java} (84%) rename sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/{Anomaly.java => DataPointAnomaly.java} (79%) rename sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/{EmailHook.java => EmailNotificationHook.java} (77%) delete mode 100644 sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/IncidentStatus.java delete mode 100644 sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListMetricSeriesDataOptions.java rename sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/{Hook.java => NotificationHook.java} (54%) delete mode 100644 sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Severity.java delete mode 100644 sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/TimeMode.java rename sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/{WebHook.java => WebNotificationHook.java} (78%) rename sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/{IncidentDetectedAsyncTest.java => AnomalyIncidentDetectedAsyncTest.java} (88%) rename sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/{IncidentDetectedTest.java => AnomalyIncidentDetectedTest.java} (72%) rename sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/{IncidentForAlertAsyncTest.java => AnomalyIncidentForAlertAsyncTest.java} (90%) rename sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/{IncidentForAlertTest.java => AnomalyIncidentForAlertTest.java} (81%) rename sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/{IncidentRootCauseAsyncTest.java => AnomalyIncidentRootCauseAsyncTest.java} (96%) rename sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/{IncidentRootCauseTest.java => AnomalyIncidentRootCauseTest.java} (96%) rename sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/{DimensionKeyTests.java => DataFeedDimensionKeyTests.java} (98%) create mode 100644 sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyAlertAsyncTest.java create mode 100644 sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyAlertTest.java rename sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/{AnomalyForAlertAsyncTest.java => DataPointAnomalyForAlertAsyncTest.java} (90%) rename sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/{AnomalyForAlertTest.java => DataPointAnomalyForAlertTest.java} (81%) rename sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/{AnomalyForDetectionConfigAsyncTest.java => DataPointAnomalyForDetectionConfigAsyncTest.java} (74%) rename sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/{AnomalyForDetectionConfigTest.java => DataPointAnomalyForDetectionConfigTest.java} (72%) rename sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/{HookAsyncTest.java => NotificationHookAsyncTest.java} (87%) rename sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/{HookTest.java => NotificationHookTest.java} (68%) rename sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/{HookTestBase.java => NotificationHookTestBase.java} (69%) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md b/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md index 6dca182adf17..74835a4ee025 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md @@ -11,6 +11,9 @@ - Renamed model `DataSourceMissingDataPointFillType` to `DataFeedMissingDataPointFillType`. - Renamed properties on `MetricEnrichedSeriesData` and `MetricSeriesData` model. - Renamed method `setSeverity` to `setSeverityRangeCondition` on `MetricAnomalyAlertConditions` model. +- Renamed property `confidenceScore` to `contributionScore` and its accessors on `IncidentRootCause` model. +- Removed model `ListMetricSeriesData` as top and skip parameters are not valid for this API. +Also, moved `startTime` and `endTime` to positional arguments on `listMetricSeriesData` method as they are required. ## 1.0.0-beta.1 (2020-10-07) Version 1.0.0-beta.1 is a preview of our efforts in creating a Azure Metrics Advisor client library that is developer-friendly diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md b/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md index 6cf67084f02a..e4b4f0251ff6 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md @@ -1,7 +1,7 @@ # Azure Metrics Advisor client library for Java Azure Metrics Advisor is a new Cognitive Service that uses time series based decision AI to identify and assist trouble shooting the incidents of online services, and monitor the business health by automating the slice and dice -of business metrics. +of business dataFeedMetrics. [Source code][source_code] | [Package (Maven)][mvn_package] | [API reference documentation][api_reference_doc] | [Product Documentation][product_documentation] | [Samples][samples] @@ -68,44 +68,47 @@ MetricsAdvisorAdministrationClient metricsAdvisorAdminClient = ### MetricsAdvisorClient `MetricsAdvisorClient` helps with: -- listing incidents -- listing root causes of incidents -- retrieving original time series data and time series data enriched by the service. -- listing alerts -- adding feedback to tune your model +- Diagnose anomalies and incidents and help with root cause analysis of incidents. +- Retrieve original time series data and time series data enriched by the service. +- Send real time alerts through multiple notification hooks. +- Adjust anomaly/incident detection using feedback to tune your model. ### MetricsAdvisorAdministrationClient `MetricsAdvisorAdministrationClient` allows you to -- manage data feeds -- configure anomaly detection configurations -- configure anomaly alerting configurations -- manage hooks +- Manage data feeds +- List available metrics and their detection configurations +- Fine tune anomaly detection configurations +- Configure anomaly alerting configurations +- Manage notification hooks ### Data feed -A `data feed` is what Metrics Advisor ingests from the user-specified data source such as Cosmos structure stream, SQL query result, and so on. -A data feed contains rows of timestamps, zero or more dimensions, one or more metrics. Therefore, multiple metrics could share the same data source and even the same data feed. +A data feed is what Metrics Advisor ingests from the user-specified data source such as Cosmos structure stream, SQL query result, and so on. +It contains rows of timestamps, zero or more dimensions, one or more etrics. Therefore, multiple metrics could share the same data source and even the same data feed. -### Metric -A `metric` is a quantifiable measure that is used to track and assess the status of a specific business process. It can be a combination of multiple time series values divided by dimensions, for example user count for a web vertical and en-us market. +### Data Feed Metric +A metric is a quantifiable measure that is used to track and assess the status of a specific business process. It can be a combination of multiple time series values divided by dimensions, for example user count for a web vertical and en-us market. -### Dimension -A `dimension` is one or more categorical values. The combination of those values identifies a particular univariate time series, for example: country, language, tenant, and so on. +### Data Feed Dimension +A dimension is one or more categorical values of the provided data feed. The combination of those values identifies a particular univariate time series, for example: country, language, tenant, and so on. -### Time series -A time series is a series of data points indexed (or listed or graphed) in time order. Most commonly, a time series is a sequence taken at successive equally spaced points in time. Therefore, it is a sequence of discrete-time data. +### Metric series +Metric series is a series of data points indexed (or listed or graphed) in time order. Most commonly, a time series is a sequence taken at successive equally spaced points in time. Therefore, it is a sequence of discrete-time data. -### AnomalyDetectionConfiguration -An `anomaly detection configuration` is a configuration supplied for a time series to identify if the data point is detected as an Anomaly. +### Anomaly Detection Configuration +An anomaly detection configuration is a configuration supplied for a time series to identify if the data point is detected as an Anomaly. +A metric can apply one or more detecting configurations. While a default detection configuration is automatically applied to each metric (named "Default"), +we can tune the detection modes used on our data by creating a customized anomaly detection configuration. -### Incident -`Incidents` are generated for series when it has an Anomaly depending on the applied Anomaly detection configurations. +### Anomaly Incident +Incidents are generated for series when it has an anomaly depending on the applied Anomaly detection configurations. +Metrics Advisor service groups series of anomalies within a metric into an incident. -### Alert -`Alerts` can be configured to be triggered when certain anomalies are met. You can set multiple alerts with different settings. For example, you could create an alert for anomalies with lower business impact, and another for more important alerts. +### Anomaly Alert +Anomaly Alerts can be configured to be triggered when certain anomalies are met. You can set multiple alerts with different settings. For example, you could create an anomalyAlert for anomalies with lower business impact, and another for more important alerts. -### Hook -`Hook` is the entry point that allows the users to subscribe to real-time alerts. These alerts are sent over the internet, using a Hook. +### Notification Hook +A notification hook is the entry point that allows the users to subscribe to real-time alerts. These alerts are sent over the internet, using a Hook. ## Examples @@ -113,7 +116,7 @@ An `anomaly detection configuration` is a configuration supplied for a time seri * [Check ingestion status](#check-ingestion-status "Check ingestion status") * [Configure anomaly detection configuration](#configure-anomaly-detection-configuration "Configure anomaly detection configuration") * [Add hooks for receiving anomaly alerts](#add-hooks-for-receiving-anomaly-alerts "Add hooks for receiving anomaly alerts") -* [Configure alert configuration](#configure-alert-configuration "Configure alert configuration") +* [Configure an anomaly alert configuration](#configure-anomaly-alert-configuration "Configure anomalyAlert configuration") * [Query anomaly detection results](#query-anomaly-detection-results "Query anomaly detection results") #### Add a data feed from a sample or data source @@ -126,8 +129,8 @@ DataFeed dataFeed = new DataFeed() .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) .setSchema(new DataFeedSchema( Arrays.asList( - new Metric().setName("metric1"), - new Metric().setName("metric2") + new DataFeedMetric().setName("metric1"), + new DataFeedMetric().setName("metric2") ) )) .setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse("2020-01-01T00:00:00Z"))) @@ -172,6 +175,7 @@ metricsAdvisorAdminClient.listDataFeedIngestionStatus( System.out.printf("Status : %s%n", dataFeedIngestionStatus.getStatus()); }); ``` + #### Configure anomaly detection configuration This example demonstrates how a user can configure an anomaly detection configuration for their data. @@ -197,9 +201,9 @@ SmartDetectionCondition smartDetectionCondition = new SmartDetectionCondition() .setSuppressCondition(new SuppressCondition().setMinNumber(1).setMinRatio(2)); final AnomalyDetectionConfiguration anomalyDetectionConfiguration = - metricsAdvisorAdminClient.createMetricAnomalyDetectionConfiguration( + metricsAdvisorAdminClient.createMetricAnomalyDetectionConfig( metricId, - new AnomalyDetectionConfiguration("My Anomaly detection configuration") + new AnomalyDetectionConfiguration("My dataPoint anomaly detection configuration") .setDescription("anomaly detection config description") .setWholeSeriesDetectionCondition( new MetricWholeSeriesDetectionCondition() @@ -214,33 +218,34 @@ final AnomalyDetectionConfiguration anomalyDetectionConfiguration = This example creates an email hook that receives anomaly incident alerts. ```java -Hook emailHook = new EmailHook("email hook") - .setDescription("my email hook") +NotificationHook emailNotificationHook = new EmailNotificationHook("email Hook") + .setDescription("my email Hook") .addEmailToAlert("alertme@alertme.com") .setExternalLink("https://adwiki.azurewebsites.net/articles/howto/alerts/create-hooks.html"); -final Hook hook = metricsAdvisorAdminClient.createHook(emailHook); -EmailHook createdEmailHook = (EmailHook) hook; -System.out.printf("Hook Id: %s%n", createdEmailHook.getId()); -System.out.printf("Hook Name: %s%n", createdEmailHook.getName()); -System.out.printf("Hook Description: %s%n", createdEmailHook.getDescription()); -System.out.printf("Hook External Link: %s%n", createdEmailHook.getExternalLink()); -System.out.printf("Hook Emails: %s%n", String.join(",", createdEmailHook.getEmailsToAlert())); +final NotificationHook notificationHook = metricsAdvisorAdminClient.createHook(emailNotificationHook); +EmailNotificationHook createdEmailHook = (EmailNotificationHook) notificationHook; +System.out.printf("Email Hook Id: %s%n", createdEmailHook.getId()); +System.out.printf("Email Hook name: %s%n", createdEmailHook.getName()); +System.out.printf("Email Hook description: %s%n", createdEmailHook.getDescription()); +System.out.printf("Email Hook external Link: %s%n", createdEmailHook.getExternalLink()); +System.out.printf("Email Hook emails to alert: %s%n", ``` -#### Configure alert configuration +#### Configure an anomaly alert configuration This example demonstrates how a user can configure an alerting configuration for detected anomalies in their data. ```java +ic void configureAlert() { String detectionConfigurationId1 = "9ol48er30-6e6e-4391-b78f-b00dfee1e6f5"; String detectionConfigurationId2 = "3e58er30-6e6e-4391-b78f-b00dfee1e6f5"; String hookId1 = "5f48er30-6e6e-4391-b78f-b00dfee1e6f5"; String hookId2 = "8i48er30-6e6e-4391-b78f-b00dfee1e6f5"; final AnomalyAlertConfiguration anomalyAlertConfiguration - = metricsAdvisorAdminClient.createAnomalyAlertConfiguration( - new AnomalyAlertConfiguration("My Alert config name") + = metricsAdvisorAdminClient.createAnomalyAlertConfig( + new AnomalyAlertConfiguration("My anomaly alert config name") .setDescription("alert config description") .setMetricAlertConfigurations( Arrays.asList( @@ -250,14 +255,13 @@ final AnomalyAlertConfiguration anomalyAlertConfiguration MetricAnomalyAlertScope.forWholeSeries()) .setAlertConditions(new MetricAnomalyAlertConditions() .setSeverityRangeCondition(new SeverityCondition() - .setMaxAlertSeverity(Severity.HIGH))) + .setMaxAlertSeverity(AnomalySeverity.HIGH))) )) .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.AND) - .setIdOfHooksToAlert(Arrays.asList(hookId1, hookId2))); ``` #### Query anomaly detection results -This example demonstrates how a user can query alerts triggered for an anomaly detection configuration and get anomalies for that alert. +This example demonstrates how a user can query alerts triggered for an anomaly detection configuration and get anomalies for that anomalyAlert. ```java String alertConfigurationId = "9ol48er30-6e6e-4391-b78f-b00dfee1e6f5"; @@ -265,20 +269,20 @@ metricsAdvisorClient.listAlerts( alertConfigurationId, new ListAlertOptions(OffsetDateTime.parse("2020-01-01T00:00:00Z"), OffsetDateTime.now(), - TimeMode.ANOMALY_TIME)) + AlertQueryTimeMode.ANOMALY_TIME)) .forEach(alert -> { - System.out.printf("Alert Id: %s%n", alert.getId()); - System.out.printf("Alert created on: %s%n", alert.getCreatedTime()); + System.out.printf("AnomalyAlert Id: %s%n", alert.getId()); + System.out.printf("AnomalyAlert created on: %s%n", alert.getCreatedTime()); // List anomalies for returned alerts metricsAdvisorClient.listAnomaliesForAlert( alertConfigurationId, alert.getId()) .forEach(anomaly -> { - System.out.printf("Anomaly was created on: %s%n", anomaly.getCreatedTime()); - System.out.printf("Anomaly severity: %s%n", anomaly.getSeverity().toString()); - System.out.printf("Anomaly status: %s%n", anomaly.getStatus()); - System.out.printf("Anomaly related series key: %s%n", anomaly.getSeriesKey().asMap()); + System.out.printf("DataPoint Anomaly was created on: %s%n", anomaly.getCreatedTime()); + System.out.printf("DataPoint Anomaly severity: %s%n", anomaly.getSeverity().toString()); + System.out.printf("DataPoint Anomaly status: %s%n", anomaly.getStatus()); + System.out.printf("DataPoint Anomaly related series key: %s%n", anomaly.getSeriesKey().asMap()); }); }); ``` @@ -291,14 +295,13 @@ In the following code snippet, the error is handled gracefully by catching the exception and display the additional information about the error. ```java -try { - metricsAdvisorClient.getMetricFeedback("non_existing_feedback_id"); -} catch (HttpResponseException e) { - System.out.println(e.getMessage()); -} +public void handlingException() { + try { + metricsAdvisorClient.getMetricFeedback("non_existing_feedback_id"); + } catch (HttpResponseException e) { + System.out.println(e.getMessage()); ``` - ### Enable client logging Azure SDKs for Java offer a consistent logging story to help aid in troubleshooting application errors and expedite their resolution. The logs produced will capture the flow of an application before reaching the terminal state to help @@ -317,11 +320,11 @@ All the examples shown so far have been using synchronous APIs, but we provide f You'll need to use `MetricsAdvisorAsyncClient` ```java -MetricsAdvisorKeyCredential credential = new MetricsAdvisorKeyCredential("subscription_key", "api_key"); -MetricsAdvisorAsyncClient metricsAdvisorAsyncClient = new MetricsAdvisorClientBuilder() - .credential(credential) - .endpoint("{endpoint}") - .buildAsyncClient(); +public void useMetricsAdvisorKeyCredentialAsyncClient() { + MetricsAdvisorKeyCredential credential = new MetricsAdvisorKeyCredential("subscription_key", "api_key"); + MetricsAdvisorAsyncClient metricsAdvisorAsyncClient = new MetricsAdvisorClientBuilder() + .credential(credential) + .endpoint("{endpoint}") ``` ### Additional documentation @@ -351,9 +354,10 @@ This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For m [coc_faq]: https://opensource.microsoft.com/codeofconduct/faq/ [coc_contact]: mailto:opencode@microsoft.com [create_new_resource]: https://docs.microsoft.com/azure/cognitive-services/cognitive-services-apis-create-account?tabs=multiservice%2Cwindows#create-a-new-azure-cognitive-services-resource +[http_clients_wiki]: https://github.com/Azure/azure-sdk-for-java/wiki/HTTP-clients [jdk_link]: https://docs.microsoft.com/java/azure/jdk/?view=azure-java-stable [metrics_advisor_account]: https://ms.portal.azure.com/#create/Microsoft.CognitiveServicesMetricsAdvisor -[metrics_advisor_doc]: https://docs.microsoft.com/en-gb/azure/cognitive-services/metrics-advisor/glossary +[metrics_advisor_doc]: https://docs.microsoft.com/azure/cognitive-services/dataFeedMetrics-advisor/glossary [mvn_package]: https://search.maven.org/artifact/com.azure/azure-ai-metricsadvisor/1.0.0-beta.1/jar [product_documentation]: https://docs.microsoft.com/azure/cognitive-services/metrics-advisor/overview [source_code]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/metricsadvisor/azure-ai-metricsadvisor/src diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClient.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClient.java index 9bacf65f2b9f..130cb0f4a17f 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClient.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClient.java @@ -3,13 +3,7 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.implementation.util.AnomalyTransforms; import com.azure.ai.metricsadvisor.implementation.AzureCognitiveServiceMetricsAdvisorRestAPIOpenAPIV2Impl; -import com.azure.ai.metricsadvisor.implementation.util.DetectionConfigurationTransforms; -import com.azure.ai.metricsadvisor.implementation.util.IncidentHelper; -import com.azure.ai.metricsadvisor.implementation.util.IncidentRootCauseTransforms; -import com.azure.ai.metricsadvisor.implementation.util.IncidentTransforms; -import com.azure.ai.metricsadvisor.implementation.util.MetricEnrichedSeriesDataTransformations; import com.azure.ai.metricsadvisor.implementation.models.AlertingResultQuery; import com.azure.ai.metricsadvisor.implementation.models.AnomalyDimensionQuery; import com.azure.ai.metricsadvisor.implementation.models.AnomalyFeedback; @@ -33,15 +27,21 @@ import com.azure.ai.metricsadvisor.implementation.models.PeriodFeedback; import com.azure.ai.metricsadvisor.implementation.models.PeriodFeedbackValue; import com.azure.ai.metricsadvisor.implementation.models.SeriesIdentity; +import com.azure.ai.metricsadvisor.implementation.util.AnomalyTransforms; +import com.azure.ai.metricsadvisor.implementation.util.DetectionConfigurationTransforms; +import com.azure.ai.metricsadvisor.implementation.util.IncidentHelper; +import com.azure.ai.metricsadvisor.implementation.util.IncidentRootCauseTransforms; +import com.azure.ai.metricsadvisor.implementation.util.IncidentTransforms; +import com.azure.ai.metricsadvisor.implementation.util.MetricEnrichedSeriesDataTransformations; import com.azure.ai.metricsadvisor.implementation.util.MetricFeedbackTransforms; import com.azure.ai.metricsadvisor.implementation.util.MetricSeriesDataTransforms; import com.azure.ai.metricsadvisor.implementation.util.MetricSeriesDefinitionTransforms; -import com.azure.ai.metricsadvisor.models.Alert; -import com.azure.ai.metricsadvisor.models.Anomaly; +import com.azure.ai.metricsadvisor.models.AnomalyAlert; +import com.azure.ai.metricsadvisor.models.AnomalyIncident; +import com.azure.ai.metricsadvisor.models.DataPointAnomaly; import com.azure.ai.metricsadvisor.models.DimensionKey; import com.azure.ai.metricsadvisor.models.EnrichmentStatus; import com.azure.ai.metricsadvisor.models.ErrorCodeException; -import com.azure.ai.metricsadvisor.models.Incident; import com.azure.ai.metricsadvisor.models.IncidentRootCause; import com.azure.ai.metricsadvisor.models.ListAlertOptions; import com.azure.ai.metricsadvisor.models.ListAnomaliesAlertedOptions; @@ -52,7 +52,6 @@ import com.azure.ai.metricsadvisor.models.ListMetricDimensionValuesOptions; import com.azure.ai.metricsadvisor.models.ListMetricEnrichmentStatusOptions; import com.azure.ai.metricsadvisor.models.ListMetricFeedbackOptions; -import com.azure.ai.metricsadvisor.models.ListMetricSeriesDataOptions; import com.azure.ai.metricsadvisor.models.ListMetricSeriesDefinitionOptions; import com.azure.ai.metricsadvisor.models.MetricAnomalyFeedback; import com.azure.ai.metricsadvisor.models.MetricChangePointFeedback; @@ -198,7 +197,7 @@ private Mono> listMetricSeriesDefinitionNe * Get time series data from metric. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricSeriesData#String-List-ListMetricSeriesDataOptions} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricSeriesData#String-List-OffsetDateTime-OffsetDateTime} * * @param metricId metric unique id. * @param seriesKeys the series key to filter. @@ -206,7 +205,8 @@ private Mono> listMetricSeriesDefinitionNe * For example, let's say we've the dimensions 'category' and 'city', * so the api can query value of the dimension 'category', with series key as 'city=redmond'. *

- * @param options query time series data condition. + * @param startTime The start time for querying the time series data. + * @param endTime The end time for querying the time series data. * * @return A {@link PagedFlux} of the {@link MetricSeriesData metric series data points}. * @throws IllegalArgumentException thrown if {@code metricId} fail the UUID format validation. @@ -216,10 +216,10 @@ private Mono> listMetricSeriesDefinitionNe */ @ServiceMethod(returns = ReturnType.COLLECTION) public PagedFlux listMetricSeriesData( - String metricId, List seriesKeys, ListMetricSeriesDataOptions options) { + String metricId, List seriesKeys, OffsetDateTime startTime, OffsetDateTime endTime) { try { return new PagedFlux<>(() -> withContext(context -> listMetricSeriesDataInternal(metricId, seriesKeys, - options, context)), + startTime, endTime, context)), null); } catch (RuntimeException ex) { return new PagedFlux<>(() -> monoError(logger, ex)); @@ -227,25 +227,28 @@ public PagedFlux listMetricSeriesData( } PagedFlux listMetricSeriesData(String metricId, List seriesKeys, - ListMetricSeriesDataOptions options, Context context) { - return new PagedFlux<>(() -> listMetricSeriesDataInternal(metricId, seriesKeys, options, context), null); + OffsetDateTime startTime, OffsetDateTime endTime, Context context) { + return new PagedFlux<>(() -> listMetricSeriesDataInternal(metricId, seriesKeys, startTime, endTime, context), + null); } private Mono> listMetricSeriesDataInternal(String metricId, - List seriesKeys, ListMetricSeriesDataOptions options, - Context context) { + List seriesKeys, OffsetDateTime startTime, + OffsetDateTime endTime, Context context) { Objects.requireNonNull(metricId, "'metricId' cannot be null."); - Objects.requireNonNull(options, "'options' cannot be null."); - Objects.requireNonNull(options.getStartTime(), "'options.startTime' cannot be null."); - Objects.requireNonNull(options.getEndTime(), "'options.endTime' cannot be null."); + Objects.requireNonNull(startTime, "'startTime' cannot be null."); + Objects.requireNonNull(endTime, "'endTime' cannot be null."); if (CoreUtils.isNullOrEmpty(seriesKeys)) { Objects.requireNonNull(seriesKeys, "'seriesKeys' cannot be null or empty."); } List> dimensionList = seriesKeys.stream().map(DimensionKey::asMap).collect(Collectors.toList()); - final MetricDataQueryOptions metricDataQueryOptions = new MetricDataQueryOptions() - .setStartTime(options.getStartTime()).setEndTime(options.getEndTime()).setSeries(dimensionList); + final MetricDataQueryOptions metricDataQueryOptions + = new MetricDataQueryOptions() + .setStartTime(startTime) + .setEndTime(startTime) + .setSeries(dimensionList); return service.getMetricDataWithResponseAsync(UUID.fromString(metricId), metricDataQueryOptions, context) @@ -546,7 +549,7 @@ PagedFlux listMetricEnrichedSeriesData(ListCode sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAnomaliesForDetectionConfiguration#String-ListAnomaliesDetectedOptions} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAnomaliesForDetectionConfig#String-ListAnomaliesDetectedOptions} * * @param detectionConfigurationId The anomaly detection configuration id. * @param options The additional parameters. @@ -558,32 +561,32 @@ PagedFlux listMetricEnrichedSeriesData(List listAnomaliesForDetectionConfiguration( + public PagedFlux listAnomaliesForDetectionConfig( String detectionConfigurationId, ListAnomaliesDetectedOptions options) { try { return new PagedFlux<>(() -> withContext(context -> - listAnomaliesForDetectionConfigurationSinglePageAsync(detectionConfigurationId, + listAnomaliesForDetectionConfigSinglePageAsync(detectionConfigurationId, options, context)), continuationToken -> - withContext(context -> listAnomaliesForDetectionConfigurationNextPageAsync(continuationToken, + withContext(context -> listAnomaliesForDetectionConfigNextPageAsync(continuationToken, options, context))); } catch (RuntimeException ex) { return new PagedFlux<>(() -> FluxUtil.monoError(logger, ex)); } } - PagedFlux listAnomaliesForDetectionConfiguration( + PagedFlux listAnomaliesForDetectionConfig( String detectionConfigurationId, ListAnomaliesDetectedOptions options, Context context) { return new PagedFlux<>(() -> - listAnomaliesForDetectionConfigurationSinglePageAsync(detectionConfigurationId, options, context), + listAnomaliesForDetectionConfigSinglePageAsync(detectionConfigurationId, options, context), continuationToken -> - listAnomaliesForDetectionConfigurationNextPageAsync(continuationToken, options, context)); + listAnomaliesForDetectionConfigNextPageAsync(continuationToken, options, context)); } - private Mono> listAnomaliesForDetectionConfigurationSinglePageAsync( + private Mono> listAnomaliesForDetectionConfigSinglePageAsync( String detectionConfigurationId, ListAnomaliesDetectedOptions options, Context context) { @@ -617,7 +620,7 @@ private Mono> listAnomaliesForDetectionConfigurationSingl .map(response -> AnomalyTransforms.fromInnerPagedResponse(response)); } - private Mono> listAnomaliesForDetectionConfigurationNextPageAsync( + private Mono> listAnomaliesForDetectionConfigNextPageAsync( String nextPageLink, ListAnomaliesDetectedOptions options, Context context) { @@ -654,7 +657,7 @@ private Mono> listAnomaliesForDetectionConfigurationNextP * Fetch the incidents identified by an anomaly detection configuration. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidentsForDetectionConfiguration#String-ListIncidentsDetectedOptions} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidentsForDetectionConfig#String-ListIncidentsDetectedOptions} * * @param detectionConfigurationId The anomaly detection configuration id. * @param options The additional parameters. @@ -665,33 +668,33 @@ private Mono> listAnomaliesForDetectionConfigurationNextP * or {@code options.startTime} or {@code options.endTime} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedFlux listIncidentsForDetectionConfiguration( + public PagedFlux listIncidentsForDetectionConfig( String detectionConfigurationId, ListIncidentsDetectedOptions options) { try { return new PagedFlux<>(() -> withContext(context -> - listIncidentsForDetectionConfigurationSinglePageAsync(detectionConfigurationId, + listIncidentsForDetectionConfigSinglePageAsync(detectionConfigurationId, options, context)), continuationToken -> - withContext(context -> listIncidentsForDetectionConfigurationNextPageAsync(continuationToken, + withContext(context -> listIncidentsForDetectionConfigNextPageAsync(continuationToken, context))); } catch (RuntimeException ex) { return new PagedFlux<>(() -> FluxUtil.monoError(logger, ex)); } } - PagedFlux listIncidentsForDetectionConfiguration( + PagedFlux listIncidentsForDetectionConfig( String detectionConfigurationId, ListIncidentsDetectedOptions options, Context context) { return new PagedFlux<>(() -> - listIncidentsForDetectionConfigurationSinglePageAsync(detectionConfigurationId, options, context), + listIncidentsForDetectionConfigSinglePageAsync(detectionConfigurationId, options, context), continuationToken -> - listIncidentsForDetectionConfigurationNextPageAsync(continuationToken, context)); + listIncidentsForDetectionConfigNextPageAsync(continuationToken, context)); } - private Mono> listIncidentsForDetectionConfigurationSinglePageAsync( + private Mono> listIncidentsForDetectionConfigSinglePageAsync( String detectionConfigurationId, ListIncidentsDetectedOptions options, Context context) { @@ -727,7 +730,7 @@ private Mono> listIncidentsForDetectionConfigurationSing .map(response -> IncidentTransforms.fromInnerPagedResponse(response)); } - private Mono> listIncidentsForDetectionConfigurationNextPageAsync( + private Mono> listIncidentsForDetectionConfigNextPageAsync( String nextPageLink, Context context) { if (CoreUtils.isNullOrEmpty(nextPageLink)) { @@ -762,12 +765,12 @@ private Mono> listIncidentsForDetectionConfigurationNext public PagedFlux listIncidentRootCauses( String detectionConfigurationId, String incidentId) { - Incident incident = new Incident(); - IncidentHelper.setId(incident, incidentId); - IncidentHelper.setDetectionConfigurationId(incident, detectionConfigurationId); + AnomalyIncident anomalyIncident = new AnomalyIncident(); + IncidentHelper.setId(anomalyIncident, incidentId); + IncidentHelper.setDetectionConfigurationId(anomalyIncident, detectionConfigurationId); try { return new PagedFlux<>(() -> - withContext(context -> listIncidentRootCausesInternal(incident, context)), null); + withContext(context -> listIncidentRootCausesInternal(anomalyIncident, context)), null); } catch (RuntimeException ex) { return new PagedFlux<>(() -> monoError(logger, ex)); } @@ -776,59 +779,61 @@ public PagedFlux listIncidentRootCauses( PagedFlux listIncidentRootCauses( String detectionConfigurationId, String incidentId, Context context) { - Incident incident = new Incident(); - IncidentHelper.setId(incident, incidentId); - IncidentHelper.setDetectionConfigurationId(incident, detectionConfigurationId); + AnomalyIncident anomalyIncident = new AnomalyIncident(); + IncidentHelper.setId(anomalyIncident, incidentId); + IncidentHelper.setDetectionConfigurationId(anomalyIncident, detectionConfigurationId); try { - return new PagedFlux<>(() -> listIncidentRootCausesInternal(incident, context), null); + return new PagedFlux<>(() -> listIncidentRootCausesInternal(anomalyIncident, context), null); } catch (RuntimeException ex) { return new PagedFlux<>(() -> monoError(logger, ex)); } } /** - * List the root causes for an incident. + * List the root causes for an anomalyIncident. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidentRootCauses#Incident} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidentRootCauses#AnomalyIncident} * - * @param incident the incident for which you want to query root causes for. + * @param anomalyIncident the anomalyIncident for which you want to query root causes for. * - * @return the list of root causes for that incident. + * @return the list of root causes for that anomalyIncident. * @throws IllegalArgumentException thrown if {@code detectionConfigurationId} fail the UUID format validation. * @throws ErrorCodeException thrown if the request is rejected by server. * @throws NullPointerException thrown if the {@code detectionConfigurationId} or {@code incidentId} is null. **/ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedFlux listIncidentRootCauses(Incident incident) { + public PagedFlux listIncidentRootCauses(AnomalyIncident anomalyIncident) { try { - return new PagedFlux<>(() -> withContext(context -> listIncidentRootCausesInternal(incident, context)), + return new PagedFlux<>(() -> withContext(context -> + listIncidentRootCausesInternal(anomalyIncident, context)), null); } catch (RuntimeException ex) { return new PagedFlux<>(() -> monoError(logger, ex)); } } - PagedFlux listIncidentRootCauses(Incident incident, Context context) { - return new PagedFlux<>(() -> listIncidentRootCausesInternal(incident, context), null); + PagedFlux listIncidentRootCauses(AnomalyIncident anomalyIncident, Context context) { + return new PagedFlux<>(() -> listIncidentRootCausesInternal(anomalyIncident, context), null); } - private Mono> listIncidentRootCausesInternal(Incident incident, Context context) { - if (incident == null) { - throw logger.logExceptionAsError(new IllegalArgumentException("'incident' is required.")); + private Mono> listIncidentRootCausesInternal(AnomalyIncident anomalyIncident, + Context context) { + if (anomalyIncident == null) { + throw logger.logExceptionAsError(new IllegalArgumentException("'anomalyIncident' is required.")); } - Objects.requireNonNull(incident.getDetectionConfigurationId(), - "'incident.detectionConfigurationId' is required."); - Objects.requireNonNull(incident.getId(), "'incident.id' is required"); + Objects.requireNonNull(anomalyIncident.getDetectionConfigurationId(), + "'anomalyIncident.detectionConfigurationId' is required."); + Objects.requireNonNull(anomalyIncident.getId(), "'anomalyIncident.id' is required"); final Context withTracing = context.addData(AZ_TRACING_NAMESPACE_KEY, METRICS_ADVISOR_TRACING_NAMESPACE_VALUE); return service.getRootCauseOfIncidentByAnomalyDetectionConfigurationWithResponseAsync( - UUID.fromString(incident.getDetectionConfigurationId()), - incident.getId(), withTracing) + UUID.fromString(anomalyIncident.getDetectionConfigurationId()), + anomalyIncident.getId(), withTracing) .doOnSubscribe(ignoredValue -> logger.info("Retrieved the IncidentRootCauses - {}", - incident.getDetectionConfigurationId())) + anomalyIncident.getDetectionConfigurationId())) .doOnSuccess(response -> logger.info("Retrieved the IncidentRootCauses - {}", response)) .doOnError(error -> logger.warning("Failed to retrieve the incident root causes - {}", - incident.getDetectionConfigurationId(), error)) + anomalyIncident.getDetectionConfigurationId(), error)) .map(res -> IncidentRootCauseTransforms.fromInnerResponse(res)); } @@ -855,12 +860,12 @@ public PagedFlux listDimensionValuesWithAnomalies( try { return new PagedFlux<>(() -> withContext(context -> - listValuesOfDimensionWithAnomaliesSinglePageAsync(detectionConfigurationId, + listDimensionValuesWithAnomaliesSinglePageAsync(detectionConfigurationId, dimensionName, options, context)), continuationToken -> - withContext(context -> listValuesOfDimensionWithAnomaliesNextPageAsync(continuationToken, + withContext(context -> listDimensionValuesWithAnomaliesNextPageAsync(continuationToken, dimensionName, options, context))); @@ -875,18 +880,18 @@ PagedFlux listDimensionValuesWithAnomalies( ListDimensionValuesWithAnomaliesOptions options, Context context) { return new PagedFlux<>(() -> - listValuesOfDimensionWithAnomaliesSinglePageAsync(detectionConfigurationId, + listDimensionValuesWithAnomaliesSinglePageAsync(detectionConfigurationId, dimensionName, options, context), continuationToken -> - listValuesOfDimensionWithAnomaliesNextPageAsync(continuationToken, + listDimensionValuesWithAnomaliesNextPageAsync(continuationToken, dimensionName, options, context)); } - private Mono> listValuesOfDimensionWithAnomaliesSinglePageAsync( + private Mono> listDimensionValuesWithAnomaliesSinglePageAsync( String detectionConfigurationId, String dimensionName, ListDimensionValuesWithAnomaliesOptions options, @@ -918,7 +923,7 @@ private Mono> listValuesOfDimensionWithAnomaliesSinglePage .doOnError(error -> logger.warning("Failed to list the dimension values with anomalies", error)); } - private Mono> listValuesOfDimensionWithAnomaliesNextPageAsync( + private Mono> listDimensionValuesWithAnomaliesNextPageAsync( String nextPageLink, String dimensionName, ListDimensionValuesWithAnomaliesOptions options, @@ -961,7 +966,7 @@ private Mono> listValuesOfDimensionWithAnomaliesNextPageAs * or {@code options.startTime} or {@code options.endTime} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedFlux listAlerts( + public PagedFlux listAlerts( String alertConfigurationId, ListAlertOptions options) { try { @@ -977,7 +982,7 @@ public PagedFlux listAlerts( } } - PagedFlux listAlerts( + PagedFlux listAlerts( String alertConfigurationId, ListAlertOptions options, Context context) { return new PagedFlux<>(() -> @@ -988,7 +993,7 @@ PagedFlux listAlerts( context)); } - private Mono> listAlertsSinglePageAsync( + private Mono> listAlertsSinglePageAsync( String alertConfigurationId, ListAlertOptions options, Context context) { @@ -1014,7 +1019,7 @@ private Mono> listAlertsSinglePageAsync( .doOnError(error -> logger.warning("Failed to list the alerts", error)); } - private Mono> listAlertsNextPageAsync( + private Mono> listAlertsNextPageAsync( String nextPageLink, ListAlertOptions options, Context context) { @@ -1052,7 +1057,7 @@ private Mono> listAlertsNextPageAsync( * @throws NullPointerException thrown if the {@code alertConfigurationId} or {@code alertId} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedFlux listAnomaliesForAlert( + public PagedFlux listAnomaliesForAlert( String alertConfigurationId, String alertId) { return listAnomaliesForAlert(alertConfigurationId, alertId, null); @@ -1074,7 +1079,7 @@ public PagedFlux listAnomaliesForAlert( * @throws NullPointerException thrown if the {@code alertConfigurationId} or {@code alertId} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedFlux listAnomaliesForAlert( + public PagedFlux listAnomaliesForAlert( String alertConfigurationId, String alertId, ListAnomaliesAlertedOptions options) { @@ -1090,7 +1095,7 @@ public PagedFlux listAnomaliesForAlert( } } - PagedFlux listAnomaliesForAlert( + PagedFlux listAnomaliesForAlert( String alertConfigurationId, String alertId, ListAnomaliesAlertedOptions options, @@ -1101,7 +1106,7 @@ PagedFlux listAnomaliesForAlert( listAnomaliesForAlertNextPageAsync(continuationToken, context)); } - private Mono> listAnomaliesForAlertSinglePageAsync( + private Mono> listAnomaliesForAlertSinglePageAsync( String alertConfigurationId, String alertId, ListAnomaliesAlertedOptions options, @@ -1122,7 +1127,7 @@ private Mono> listAnomaliesForAlertSinglePageAsync( .map(response -> AnomalyTransforms.fromInnerPagedResponse(response)); } - private Mono> listAnomaliesForAlertNextPageAsync( + private Mono> listAnomaliesForAlertNextPageAsync( String nextPageLink, Context context) { if (CoreUtils.isNullOrEmpty(nextPageLink)) { @@ -1155,7 +1160,7 @@ private Mono> listAnomaliesForAlertNextPageAsync( * @throws NullPointerException thrown if the {@code alertConfigurationId} or {@code alertId} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedFlux listIncidentsForAlert( + public PagedFlux listIncidentsForAlert( String alertConfigurationId, String alertId, ListIncidentsAlertedOptions options) { @@ -1171,7 +1176,7 @@ public PagedFlux listIncidentsForAlert( } } - PagedFlux listIncidentsForAlert( + PagedFlux listIncidentsForAlert( String alertConfigurationId, String alertId, ListIncidentsAlertedOptions options, Context context) { @@ -1181,7 +1186,7 @@ PagedFlux listIncidentsForAlert( listIncidentsForAlertNextPageAsync(continuationToken, context)); } - private Mono> listIncidentsForAlertSinglePageAsync( + private Mono> listIncidentsForAlertSinglePageAsync( String alertConfigurationId, String alertId, ListIncidentsAlertedOptions options, Context context) { @@ -1201,7 +1206,7 @@ private Mono> listIncidentsForAlertSinglePageAsync( .map(response -> IncidentTransforms.fromInnerPagedResponse(response)); } - private Mono> listIncidentsForAlertNextPageAsync( + private Mono> listIncidentsForAlertNextPageAsync( String nextPageLink, Context context) { if (CoreUtils.isNullOrEmpty(nextPageLink)) { diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorClient.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorClient.java index 8d6e7db0bf85..06531dd3406d 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorClient.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorClient.java @@ -4,12 +4,12 @@ package com.azure.ai.metricsadvisor; import com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClientBuilder; -import com.azure.ai.metricsadvisor.models.Alert; -import com.azure.ai.metricsadvisor.models.Anomaly; +import com.azure.ai.metricsadvisor.models.AnomalyAlert; +import com.azure.ai.metricsadvisor.models.AnomalyIncident; +import com.azure.ai.metricsadvisor.models.DataPointAnomaly; import com.azure.ai.metricsadvisor.models.DimensionKey; import com.azure.ai.metricsadvisor.models.EnrichmentStatus; import com.azure.ai.metricsadvisor.models.ErrorCodeException; -import com.azure.ai.metricsadvisor.models.Incident; import com.azure.ai.metricsadvisor.models.IncidentRootCause; import com.azure.ai.metricsadvisor.models.ListAlertOptions; import com.azure.ai.metricsadvisor.models.ListAnomaliesAlertedOptions; @@ -19,7 +19,6 @@ import com.azure.ai.metricsadvisor.models.ListMetricDimensionValuesOptions; import com.azure.ai.metricsadvisor.models.ListMetricEnrichmentStatusOptions; import com.azure.ai.metricsadvisor.models.ListMetricFeedbackOptions; -import com.azure.ai.metricsadvisor.models.ListMetricSeriesDataOptions; import com.azure.ai.metricsadvisor.models.ListMetricSeriesDefinitionOptions; import com.azure.ai.metricsadvisor.models.ListDimensionValuesWithAnomaliesOptions; import com.azure.ai.metricsadvisor.models.MetricEnrichedSeriesData; @@ -39,7 +38,7 @@ /** * This class provides an asynchronous client that contains all the operations that apply to Azure Metrics Advisor. * - *

Instantiating an synchronous Metric Advisor Client

+ *

Instantiating an synchronous DataFeedMetric Advisor Client

* {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.instantiation} * * @see MetricsAdvisorClientBuilder @@ -111,7 +110,7 @@ public PagedIterable listMetricSeriesDefinitions( * Get time series data from metric. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesData#String-List-ListMetricSeriesDataOptions} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesData#String-List-OffsetDateTime-OffsetDateTime} * * @param metricId metric unique id. * @param seriesKeys the series key to filter. @@ -119,7 +118,8 @@ public PagedIterable listMetricSeriesDefinitions( * For example, let's say we've the dimensions 'category' and 'city', * so the api can query value of the dimension 'category', with series key as 'city=redmond'. *

- * @param options query time series data condition. + * @param startTime The start time for querying the time series data. + * @param endTime The end time for querying the time series data. * * @return A {@link PagedIterable} of the {@link MetricSeriesData metric series data points}. * @throws IllegalArgumentException thrown if {@code metricId} fail the UUID format validation. @@ -128,15 +128,15 @@ public PagedIterable listMetricSeriesDefinitions( */ @ServiceMethod(returns = ReturnType.COLLECTION) public PagedIterable listMetricSeriesData(String metricId, - List seriesKeys, ListMetricSeriesDataOptions options) { - return listMetricSeriesData(metricId, seriesKeys, options, Context.NONE); + List seriesKeys, OffsetDateTime startTime, OffsetDateTime endTime) { + return listMetricSeriesData(metricId, seriesKeys, startTime, endTime, Context.NONE); } /** * Get time series data from metric. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesData#String-List-ListMetricSeriesDataOptions-Context} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesData#String-List-OffsetDateTime-OffsetDateTime-Context} * * @param metricId metric unique id. * @param seriesKeys the series key to filter. @@ -144,19 +144,20 @@ public PagedIterable listMetricSeriesData(String metricId, * For example, let's say we've the dimensions 'category' and 'city', * so the api can query value of the dimension 'category', with series key as 'city=redmond'. *

- * @param options query time series data condition. + * @param startTime The start time for querying the time series data. + * @param endTime The end time for querying the time series data. * @param context Additional context that is passed through the Http pipeline during the service call. * * @return A {@link PagedIterable} of the {@link MetricSeriesData metric series data points}. * @throws IllegalArgumentException thrown if {@code metricId} fail the UUID format validation. - * @throws NullPointerException thrown if the {@code metricId}, {@code options.startTime} or {@code options.endTime} + * @throws NullPointerException thrown if the {@code metricId}, {@code startTime} or {@code endTime} * is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) public PagedIterable listMetricSeriesData(String metricId, List seriesKeys, - ListMetricSeriesDataOptions options, Context context) { - return new PagedIterable<>(client.listMetricSeriesData(metricId, seriesKeys, options, - context == null ? Context.NONE : context)); + OffsetDateTime startTime, OffsetDateTime endTime, Context context) { + return new PagedIterable<>(client.listMetricSeriesData(metricId, seriesKeys, startTime, endTime, + context == null ? Context.NONE : context)); } /** @@ -272,7 +273,7 @@ public PagedIterable listMetricEnrichedSeriesData( * Fetch the anomalies identified by an anomaly detection configuration. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForDetectionConfiguration#String-ListAnomaliesDetectedOptions} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForDetectionConfig#String-ListAnomaliesDetectedOptions} * * @param detectionConfigurationId The anomaly detection configuration id. * @param options The additional parameters. @@ -284,17 +285,17 @@ public PagedIterable listMetricEnrichedSeriesData( * or {@code options.startTime} or {@code options.endTime} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable listAnomaliesForDetectionConfiguration( + public PagedIterable listAnomaliesForDetectionConfig( String detectionConfigurationId, ListAnomaliesDetectedOptions options) { - return listAnomaliesForDetectionConfiguration(detectionConfigurationId, options, Context.NONE); + return listAnomaliesForDetectionConfig(detectionConfigurationId, options, Context.NONE); } /** * Fetch the anomalies identified by an anomaly detection configuration. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForDetectionConfiguration#String-ListAnomaliesDetectedOptions-Context} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForDetectionConfig#String-ListAnomaliesDetectedOptions-Context} * * @param detectionConfigurationId The anomaly detection configuration id. * @param options The additional parameters. @@ -307,10 +308,10 @@ public PagedIterable listAnomaliesForDetectionConfiguration( * or {@code options.startTime} or {@code options.endTime} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable listAnomaliesForDetectionConfiguration( + public PagedIterable listAnomaliesForDetectionConfig( String detectionConfigurationId, ListAnomaliesDetectedOptions options, Context context) { - return new PagedIterable<>(client.listAnomaliesForDetectionConfiguration(detectionConfigurationId, + return new PagedIterable<>(client.listAnomaliesForDetectionConfig(detectionConfigurationId, options, context == null ? Context.NONE : context)); } @@ -319,7 +320,7 @@ public PagedIterable listAnomaliesForDetectionConfiguration( * Fetch the incidents identified by an anomaly detection configuration. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentsForDetectionConfiguration#String-ListIncidentsDetectedOptions} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentsForDetectionConfig#String-ListIncidentsDetectedOptions} * * @param detectionConfigurationId The anomaly detection configuration id. * @param options The additional parameters. @@ -330,17 +331,17 @@ public PagedIterable listAnomaliesForDetectionConfiguration( * or {@code options.startTime} or {@code options.endTime} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable listIncidentsForDetectionConfiguration( + public PagedIterable listIncidentsForDetectionConfig( String detectionConfigurationId, ListIncidentsDetectedOptions options) { - return listIncidentsForDetectionConfiguration(detectionConfigurationId, options, Context.NONE); + return listIncidentsForDetectionConfig(detectionConfigurationId, options, Context.NONE); } /** * Fetch the incidents identified by an anomaly detection configuration. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentsForDetectionConfiguration#String-ListIncidentsDetectedOptions-Context} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentsForDetectionConfig#String-ListIncidentsDetectedOptions-Context} * * @param detectionConfigurationId The anomaly detection configuration id. * @param options The additional parameters. @@ -352,10 +353,10 @@ public PagedIterable listIncidentsForDetectionConfiguration( * or {@code options.startTime} or {@code options.endTime} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable listIncidentsForDetectionConfiguration( + public PagedIterable listIncidentsForDetectionConfig( String detectionConfigurationId, ListIncidentsDetectedOptions options, Context context) { - return new PagedIterable<>(client.listIncidentsForDetectionConfiguration(detectionConfigurationId, + return new PagedIterable<>(client.listIncidentsForDetectionConfig(detectionConfigurationId, options, context == null ? Context.NONE : context)); } @@ -404,21 +405,21 @@ public PagedIterable listIncidentRootCauses( } /** - * List the root causes for an incident. + * List the root causes for an anomalyIncident. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentRootCauses#Incident} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentRootCauses#AnomalyIncident} * - * @param incident the incident for which you want to query root causes for. + * @param anomalyIncident the anomalyIncident for which you want to query root causes for. * - * @return the list of root causes for that incident. + * @return the list of root causes for that anomalyIncident. * @throws IllegalArgumentException thrown if {@code detectionConfigurationId} fail the UUID format validation. * @throws ErrorCodeException thrown if the request is rejected by server. * @throws NullPointerException thrown if the {@code detectionConfigurationId} or {@code incidentId} is null. **/ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable listIncidentRootCauses(Incident incident) { - return new PagedIterable<>(client.listIncidentRootCauses(incident, Context.NONE)); + public PagedIterable listIncidentRootCauses(AnomalyIncident anomalyIncident) { + return new PagedIterable<>(client.listIncidentRootCauses(anomalyIncident, Context.NONE)); } /** @@ -488,7 +489,7 @@ public PagedIterable listDimensionValuesWithAnomalies( * or {@code options.startTime} or {@code options.endTime} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable listAlerts( + public PagedIterable listAlerts( String alertConfigurationId, ListAlertOptions options) { return listAlerts(alertConfigurationId, options, Context.NONE); @@ -511,7 +512,7 @@ public PagedIterable listAlerts( * or {@code options.startTime} or {@code options.endTime} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable listAlerts( + public PagedIterable listAlerts( String alertConfigurationId, ListAlertOptions options, Context context) { return new PagedIterable<>(client.listAlerts(alertConfigurationId, options, @@ -532,7 +533,7 @@ public PagedIterable listAlerts( * @throws NullPointerException thrown if the {@code alertConfigurationId} or {@code alertId} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable listAnomaliesForAlert( + public PagedIterable listAnomaliesForAlert( String alertConfigurationId, String alertId) { return listAnomaliesForAlert(alertConfigurationId, alertId, null, Context.NONE); @@ -555,7 +556,7 @@ public PagedIterable listAnomaliesForAlert( * @throws NullPointerException thrown if the {@code alertConfigurationId} or {@code alertId} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable listAnomaliesForAlert( + public PagedIterable listAnomaliesForAlert( String alertConfigurationId, String alertId, ListAnomaliesAlertedOptions options, Context context) { @@ -581,7 +582,7 @@ public PagedIterable listAnomaliesForAlert( * @throws NullPointerException thrown if the {@code alertConfigurationId} or {@code alertId} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable listIncidentsForAlert( + public PagedIterable listIncidentsForAlert( String alertConfigurationId, String alertId, ListIncidentsAlertedOptions options) { @@ -605,7 +606,7 @@ public PagedIterable listIncidentsForAlert( * @throws NullPointerException thrown if the {@code alertConfigurationId} or {@code alertId} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable listIncidentsForAlert( + public PagedIterable listIncidentsForAlert( String alertConfigurationId, String alertId, ListIncidentsAlertedOptions options, Context context) { diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClient.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClient.java index b4e954e23378..209856b573dc 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClient.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClient.java @@ -38,7 +38,7 @@ import com.azure.ai.metricsadvisor.models.DataFeedOptions; import com.azure.ai.metricsadvisor.models.DataFeedRollupSettings; import com.azure.ai.metricsadvisor.models.DataFeedSchema; -import com.azure.ai.metricsadvisor.models.Hook; +import com.azure.ai.metricsadvisor.models.NotificationHook; import com.azure.ai.metricsadvisor.models.ListDataFeedFilter; import com.azure.ai.metricsadvisor.models.ListDataFeedIngestionOptions; import com.azure.ai.metricsadvisor.models.ListDataFeedOptions; @@ -700,7 +700,7 @@ Mono> getDataFeedIngestionProgressWithRespon * Create a configuration to detect anomalies in the time series of a metric. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createMetricAnomalyDetectionConfiguration#String-AnomalyDetectionConfiguration} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createMetricAnomalyDetectionConfig#String-AnomalyDetectionConfiguration} * * @param metricId The metric id to associate the configuration with. * @param detectionConfiguration The anomaly detection configuration. @@ -716,10 +716,10 @@ Mono> getDataFeedIngestionProgressWithRespon * {@code MetricSingleSeriesDetectionCondition} or {@code MetricSeriesGroupDetectionCondition}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono createMetricAnomalyDetectionConfiguration( + public Mono createMetricAnomalyDetectionConfig( String metricId, AnomalyDetectionConfiguration detectionConfiguration) { - return createMetricAnomalyDetectionConfigurationWithResponse(metricId, detectionConfiguration) + return createMetricAnomalyDetectionConfigWithResponse(metricId, detectionConfiguration) .map(Response::getValue); } @@ -727,7 +727,8 @@ public Mono createMetricAnomalyDetectionConfigura * Create a configuration to detect anomalies in the time series of a metric. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createMetricAnomalyDetectionConfigurationWithResponse#String-AnomalyDetectionConfiguration} + * * + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createMetricAnomalyDetectionConfigWithResponse#String-AnomalyDetectionConfiguration} * * @param metricId The metric id to associate the configuration with. * @param detectionConfiguration The anomaly detection configuration. @@ -743,11 +744,11 @@ public Mono createMetricAnomalyDetectionConfigura * {@code MetricSingleSeriesDetectionCondition} or {@code MetricSeriesGroupDetectionCondition}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> createMetricAnomalyDetectionConfigurationWithResponse( + public Mono> createMetricAnomalyDetectionConfigWithResponse( String metricId, AnomalyDetectionConfiguration detectionConfiguration) { try { - return withContext(context -> createMetricAnomalyDetectionConfigurationWithResponse(metricId, + return withContext(context -> createMetricAnomalyDetectionConfigWithResponse(metricId, detectionConfiguration, context)); } catch (RuntimeException e) { @@ -755,7 +756,7 @@ public Mono> createMetricAnomalyDetectio } } - Mono> createMetricAnomalyDetectionConfigurationWithResponse( + Mono> createMetricAnomalyDetectionConfigWithResponse( String metricId, AnomalyDetectionConfiguration detectionConfiguration, Context context) { @@ -774,7 +775,7 @@ Mono> createMetricAnomalyDetectionConfig .flatMap(response -> { final String configurationId = Utility.parseOperationId(response.getDeserializedHeaders().getLocation()); - return getMetricAnomalyDetectionConfigurationWithResponse(configurationId, context) + return getMetricAnomalyDetectionConfigWithResponse(configurationId, context) .map(configurationResponse -> new ResponseBase( response.getRequest(), response.getStatusCode(), @@ -788,7 +789,7 @@ Mono> createMetricAnomalyDetectionConfig * Get the anomaly detection configuration by its id. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getMetricAnomalyDetectionConfiguration#String} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getMetricAnomalyDetectionConfig#String} * * @param detectionConfigurationId The anomaly detection configuration id. * @return A {@link Mono} containing the {@link AnomalyDetectionConfiguration} for the provided id. @@ -797,9 +798,9 @@ Mono> createMetricAnomalyDetectionConfig * @throws NullPointerException thrown if the {@code detectionConfigurationId} is null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono getMetricAnomalyDetectionConfiguration( + public Mono getMetricAnomalyDetectionConfig( String detectionConfigurationId) { - return getMetricAnomalyDetectionConfigurationWithResponse(detectionConfigurationId) + return getMetricAnomalyDetectionConfigWithResponse(detectionConfigurationId) .map(Response::getValue); } @@ -807,7 +808,7 @@ public Mono getMetricAnomalyDetectionConfiguratio * Get the anomaly detection configuration by its id. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getMetricAnomalyDetectionConfigurationWithResponse#String} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getMetricAnomalyDetectionConfigWithResponse#String} * * @param detectionConfigurationId The anomaly detection configuration id. * @return A {@link Response} of a {@link Mono} containing the {@link AnomalyDetectionConfiguration} @@ -817,17 +818,17 @@ public Mono getMetricAnomalyDetectionConfiguratio * @throws NullPointerException thrown if the {@code detectionConfigurationId} is null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getMetricAnomalyDetectionConfigurationWithResponse( + public Mono> getMetricAnomalyDetectionConfigWithResponse( String detectionConfigurationId) { try { - return withContext(context -> getMetricAnomalyDetectionConfigurationWithResponse(detectionConfigurationId, + return withContext(context -> getMetricAnomalyDetectionConfigWithResponse(detectionConfigurationId, context)); } catch (RuntimeException e) { return FluxUtil.monoError(logger, e); } } - Mono> getMetricAnomalyDetectionConfigurationWithResponse( + Mono> getMetricAnomalyDetectionConfigWithResponse( String detectionConfigurationId, Context context) { Objects.requireNonNull(detectionConfigurationId, "detectionConfigurationId is required."); @@ -853,7 +854,7 @@ Mono> getMetricAnomalyDetectionConfigura * Update a configuration to detect anomalies in the time series of a metric. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateMetricAnomalyDetectionConfiguration#AnomalyDetectionConfiguration} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateMetricAnomalyDetectionConfig#AnomalyDetectionConfiguration} * * @param detectionConfiguration The anomaly detection configuration. * @return A {@link Mono} containing the updated {@link AnomalyDetectionConfiguration}. @@ -861,9 +862,9 @@ Mono> getMetricAnomalyDetectionConfigura * or {@code detectionConfiguration.id} is null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono updateMetricAnomalyDetectionConfiguration( + public Mono updateMetricAnomalyDetectionConfig( AnomalyDetectionConfiguration detectionConfiguration) { - return updateMetricAnomalyDetectionConfigurationWithResponse(detectionConfiguration) + return updateMetricAnomalyDetectionConfigWithResponse(detectionConfiguration) .map(Response::getValue); } @@ -871,7 +872,7 @@ public Mono updateMetricAnomalyDetectionConfigura * Update a configuration to detect anomalies in the time series of a metric. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateMetricAnomalyDetectionConfigurationWithResponse#AnomalyDetectionConfiguration} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateMetricAnomalyDetectionConfigWithResponse#AnomalyDetectionConfiguration} * * @param detectionConfiguration The anomaly detection configuration. * @return A {@link Response} of a {@link Mono} containing the updated {@link AnomalyDetectionConfiguration}. @@ -879,17 +880,17 @@ public Mono updateMetricAnomalyDetectionConfigura * or {@code detectionConfiguration.id} is null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> updateMetricAnomalyDetectionConfigurationWithResponse( + public Mono> updateMetricAnomalyDetectionConfigWithResponse( AnomalyDetectionConfiguration detectionConfiguration) { try { - return withContext(context -> updateMetricAnomalyDetectionConfigurationWithResponse(detectionConfiguration, + return withContext(context -> updateMetricAnomalyDetectionConfigWithResponse(detectionConfiguration, context)); } catch (RuntimeException e) { return FluxUtil.monoError(logger, e); } } - Mono> updateMetricAnomalyDetectionConfigurationWithResponse( + Mono> updateMetricAnomalyDetectionConfigWithResponse( AnomalyDetectionConfiguration detectionConfiguration, Context context) { Objects.requireNonNull(detectionConfiguration, "detectionConfiguration is required"); @@ -905,7 +906,7 @@ Mono> updateMetricAnomalyDetectionConfig .doOnSuccess(response -> logger.info("Updated AnomalyDetectionConfiguration")) .doOnError(error -> logger.warning("Failed to update AnomalyDetectionConfiguration", error)) .flatMap(response -> { - return getMetricAnomalyDetectionConfigurationWithResponse(detectionConfiguration.getId(), context) + return getMetricAnomalyDetectionConfigWithResponse(detectionConfiguration.getId(), context) .map(configurationResponse -> new ResponseBase( response.getRequest(), response.getStatusCode(), @@ -921,7 +922,7 @@ Mono> updateMetricAnomalyDetectionConfig * @param detectionConfigurationId The metric anomaly detection configuration unique id. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteMetricAnomalyDetectionConfiguration#String} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteMetricAnomalyDetectionConfig#String} * * @return An empty Mono. * @throws NullPointerException thrown if the {@code detectionConfigurationId} is null. @@ -930,14 +931,14 @@ Mono> updateMetricAnomalyDetectionConfig */ @ServiceMethod(returns = ReturnType.SINGLE) public Mono deleteMetricAnomalyDetectionConfiguration(String detectionConfigurationId) { - return deleteMetricAnomalyDetectionConfigurationWithResponse(detectionConfigurationId).then(); + return deleteMetricAnomalyDetectionConfigWithResponse(detectionConfigurationId).then(); } /** * Delete a metric anomaly detection configuration. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteMetricAnomalyDetectionConfigurationWithResponse#String} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteMetricAnomalyDetectionConfigWithResponse#String} * * @param detectionConfigurationId The metric anomaly detection configuration unique id. * @@ -947,10 +948,10 @@ public Mono deleteMetricAnomalyDetectionConfiguration(String detectionConf * format specification. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> deleteMetricAnomalyDetectionConfigurationWithResponse( + public Mono> deleteMetricAnomalyDetectionConfigWithResponse( String detectionConfigurationId) { try { - return withContext(context -> deleteMetricAnomalyDetectionConfigurationWithResponse( + return withContext(context -> deleteMetricAnomalyDetectionConfigWithResponse( detectionConfigurationId, context)); } catch (RuntimeException e) { @@ -958,7 +959,7 @@ public Mono> deleteMetricAnomalyDetectionConfigurationWithRespons } } - Mono> deleteMetricAnomalyDetectionConfigurationWithResponse(String detectionConfigurationId, + Mono> deleteMetricAnomalyDetectionConfigWithResponse(String detectionConfigurationId, Context context) { Objects.requireNonNull(detectionConfigurationId, "detectionConfigurationId is required."); return service.deleteHookWithResponseAsync(UUID.fromString(detectionConfigurationId), @@ -972,7 +973,7 @@ Mono> deleteMetricAnomalyDetectionConfigurationWithResponse(Strin * Given a metric id, retrieve all anomaly detection configurations applied to it. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listMetricAnomalyDetectionConfigurations#String} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listMetricAnomalyDetectionConfigs#String} * * @param metricId The metric id. * @return The anomaly detection configurations. @@ -980,9 +981,9 @@ Mono> deleteMetricAnomalyDetectionConfigurationWithResponse(Strin * @throws IllegalArgumentException If {@code metricId} does not conform to the UUID format specification. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedFlux listMetricAnomalyDetectionConfigurations(String metricId) { + public PagedFlux listMetricAnomalyDetectionConfigs(String metricId) { try { - return new PagedFlux<>(() -> withContext(context -> listMetricAnomalyDetectionConfigurationsInternal( + return new PagedFlux<>(() -> withContext(context -> listMetricAnomalyDetectionConfigsInternal( metricId, context)), null); } catch (RuntimeException ex) { @@ -990,13 +991,13 @@ public PagedFlux listMetricAnomalyDetectionConfig } } - PagedFlux listMetricAnomalyDetectionConfigurations(String metricId, + PagedFlux listMetricAnomalyDetectionConfigs(String metricId, Context context) { - return new PagedFlux<>(() -> listMetricAnomalyDetectionConfigurationsInternal(metricId, context), + return new PagedFlux<>(() -> listMetricAnomalyDetectionConfigsInternal(metricId, context), null); } - private Mono> listMetricAnomalyDetectionConfigurationsInternal( + private Mono> listMetricAnomalyDetectionConfigsInternal( String metricId, Context context) { Objects.requireNonNull(metricId, "metricId is required"); @@ -1032,56 +1033,58 @@ private Mono> listMetricAnomalyDete } /** - * Creates a hook that receives anomaly incident alerts. + * Creates a notificationHook that receives anomaly incident alerts. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createHook#Hook} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createHook#NotificationHook} * - * @param hook The hook. + * @param notificationHook The notificationHook. * - * @return A {@link Mono} containing the created {@link Hook}. - * @throws NullPointerException If {@code hook}, {@code hook.name}, {@code hook.endpoint} (for web hook) is null. - * @throws IllegalArgumentException If at least one email not present for email hook. + * @return A {@link Mono} containing the created {@link NotificationHook}. + * @throws NullPointerException If {@code notificationHook}, {@code notificationHook.name}, + * {@code notificationHook.endpoint} (for web notificationHook) is null. + * @throws IllegalArgumentException If at least one email not present for email notificationHook. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono createHook(Hook hook) { - return createHookWithResponse(hook) + public Mono createHook(NotificationHook notificationHook) { + return createHookWithResponse(notificationHook) .map(Response::getValue); } /** - * Creates a hook that receives anomaly incident alerts. + * Creates a notificationHook that receives anomaly incident alerts. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createHookWithResponse#Hook} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createHookWithResponse#NotificationHook} * - * @param hook The hook. + * @param notificationHook The notificationHook. * - * @return A {@link Response} of a {@link Mono} containing the created {@link Hook}. - * @throws NullPointerException If {@code hook}, {@code hook.name}, {@code hook.endpoint} (for web hook) is null. - * @throws IllegalArgumentException If at least one email not present for email hook. + * @return A {@link Response} of a {@link Mono} containing the created {@link NotificationHook}. + * @throws NullPointerException If {@code notificationHook}, {@code notificationHook.name}, + * {@code notificationHook.endpoint} (for web notificationHook) is null. + * @throws IllegalArgumentException If at least one email not present for email notificationHook. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> createHookWithResponse(Hook hook) { + public Mono> createHookWithResponse(NotificationHook notificationHook) { try { - return withContext(context -> createHookWithResponse(hook, context)); + return withContext(context -> createHookWithResponse(notificationHook, context)); } catch (RuntimeException e) { return FluxUtil.monoError(logger, e); } } - Mono> createHookWithResponse(Hook hook, Context context) { - Objects.requireNonNull(hook, "'hook' cannot be null."); - return service.createHookWithResponseAsync(HookTransforms.toInnerForCreate(logger, hook), + Mono> createHookWithResponse(NotificationHook notificationHook, Context context) { + Objects.requireNonNull(notificationHook, "'notificationHook' cannot be null."); + return service.createHookWithResponseAsync(HookTransforms.toInnerForCreate(logger, notificationHook), context.addData(AZ_TRACING_NAMESPACE_KEY, METRICS_ADVISOR_TRACING_NAMESPACE_VALUE)) - .doOnRequest(ignoredValue -> logger.info("Creating Hook")) - .doOnSuccess(response -> logger.info("Created Hook {}", response)) - .doOnError(error -> logger.warning("Failed to create hook", error)) + .doOnRequest(ignoredValue -> logger.info("Creating NotificationHook")) + .doOnSuccess(response -> logger.info("Created NotificationHook {}", response)) + .doOnError(error -> logger.warning("Failed to create notificationHook", error)) .flatMap(response -> { final String hookUri = response.getDeserializedHeaders().getLocation(); final String hookId = parseOperationId(hookUri); return getHookWithResponse(hookId, context) - .map(hookResponse -> new ResponseBase(response.getRequest(), + .map(hookResponse -> new ResponseBase(response.getRequest(), response.getStatusCode(), response.getHeaders(), hookResponse.getValue(), @@ -1097,12 +1100,12 @@ Mono> createHookWithResponse(Hook hook, Context context) { * * @param hookId The hook unique id. * - * @return A {@link Mono} containing the {@link Hook} for the provided id. + * @return A {@link Mono} containing the {@link NotificationHook} for the provided id. * @throws IllegalArgumentException If {@code hookId} does not conform to the UUID format specification. * @throws NullPointerException thrown if the {@code hookId} is null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono getHook(String hookId) { + public Mono getHook(String hookId) { return getHookWithResponse(hookId).map(Response::getValue); } @@ -1114,12 +1117,12 @@ public Mono getHook(String hookId) { * * @param hookId The hook unique id. * - * @return A {@link Response} of a {@link Mono} containing the {@link Hook} for the provided id. + * @return A {@link Response} of a {@link Mono} containing the {@link NotificationHook} for the provided id. * @throws IllegalArgumentException If {@code hookId} does not conform to the UUID format specification. * @throws NullPointerException thrown if the {@code hookId} is null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getHookWithResponse(String hookId) { + public Mono> getHookWithResponse(String hookId) { try { return withContext(context -> getHookWithResponse(hookId, context)); } catch (RuntimeException e) { @@ -1127,14 +1130,14 @@ public Mono> getHookWithResponse(String hookId) { } } - Mono> getHookWithResponse(String hookId, Context context) { + Mono> getHookWithResponse(String hookId, Context context) { Objects.requireNonNull(hookId, "hookId is required."); return service.getHookWithResponseAsync(UUID.fromString(hookId), context.addData(AZ_TRACING_NAMESPACE_KEY, METRICS_ADVISOR_TRACING_NAMESPACE_VALUE)) - .doOnRequest(ignoredValue -> logger.info("Retrieving Hook")) - .doOnSuccess(response -> logger.info("Retrieved Hook {}", response)) + .doOnRequest(ignoredValue -> logger.info("Retrieving NotificationHook")) + .doOnSuccess(response -> logger.info("Retrieved NotificationHook {}", response)) .doOnError(error -> logger.warning("Failed to retrieve hook", error)) - .map(innerResponse -> new ResponseBase(innerResponse.getRequest(), + .map(innerResponse -> new ResponseBase(innerResponse.getRequest(), innerResponse.getStatusCode(), innerResponse.getHeaders(), HookTransforms.fromInner(logger, innerResponse.getValue()), @@ -1142,53 +1145,54 @@ Mono> getHookWithResponse(String hookId, Context context) { } /** - * Update an existing hook. + * Update an existing notificationHook. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateHook#Hook} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateHook#NotificationHook} * - * @param hook The hook to update. + * @param notificationHook The notificationHook to update. * - * @return A {@link Mono} containing the updated {@link Hook}. - * @throws NullPointerException If {@code hook.id} is null. + * @return A {@link Mono} containing the updated {@link NotificationHook}. + * @throws NullPointerException If {@code notificationHook.id} is null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono updateHook(Hook hook) { - return updateHookWithResponse(hook).map(Response::getValue); + public Mono updateHook(NotificationHook notificationHook) { + return updateHookWithResponse(notificationHook).map(Response::getValue); } /** - * Update an existing hook. + * Update an existing notificationHook. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateHookWithResponse#Hook} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateHookWithResponse#NotificationHook} * - * @param hook The hook to update. + * @param notificationHook The notificationHook to update. * - * @return A {@link Response} of a {@link Mono} containing the updated {@link Hook}. - * @throws NullPointerException If {@code hook.id} is null. - * @throws IllegalArgumentException If {@code hook.Id} does not conform to the UUID format specification. + * @return A {@link Response} of a {@link Mono} containing the updated {@link NotificationHook}. + * @throws NullPointerException If {@code notificationHook.id} is null. + * @throws IllegalArgumentException If {@code notificationHook.Id} does not conform to the UUID format + * specification. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> updateHookWithResponse(Hook hook) { + public Mono> updateHookWithResponse(NotificationHook notificationHook) { try { - return withContext(context -> updateHookWithResponse(hook, context)); + return withContext(context -> updateHookWithResponse(notificationHook, context)); } catch (RuntimeException e) { return FluxUtil.monoError(logger, e); } } - Mono> updateHookWithResponse(Hook hook, Context context) { - Objects.requireNonNull(hook, "'hook' cannot be null."); - Objects.requireNonNull(hook.getId(), "'hook.id' cannot be null."); - return service.updateHookWithResponseAsync(UUID.fromString(hook.getId()), - HookTransforms.toInnerForUpdate(logger, hook), + Mono> updateHookWithResponse(NotificationHook notificationHook, Context context) { + Objects.requireNonNull(notificationHook, "'notificationHook' cannot be null."); + Objects.requireNonNull(notificationHook.getId(), "'notificationHook.id' cannot be null."); + return service.updateHookWithResponseAsync(UUID.fromString(notificationHook.getId()), + HookTransforms.toInnerForUpdate(logger, notificationHook), context.addData(AZ_TRACING_NAMESPACE_KEY, METRICS_ADVISOR_TRACING_NAMESPACE_VALUE)) - .doOnRequest(ignoredValue -> logger.info("Updating Hook")) - .doOnSuccess(response -> logger.info("Updated Hook {}", response)) - .doOnError(error -> logger.warning("Failed to update hook", error)) - .flatMap(response -> getHookWithResponse(hook.getId(), context) - .map(hookResponse -> new ResponseBase(response.getRequest(), + .doOnRequest(ignoredValue -> logger.info("Updating NotificationHook")) + .doOnSuccess(response -> logger.info("Updated NotificationHook {}", response)) + .doOnError(error -> logger.warning("Failed to update notificationHook", error)) + .flatMap(response -> getHookWithResponse(notificationHook.getId(), context) + .map(hookResponse -> new ResponseBase(response.getRequest(), response.getStatusCode(), response.getHeaders(), hookResponse.getValue(), @@ -1236,8 +1240,8 @@ public Mono> deleteHookWithResponse(String hookId) { Mono> deleteHookWithResponse(String hookId, Context context) { Objects.requireNonNull(hookId, "hookId is required."); return service.deleteHookWithResponseAsync(UUID.fromString(hookId), context) - .doOnRequest(ignoredValue -> logger.info("Deleting Hook")) - .doOnSuccess(response -> logger.info("Deleted Hook")) + .doOnRequest(ignoredValue -> logger.info("Deleting NotificationHook")) + .doOnSuccess(response -> logger.info("Deleted NotificationHook")) .doOnError(error -> logger.warning("Failed to delete hook", error)); } @@ -1247,10 +1251,10 @@ Mono> deleteHookWithResponse(String hookId, Context context) { *

Code sample

* {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listHooks} * - * @return A {@link PagedFlux} containing information of all the {@link Hook} in the account. + * @return A {@link PagedFlux} containing information of all the {@link NotificationHook} in the account. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedFlux listHooks() { + public PagedFlux listHooks() { return listHooks(new ListHookOptions()); } @@ -1262,10 +1266,10 @@ public PagedFlux listHooks() { * * @param options The additional parameters * - * @return A {@link PagedFlux} containing information of the {@link Hook} resources. + * @return A {@link PagedFlux} containing information of the {@link NotificationHook} resources. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedFlux listHooks(ListHookOptions options) { + public PagedFlux listHooks(ListHookOptions options) { try { return new PagedFlux<>(() -> withContext(context -> @@ -1278,14 +1282,14 @@ public PagedFlux listHooks(ListHookOptions options) { } } - PagedFlux listHooks(ListHookOptions options, Context context) { + PagedFlux listHooks(ListHookOptions options, Context context) { return new PagedFlux<>(() -> listHooksSinglePageAsync(options, context), continuationToken -> listHooksNextPageAsync(continuationToken, context)); } - private Mono> listHooksSinglePageAsync(ListHookOptions options, Context context) { + private Mono> listHooksSinglePageAsync(ListHookOptions options, Context context) { return service.listHooksSinglePageAsync( options != null ? options.getHookNameFilter() : null, options != null ? options.getSkip() : null, @@ -1297,7 +1301,7 @@ private Mono> listHooksSinglePageAsync(ListHookOptions optio .map(response -> HookTransforms.fromInnerPagedResponse(logger, response)); } - private Mono> listHooksNextPageAsync(String nextPageLink, Context context) { + private Mono> listHooksNextPageAsync(String nextPageLink, Context context) { if (CoreUtils.isNullOrEmpty(nextPageLink)) { return Mono.empty(); } @@ -1316,7 +1320,7 @@ private Mono> listHooksNextPageAsync(String nextPageLink, Co * Create a configuration to trigger alert when anomalies are detected. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createAnomalyAlertConfiguration#AnomalyAlertConfiguration} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createAnomalyAlertConfig#AnomalyAlertConfiguration} * * @param alertConfiguration The anomaly alerting configuration. * @@ -1325,16 +1329,16 @@ private Mono> listHooksNextPageAsync(String nextPageLink, Co * {@code alertConfiguration.metricAnomalyAlertConfigurations} is null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono createAnomalyAlertConfiguration( + public Mono createAnomalyAlertConfig( AnomalyAlertConfiguration alertConfiguration) { - return createAnomalyAlertConfigurationWithResponse(alertConfiguration).flatMap(FluxUtil::toMono); + return createAnomalyAlertConfigWithResponse(alertConfiguration).flatMap(FluxUtil::toMono); } /** * Create a configuration to trigger alert when anomalies are detected. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createAnomalyAlertConfigurationWithResponse#AnomalyAlertConfiguration} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createAnomalyAlertConfigWithResponse#AnomalyAlertConfiguration} * * @param alertConfiguration The anomaly alerting configuration. * @@ -1343,16 +1347,16 @@ public Mono createAnomalyAlertConfiguration( * {@code alertConfiguration.metricAnomalyAlertConfigurations} is null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> createAnomalyAlertConfigurationWithResponse( + public Mono> createAnomalyAlertConfigWithResponse( AnomalyAlertConfiguration alertConfiguration) { try { - return withContext(context -> createAnomalyAlertConfigurationWithResponse(alertConfiguration, context)); + return withContext(context -> createAnomalyAlertConfigWithResponse(alertConfiguration, context)); } catch (RuntimeException ex) { return monoError(logger, ex); } } - Mono> createAnomalyAlertConfigurationWithResponse( + Mono> createAnomalyAlertConfigWithResponse( AnomalyAlertConfiguration alertConfiguration, Context context) { Objects.requireNonNull(alertConfiguration, "'alertConfiguration' is required."); if (CoreUtils.isNullOrEmpty(alertConfiguration.getMetricAlertConfigurations())) { @@ -1376,7 +1380,7 @@ Mono> createAnomalyAlertConfigurationWithRes innerAlertConfiguration, error)) .flatMap(response -> { final String configurationId = parseOperationId(response.getDeserializedHeaders().getLocation()); - return getAnomalyAlertConfigurationWithResponse(configurationId, context) + return getAnomalyAlertConfigWithResponse(configurationId, context) .map(getResponse -> new ResponseBase(response.getRequest(), response.getStatusCode(), response.getHeaders(), @@ -1389,7 +1393,7 @@ Mono> createAnomalyAlertConfigurationWithRes * Get the anomaly alert configuration identified by {@code alertConfigurationId}. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getAnomalyAlertConfiguration#String} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getAnomalyAlertConfig#String} * * @param alertConfigurationId The anomaly alert configuration id. * @@ -1399,16 +1403,16 @@ Mono> createAnomalyAlertConfigurationWithRes * @throws NullPointerException thrown if the {@code alertConfigurationId} is null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono getAnomalyAlertConfiguration( + public Mono getAnomalyAlertConfig( String alertConfigurationId) { - return getAnomalyAlertConfigurationWithResponse(alertConfigurationId).flatMap(FluxUtil::toMono); + return getAnomalyAlertConfigWithResponse(alertConfigurationId).flatMap(FluxUtil::toMono); } /** * Get the anomaly alert configuration identified by {@code alertConfigurationId}. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getAnomalyAlertConfigurationWithResponse#String} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getAnomalyAlertConfigWithResponse#String} * * @param alertConfigurationId The anomaly alert configuration id. * @@ -1419,16 +1423,16 @@ public Mono getAnomalyAlertConfiguration( * @throws NullPointerException thrown if the {@code alertConfigurationId} is null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getAnomalyAlertConfigurationWithResponse( + public Mono> getAnomalyAlertConfigWithResponse( String alertConfigurationId) { try { - return withContext(context -> getAnomalyAlertConfigurationWithResponse(alertConfigurationId, context)); + return withContext(context -> getAnomalyAlertConfigWithResponse(alertConfigurationId, context)); } catch (RuntimeException ex) { return monoError(logger, ex); } } - Mono> getAnomalyAlertConfigurationWithResponse( + Mono> getAnomalyAlertConfigWithResponse( String alertConfigurationId, Context context) { Objects.requireNonNull(alertConfigurationId, "'alertConfigurationId' is required."); final Context withTracing = context.addData(AZ_TRACING_NAMESPACE_KEY, METRICS_ADVISOR_TRACING_NAMESPACE_VALUE); @@ -1449,7 +1453,7 @@ Mono> getAnomalyAlertConfigurationWithRespon * Update anomaly alert configuration. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateAnomalyAlertConfiguration#AnomalyAlertConfiguration} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateAnomalyAlertConfig#AnomalyAlertConfiguration} * * @param alertConfiguration The anomaly alert configuration to update. * @@ -1458,16 +1462,16 @@ Mono> getAnomalyAlertConfigurationWithRespon * {@code alertConfiguration.metricAnomalyAlertConfigurations} is null or empty. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono updateAnomalyAlertConfiguration( + public Mono updateAnomalyAlertConfig( AnomalyAlertConfiguration alertConfiguration) { - return updateAnomalyAlertConfigurationWithResponse(alertConfiguration).flatMap(FluxUtil::toMono); + return updateAnomalyAlertConfigWithResponse(alertConfiguration).flatMap(FluxUtil::toMono); } /** * Update anomaly alert configuration. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateAnomalyAlertConfigurationWithResponse#AnomalyAlertConfiguration} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateAnomalyAlertConfigWithResponse#AnomalyAlertConfiguration} * * @param alertConfiguration The anomaly alert configuration to update. * @@ -1476,16 +1480,16 @@ public Mono updateAnomalyAlertConfiguration( * {@code alertConfiguration.metricAnomalyAlertConfigurations} is null or empty. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> updateAnomalyAlertConfigurationWithResponse( + public Mono> updateAnomalyAlertConfigWithResponse( AnomalyAlertConfiguration alertConfiguration) { try { - return withContext(context -> updateAnomalyAlertConfigurationWithResponse(alertConfiguration, context)); + return withContext(context -> updateAnomalyAlertConfigWithResponse(alertConfiguration, context)); } catch (RuntimeException ex) { return monoError(logger, ex); } } - Mono> updateAnomalyAlertConfigurationWithResponse( + Mono> updateAnomalyAlertConfigWithResponse( AnomalyAlertConfiguration alertConfiguration, Context context) { Objects.requireNonNull(alertConfiguration, "'alertConfiguration' is required"); if (CoreUtils.isNullOrEmpty(alertConfiguration.getMetricAlertConfigurations())) { @@ -1505,7 +1509,7 @@ Mono> updateAnomalyAlertConfigurationWithRes .doOnSuccess(response -> logger.info("Updated AnomalyAlertConfiguration - {}", response)) .doOnError(error -> logger.warning("Failed to update AnomalyAlertConfiguration - {}", innerAlertConfiguration, error)) - .flatMap(response -> getAnomalyAlertConfigurationWithResponse(alertConfiguration.getId(), context) + .flatMap(response -> getAnomalyAlertConfigWithResponse(alertConfiguration.getId(), context) .map(getResponse -> new ResponseBase(response.getRequest(), response.getStatusCode(), response.getHeaders(), @@ -1517,7 +1521,7 @@ Mono> updateAnomalyAlertConfigurationWithRes * Deletes the anomaly alert configuration identified by {@code alertConfigurationId}. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteAnomalyAlertConfiguration#String} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteAnomalyAlertConfig#String} * * @param alertConfigurationId The anomaly alert configuration id. * @@ -1527,15 +1531,15 @@ Mono> updateAnomalyAlertConfigurationWithRes * @throws NullPointerException thrown if the {@code alertConfigurationId} is null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono deleteAnomalyAlertConfiguration(String alertConfigurationId) { - return deleteAnomalyAlertConfigurationWithResponse(alertConfigurationId).flatMap(FluxUtil::toMono); + public Mono deleteAnomalyAlertConfig(String alertConfigurationId) { + return deleteAnomalyAlertConfigWithResponse(alertConfigurationId).flatMap(FluxUtil::toMono); } /** * Deletes the anomaly alert configuration identified by {@code alertConfigurationId}. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteAnomalyAlertConfigurationWithResponse#String} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteAnomalyAlertConfigWithResponse#String} * * @param alertConfigurationId The anomaly alert configuration id. * @@ -1545,15 +1549,15 @@ public Mono deleteAnomalyAlertConfiguration(String alertConfigurationId) { * @throws NullPointerException thrown if the {@code alertConfigurationId} is null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> deleteAnomalyAlertConfigurationWithResponse(String alertConfigurationId) { + public Mono> deleteAnomalyAlertConfigWithResponse(String alertConfigurationId) { try { - return withContext(context -> deleteAnomalyAlertConfigurationWithResponse(alertConfigurationId, context)); + return withContext(context -> deleteAnomalyAlertConfigWithResponse(alertConfigurationId, context)); } catch (RuntimeException ex) { return monoError(logger, ex); } } - Mono> deleteAnomalyAlertConfigurationWithResponse(String alertConfigurationId, Context context) { + Mono> deleteAnomalyAlertConfigWithResponse(String alertConfigurationId, Context context) { Objects.requireNonNull(alertConfigurationId, "'alertConfigurationId' is required."); final Context withTracing = context.addData(AZ_TRACING_NAMESPACE_KEY, METRICS_ADVISOR_TRACING_NAMESPACE_VALUE); @@ -1569,7 +1573,7 @@ Mono> deleteAnomalyAlertConfigurationWithResponse(String alertCon * Fetch the anomaly alert configurations associated with a detection configuration. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listAnomalyAlertConfigurations#String} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listAnomalyAlertConfigs#String} * * @param detectionConfigurationId The id of the detection configuration. * @@ -1580,23 +1584,23 @@ Mono> deleteAnomalyAlertConfigurationWithResponse(String alertCon * UUID format specification. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedFlux listAnomalyAlertConfigurations( + public PagedFlux listAnomalyAlertConfigs( String detectionConfigurationId) { try { return new PagedFlux<>(() -> - withContext(context -> listAnomalyAlertConfigurationsInternal(detectionConfigurationId, context)), + withContext(context -> listAnomalyAlertConfigsInternal(detectionConfigurationId, context)), null); } catch (RuntimeException ex) { return new PagedFlux<>(() -> monoError(logger, ex)); } } - PagedFlux listAnomalyAlertConfigurations( + PagedFlux listAnomalyAlertConfigs( String detectionConfigurationId, Context context) { - return new PagedFlux<>(() -> listAnomalyAlertConfigurationsInternal(detectionConfigurationId, context), null); + return new PagedFlux<>(() -> listAnomalyAlertConfigsInternal(detectionConfigurationId, context), null); } - private Mono> listAnomalyAlertConfigurationsInternal( + private Mono> listAnomalyAlertConfigsInternal( String detectionConfigurationId, Context context) { Objects.requireNonNull(detectionConfigurationId, "'detectionConfigurationId' is required."); final Context withTracing = context.addData(AZ_TRACING_NAMESPACE_KEY, METRICS_ADVISOR_TRACING_NAMESPACE_VALUE); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClient.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClient.java index 744dbf4b578e..77feb8093081 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClient.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClient.java @@ -7,7 +7,7 @@ import com.azure.ai.metricsadvisor.models.DataFeed; import com.azure.ai.metricsadvisor.models.DataFeedIngestionProgress; import com.azure.ai.metricsadvisor.models.DataFeedIngestionStatus; -import com.azure.ai.metricsadvisor.models.Hook; +import com.azure.ai.metricsadvisor.models.NotificationHook; import com.azure.ai.metricsadvisor.models.ListDataFeedIngestionOptions; import com.azure.ai.metricsadvisor.models.ListDataFeedOptions; import com.azure.ai.metricsadvisor.models.ListHookOptions; @@ -342,7 +342,7 @@ public Response getDataFeedIngestionProgressWithRespo * Create a configuration to detect anomalies in the time series of a metric. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createMetricAnomalyDetectionConfiguration#String-AnomalyDetectionConfiguration} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createMetricAnomalyDetectionConfig#String-AnomalyDetectionConfiguration} * * @param metricId The metric id to associate the configuration with. * @param detectionConfiguration The anomaly detection configuration. @@ -358,10 +358,10 @@ public Response getDataFeedIngestionProgressWithRespo * {@code MetricSingleSeriesDetectionCondition} or {@code MetricSeriesGroupDetectionCondition}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public AnomalyDetectionConfiguration createMetricAnomalyDetectionConfiguration( + public AnomalyDetectionConfiguration createMetricAnomalyDetectionConfig( String metricId, AnomalyDetectionConfiguration detectionConfiguration) { - return createMetricAnomalyDetectionConfigurationWithResponse(metricId, + return createMetricAnomalyDetectionConfigWithResponse(metricId, detectionConfiguration, Context.NONE).getValue(); } @@ -370,7 +370,7 @@ public AnomalyDetectionConfiguration createMetricAnomalyDetectionConfiguration( * Create a configuration to detect anomalies in the time series of a metric. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createMetricAnomalyDetectionConfigurationWithResponse#String-AnomalyDetectionConfiguration-Context} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createMetricAnomalyDetectionConfigWithResponse#String-AnomalyDetectionConfiguration-Context} * * @param metricId The metric id to associate the configuration with. * @param detectionConfiguration The anomaly detection configuration. @@ -387,11 +387,11 @@ public AnomalyDetectionConfiguration createMetricAnomalyDetectionConfiguration( * {@code MetricSingleSeriesDetectionCondition} or {@code MetricSeriesGroupDetectionCondition}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response createMetricAnomalyDetectionConfigurationWithResponse( + public Response createMetricAnomalyDetectionConfigWithResponse( String metricId, AnomalyDetectionConfiguration detectionConfiguration, Context context) { - return client.createMetricAnomalyDetectionConfigurationWithResponse(metricId, detectionConfiguration, + return client.createMetricAnomalyDetectionConfigWithResponse(metricId, detectionConfiguration, context == null ? Context.NONE : context).block(); } @@ -399,7 +399,7 @@ public Response createMetricAnomalyDetectionConfi * Get the anomaly detection configuration by its id. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getMetricAnomalyDetectionConfiguration#String} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getMetricAnomalyDetectionConfig#String} * * @param detectionConfigurationId The anomaly detection configuration id. * @return The {@link AnomalyDetectionConfiguration} identified by the given id. @@ -408,17 +408,16 @@ public Response createMetricAnomalyDetectionConfi * @throws NullPointerException thrown if the {@code detectionConfigurationId} is null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public AnomalyDetectionConfiguration getMetricAnomalyDetectionConfiguration( + public AnomalyDetectionConfiguration getMetricAnomalyDetectionConfig( String detectionConfigurationId) { - return getMetricAnomalyDetectionConfigurationWithResponse(detectionConfigurationId, - Context.NONE).getValue(); + return getMetricAnomalyDetectionConfigWithResponse(detectionConfigurationId, Context.NONE).getValue(); } /** * Get the anomaly detection configuration by its id. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getMetricAnomalyDetectionConfigurationWithResponse#String-Context} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getMetricAnomalyDetectionConfigWithResponse#String-Context} * * @param detectionConfigurationId The anomaly detection configuration id. * @param context Additional context that is passed through the Http pipeline during the service call. @@ -428,9 +427,9 @@ public AnomalyDetectionConfiguration getMetricAnomalyDetectionConfiguration( * @throws NullPointerException thrown if the {@code detectionConfigurationId} is null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response getMetricAnomalyDetectionConfigurationWithResponse( + public Response getMetricAnomalyDetectionConfigWithResponse( String detectionConfigurationId, Context context) { - return client.getMetricAnomalyDetectionConfigurationWithResponse(detectionConfigurationId, + return client.getMetricAnomalyDetectionConfigWithResponse(detectionConfigurationId, context == null ? Context.NONE : context).block(); } @@ -438,7 +437,7 @@ public Response getMetricAnomalyDetectionConfigur * Update a configuration to detect anomalies in the time series of a metric. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateMetricAnomalyDetectionConfiguration#AnomalyDetectionConfiguration} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateMetricAnomalyDetectionConfig#AnomalyDetectionConfiguration} * * @param detectionConfiguration The anomaly detection configuration. * @return The updated {@link AnomalyDetectionConfiguration}. @@ -446,9 +445,9 @@ public Response getMetricAnomalyDetectionConfigur * or {@code detectionConfiguration.id} is null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public AnomalyDetectionConfiguration updateMetricAnomalyDetectionConfiguration( + public AnomalyDetectionConfiguration updateMetricAnomalyDetectionConfig( AnomalyDetectionConfiguration detectionConfiguration) { - return updateMetricAnomalyDetectionConfigurationWithResponse(detectionConfiguration, Context.NONE) + return updateMetricAnomalyDetectionConfigWithResponse(detectionConfiguration, Context.NONE) .getValue(); } @@ -456,7 +455,7 @@ public AnomalyDetectionConfiguration updateMetricAnomalyDetectionConfiguration( * Update a configuration to detect anomalies in the time series of a metric. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateMetricAnomalyDetectionConfigurationWithResponse#AnomalyDetectionConfiguration-Context} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateMetricAnomalyDetectionConfigWithResponse#AnomalyDetectionConfiguration-Context} * * @param detectionConfiguration The anomaly detection configuration. * @param context Additional context that is passed through the Http pipeline during the service call. @@ -465,10 +464,10 @@ public AnomalyDetectionConfiguration updateMetricAnomalyDetectionConfiguration( * or {@code detectionConfiguration.id} is null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response updateMetricAnomalyDetectionConfigurationWithResponse( + public Response updateMetricAnomalyDetectionConfigWithResponse( AnomalyDetectionConfiguration detectionConfiguration, Context context) { - return client.updateMetricAnomalyDetectionConfigurationWithResponse(detectionConfiguration, + return client.updateMetricAnomalyDetectionConfigWithResponse(detectionConfiguration, context == null ? Context.NONE : context).block(); } @@ -476,7 +475,7 @@ public Response updateMetricAnomalyDetectionConfi * Delete a metric anomaly detection configuration. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteMetricAnomalyDetectionConfiguration#String} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteMetricAnomalyDetectionConfig#String} * * @param detectionConfigurationId The metric anomaly detection configuration unique id. * @@ -485,8 +484,8 @@ public Response updateMetricAnomalyDetectionConfi * format specification. */ @ServiceMethod(returns = ReturnType.SINGLE) - public void deleteMetricAnomalyDetectionConfiguration(String detectionConfigurationId) { - deleteMetricAnomalyDetectionConfigurationWithResponse(detectionConfigurationId, Context.NONE) + public void deleteMetricAnomalyDetectionConfig(String detectionConfigurationId) { + deleteMetricAnomalyDetectionConfigWithResponse(detectionConfigurationId, Context.NONE) .getValue(); } @@ -494,7 +493,7 @@ public void deleteMetricAnomalyDetectionConfiguration(String detectionConfigurat * Delete a metric anomaly detection configuration. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteMetricAnomalyDetectionConfigurationWithResponse#String-Context} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteMetricAnomalyDetectionConfigWithResponse#String-Context} * * @param detectionConfigurationId The metric anomaly detection configuration unique id. * @param context Additional context that is passed through the Http pipeline during the service call. @@ -504,10 +503,10 @@ public void deleteMetricAnomalyDetectionConfiguration(String detectionConfigurat * format specification. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response deleteMetricAnomalyDetectionConfigurationWithResponse( + public Response deleteMetricAnomalyDetectionConfigWithResponse( String detectionConfigurationId, Context context) { - return client.deleteMetricAnomalyDetectionConfigurationWithResponse( + return client.deleteMetricAnomalyDetectionConfigWithResponse( detectionConfigurationId, context == null ? Context.NONE : context).block(); } @@ -516,7 +515,7 @@ public Response deleteMetricAnomalyDetectionConfigurationWithResponse( * Given a metric id, retrieve all anomaly detection configurations applied to it. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listMetricAnomalyDetectionConfigurations#String} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listMetricAnomalyDetectionConfigs#String} * * @param metricId The metric id. * @return The anomaly detection configurations. @@ -524,8 +523,8 @@ public Response deleteMetricAnomalyDetectionConfigurationWithResponse( * @throws IllegalArgumentException If {@code metricId} does not conform to the UUID format specification. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable listMetricAnomalyDetectionConfigurations(String metricId) { - return new PagedIterable<>(client.listMetricAnomalyDetectionConfigurations(metricId, + public PagedIterable listMetricAnomalyDetectionConfigs(String metricId) { + return new PagedIterable<>(client.listMetricAnomalyDetectionConfigs(metricId, Context.NONE)); } @@ -533,7 +532,7 @@ public PagedIterable listMetricAnomalyDetectionCo * Given a metric id, retrieve all anomaly detection configurations applied to it. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listMetricAnomalyDetectionConfigurations#String-Context} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listMetricAnomalyDetectionConfigs#String-Context} * * @param metricId The metric id. * @param context Additional context that is passed through the Http pipeline during the service call. @@ -542,43 +541,45 @@ public PagedIterable listMetricAnomalyDetectionCo * @throws IllegalArgumentException If {@code metricId} does not conform to the UUID format specification. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable listMetricAnomalyDetectionConfigurations(String metricId, + public PagedIterable listMetricAnomalyDetectionConfigs(String metricId, Context context) { - return new PagedIterable<>(client.listMetricAnomalyDetectionConfigurations(metricId, + return new PagedIterable<>(client.listMetricAnomalyDetectionConfigs(metricId, context == null ? Context.NONE : context)); } /** - * Creates a hook that receives anomaly incident alerts. + * Creates a notificationHook that receives anomaly incident alerts. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createHook#Hook} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createHook#NotificationHook} * - * @param hook The hook. - * @return The created {@link Hook}. - * @throws NullPointerException If {@code hook}, {@code hook.name}, {@code hook.endpoint} (for web hook) is null. - * @throws IllegalArgumentException If at least one email not present for email hook. + * @param notificationHook The notificationHook. + * @return The created {@link NotificationHook}. + * @throws NullPointerException If {@code notificationHook}, {@code notificationHook.name}, + * {@code notificationHook.endpoint} (for web notificationHook) is null. + * @throws IllegalArgumentException If at least one email not present for email notificationHook. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Hook createHook(Hook hook) { - return createHookWithResponse(hook, Context.NONE).getValue(); + public NotificationHook createHook(NotificationHook notificationHook) { + return createHookWithResponse(notificationHook, Context.NONE).getValue(); } /** - * Creates a hook that receives anomaly incident alerts. + * Creates a notificationHook that receives anomaly incident alerts. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createHookWithResponse#Hook-Context} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createHookWithResponse#NotificationHook-Context} * - * @param hook The hook. + * @param notificationHook The notificationHook. * @param context Additional context that is passed through the Http pipeline during the service call. - * @return A {@link Response} containing the created {@link Hook}. - * @throws NullPointerException If {@code hook}, {@code hook.name}, {@code hook.endpoint} (for web hook) is null. - * @throws IllegalArgumentException If at least one email not present for email hook. + * @return A {@link Response} containing the created {@link NotificationHook}. + * @throws NullPointerException If {@code notificationHook}, {@code notificationHook.name}, + * {@code notificationHook.endpoint} (for web notificationHook) is null. + * @throws IllegalArgumentException If at least one email not present for email notificationHook. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response createHookWithResponse(Hook hook, Context context) { - return client.createHookWithResponse(hook, context == null ? Context.NONE : context) + public Response createHookWithResponse(NotificationHook notificationHook, Context context) { + return client.createHookWithResponse(notificationHook, context == null ? Context.NONE : context) .block(); } @@ -589,12 +590,12 @@ public Response createHookWithResponse(Hook hook, Context context) { * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getHook#String} * * @param hookId The hook unique id. - * @return The {@link Hook} for the provided id. + * @return The {@link NotificationHook} for the provided id. * @throws IllegalArgumentException If {@code hookId} does not conform to the UUID format specification. * @throws NullPointerException thrown if the {@code hookId} is null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Hook getHook(String hookId) { + public NotificationHook getHook(String hookId) { return getHookWithResponse(hookId, Context.NONE).getValue(); } @@ -606,46 +607,47 @@ public Hook getHook(String hookId) { * * @param hookId The hook unique id. * @param context Additional context that is passed through the Http pipeline during the service call. - * @return A {@link Response} containing the {@link Hook} for the provided id. + * @return A {@link Response} containing the {@link NotificationHook} for the provided id. * @throws IllegalArgumentException If {@code hookId} does not conform to the UUID format specification. * @throws NullPointerException thrown if the {@code hookId} is null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response getHookWithResponse(String hookId, Context context) { + public Response getHookWithResponse(String hookId, Context context) { return client.getHookWithResponse(hookId, context == null ? Context.NONE : context) .block(); } /** - * Update an existing hook. + * Update an existing notificationHook. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateHook#Hook} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateHook#NotificationHook} * - * @param hook The hook to update. - * @return The updated {@link Hook}. - * @throws NullPointerException If {@code hook.id} is null. + * @param notificationHook The notificationHook to update. + * @return The updated {@link NotificationHook}. + * @throws NullPointerException If {@code notificationHook.id} is null. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Hook updateHook(Hook hook) { - return updateHookWithResponse(hook, Context.NONE).getValue(); + public NotificationHook updateHook(NotificationHook notificationHook) { + return updateHookWithResponse(notificationHook, Context.NONE).getValue(); } /** - * Update an existing hook. + * Update an existing notificationHook. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateHookWithResponse#Hook-Context} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateHookWithResponse#NotificationHook-Context} * - * @param hook The hook to update. + * @param notificationHook The notificationHook to update. * @param context Additional context that is passed through the Http pipeline during the service call. - * @return A {@link Response} containing the updated {@link Hook}. - * @throws NullPointerException If {@code hook.id} is null. - * @throws IllegalArgumentException If {@code hook.Id} does not conform to the UUID format specification. + * @return A {@link Response} containing the updated {@link NotificationHook}. + * @throws NullPointerException If {@code notificationHook.id} is null. + * @throws IllegalArgumentException If {@code notificationHook.Id} does not conform to the UUID format + * specification. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response updateHookWithResponse(Hook hook, Context context) { - return client.updateHookWithResponse(hook, context == null ? Context.NONE : context) + public Response updateHookWithResponse(NotificationHook notificationHook, Context context) { + return client.updateHookWithResponse(notificationHook, context == null ? Context.NONE : context) .block(); } @@ -688,10 +690,10 @@ public Response deleteHookWithResponse(String hookId, Context context) { *

Code sample

* {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listHooks} * - * @return A {@link PagedIterable} containing information of all the {@link Hook} in the account. + * @return A {@link PagedIterable} containing information of all the {@link NotificationHook} in the account. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable listHooks() { + public PagedIterable listHooks() { return listHooks(new ListHookOptions(), Context.NONE); } @@ -703,10 +705,10 @@ public PagedIterable listHooks() { * * @param options The additional parameters. * @param context Additional context that is passed through the Http pipeline during the service call. - * @return A {@link PagedIterable} containing information of the {@link Hook} resources. + * @return A {@link PagedIterable} containing information of the {@link NotificationHook} resources. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable listHooks(ListHookOptions options, Context context) { + public PagedIterable listHooks(ListHookOptions options, Context context) { return new PagedIterable<>(client.listHooks(options, context == null ? Context.NONE : context)); } @@ -714,23 +716,23 @@ public PagedIterable listHooks(ListHookOptions options, Context context) { * Create a configuration to trigger alert when anomalies are detected. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createAnomalyAlertConfiguration#AnomalyAlertConfiguration} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createAnomalyAlertConfig#AnomalyAlertConfiguration} * * @param alertConfiguration The anomaly alerting configuration. * * @return The {@link AnomalyAlertConfiguration} that was created. */ @ServiceMethod(returns = ReturnType.SINGLE) - public AnomalyAlertConfiguration createAnomalyAlertConfiguration( + public AnomalyAlertConfiguration createAnomalyAlertConfig( AnomalyAlertConfiguration alertConfiguration) { - return createAnomalyAlertConfigurationWithResponse(alertConfiguration, Context.NONE).getValue(); + return createAnomalyAlertConfigWithResponse(alertConfiguration, Context.NONE).getValue(); } /** * Create a configuration to trigger alert when anomalies are detected. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createAnomalyAlertConfigurationWithResponse#AnomalyAlertConfiguration-Context} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createAnomalyAlertConfigWithResponse#AnomalyAlertConfiguration-Context} * * @param alertConfiguration The anomaly alerting configuration. * @param context Additional context that is passed through the Http pipeline during the service call. @@ -738,9 +740,9 @@ public AnomalyAlertConfiguration createAnomalyAlertConfiguration( * @return A {@link Response} containing the created {@link AnomalyAlertConfiguration}. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response createAnomalyAlertConfigurationWithResponse( + public Response createAnomalyAlertConfigWithResponse( AnomalyAlertConfiguration alertConfiguration, Context context) { - return client.createAnomalyAlertConfigurationWithResponse(alertConfiguration, context == null + return client.createAnomalyAlertConfigWithResponse(alertConfiguration, context == null ? Context.NONE : context).block(); } @@ -748,7 +750,7 @@ public Response createAnomalyAlertConfigurationWithRe * Get the anomaly alert configuration identified by {@code alertConfigurationId}. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getAnomalyAlertConfiguration#String} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getAnomalyAlertConfig#String} * * @param alertConfigurationId The anomaly alert configuration id. * @@ -758,16 +760,16 @@ public Response createAnomalyAlertConfigurationWithRe * UUID format specification. */ @ServiceMethod(returns = ReturnType.SINGLE) - public AnomalyAlertConfiguration getAnomalyAlertConfiguration( + public AnomalyAlertConfiguration getAnomalyAlertConfig( String alertConfigurationId) { - return getAnomalyAlertConfigurationWithResponse(alertConfigurationId, Context.NONE).getValue(); + return getAnomalyAlertConfigWithResponse(alertConfigurationId, Context.NONE).getValue(); } /** * Get the anomaly alert configuration identified by {@code alertConfigurationId}. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getAnomalyAlertConfigurationWithResponse#String-Context} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getAnomalyAlertConfigWithResponse#String-Context} * * @param alertConfigurationId The anomaly alert configuration id. * @param context Additional context that is passed through the Http pipeline during the service call. @@ -777,9 +779,9 @@ public AnomalyAlertConfiguration getAnomalyAlertConfiguration( * UUID format specification. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response getAnomalyAlertConfigurationWithResponse( + public Response getAnomalyAlertConfigWithResponse( String alertConfigurationId, Context context) { - return client.getAnomalyAlertConfigurationWithResponse(alertConfigurationId, context == null + return client.getAnomalyAlertConfigWithResponse(alertConfigurationId, context == null ? Context.NONE : context).block(); } @@ -787,7 +789,7 @@ public Response getAnomalyAlertConfigurationWithRespo * Update anomaly alert configuration. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateAnomalyAlertConfiguration#AnomalyAlertConfiguration} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateAnomalyAlertConfig#AnomalyAlertConfiguration} * * @param alertConfiguration The anomaly alert configuration to update. * @@ -798,16 +800,16 @@ public Response getAnomalyAlertConfigurationWithRespo * UUID format specification. */ @ServiceMethod(returns = ReturnType.SINGLE) - public AnomalyAlertConfiguration updateAnomalyAlertConfiguration( + public AnomalyAlertConfiguration updateAnomalyAlertConfig( AnomalyAlertConfiguration alertConfiguration) { - return updateAnomalyAlertConfigurationWithResponse(alertConfiguration, Context.NONE).getValue(); + return updateAnomalyAlertConfigWithResponse(alertConfiguration, Context.NONE).getValue(); } /** * Update anomaly alert configuration. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateAnomalyAlertConfigurationWithResponse#AnomalyAlertConfiguration-Context} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateAnomalyAlertConfigWithResponse#AnomalyAlertConfiguration-Context} * * @param alertConfiguration The anomaly alert configuration to update. * @param context Additional context that is passed through the Http pipeline during the service call. @@ -819,9 +821,9 @@ public AnomalyAlertConfiguration updateAnomalyAlertConfiguration( * UUID format specification. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response updateAnomalyAlertConfigurationWithResponse( + public Response updateAnomalyAlertConfigWithResponse( AnomalyAlertConfiguration alertConfiguration, Context context) { - return client.updateAnomalyAlertConfigurationWithResponse(alertConfiguration, context == null + return client.updateAnomalyAlertConfigWithResponse(alertConfiguration, context == null ? Context.NONE : context).block(); } @@ -829,7 +831,7 @@ public Response updateAnomalyAlertConfigurationWithRe * Deletes the anomaly alert configuration identified by {@code alertConfigurationId}. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteAnomalyAlertConfiguration#String} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteAnomalyAlertConfig#String} * * @param alertConfigurationId The anomaly alert configuration id. * @throws NullPointerException thrown if the {@code alertConfigurationId} is null. @@ -837,15 +839,15 @@ public Response updateAnomalyAlertConfigurationWithRe * UUID format specification. */ @ServiceMethod(returns = ReturnType.SINGLE) - public void deleteAnomalyAlertConfiguration(String alertConfigurationId) { - deleteAnomalyAlertConfigurationWithResponse(alertConfigurationId, Context.NONE); + public void deleteAnomalyAlertConfig(String alertConfigurationId) { + deleteAnomalyAlertConfigWithResponse(alertConfigurationId, Context.NONE); } /** * Deletes the anomaly alert configuration identified by {@code alertConfigurationId}. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteAnomalyAlertConfigurationWithResponse#String-Context} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteAnomalyAlertConfigWithResponse#String-Context} * * @param alertConfigurationId The anomaly alert configuration id. * @param context Additional context that is passed through the Http pipeline during the service call. @@ -856,8 +858,8 @@ public void deleteAnomalyAlertConfiguration(String alertConfigurationId) { * UUID format specification. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Response deleteAnomalyAlertConfigurationWithResponse(String alertConfigurationId, Context context) { - return client.deleteAnomalyAlertConfigurationWithResponse(alertConfigurationId, context == null + public Response deleteAnomalyAlertConfigWithResponse(String alertConfigurationId, Context context) { + return client.deleteAnomalyAlertConfigWithResponse(alertConfigurationId, context == null ? Context.NONE : context).block(); } @@ -865,7 +867,7 @@ public Response deleteAnomalyAlertConfigurationWithResponse(String alertCo * Fetch the anomaly alert configurations associated with a detection configuration. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listAnomalyAlertConfigurations#String} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listAnomalyAlertConfigs#String} * * @param detectionConfigurationId The id of the detection configuration. * @@ -876,16 +878,16 @@ public Response deleteAnomalyAlertConfigurationWithResponse(String alertCo * UUID format specification. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable listAnomalyAlertConfigurations( + public PagedIterable listAnomalyAlertConfigs( String detectionConfigurationId) { - return listAnomalyAlertConfigurations(detectionConfigurationId, Context.NONE); + return listAnomalyAlertConfigs(detectionConfigurationId, Context.NONE); } /** * Fetch the anomaly alert configurations associated with a detection configuration. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listAnomalyAlertConfigurations#String-Context} + * {@codesnippet com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listAnomalyAlertConfigs#String-Context} * * @param detectionConfigurationId The id of the detection configuration. * @param context Additional context that is passed through the Http pipeline during the service call. @@ -897,9 +899,9 @@ public PagedIterable listAnomalyAlertConfigurations( * UUID format specification. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable listAnomalyAlertConfigurations( + public PagedIterable listAnomalyAlertConfigs( String detectionConfigurationId, Context context) { - return new PagedIterable<>(client.listAnomalyAlertConfigurations(detectionConfigurationId, + return new PagedIterable<>(client.listAnomalyAlertConfigs(detectionConfigurationId, context == null ? Context.NONE : context)); } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/AzureCognitiveServiceMetricsAdvisorRestAPIOpenAPIV2Impl.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/AzureCognitiveServiceMetricsAdvisorRestAPIOpenAPIV2Impl.java index dd95aab88820..d8a08ed2584a 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/AzureCognitiveServiceMetricsAdvisorRestAPIOpenAPIV2Impl.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/AzureCognitiveServiceMetricsAdvisorRestAPIOpenAPIV2Impl.java @@ -31,6 +31,7 @@ import com.azure.ai.metricsadvisor.implementation.models.EnrichmentStatusList; import com.azure.ai.metricsadvisor.implementation.models.EnrichmentStatusQueryOption; import com.azure.ai.metricsadvisor.implementation.models.EntityStatus; +import com.azure.ai.metricsadvisor.models.AnomalyAlert; import com.azure.ai.metricsadvisor.models.ErrorCodeException; import com.azure.ai.metricsadvisor.implementation.models.Granularity; import com.azure.ai.metricsadvisor.implementation.models.HookInfo; @@ -53,7 +54,6 @@ import com.azure.ai.metricsadvisor.implementation.models.RootCauseList; import com.azure.ai.metricsadvisor.implementation.models.SeriesResultList; import com.azure.ai.metricsadvisor.implementation.models.UsageStats; -import com.azure.ai.metricsadvisor.models.Alert; import com.azure.ai.metricsadvisor.models.DataFeedIngestionProgress; import com.azure.ai.metricsadvisor.models.DataFeedIngestionStatus; import com.azure.ai.metricsadvisor.models.EnrichmentStatus; @@ -1086,7 +1086,7 @@ public void createAnomalyAlertingConfiguration(AnomalyAlertingConfiguration body * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getAlertsByAnomalyAlertingConfigurationSinglePageAsync( + public Mono> getAlertsByAnomalyAlertingConfigurationSinglePageAsync( UUID configurationId, AlertingResultQuery body, Integer skip, Integer top) { return FluxUtil.withContext( context -> @@ -1117,7 +1117,7 @@ public Mono> getAlertsByAnomalyAlertingConfigurationSingleP * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getAlertsByAnomalyAlertingConfigurationSinglePageAsync( + public Mono> getAlertsByAnomalyAlertingConfigurationSinglePageAsync( UUID configurationId, AlertingResultQuery body, Integer skip, Integer top, Context context) { return service.getAlertsByAnomalyAlertingConfiguration( this.getEndpoint(), configurationId, skip, top, body, context) @@ -1145,7 +1145,7 @@ public Mono> getAlertsByAnomalyAlertingConfigurationSingleP * @return the response. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedFlux getAlertsByAnomalyAlertingConfigurationAsync( + public PagedFlux getAlertsByAnomalyAlertingConfigurationAsync( UUID configurationId, AlertingResultQuery body, Integer skip, Integer top) { return new PagedFlux<>( () -> getAlertsByAnomalyAlertingConfigurationSinglePageAsync(configurationId, body, skip, top), @@ -1166,7 +1166,7 @@ public PagedFlux getAlertsByAnomalyAlertingConfigurationAsync( * @return the response. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedFlux getAlertsByAnomalyAlertingConfigurationAsync( + public PagedFlux getAlertsByAnomalyAlertingConfigurationAsync( UUID configurationId, AlertingResultQuery body, Integer skip, Integer top, Context context) { return new PagedFlux<>( () -> getAlertsByAnomalyAlertingConfigurationSinglePageAsync(configurationId, body, skip, top, context), @@ -1186,7 +1186,7 @@ public PagedFlux getAlertsByAnomalyAlertingConfigurationAsync( * @return the response. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable getAlertsByAnomalyAlertingConfiguration( + public PagedIterable getAlertsByAnomalyAlertingConfiguration( UUID configurationId, AlertingResultQuery body, Integer skip, Integer top) { return new PagedIterable<>(getAlertsByAnomalyAlertingConfigurationAsync(configurationId, body, skip, top)); } @@ -1205,7 +1205,7 @@ public PagedIterable getAlertsByAnomalyAlertingConfiguration( * @return the response. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable getAlertsByAnomalyAlertingConfiguration( + public PagedIterable getAlertsByAnomalyAlertingConfiguration( UUID configurationId, AlertingResultQuery body, Integer skip, Integer top, Context context) { return new PagedIterable<>( getAlertsByAnomalyAlertingConfigurationAsync(configurationId, body, skip, top, context)); @@ -5003,7 +5003,7 @@ public PagedIterable getEnrichmentStatusByMetric( * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getAlertsByAnomalyAlertingConfigurationNextSinglePageAsync( + public Mono> getAlertsByAnomalyAlertingConfigurationNextSinglePageAsync( String nextLink, AlertingResultQuery body) { return FluxUtil.withContext( context -> @@ -5032,7 +5032,7 @@ public Mono> getAlertsByAnomalyAlertingConfigurationNextSin * @return the response. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getAlertsByAnomalyAlertingConfigurationNextSinglePageAsync( + public Mono> getAlertsByAnomalyAlertingConfigurationNextSinglePageAsync( String nextLink, AlertingResultQuery body, Context context) { return service.getAlertsByAnomalyAlertingConfigurationNext(this.getEndpoint(), nextLink, body, context) .map( diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/AlertResultList.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/AlertResultList.java index 1b4902e95dac..304e8661b1dd 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/AlertResultList.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/AlertResultList.java @@ -4,9 +4,10 @@ package com.azure.ai.metricsadvisor.implementation.models; -import com.azure.ai.metricsadvisor.models.Alert; +import com.azure.ai.metricsadvisor.models.AnomalyAlert; import com.azure.core.annotation.Fluent; import com.fasterxml.jackson.annotation.JsonProperty; + import java.util.List; /** The AlertResultList model. */ @@ -22,7 +23,7 @@ public final class AlertResultList { * The value property. */ @JsonProperty(value = "value", required = true) - private List value; + private List value; /** * Get the nextLink property: The @nextLink property. @@ -49,7 +50,7 @@ public AlertResultList setNextLink(String nextLink) { * * @return the value value. */ - public List getValue() { + public List getValue() { return this.value; } @@ -59,7 +60,7 @@ public List getValue() { * @param value the value value to set. * @return the AlertResultList object itself. */ - public AlertResultList setValue(List value) { + public AlertResultList setValue(List value) { this.value = value; return this; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/AlertingResultQuery.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/AlertingResultQuery.java index f8c923349f01..32d7fb5768cf 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/AlertingResultQuery.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/AlertingResultQuery.java @@ -4,7 +4,7 @@ package com.azure.ai.metricsadvisor.implementation.models; -import com.azure.ai.metricsadvisor.models.TimeMode; +import com.azure.ai.metricsadvisor.models.AlertQueryTimeMode; import com.azure.core.annotation.Fluent; import com.fasterxml.jackson.annotation.JsonProperty; import java.time.OffsetDateTime; @@ -28,7 +28,7 @@ public final class AlertingResultQuery { * time mode */ @JsonProperty(value = "timeMode", required = true) - private TimeMode timeMode; + private AlertQueryTimeMode timeMode; /** * Get the startTime property: start time. @@ -75,7 +75,7 @@ public AlertingResultQuery setEndTime(OffsetDateTime endTime) { * * @return the timeMode value. */ - public TimeMode getTimeMode() { + public AlertQueryTimeMode getTimeMode() { return this.timeMode; } @@ -85,7 +85,7 @@ public TimeMode getTimeMode() { * @param timeMode the timeMode value to set. * @return the AlertingResultQuery object itself. */ - public AlertingResultQuery setTimeMode(TimeMode timeMode) { + public AlertingResultQuery setTimeMode(AlertQueryTimeMode timeMode) { this.timeMode = timeMode; return this; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/AnomalyProperty.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/AnomalyProperty.java index acdf19cc5cff..2bcd2ad0d12a 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/AnomalyProperty.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/AnomalyProperty.java @@ -4,8 +4,8 @@ package com.azure.ai.metricsadvisor.implementation.models; +import com.azure.ai.metricsadvisor.models.AnomalySeverity; import com.azure.ai.metricsadvisor.models.AnomalyStatus; -import com.azure.ai.metricsadvisor.models.Severity; import com.azure.core.annotation.Fluent; import com.fasterxml.jackson.annotation.JsonProperty; @@ -16,7 +16,7 @@ public final class AnomalyProperty { * anomaly severity */ @JsonProperty(value = "anomalySeverity", required = true) - private Severity anomalySeverity; + private AnomalySeverity anomalySeverity; /* * anomaly status @@ -31,7 +31,7 @@ public final class AnomalyProperty { * * @return the anomalySeverity value. */ - public Severity getAnomalySeverity() { + public AnomalySeverity getAnomalySeverity() { return this.anomalySeverity; } @@ -41,7 +41,7 @@ public Severity getAnomalySeverity() { * @param anomalySeverity the anomalySeverity value to set. * @return the AnomalyProperty object itself. */ - public AnomalyProperty setAnomalySeverity(Severity anomalySeverity) { + public AnomalyProperty setAnomalySeverity(AnomalySeverity anomalySeverity) { this.anomalySeverity = anomalySeverity; return this; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/AnomalyScope.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/AnomalyScope.java index ad490aee9f8f..7dbb191c8f8b 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/AnomalyScope.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/AnomalyScope.java @@ -13,8 +13,8 @@ public final class AnomalyScope extends ExpandableStringEnum { /** Static value All for AnomalyScope. */ public static final AnomalyScope ALL = fromString("All"); - /** Static value Dimension for AnomalyScope. */ - public static final AnomalyScope DIMENSION = fromString("Dimension"); + /** Static value DataFeedDimension for AnomalyScope. */ + public static final AnomalyScope DIMENSION = fromString("DataFeedDimension"); /** Static value TopN for AnomalyScope. */ public static final AnomalyScope TOPN = fromString("TopN"); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/DataFeedDetail.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/DataFeedDetail.java index 7b05f3b0c580..9d4b41111aa4 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/DataFeedDetail.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/DataFeedDetail.java @@ -4,8 +4,8 @@ package com.azure.ai.metricsadvisor.implementation.models; -import com.azure.ai.metricsadvisor.models.Dimension; -import com.azure.ai.metricsadvisor.models.Metric; +import com.azure.ai.metricsadvisor.models.DataFeedDimension; +import com.azure.ai.metricsadvisor.models.DataFeedMetric; import com.azure.core.annotation.Fluent; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -73,13 +73,13 @@ public class DataFeedDetail { * measure list */ @JsonProperty(value = "metrics", required = true) - private List metrics; + private List metrics; /* * dimension list */ @JsonProperty(value = "dimension") - private List dimension; + private List dimension; /* * user-defined timestamp column. if timestampColumn is null, start time of @@ -299,18 +299,18 @@ public DataFeedDetail setGranularityAmount(Integer granularityAmount) { * * @return the metrics value. */ - public List getMetrics() { + public List getMetrics() { return this.metrics; } /** - * Set the metrics property: measure list. + * Set the dataFeedMetrics property: measure list. * - * @param metrics the metrics value to set. + * @param dataFeedMetrics the dataFeedMetrics value to set. * @return the DataFeedDetail object itself. */ - public DataFeedDetail setMetrics(List metrics) { - this.metrics = metrics; + public DataFeedDetail setMetrics(List dataFeedMetrics) { + this.metrics = dataFeedMetrics; return this; } @@ -319,7 +319,7 @@ public DataFeedDetail setMetrics(List metrics) { * * @return the dimension value. */ - public List getDimension() { + public List getDimension() { return this.dimension; } @@ -329,7 +329,7 @@ public List getDimension() { * @param dimension the dimension value to set. * @return the DataFeedDetail object itself. */ - public DataFeedDetail setDimension(List dimension) { + public DataFeedDetail setDimension(List dimension) { this.dimension = dimension; return this; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/IncidentProperty.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/IncidentProperty.java index 1dd9799c28fc..29482c33a59f 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/IncidentProperty.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/IncidentProperty.java @@ -4,8 +4,8 @@ package com.azure.ai.metricsadvisor.implementation.models; -import com.azure.ai.metricsadvisor.models.IncidentStatus; -import com.azure.ai.metricsadvisor.models.Severity; +import com.azure.ai.metricsadvisor.models.AnomalyIncidentStatus; +import com.azure.ai.metricsadvisor.models.AnomalySeverity; import com.azure.core.annotation.Fluent; import com.fasterxml.jackson.annotation.JsonProperty; @@ -16,7 +16,7 @@ public final class IncidentProperty { * max severity of latest anomalies in the incident */ @JsonProperty(value = "maxSeverity", required = true) - private Severity maxSeverity; + private AnomalySeverity maxSeverity; /* * incident status @@ -24,14 +24,14 @@ public final class IncidentProperty { * only return for alerting incident result */ @JsonProperty(value = "incidentStatus", access = JsonProperty.Access.WRITE_ONLY) - private IncidentStatus incidentStatus; + private AnomalyIncidentStatus incidentStatus; /** * Get the maxSeverity property: max severity of latest anomalies in the incident. * * @return the maxSeverity value. */ - public Severity getMaxSeverity() { + public AnomalySeverity getMaxSeverity() { return this.maxSeverity; } @@ -41,7 +41,7 @@ public Severity getMaxSeverity() { * @param maxSeverity the maxSeverity value to set. * @return the IncidentProperty object itself. */ - public IncidentProperty setMaxSeverity(Severity maxSeverity) { + public IncidentProperty setMaxSeverity(AnomalySeverity maxSeverity) { this.maxSeverity = maxSeverity; return this; } @@ -53,7 +53,7 @@ public IncidentProperty setMaxSeverity(Severity maxSeverity) { * * @return the incidentStatus value. */ - public IncidentStatus getIncidentStatus() { + public AnomalyIncidentStatus getIncidentStatus() { return this.incidentStatus; } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/SeriesResult.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/SeriesResult.java index e4d3037be7e5..3df57a809e01 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/SeriesResult.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/SeriesResult.java @@ -175,7 +175,7 @@ public List getExpectedValueList() { * @param expectedValueList the expectedValueList value to set. * @return the SeriesResult object itself. */ - public SeriesResult setExpectedValueList(List expectedValueList) { + public SeriesResult setExpectedMetricValues(List expectedValueList) { this.expectedValueList = expectedValueList; return this; } @@ -195,7 +195,7 @@ public List getLowerBoundaryList() { * @param lowerBoundaryList the lowerBoundaryList value to set. * @return the SeriesResult object itself. */ - public SeriesResult setLowerBoundaryList(List lowerBoundaryList) { + public SeriesResult setLowerBoundaryValues(List lowerBoundaryList) { this.lowerBoundaryList = lowerBoundaryList; return this; } @@ -215,7 +215,7 @@ public List getUpperBoundaryList() { * @param upperBoundaryList the upperBoundaryList value to set. * @return the SeriesResult object itself. */ - public SeriesResult setUpperBoundaryList(List upperBoundaryList) { + public SeriesResult setUpperBoundaryValues(List upperBoundaryList) { this.upperBoundaryList = upperBoundaryList; return this; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/SeverityFilterCondition.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/SeverityFilterCondition.java index 08fc375a0f8b..e3ab15f7a838 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/SeverityFilterCondition.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/SeverityFilterCondition.java @@ -4,7 +4,7 @@ package com.azure.ai.metricsadvisor.implementation.models; -import com.azure.ai.metricsadvisor.models.Severity; +import com.azure.ai.metricsadvisor.models.AnomalySeverity; import com.azure.core.annotation.Fluent; import com.fasterxml.jackson.annotation.JsonProperty; @@ -15,20 +15,20 @@ public final class SeverityFilterCondition { * min severity */ @JsonProperty(value = "min", required = true) - private Severity min; + private AnomalySeverity min; /* * max severity */ @JsonProperty(value = "max", required = true) - private Severity max; + private AnomalySeverity max; /** * Get the min property: min severity. * * @return the min value. */ - public Severity getMin() { + public AnomalySeverity getMin() { return this.min; } @@ -38,7 +38,7 @@ public Severity getMin() { * @param min the min value to set. * @return the SeverityFilterCondition object itself. */ - public SeverityFilterCondition setMin(Severity min) { + public SeverityFilterCondition setMin(AnomalySeverity min) { this.min = min; return this; } @@ -48,7 +48,7 @@ public SeverityFilterCondition setMin(Severity min) { * * @return the max value. */ - public Severity getMax() { + public AnomalySeverity getMax() { return this.max; } @@ -58,7 +58,7 @@ public Severity getMax() { * @param max the max value to set. * @return the SeverityFilterCondition object itself. */ - public SeverityFilterCondition setMax(Severity max) { + public SeverityFilterCondition setMax(AnomalySeverity max) { this.max = max; return this; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/AlertConfigurationTransforms.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/AlertConfigurationTransforms.java index 0719dcc930dc..d71ab5480b44 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/AlertConfigurationTransforms.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/AlertConfigurationTransforms.java @@ -93,11 +93,11 @@ public static AnomalyAlertingConfigurationPatch toInnerForUpdate( } /** - * Internal helper method to get the service Metric alert configurations list. + * Internal helper method to get the service DataFeedMetric alert configurations list. * * @param metricAlertConfigurations the SDK level provided metric configurations list. * - * @return the service required Metric alert configurations list. + * @return the service required DataFeedMetric alert configurations list. */ private static List getMetricAlertConfigList( List metricAlertConfigurations) { diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/AnomalyHelper.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/AnomalyHelper.java index fc1f48b766da..1d4da88fa3c5 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/AnomalyHelper.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/AnomalyHelper.java @@ -3,15 +3,15 @@ package com.azure.ai.metricsadvisor.implementation.util; -import com.azure.ai.metricsadvisor.models.Anomaly; +import com.azure.ai.metricsadvisor.models.AnomalySeverity; +import com.azure.ai.metricsadvisor.models.DataPointAnomaly; import com.azure.ai.metricsadvisor.models.AnomalyStatus; import com.azure.ai.metricsadvisor.models.DimensionKey; -import com.azure.ai.metricsadvisor.models.Severity; import java.time.OffsetDateTime; /** - * The helper class to set the non-public properties of an {@link Anomaly} instance. + * The helper class to set the non-public properties of an {@link DataPointAnomaly} instance. */ public final class AnomalyHelper { private static AnomalyAccessor accessor; @@ -19,21 +19,21 @@ public final class AnomalyHelper { private AnomalyHelper() { } /** - * Type defining the methods to set the non-public properties of an {@link Anomaly} instance. + * Type defining the methods to set the non-public properties of an {@link DataPointAnomaly} instance. */ public interface AnomalyAccessor { - void setMetricId(Anomaly anomaly, String metricId); - void setSeriesKey(Anomaly anomaly, DimensionKey seriesKey); - void setDetectionConfigurationId(Anomaly anomaly, String detectionConfigurationId); - void setSeverity(Anomaly anomaly, Severity severity); - void setStatus(Anomaly anomaly, AnomalyStatus status); - void setTimeStamp(Anomaly anomaly, OffsetDateTime timeStamp); - void setCreatedTime(Anomaly anomaly, OffsetDateTime createdTime); - void setModifiedTime(Anomaly anomaly, OffsetDateTime modifiedTime); + void setMetricId(DataPointAnomaly anomaly, String metricId); + void setSeriesKey(DataPointAnomaly anomaly, DimensionKey seriesKey); + void setDetectionConfigurationId(DataPointAnomaly anomaly, String detectionConfigurationId); + void setSeverity(DataPointAnomaly anomaly, AnomalySeverity severity); + void setStatus(DataPointAnomaly anomaly, AnomalyStatus status); + void setTimeStamp(DataPointAnomaly anomaly, OffsetDateTime timeStamp); + void setCreatedTime(DataPointAnomaly anomaly, OffsetDateTime createdTime); + void setModifiedTime(DataPointAnomaly anomaly, OffsetDateTime modifiedTime); } /** - * The method called from {@link Anomaly} to set it's accessor. + * The method called from {@link DataPointAnomaly} to set it's accessor. * * @param anomalyAccessor The accessor. */ @@ -41,35 +41,35 @@ public static void setAccessor(final AnomalyAccessor anomalyAccessor) { accessor = anomalyAccessor; } - static void setMetricId(Anomaly anomaly, String metricId) { + static void setMetricId(DataPointAnomaly anomaly, String metricId) { accessor.setMetricId(anomaly, metricId); } - static void setSeriesKey(Anomaly anomaly, DimensionKey seriesKey) { + static void setSeriesKey(DataPointAnomaly anomaly, DimensionKey seriesKey) { accessor.setSeriesKey(anomaly, seriesKey); } - static void setDetectionConfigurationId(Anomaly anomaly, String detectionConfigurationId) { + static void setDetectionConfigurationId(DataPointAnomaly anomaly, String detectionConfigurationId) { accessor.setDetectionConfigurationId(anomaly, detectionConfigurationId); } - static void setSeverity(Anomaly anomaly, Severity severity) { + static void setSeverity(DataPointAnomaly anomaly, AnomalySeverity severity) { accessor.setSeverity(anomaly, severity); } - static void setStatus(Anomaly anomaly, AnomalyStatus status) { + static void setStatus(DataPointAnomaly anomaly, AnomalyStatus status) { accessor.setStatus(anomaly, status); } - static void setTimeStamp(Anomaly anomaly, OffsetDateTime timeStamp) { + static void setTimeStamp(DataPointAnomaly anomaly, OffsetDateTime timeStamp) { accessor.setTimeStamp(anomaly, timeStamp); } - static void setCreatedTime(Anomaly anomaly, OffsetDateTime createdTime) { + static void setCreatedTime(DataPointAnomaly anomaly, OffsetDateTime createdTime) { accessor.setCreatedTime(anomaly, createdTime); } - static void setModifiedTime(Anomaly anomaly, OffsetDateTime modifiedTime) { + static void setModifiedTime(DataPointAnomaly anomaly, OffsetDateTime modifiedTime) { accessor.setModifiedTime(anomaly, modifiedTime); } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/AnomalyTransforms.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/AnomalyTransforms.java index fa7669470009..4d6da2c6730b 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/AnomalyTransforms.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/AnomalyTransforms.java @@ -7,10 +7,10 @@ import com.azure.ai.metricsadvisor.implementation.models.DetectionAnomalyFilterCondition; import com.azure.ai.metricsadvisor.implementation.models.DimensionGroupIdentity; import com.azure.ai.metricsadvisor.implementation.models.SeverityFilterCondition; -import com.azure.ai.metricsadvisor.models.Anomaly; +import com.azure.ai.metricsadvisor.models.AnomalySeverity; +import com.azure.ai.metricsadvisor.models.DataPointAnomaly; import com.azure.ai.metricsadvisor.models.DimensionKey; import com.azure.ai.metricsadvisor.models.ListAnomaliesDetectedFilter; -import com.azure.ai.metricsadvisor.models.Severity; import com.azure.core.http.rest.Page; import com.azure.core.http.rest.PagedResponse; import com.azure.core.http.rest.PagedResponseBase; @@ -25,8 +25,8 @@ public class AnomalyTransforms { public static DetectionAnomalyFilterCondition toInnerFilter(ListAnomaliesDetectedFilter filter, ClientLogger logger) { DetectionAnomalyFilterCondition innerFilter = new DetectionAnomalyFilterCondition(); - Severity minSeverity = filter.getMinSeverity(); - Severity maxSeverity = filter.getMaxSeverity(); + AnomalySeverity minSeverity = filter.getMinSeverity(); + AnomalySeverity maxSeverity = filter.getMaxSeverity(); if ((minSeverity != null) ^ (maxSeverity != null)) { throw logger.logExceptionAsError(new IllegalArgumentException( "Both min and max severity are required if anomalies needs to be filtered based on 'severity'")); @@ -52,62 +52,62 @@ public static DetectionAnomalyFilterCondition toInnerFilter(ListAnomaliesDetecte } } - public static PagedResponse fromInnerPagedResponse(PagedResponse innerResponse) { - List anomalyList; + public static PagedResponse fromInnerPagedResponse(PagedResponse innerResponse) { + List dataPointAnomalyList; final List innerAnomalyList = innerResponse.getValue(); if (innerAnomalyList == null || innerAnomalyList.isEmpty()) { - anomalyList = new ArrayList<>(); + dataPointAnomalyList = new ArrayList<>(); } else { - anomalyList = innerAnomalyList + dataPointAnomalyList = innerAnomalyList .stream() .map(innerAnomaly -> fromInner(innerAnomaly)) .collect(Collectors.toList()); } - final IterableStream pageElements - = new IterableStream<>(anomalyList); + final IterableStream pageElements + = new IterableStream<>(dataPointAnomalyList); - return new PagedResponseBase(innerResponse.getRequest(), + return new PagedResponseBase(innerResponse.getRequest(), innerResponse.getStatusCode(), innerResponse.getHeaders(), new AnomalyPage(pageElements, innerResponse.getContinuationToken()), null); } - private static Anomaly fromInner(AnomalyResult innerAnomaly) { - Anomaly anomaly = new Anomaly(); + private static DataPointAnomaly fromInner(AnomalyResult innerAnomaly) { + DataPointAnomaly dataPointAnomaly = new DataPointAnomaly(); if (innerAnomaly.getMetricId() != null) { - AnomalyHelper.setMetricId(anomaly, innerAnomaly.getMetricId().toString()); + AnomalyHelper.setMetricId(dataPointAnomaly, innerAnomaly.getMetricId().toString()); } if (innerAnomaly.getAnomalyDetectionConfigurationId() != null) { - AnomalyHelper.setDetectionConfigurationId(anomaly, + AnomalyHelper.setDetectionConfigurationId(dataPointAnomaly, innerAnomaly.getAnomalyDetectionConfigurationId().toString()); } if (innerAnomaly.getDimension() != null) { - AnomalyHelper.setSeriesKey(anomaly, new DimensionKey(innerAnomaly.getDimension())); + AnomalyHelper.setSeriesKey(dataPointAnomaly, new DimensionKey(innerAnomaly.getDimension())); } if (innerAnomaly.getProperty() != null) { - AnomalyHelper.setSeverity(anomaly, innerAnomaly.getProperty().getAnomalySeverity()); - AnomalyHelper.setStatus(anomaly, innerAnomaly.getProperty().getAnomalyStatus()); + AnomalyHelper.setSeverity(dataPointAnomaly, innerAnomaly.getProperty().getAnomalySeverity()); + AnomalyHelper.setStatus(dataPointAnomaly, innerAnomaly.getProperty().getAnomalyStatus()); } - AnomalyHelper.setTimeStamp(anomaly, innerAnomaly.getTimestamp()); - AnomalyHelper.setCreatedTime(anomaly, innerAnomaly.getCreatedTime()); - AnomalyHelper.setModifiedTime(anomaly, innerAnomaly.getModifiedTime()); - return anomaly; + AnomalyHelper.setTimeStamp(dataPointAnomaly, innerAnomaly.getTimestamp()); + AnomalyHelper.setCreatedTime(dataPointAnomaly, innerAnomaly.getCreatedTime()); + AnomalyHelper.setModifiedTime(dataPointAnomaly, innerAnomaly.getModifiedTime()); + return dataPointAnomaly; } - private static final class AnomalyPage implements Page { - private final IterableStream elements; + private static final class AnomalyPage implements Page { + private final IterableStream elements; private final String continuationTToken; - private AnomalyPage(IterableStream elements, String continuationTToken) { + private AnomalyPage(IterableStream elements, String continuationTToken) { this.elements = elements; this.continuationTToken = continuationTToken; } @Override - public IterableStream getElements() { + public IterableStream getElements() { return this.elements; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/DataFeedTransforms.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/DataFeedTransforms.java index 3afb682f42d7..9cb62092f744 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/DataFeedTransforms.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/DataFeedTransforms.java @@ -53,6 +53,7 @@ import com.azure.ai.metricsadvisor.models.DataFeedGranularity; import com.azure.ai.metricsadvisor.models.DataFeedGranularityType; import com.azure.ai.metricsadvisor.models.DataFeedIngestionSettings; +import com.azure.ai.metricsadvisor.models.DataFeedMetric; import com.azure.ai.metricsadvisor.models.DataFeedMissingDataPointFillSettings; import com.azure.ai.metricsadvisor.models.DataFeedOptions; import com.azure.ai.metricsadvisor.models.DataFeedRollupSettings; @@ -65,7 +66,6 @@ import com.azure.ai.metricsadvisor.models.ElasticsearchDataFeedSource; import com.azure.ai.metricsadvisor.models.HttpRequestDataFeedSource; import com.azure.ai.metricsadvisor.models.InfluxDBDataFeedSource; -import com.azure.ai.metricsadvisor.models.Metric; import com.azure.ai.metricsadvisor.models.MongoDBDataFeedSource; import com.azure.ai.metricsadvisor.models.MySqlDataFeedSource; import com.azure.ai.metricsadvisor.models.PostgreSqlDataFeedSource; @@ -128,7 +128,7 @@ public static DataFeed fromInner(final DataFeedDetail dataFeedDetail) { DataFeedHelper.setCreator(dataFeed, dataFeedDetail.getCreator()); DataFeedHelper.setStatus(dataFeed, DataFeedStatus.fromString(dataFeedDetail.getStatus().toString())); DataFeedHelper.setMetricIds(dataFeed, - dataFeedDetail.getMetrics().stream().map(Metric::getId).collect(Collectors.toList())); + dataFeedDetail.getMetrics().stream().map(DataFeedMetric::getId).collect(Collectors.toList())); return dataFeed; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/HookHelper.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/HookHelper.java index cffb61954f34..26550fdfb7ec 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/HookHelper.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/HookHelper.java @@ -3,12 +3,12 @@ package com.azure.ai.metricsadvisor.implementation.util; -import com.azure.ai.metricsadvisor.models.Hook; +import com.azure.ai.metricsadvisor.models.NotificationHook; import java.util.List; /** - * The helper class to set the non-public properties of an {@link Hook} instance. + * The helper class to set the non-public properties of an {@link NotificationHook} instance. */ public final class HookHelper { private static HookAccessor accessor; @@ -16,15 +16,15 @@ public final class HookHelper { private HookHelper() { } /** - * Type defining the methods to set the non-public properties of an {@link Hook} instance. + * Type defining the methods to set the non-public properties of an {@link NotificationHook} instance. */ public interface HookAccessor { - void setId(Hook hook, String id); - void setAdmins(Hook hook, List admins); + void setId(NotificationHook hook, String id); + void setAdminEmails(NotificationHook hook, List admins); } /** - * The method called from {@link Hook} to set it's accessor. + * The method called from {@link NotificationHook} to set it's accessor. * * @param hookAccessor The accessor. */ @@ -32,11 +32,11 @@ public static void setAccessor(final HookAccessor hookAccessor) { accessor = hookAccessor; } - public static void setId(Hook hook, String id) { + public static void setId(NotificationHook hook, String id) { accessor.setId(hook, id); } - static void setAdmins(Hook hook, List admins) { - accessor.setAdmins(hook, admins); + static void setAdminEmails(NotificationHook hook, List adminEmails) { + accessor.setAdminEmails(hook, adminEmails); } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/HookTransforms.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/HookTransforms.java index 5d5d28ee921b..a14924c36d7d 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/HookTransforms.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/HookTransforms.java @@ -11,9 +11,9 @@ import com.azure.ai.metricsadvisor.implementation.models.WebhookHookInfo; import com.azure.ai.metricsadvisor.implementation.models.WebhookHookInfoPatch; import com.azure.ai.metricsadvisor.implementation.models.WebhookHookParameter; -import com.azure.ai.metricsadvisor.models.EmailHook; -import com.azure.ai.metricsadvisor.models.Hook; -import com.azure.ai.metricsadvisor.models.WebHook; +import com.azure.ai.metricsadvisor.models.EmailNotificationHook; +import com.azure.ai.metricsadvisor.models.NotificationHook; +import com.azure.ai.metricsadvisor.models.WebNotificationHook; import com.azure.core.http.HttpHeaders; import com.azure.core.http.rest.Page; import com.azure.core.http.rest.PagedResponse; @@ -35,15 +35,16 @@ public final class HookTransforms { private HookTransforms() { } - public static HookInfo toInnerForCreate(ClientLogger logger, Hook hook) { - if (hook instanceof EmailHook) { - EmailHook emailHook = (EmailHook) hook; + public static HookInfo toInnerForCreate(ClientLogger logger, NotificationHook notificationHook) { + if (notificationHook instanceof EmailNotificationHook) { + EmailNotificationHook emailHook = (EmailNotificationHook) notificationHook; if (CoreUtils.isNullOrEmpty(emailHook.getName())) { - throw logger.logExceptionAsError(new IllegalArgumentException("The hook.name is required.")); + throw logger.logExceptionAsError( + new IllegalArgumentException("The notificationHook.name is required.")); } if (emailHook.getEmailsToAlert().isEmpty()) { throw logger.logExceptionAsError( - new IllegalArgumentException("At least one email is required in the hook.")); + new IllegalArgumentException("At least one email is required in the notificationHook.")); } EmailHookInfo innerEmailHook = new EmailHookInfo(); innerEmailHook.setHookName(emailHook.getName()); @@ -52,13 +53,15 @@ public static HookInfo toInnerForCreate(ClientLogger logger, Hook hook) { innerEmailHook.setHookParameter(new EmailHookParameter() .setToList(emailHook.getEmailsToAlert())); return innerEmailHook; - } else if (hook instanceof WebHook) { - WebHook webHook = (WebHook) hook; + } else if (notificationHook instanceof WebNotificationHook) { + WebNotificationHook webHook = (WebNotificationHook) notificationHook; if (CoreUtils.isNullOrEmpty(webHook.getName())) { - throw logger.logExceptionAsError(new IllegalArgumentException("The hook.name is required.")); + throw logger.logExceptionAsError( + new IllegalArgumentException("The notificationHook.name is required.")); } if (CoreUtils.isNullOrEmpty(webHook.getEndpoint())) { - throw logger.logExceptionAsError(new IllegalArgumentException("The hook.endpoint is required.")); + throw logger.logExceptionAsError( + new IllegalArgumentException("The notificationHook.endpoint is required.")); } WebhookHookInfo innerWebHook = new WebhookHookInfo(); innerWebHook.setHookName(webHook.getName()); @@ -75,13 +78,13 @@ public static HookInfo toInnerForCreate(ClientLogger logger, Hook hook) { } else { throw logger .logExceptionAsError(new IllegalArgumentException(String.format( - "The hook type %s not supported", hook.getClass().getCanonicalName()))); + "The notificationHook type %s not supported", notificationHook.getClass().getCanonicalName()))); } } - public static HookInfoPatch toInnerForUpdate(ClientLogger logger, Hook hook) { - if (hook instanceof EmailHook) { - EmailHook emailHook = (EmailHook) hook; + public static HookInfoPatch toInnerForUpdate(ClientLogger logger, NotificationHook notificationHook) { + if (notificationHook instanceof EmailNotificationHook) { + EmailNotificationHook emailHook = (EmailNotificationHook) notificationHook; EmailHookInfoPatch innerEmailHook = new EmailHookInfoPatch(); innerEmailHook.setHookName(emailHook.getName()); innerEmailHook.setDescription(emailHook.getDescription()); @@ -89,8 +92,8 @@ public static HookInfoPatch toInnerForUpdate(ClientLogger logger, Hook hook) { innerEmailHook.setHookParameter(new EmailHookParameter() .setToList(emailHook.getEmailsToAlert())); return innerEmailHook; - } else if (hook instanceof WebHook) { - WebHook webHook = (WebHook) hook; + } else if (notificationHook instanceof WebNotificationHook) { + WebNotificationHook webHook = (WebNotificationHook) notificationHook; WebhookHookInfoPatch innerWebHook = new WebhookHookInfoPatch(); innerWebHook.setHookName(webHook.getName()); innerWebHook.setDescription(webHook.getDescription()); @@ -106,14 +109,14 @@ public static HookInfoPatch toInnerForUpdate(ClientLogger logger, Hook hook) { } else { throw logger .logExceptionAsError(new IllegalArgumentException(String.format( - "The hook type %s not supported", hook.getClass().getCanonicalName()))); + "The notificationHook type %s not supported", notificationHook.getClass().getCanonicalName()))); } } - public static Hook fromInner(ClientLogger logger, HookInfo innerHook) { + public static NotificationHook fromInner(ClientLogger logger, HookInfo innerHook) { if (innerHook instanceof EmailHookInfo) { EmailHookInfo innerEmailHook = (EmailHookInfo) innerHook; - EmailHook emailHook = new EmailHook(innerEmailHook.getHookName(), + EmailNotificationHook emailHook = new EmailNotificationHook(innerEmailHook.getHookName(), innerEmailHook.getHookParameter().getToList()); emailHook.setDescription(innerEmailHook.getDescription()); @@ -125,12 +128,12 @@ public static Hook fromInner(ClientLogger logger, HookInfo innerHook) { if (adminList == null) { adminList = new ArrayList<>(); } - HookHelper.setAdmins(emailHook, Collections.unmodifiableList(adminList)); + HookHelper.setAdminEmails(emailHook, Collections.unmodifiableList(adminList)); return emailHook; } else if (innerHook instanceof WebhookHookInfo) { WebhookHookInfo innerWebHook = (WebhookHookInfo) innerHook; - WebHook webHook = new WebHook(innerWebHook.getHookName(), + WebNotificationHook webHook = new WebNotificationHook(innerWebHook.getHookName(), innerWebHook.getHookParameter().getEndpoint()); webHook.setDescription(innerWebHook.getDescription()); @@ -153,7 +156,7 @@ public static Hook fromInner(ClientLogger logger, HookInfo innerHook) { if (adminList == null) { adminList = new ArrayList<>(); } - HookHelper.setAdmins(webHook, Collections.unmodifiableList(adminList)); + HookHelper.setAdminEmails(webHook, Collections.unmodifiableList(adminList)); return webHook; } else { @@ -162,40 +165,40 @@ public static Hook fromInner(ClientLogger logger, HookInfo innerHook) { } } - public static PagedResponse fromInnerPagedResponse(ClientLogger logger, + public static PagedResponse fromInnerPagedResponse(ClientLogger logger, PagedResponse innerResponse) { - List hookList; + List notificationHookList; final List innerHookList = innerResponse.getValue(); if (innerHookList == null || innerHookList.isEmpty()) { - hookList = new ArrayList<>(); + notificationHookList = new ArrayList<>(); } else { - hookList = innerHookList + notificationHookList = innerHookList .stream() .map(innerAnomaly -> fromInner(logger, innerAnomaly)) .collect(Collectors.toList()); } - final IterableStream pageElements - = new IterableStream<>(hookList); + final IterableStream pageElements + = new IterableStream<>(notificationHookList); - return new PagedResponseBase(innerResponse.getRequest(), + return new PagedResponseBase(innerResponse.getRequest(), innerResponse.getStatusCode(), innerResponse.getHeaders(), new HookPage(pageElements, innerResponse.getContinuationToken()), null); } - private static final class HookPage implements Page { - private final IterableStream elements; + private static final class HookPage implements Page { + private final IterableStream elements; private final String continuationTToken; - private HookPage(IterableStream elements, String continuationTToken) { + private HookPage(IterableStream elements, String continuationTToken) { this.elements = elements; this.continuationTToken = continuationTToken; } @Override - public IterableStream getElements() { + public IterableStream getElements() { return this.elements; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/IncidentHelper.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/IncidentHelper.java index fd16ca319e95..7b0a93ab39ab 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/IncidentHelper.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/IncidentHelper.java @@ -3,15 +3,15 @@ package com.azure.ai.metricsadvisor.implementation.util; +import com.azure.ai.metricsadvisor.models.AnomalyIncidentStatus; +import com.azure.ai.metricsadvisor.models.AnomalySeverity; import com.azure.ai.metricsadvisor.models.DimensionKey; -import com.azure.ai.metricsadvisor.models.Incident; -import com.azure.ai.metricsadvisor.models.IncidentStatus; -import com.azure.ai.metricsadvisor.models.Severity; +import com.azure.ai.metricsadvisor.models.AnomalyIncident; import java.time.OffsetDateTime; /** - * The helper class to set the non-public properties of an {@link Incident} instance. + * The helper class to set the non-public properties of an {@link AnomalyIncident} instance. */ public final class IncidentHelper { private static IncidentAccessor accessor; @@ -19,21 +19,21 @@ public final class IncidentHelper { private IncidentHelper() { } /** - * Type defining the methods to set the non-public properties of an {@link Incident} instance. + * Type defining the methods to set the non-public properties of an {@link AnomalyIncident} instance. */ public interface IncidentAccessor { - void setId(Incident incident, String id); - void setMetricId(Incident incident, String metricId); - void setDetectionConfigurationId(Incident incident, String detectionConfigurationId); - void setRootDimensionKey(Incident incident, DimensionKey rootDimensionKey); - void setSeverity(Incident incident, Severity severity); - void setStatus(Incident incident, IncidentStatus status); - void setStartTime(Incident incident, OffsetDateTime startTime); - void setLastTime(Incident incident, OffsetDateTime lastTime); + void setId(AnomalyIncident incident, String id); + void setMetricId(AnomalyIncident incident, String metricId); + void setDetectionConfigurationId(AnomalyIncident incident, String detectionConfigurationId); + void setRootDimensionKey(AnomalyIncident incident, DimensionKey rootDimensionKey); + void setSeverity(AnomalyIncident incident, AnomalySeverity severity); + void setStatus(AnomalyIncident incident, AnomalyIncidentStatus status); + void setStartTime(AnomalyIncident incident, OffsetDateTime startTime); + void setLastTime(AnomalyIncident incident, OffsetDateTime lastTime); } /** - * The method called from {@link Incident} to set it's accessor. + * The method called from {@link AnomalyIncident} to set it's accessor. * * @param incidentAccessor The accessor. */ @@ -41,35 +41,35 @@ public static void setAccessor(final IncidentAccessor incidentAccessor) { accessor = incidentAccessor; } - public static void setId(Incident incident, String id) { + public static void setId(AnomalyIncident incident, String id) { accessor.setId(incident, id); } - static void setMetricId(Incident incident, String metricId) { + static void setMetricId(AnomalyIncident incident, String metricId) { accessor.setMetricId(incident, metricId); } - public static void setDetectionConfigurationId(Incident incident, String detectionConfigurationId) { + public static void setDetectionConfigurationId(AnomalyIncident incident, String detectionConfigurationId) { accessor.setDetectionConfigurationId(incident, detectionConfigurationId); } - static void setRootDimensionKey(Incident incident, DimensionKey rootDimensionKey) { + static void setRootDimensionKey(AnomalyIncident incident, DimensionKey rootDimensionKey) { accessor.setRootDimensionKey(incident, rootDimensionKey); } - static void setSeverity(Incident incident, Severity severity) { + static void setSeverity(AnomalyIncident incident, AnomalySeverity severity) { accessor.setSeverity(incident, severity); } - static void setStatus(Incident incident, IncidentStatus status) { + static void setStatus(AnomalyIncident incident, AnomalyIncidentStatus status) { accessor.setStatus(incident, status); } - static void setStartTime(Incident incident, OffsetDateTime startTime) { + static void setStartTime(AnomalyIncident incident, OffsetDateTime startTime) { accessor.setStartTime(incident, startTime); } - static void setLastTime(Incident incident, OffsetDateTime lastTime) { + static void setLastTime(AnomalyIncident incident, OffsetDateTime lastTime) { accessor.setLastTime(incident, lastTime); } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/IncidentRootCauseHelper.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/IncidentRootCauseHelper.java index 1d0816d61dcc..650cafb4b35f 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/IncidentRootCauseHelper.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/IncidentRootCauseHelper.java @@ -22,7 +22,7 @@ private IncidentRootCauseHelper() { } public interface IncidentRootCauseAccessor { void setSeriesKey(IncidentRootCause rootCause, DimensionKey seriesKey); void setPaths(IncidentRootCause rootCause, List paths); - void setConfidenceScore(IncidentRootCause rootCause, double confidenceScore); + void setContributionScore(IncidentRootCause rootCause, double confidenceScore); void setDescription(IncidentRootCause rootCause, String description); } @@ -43,8 +43,8 @@ static void setPaths(IncidentRootCause rootCause, List paths) { accessor.setPaths(rootCause, paths); } - static void setConfidenceScore(IncidentRootCause rootCause, double confidenceScore) { - accessor.setConfidenceScore(rootCause, confidenceScore); + static void setContributionScore(IncidentRootCause rootCause, double confidenceScore) { + accessor.setContributionScore(rootCause, confidenceScore); } static void setDescription(IncidentRootCause rootCause, String description) { diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/IncidentRootCauseTransforms.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/IncidentRootCauseTransforms.java index 5076e6d7de99..839e13261284 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/IncidentRootCauseTransforms.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/IncidentRootCauseTransforms.java @@ -45,7 +45,7 @@ public static IncidentRootCause fromInner(RootCause inner) { final IncidentRootCause incidentRootCause = new IncidentRootCause(); IncidentRootCauseHelper.setSeriesKey(incidentRootCause, new DimensionKey(inner.getRootCause().getDimension())); IncidentRootCauseHelper.setPaths(incidentRootCause, inner.getPath()); - IncidentRootCauseHelper.setConfidenceScore(incidentRootCause, inner.getScore()); + IncidentRootCauseHelper.setContributionScore(incidentRootCause, inner.getScore()); IncidentRootCauseHelper.setDescription(incidentRootCause, inner.getDescription()); return incidentRootCause; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/IncidentTransforms.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/IncidentTransforms.java index f19f37210f64..d5bd348e4909 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/IncidentTransforms.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/IncidentTransforms.java @@ -4,8 +4,8 @@ package com.azure.ai.metricsadvisor.implementation.util; import com.azure.ai.metricsadvisor.implementation.models.IncidentResult; +import com.azure.ai.metricsadvisor.models.AnomalyIncident; import com.azure.ai.metricsadvisor.models.DimensionKey; -import com.azure.ai.metricsadvisor.models.Incident; import com.azure.core.http.rest.Page; import com.azure.core.http.rest.PagedResponse; import com.azure.core.http.rest.PagedResponseBase; @@ -16,22 +16,22 @@ import java.util.stream.Collectors; public class IncidentTransforms { - public static PagedResponse fromInnerPagedResponse(PagedResponse innerResponse) { - List incidentList; + public static PagedResponse fromInnerPagedResponse(PagedResponse innerResponse) { + List anomalyIncidentList; final List innerIncidentList = innerResponse.getValue(); if (innerIncidentList == null || innerIncidentList.isEmpty()) { - incidentList = new ArrayList<>(); + anomalyIncidentList = new ArrayList<>(); } else { - incidentList = innerIncidentList + anomalyIncidentList = innerIncidentList .stream() .map(innerConfiguration -> fromInner(innerConfiguration)) .collect(Collectors.toList()); } - final IterableStream pageElements - = new IterableStream<>(incidentList); + final IterableStream pageElements + = new IterableStream<>(anomalyIncidentList); - return new PagedResponseBase(innerResponse.getRequest(), + return new PagedResponseBase(innerResponse.getRequest(), innerResponse.getStatusCode(), innerResponse.getHeaders(), new IncidentPage(pageElements, innerResponse.getContinuationToken()), @@ -39,8 +39,8 @@ public static PagedResponse fromInnerPagedResponse(PagedResponse { - private final IterableStream elements; + private static final class IncidentPage implements Page { + private final IterableStream elements; private final String continuationTToken; - private IncidentPage(IterableStream elements, String continuationTToken) { + private IncidentPage(IterableStream elements, String continuationTToken) { this.elements = elements; this.continuationTToken = continuationTToken; } @Override - public IterableStream getElements() { + public IterableStream getElements() { return this.elements; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/MetricEnrichedSeriesDataHelper.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/MetricEnrichedSeriesDataHelper.java index bbe400b21ef5..c503cb442a47 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/MetricEnrichedSeriesDataHelper.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/MetricEnrichedSeriesDataHelper.java @@ -22,13 +22,13 @@ private MetricEnrichedSeriesDataHelper() { } */ public interface MetricEnrichedSeriesDataAccessor { void setSeriesKey(MetricEnrichedSeriesData seriesData, DimensionKey seriesKey); - void setTimestampList(MetricEnrichedSeriesData seriesData, List timestampList); - void setValueList(MetricEnrichedSeriesData seriesData, List valueList); - void setIsAnomalyList(MetricEnrichedSeriesData seriesData, List isAnomalyList); - void setPeriodList(MetricEnrichedSeriesData seriesData, List periodList); - void setExpectedValueList(MetricEnrichedSeriesData seriesData, List expectedValueList); - void setLowerBoundaryList(MetricEnrichedSeriesData seriesData, List lowerBoundaryList); - void setUpperBoundaryList(MetricEnrichedSeriesData seriesData, List upperBoundaryList); + void setTimestamps(MetricEnrichedSeriesData seriesData, List timestamps); + void setMetricValues(MetricEnrichedSeriesData seriesData, List metricValues); + void setIsAnomalyList(MetricEnrichedSeriesData seriesData, List isAnomaly); + void setPeriods(MetricEnrichedSeriesData seriesData, List periods); + void setExpectedMetricValues(MetricEnrichedSeriesData seriesData, List expectedMetricValues); + void setLowerBoundaryValues(MetricEnrichedSeriesData seriesData, List lowerBoundaryValues); + void setUpperBoundaryValues(MetricEnrichedSeriesData seriesData, List upperBoundaryValues); } /** @@ -44,31 +44,31 @@ static void setSeriesKey(MetricEnrichedSeriesData seriesData, DimensionKey serie accessor.setSeriesKey(seriesData, seriesKey); } - static void setTimestampList(MetricEnrichedSeriesData seriesData, List timestampList) { - accessor.setTimestampList(seriesData, timestampList); + static void setTimestamps(MetricEnrichedSeriesData seriesData, List timestamps) { + accessor.setTimestamps(seriesData, timestamps); } - static void setValueList(MetricEnrichedSeriesData seriesData, List valueList) { - accessor.setValueList(seriesData, valueList); + static void setMetricValues(MetricEnrichedSeriesData seriesData, List metricValues) { + accessor.setMetricValues(seriesData, metricValues); } - static void setIsAnomalyList(MetricEnrichedSeriesData seriesData, List isAnomalyList) { - accessor.setIsAnomalyList(seriesData, isAnomalyList); + static void setIsAnomalyList(MetricEnrichedSeriesData seriesData, List isAnomaly) { + accessor.setIsAnomalyList(seriesData, isAnomaly); } - static void setPeriodList(MetricEnrichedSeriesData seriesData, List periodList) { - accessor.setPeriodList(seriesData, periodList); + static void setPeriods(MetricEnrichedSeriesData seriesData, List periods) { + accessor.setPeriods(seriesData, periods); } - static void setExpectedValueList(MetricEnrichedSeriesData seriesData, List expectedValueList) { - accessor.setExpectedValueList(seriesData, expectedValueList); + static void setExpectedMetricValues(MetricEnrichedSeriesData seriesData, List expectedMetricValues) { + accessor.setExpectedMetricValues(seriesData, expectedMetricValues); } - static void setLowerBoundaryList(MetricEnrichedSeriesData seriesData, List lowerBoundaryList) { - accessor.setLowerBoundaryList(seriesData, lowerBoundaryList); + static void setLowerBoundaryValues(MetricEnrichedSeriesData seriesData, List lowerBoundaryValues) { + accessor.setLowerBoundaryValues(seriesData, lowerBoundaryValues); } - static void setUpperBoundaryList(MetricEnrichedSeriesData seriesData, List upperBoundaryList) { - accessor.setUpperBoundaryList(seriesData, upperBoundaryList); + static void setUpperBoundaryValues(MetricEnrichedSeriesData seriesData, List upperBoundaryValues) { + accessor.setUpperBoundaryValues(seriesData, upperBoundaryValues); } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/MetricEnrichedSeriesDataTransformations.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/MetricEnrichedSeriesDataTransformations.java index 18011e56f7db..77dcaa294a0e 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/MetricEnrichedSeriesDataTransformations.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/MetricEnrichedSeriesDataTransformations.java @@ -37,13 +37,13 @@ private static MetricEnrichedSeriesData fromInner(SeriesResult innerEnrichedSeri if (timestampList == null) { timestampList = new ArrayList<>(); } - MetricEnrichedSeriesDataHelper.setTimestampList(enrichedSeriesData, timestampList); + MetricEnrichedSeriesDataHelper.setTimestamps(enrichedSeriesData, timestampList); List valueList = innerEnrichedSeriesData.getValueList(); if (valueList == null) { valueList = new ArrayList<>(); } - MetricEnrichedSeriesDataHelper.setValueList(enrichedSeriesData, valueList); + MetricEnrichedSeriesDataHelper.setMetricValues(enrichedSeriesData, valueList); List isAnomalyList = innerEnrichedSeriesData.getIsAnomalyList(); if (isAnomalyList == null) { @@ -55,25 +55,25 @@ private static MetricEnrichedSeriesData fromInner(SeriesResult innerEnrichedSeri if (periodList == null) { periodList = new ArrayList<>(); } - MetricEnrichedSeriesDataHelper.setPeriodList(enrichedSeriesData, periodList); + MetricEnrichedSeriesDataHelper.setPeriods(enrichedSeriesData, periodList); List expectedValueList = innerEnrichedSeriesData.getExpectedValueList(); if (expectedValueList == null) { expectedValueList = new ArrayList<>(); } - MetricEnrichedSeriesDataHelper.setExpectedValueList(enrichedSeriesData, expectedValueList); + MetricEnrichedSeriesDataHelper.setExpectedMetricValues(enrichedSeriesData, expectedValueList); List lowerBoundList = innerEnrichedSeriesData.getLowerBoundaryList(); if (lowerBoundList == null) { lowerBoundList = new ArrayList<>(); } - MetricEnrichedSeriesDataHelper.setLowerBoundaryList(enrichedSeriesData, lowerBoundList); + MetricEnrichedSeriesDataHelper.setLowerBoundaryValues(enrichedSeriesData, lowerBoundList); List upperBoundList = innerEnrichedSeriesData.getUpperBoundaryList(); if (upperBoundList == null) { upperBoundList = new ArrayList<>(); } - MetricEnrichedSeriesDataHelper.setUpperBoundaryList(enrichedSeriesData, upperBoundList); + MetricEnrichedSeriesDataHelper.setUpperBoundaryValues(enrichedSeriesData, upperBoundList); return enrichedSeriesData; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/AlertQueryTimeMode.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/AlertQueryTimeMode.java new file mode 100644 index 000000000000..593a20e09d1f --- /dev/null +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/AlertQueryTimeMode.java @@ -0,0 +1,37 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.ai.metricsadvisor.models; + +import com.azure.core.util.ExpandableStringEnum; +import com.fasterxml.jackson.annotation.JsonCreator; +import java.util.Collection; + +/** Defines values for AlertQueryTimeMode. */ +public final class AlertQueryTimeMode extends ExpandableStringEnum { + /** Static value AnomalyTime for AlertQueryTimeMode. */ + public static final AlertQueryTimeMode ANOMALY_TIME = fromString("AnomalyTime"); + + /** Static value CreatedTime for AlertQueryTimeMode. */ + public static final AlertQueryTimeMode CREATED_TIME = fromString("CreatedTime"); + + /** Static value ModifiedTime for AlertQueryTimeMode. */ + public static final AlertQueryTimeMode MODIFIED_TIME = fromString("ModifiedTime"); + + /** + * Creates or finds a AlertQueryTimeMode from its string representation. + * + * @param name a name to look for. + * @return the corresponding AlertQueryTimeMode. + */ + @JsonCreator + public static AlertQueryTimeMode fromString(String name) { + return fromString(name, AlertQueryTimeMode.class); + } + + /** @return known AlertQueryTimeMode values. */ + public static Collection values() { + return values(AlertQueryTimeMode.class); + } +} diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Alert.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/AnomalyAlert.java similarity index 98% rename from sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Alert.java rename to sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/AnomalyAlert.java index bc88d51ab883..c79b8e071c30 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Alert.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/AnomalyAlert.java @@ -10,7 +10,7 @@ /** The AlertResult model. */ @Immutable -public final class Alert { +public final class AnomalyAlert { /* * alert id */ diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Incident.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/AnomalyIncident.java similarity index 77% rename from sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Incident.java rename to sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/AnomalyIncident.java index 6376d1edaa47..81bc29100d45 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Incident.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/AnomalyIncident.java @@ -10,55 +10,55 @@ /** * Describes an incident detected in a time series or a time series group. */ -public final class Incident { +public final class AnomalyIncident { private String id; private String metricId; private String detectionConfigurationId; private DimensionKey rootDimensionKey; - private Severity severity; - private IncidentStatus status; + private AnomalySeverity severity; + private AnomalyIncidentStatus status; private OffsetDateTime startTime; private OffsetDateTime lastTime; static { IncidentHelper.setAccessor(new IncidentHelper.IncidentAccessor() { @Override - public void setId(Incident incident, String id) { + public void setId(AnomalyIncident incident, String id) { incident.setId(id); } @Override - public void setMetricId(Incident incident, String metricId) { + public void setMetricId(AnomalyIncident incident, String metricId) { incident.setMetricId(metricId); } @Override - public void setDetectionConfigurationId(Incident incident, String detectionConfigurationId) { + public void setDetectionConfigurationId(AnomalyIncident incident, String detectionConfigurationId) { incident.setDetectionConfigurationId(detectionConfigurationId); } @Override - public void setRootDimensionKey(Incident incident, DimensionKey rootDimensionKey) { + public void setRootDimensionKey(AnomalyIncident incident, DimensionKey rootDimensionKey) { incident.setRootDimensionKey(rootDimensionKey); } @Override - public void setSeverity(Incident incident, Severity severity) { + public void setSeverity(AnomalyIncident incident, AnomalySeverity severity) { incident.setSeverity(severity); } @Override - public void setStatus(Incident incident, IncidentStatus status) { + public void setStatus(AnomalyIncident incident, AnomalyIncidentStatus status) { incident.setStatus(status); } @Override - public void setStartTime(Incident incident, OffsetDateTime startTime) { + public void setStartTime(AnomalyIncident incident, OffsetDateTime startTime) { incident.setStartTime(startTime); } @Override - public void setLastTime(Incident incident, OffsetDateTime lastTime) { + public void setLastTime(AnomalyIncident incident, OffsetDateTime lastTime) { incident.setLastTime(lastTime); } }); @@ -107,7 +107,7 @@ public DimensionKey getRootDimensionKey() { * * @return The severity. */ - public Severity getSeverity() { + public AnomalySeverity getSeverity() { return this.severity; } @@ -116,7 +116,7 @@ public Severity getSeverity() { * * @return The incident status. */ - public IncidentStatus getStatus() { + public AnomalyIncidentStatus getStatus() { return this.status; } @@ -154,11 +154,11 @@ void setRootDimensionKey(DimensionKey rootDimensionKey) { this.rootDimensionKey = rootDimensionKey; } - void setSeverity(Severity severity) { + void setSeverity(AnomalySeverity severity) { this.severity = severity; } - void setStatus(IncidentStatus status) { + void setStatus(AnomalyIncidentStatus status) { this.status = status; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/AnomalyIncidentStatus.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/AnomalyIncidentStatus.java new file mode 100644 index 000000000000..592315ce99fa --- /dev/null +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/AnomalyIncidentStatus.java @@ -0,0 +1,34 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.ai.metricsadvisor.models; + +import com.azure.core.util.ExpandableStringEnum; +import com.fasterxml.jackson.annotation.JsonCreator; +import java.util.Collection; + +/** Defines values for AnomalyIncidentStatus. */ +public final class AnomalyIncidentStatus extends ExpandableStringEnum { + /** Static value Active for AnomalyIncidentStatus. */ + public static final AnomalyIncidentStatus ACTIVE = fromString("Active"); + + /** Static value Resolved for AnomalyIncidentStatus. */ + public static final AnomalyIncidentStatus RESOLVED = fromString("Resolved"); + + /** + * Creates or finds a AnomalyIncidentStatus from its string representation. + * + * @param name a name to look for. + * @return the corresponding AnomalyIncidentStatus. + */ + @JsonCreator + public static AnomalyIncidentStatus fromString(String name) { + return fromString(name, AnomalyIncidentStatus.class); + } + + /** @return known AnomalyIncidentStatus values. */ + public static Collection values() { + return values(AnomalyIncidentStatus.class); + } +} diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/AnomalySeverity.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/AnomalySeverity.java new file mode 100644 index 000000000000..515fbae35bcc --- /dev/null +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/AnomalySeverity.java @@ -0,0 +1,37 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.ai.metricsadvisor.models; + +import com.azure.core.util.ExpandableStringEnum; +import com.fasterxml.jackson.annotation.JsonCreator; +import java.util.Collection; + +/** Defines values for AnomalySeverity. */ +public final class AnomalySeverity extends ExpandableStringEnum { + /** Static value Low for AnomalySeverity. */ + public static final AnomalySeverity LOW = fromString("Low"); + + /** Static value Medium for AnomalySeverity. */ + public static final AnomalySeverity MEDIUM = fromString("Medium"); + + /** Static value High for AnomalySeveDrity. */ + public static final AnomalySeverity HIGH = fromString("High"); + + /** + * Creates or finds a AnomalySeverity from its string representation. + * + * @param name a name to look for. + * @return the corresponding AnomalySeverity. + */ + @JsonCreator + public static AnomalySeverity fromString(String name) { + return fromString(name, AnomalySeverity.class); + } + + /** @return known AnomalySeverity values. */ + public static Collection values() { + return values(AnomalySeverity.class); + } +} diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Dimension.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedDimension.java similarity index 81% rename from sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Dimension.java rename to sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedDimension.java index 45a2eb74a77f..1f7bf294457e 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Dimension.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedDimension.java @@ -7,9 +7,9 @@ import com.azure.core.annotation.Fluent; import com.fasterxml.jackson.annotation.JsonProperty; -/** The Dimension model. */ +/** The DataFeedDimension model. */ @Fluent -public final class Dimension { +public final class DataFeedDimension { /* * dimension name */ @@ -35,9 +35,9 @@ public String getName() { * Set the name property: dimension name. * * @param name the name value to set. - * @return the Dimension object itself. + * @return the DataFeedDimension object itself. */ - public Dimension setName(String name) { + public DataFeedDimension setName(String name) { this.name = name; return this; } @@ -55,9 +55,9 @@ public String getDisplayName() { * Set the displayName property: dimension display name. * * @param displayName the displayName value to set. - * @return the Dimension object itself. + * @return the DataFeedDimension object itself. */ - public Dimension setDisplayName(String displayName) { + public DataFeedDimension setDisplayName(String displayName) { this.displayName = displayName; return this; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Metric.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedMetric.java similarity index 84% rename from sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Metric.java rename to sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedMetric.java index e3d9fc569fbf..44cadd63b0d1 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Metric.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedMetric.java @@ -7,9 +7,9 @@ import com.azure.core.annotation.Fluent; import com.fasterxml.jackson.annotation.JsonProperty; -/** The Metric model. */ +/** The DataFeedMetric model. */ @Fluent -public final class Metric { +public final class DataFeedMetric { /* * metric id */ @@ -56,9 +56,9 @@ public String getName() { * Set the name property: metric name. * * @param name the name value to set. - * @return the Metric object itself. + * @return the DataFeedMetric object itself. */ - public Metric setName(String name) { + public DataFeedMetric setName(String name) { this.name = name; return this; } @@ -76,9 +76,9 @@ public String getDisplayName() { * Set the displayName property: metric display name. * * @param displayName the displayName value to set. - * @return the Metric object itself. + * @return the DataFeedMetric object itself. */ - public Metric setDisplayName(String displayName) { + public DataFeedMetric setDisplayName(String displayName) { this.displayName = displayName; return this; } @@ -96,9 +96,9 @@ public String getDescription() { * Set the description property: metric description. * * @param description the description value to set. - * @return the Metric object itself. + * @return the DataFeedMetric object itself. */ - public Metric setDescription(String description) { + public DataFeedMetric setDescription(String description) { this.description = description; return this; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedSchema.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedSchema.java index e8db24b544ed..71b6c289528d 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedSchema.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedSchema.java @@ -12,24 +12,24 @@ */ @Fluent public final class DataFeedSchema { - private final List metrics; - private List dimensions; + private final List dataFeedMetrics; + private List dataFeedDimensions; private String timestampColumn; /** - * @param metrics the metric columns to set. + * @param dataFeedMetrics the metric columns to set. */ - public DataFeedSchema(final List metrics) { - this.metrics = metrics; + public DataFeedSchema(final List dataFeedMetrics) { + this.dataFeedMetrics = dataFeedMetrics; } /** - * Get the related metrics list. + * Get the related dataFeedMetrics list. * - * @return the list of metrics column set. + * @return the list of dataFeedMetrics column set. */ - public List getMetrics() { - return this.metrics; + public List getMetrics() { + return this.dataFeedMetrics; } /** @@ -37,8 +37,8 @@ public List getMetrics() { * * @return the dimension list */ - public List getDimensions() { - return this.dimensions; + public List getDimensions() { + return this.dataFeedDimensions; } /** @@ -54,12 +54,12 @@ public String getTimestampColumn() { /** * Sets the dimension columns value. * - * @param dimensions the dimensions column value to set. + * @param dimensions the dataFeedDimensions column value to set. * * @return the DataFeedSchema object itself. */ - public DataFeedSchema setDimensions(List dimensions) { - this.dimensions = dimensions; + public DataFeedSchema setDimensions(List dimensions) { + this.dataFeedDimensions = dimensions; return this; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Anomaly.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataPointAnomaly.java similarity index 79% rename from sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Anomaly.java rename to sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataPointAnomaly.java index c55eabf56844..75c361b4391c 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Anomaly.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataPointAnomaly.java @@ -10,11 +10,11 @@ /** * Describes an anomaly detected in a metric series. */ -public final class Anomaly { +public final class DataPointAnomaly { private String metricId; private DimensionKey seriesKey; private String detectionConfigurationId; - private Severity severity; + private AnomalySeverity severity; private AnomalyStatus status; private OffsetDateTime timeStamp; private OffsetDateTime createdTime; @@ -23,42 +23,42 @@ public final class Anomaly { static { AnomalyHelper.setAccessor(new AnomalyHelper.AnomalyAccessor() { @Override - public void setMetricId(Anomaly anomaly, String metricId) { + public void setMetricId(DataPointAnomaly anomaly, String metricId) { anomaly.setMetricId(metricId); } @Override - public void setSeriesKey(Anomaly anomaly, DimensionKey seriesKey) { + public void setSeriesKey(DataPointAnomaly anomaly, DimensionKey seriesKey) { anomaly.setSeriesKey(seriesKey); } @Override - public void setDetectionConfigurationId(Anomaly anomaly, String detectionConfigurationId) { + public void setDetectionConfigurationId(DataPointAnomaly anomaly, String detectionConfigurationId) { anomaly.setDetectionConfigurationId(detectionConfigurationId); } @Override - public void setSeverity(Anomaly anomaly, Severity severity) { + public void setSeverity(DataPointAnomaly anomaly, AnomalySeverity severity) { anomaly.setSeverity(severity); } @Override - public void setStatus(Anomaly anomaly, AnomalyStatus status) { + public void setStatus(DataPointAnomaly anomaly, AnomalyStatus status) { anomaly.setStatus(status); } @Override - public void setTimeStamp(Anomaly anomaly, OffsetDateTime timeStamp) { + public void setTimeStamp(DataPointAnomaly anomaly, OffsetDateTime timeStamp) { anomaly.setTimeStamp(timeStamp); } @Override - public void setCreatedTime(Anomaly anomaly, OffsetDateTime createdTime) { + public void setCreatedTime(DataPointAnomaly anomaly, OffsetDateTime createdTime) { anomaly.setCreatedTime(createdTime); } @Override - public void setModifiedTime(Anomaly anomaly, OffsetDateTime modifiedTime) { + public void setModifiedTime(DataPointAnomaly anomaly, OffsetDateTime modifiedTime) { anomaly.setModifiedTime(modifiedTime); } }); @@ -96,7 +96,7 @@ public DimensionKey getSeriesKey() { * * @return The severity. */ - public Severity getSeverity() { + public AnomalySeverity getSeverity() { return this.severity; } @@ -149,7 +149,7 @@ void setDetectionConfigurationId(String detectionConfigurationId) { this.detectionConfigurationId = detectionConfigurationId; } - void setSeverity(Severity severity) { + void setSeverity(AnomalySeverity severity) { this.severity = severity; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DimensionKey.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DimensionKey.java index a1ab3a4d2a29..b26710dd3af0 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DimensionKey.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DimensionKey.java @@ -9,7 +9,7 @@ import java.util.TreeMap; /** - * Describes a Metric dimension name-value pairs. + * Describes a DataFeedMetric dimension name-value pairs. * *

* A metric advisor data feed schema {@link DataFeedSchema} defines dimension diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/EmailHook.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/EmailNotificationHook.java similarity index 77% rename from sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/EmailHook.java rename to sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/EmailNotificationHook.java index 0fa6aca61746..fc54e0cf400d 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/EmailHook.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/EmailNotificationHook.java @@ -12,29 +12,29 @@ /** * A hook that describes email based incident alerts notification. */ -public final class EmailHook extends Hook { +public final class EmailNotificationHook extends NotificationHook { private String name; private String description; private List emailsToAlert; private String externalLink; /** - * Create a new instance of EmailHook. + * Create a new instance of EmailNotificationHook. * * @param name The email hook name. */ - public EmailHook(String name) { + public EmailNotificationHook(String name) { this.emailsToAlert = new ArrayList<>(); this.name = name; } /** - * Create a new instance of EmailHook. + * Create a new instance of EmailNotificationHook. * * @param name The email hook name. * @param emails The emails to send the alerts. */ - public EmailHook(String name, List emails) { + public EmailNotificationHook(String name, List emails) { if (emails == null) { this.emailsToAlert = new ArrayList<>(); } else { @@ -62,8 +62,6 @@ public List getEmailsToAlert() { return Collections.unmodifiableList(this.emailsToAlert); } - - /** * Gets the customized external link which is displayed in the title bar of the alert email. * @@ -77,9 +75,9 @@ public String getExternalLink() { * Sets the emails to send the alert. * * @param emails The emails. - * @return The EmailHook object itself. + * @return The EmailNotificationHook object itself. */ - public EmailHook setEmailsToAlert(List emails) { + public EmailNotificationHook setEmailsToAlert(List emails) { if (emails == null) { this.emailsToAlert = new ArrayList<>(); } else { @@ -92,9 +90,9 @@ public EmailHook setEmailsToAlert(List emails) { * Add an email to the list of emails to send the alert. * * @param email The email to add. - * @return The EmailHook object itself. + * @return The EmailNotificationHook object itself. */ - public EmailHook addEmailToAlert(String email) { + public EmailNotificationHook addEmailToAlert(String email) { if (this.emailsToAlert .stream() .anyMatch(email::equalsIgnoreCase)) { @@ -108,9 +106,9 @@ public EmailHook addEmailToAlert(String email) { * Removes an email from the list of alert emails. * * @param email The email to remove. - * @return The EmailHook object itself. + * @return The EmailNotificationHook object itself. */ - public EmailHook removeEmailToAlert(String email) { + public EmailNotificationHook removeEmailToAlert(String email) { int idx = IntStream.range(0, this.emailsToAlert.size()) .filter(i -> this.emailsToAlert.get(i).equalsIgnoreCase(email)) .findFirst() @@ -125,9 +123,9 @@ public EmailHook removeEmailToAlert(String email) { * Sets email hook name. * * @param name The email hook name. - * @return The EmailHook object itself. + * @return The EmailNotificationHook object itself. */ - public EmailHook setName(String name) { + public EmailNotificationHook setName(String name) { this.name = name; return this; } @@ -136,9 +134,9 @@ public EmailHook setName(String name) { * Sets email hook description. * * @param description The email hook description. - * @return The EmailHook object itself. + * @return The EmailNotificationHook object itself. */ - public EmailHook setDescription(String description) { + public EmailNotificationHook setDescription(String description) { this.description = description; return this; } @@ -147,9 +145,9 @@ public EmailHook setDescription(String description) { * Sets the customized external link which is displayed in the title bar of the alert email. * * @param externalLink The customized link. - * @return The EmailHook object itself. + * @return The EmailNotificationHook object itself. */ - public EmailHook setExternalLink(String externalLink) { + public EmailNotificationHook setExternalLink(String externalLink) { this.externalLink = externalLink; return this; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/IncidentRootCause.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/IncidentRootCause.java index 97299df139a2..5aeb39deb5c3 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/IncidentRootCause.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/IncidentRootCause.java @@ -13,7 +13,7 @@ public final class IncidentRootCause { private DimensionKey seriesKey; private List paths; - private double confidenceScore; + private double contributionScore; private String description; static { @@ -30,8 +30,8 @@ public void setPaths(IncidentRootCause rootCause, List paths) { } @Override - public void setConfidenceScore(IncidentRootCause rootCause, double confidenceScore) { - rootCause.setConfidenceScore(confidenceScore); + public void setContributionScore(IncidentRootCause rootCause, double confidenceScore) { + rootCause.setContributionScore(confidenceScore); } @Override @@ -64,12 +64,12 @@ public List getPaths() { } /** - * Get the confidence score value for the returned root cause. + * Get the contribution score value for the returned root cause. * * @return the score value. */ - public double getConfidenceScore() { - return this.confidenceScore; + public double getContributionScore() { + return this.contributionScore; } /** @@ -89,8 +89,8 @@ void setPaths(List paths) { this.paths = paths; } - void setConfidenceScore(double confidenceScore) { - this.confidenceScore = confidenceScore; + void setContributionScore(double contributionScore) { + this.contributionScore = contributionScore; } void setDescription(String description) { diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/IncidentStatus.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/IncidentStatus.java deleted file mode 100644 index b50e4689cf22..000000000000 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/IncidentStatus.java +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.ai.metricsadvisor.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for IncidentStatus. */ -public final class IncidentStatus extends ExpandableStringEnum { - /** Static value Active for IncidentStatus. */ - public static final IncidentStatus ACTIVE = fromString("Active"); - - /** Static value Resolved for IncidentStatus. */ - public static final IncidentStatus RESOLVED = fromString("Resolved"); - - /** - * Creates or finds a IncidentStatus from its string representation. - * - * @param name a name to look for. - * @return the corresponding IncidentStatus. - */ - @JsonCreator - public static IncidentStatus fromString(String name) { - return fromString(name, IncidentStatus.class); - } - - /** @return known IncidentStatus values. */ - public static Collection values() { - return values(IncidentStatus.class); - } -} diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListAlertOptions.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListAlertOptions.java index 9be561e85aa8..17cea625bc1a 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListAlertOptions.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListAlertOptions.java @@ -11,7 +11,7 @@ public final class ListAlertOptions { private final OffsetDateTime startTime; private final OffsetDateTime endTime; - private final TimeMode timeMode; + private final AlertQueryTimeMode alertQueryTimeMode; private Integer top; private Integer skip; @@ -24,10 +24,10 @@ public final class ListAlertOptions { */ public ListAlertOptions(OffsetDateTime startTime, OffsetDateTime endTime, - TimeMode timeMode) { + AlertQueryTimeMode timeMode) { this.startTime = startTime; this.endTime = endTime; - this.timeMode = timeMode; + this.alertQueryTimeMode = timeMode; } /** @@ -53,8 +53,8 @@ public OffsetDateTime getEndTime() { * * @return The time mode. */ - public TimeMode getTimeMode() { - return this.timeMode; + public AlertQueryTimeMode getTimeMode() { + return this.alertQueryTimeMode; } /** diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListAnomaliesDetectedFilter.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListAnomaliesDetectedFilter.java index 40ad234ef85e..0222ea5c723e 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListAnomaliesDetectedFilter.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListAnomaliesDetectedFilter.java @@ -9,8 +9,8 @@ * Describes additional conditions to filter the anomalies while listing. */ public final class ListAnomaliesDetectedFilter { - private Severity minSeverity; - private Severity maxSeverity; + private AnomalySeverity minSeverity; + private AnomalySeverity maxSeverity; private List seriesKeys; /** @@ -18,7 +18,7 @@ public final class ListAnomaliesDetectedFilter { * * @return The minimum severity. */ - public Severity getMinSeverity() { + public AnomalySeverity getMinSeverity() { return this.minSeverity; } @@ -27,7 +27,7 @@ public Severity getMinSeverity() { * * @return The max severity. */ - public Severity getMaxSeverity() { + public AnomalySeverity getMaxSeverity() { return this.maxSeverity; } @@ -48,7 +48,7 @@ public List getSeriesKeys() { * @param max The maximum severity. * @return The ListAnomaliesDetectedFilter object itself. */ - public ListAnomaliesDetectedFilter setSeverityRange(Severity min, Severity max) { + public ListAnomaliesDetectedFilter setSeverityRange(AnomalySeverity min, AnomalySeverity max) { this.minSeverity = min; this.maxSeverity = max; return this; @@ -61,9 +61,21 @@ public ListAnomaliesDetectedFilter setSeverityRange(Severity min, Severity max) * @param minSeverity The minimum severity. * @return The ListAnomaliesDetectedFilter object itself. */ - public ListAnomaliesDetectedFilter setSeverity(Severity minSeverity) { + public ListAnomaliesDetectedFilter setSeverity(AnomalySeverity minSeverity) { this.minSeverity = minSeverity; this.maxSeverity = minSeverity; return this; } + + /** + * Sets the time series keys, indicating that retrieve the anomalies occurred + * in these time series. + * + * @param seriesKeys The series keys. + * @return The ListAnomaliesDetectedFilter object itself. + */ + public ListAnomaliesDetectedFilter setSeriesKeys(List seriesKeys) { + this.seriesKeys = seriesKeys; + return this; + } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListMetricSeriesDataOptions.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListMetricSeriesDataOptions.java deleted file mode 100644 index 44574508c6a7..000000000000 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListMetricSeriesDataOptions.java +++ /dev/null @@ -1,92 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.ai.metricsadvisor.models; - -import com.azure.core.annotation.Fluent; - -import java.time.OffsetDateTime; - -/** - * Additional parameters for the API to list values time series data for a metric. - */ -@Fluent -public final class ListMetricSeriesDataOptions { - private final OffsetDateTime startTime; - private final OffsetDateTime endTime; - private Integer top; - private Integer skip; - - /** - * Creates a new instance of ListMetricSeriesDataOptions. - * - * @param startTime The start time for querying the time series data. - * @param endTime The end time for querying the time series data. - */ - public ListMetricSeriesDataOptions(OffsetDateTime startTime, - OffsetDateTime endTime) { - this.startTime = startTime; - this.endTime = endTime; - } - - /** - * Gets limit indicating the number of items that will be included in a service returned page. - * - * @return The top value. - */ - public Integer getTop() { - return this.top; - } - - /** - * Gets the number of items in the queried collection that will be skipped and not included - * in the returned result. - * - * @return The skip value. - */ - public Integer getSkip() { - return this.skip; - } - - /** - * Sets limit indicating the number of items to be included in a service returned page. - * - * @param top The top value. - * - * @return The ListMetricSeriesDataOptions object itself. - */ - public ListMetricSeriesDataOptions setTop(int top) { - this.top = top; - return this; - } - - /** - * Sets the number of items in the queried collection that are to be skipped and not included - * in the returned result. - * - * @param skip The skip value. - * @return ListMetricSeriesDataOptions itself. - */ - public ListMetricSeriesDataOptions setSkip(int skip) { - this.skip = skip; - return this; - } - - /** - * Gets the start time for which the time series data will be queried for. - * - * @return The start time. - */ - public OffsetDateTime getStartTime() { - return this.startTime; - } - - /** - * Gets the end time for which the time series data will be queried for. - * - * @return The end time. - */ - public OffsetDateTime getEndTime() { - return this.endTime; - } -} diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricAnomalyAlertConditions.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricAnomalyAlertConditions.java index b076a13a8177..ee7c30ee81d8 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricAnomalyAlertConditions.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricAnomalyAlertConditions.java @@ -51,7 +51,7 @@ public MetricAnomalyAlertConditions setMetricBoundaryCondition(MetricBoundaryCon * @param max The upper bound of severity range. * @return The MetricAnomalyAlertConditions object itself. */ - public MetricAnomalyAlertConditions setSeverityCondition(Severity min, Severity max) { + public MetricAnomalyAlertConditions setSeverityCondition(AnomalySeverity min, AnomalySeverity max) { return setSeverityRangeCondition(new SeverityCondition() .setMinAlertSeverity(min) .setMaxAlertSeverity(max)); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricEnrichedSeriesData.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricEnrichedSeriesData.java index cd7421898f05..aedc17cc7432 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricEnrichedSeriesData.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricEnrichedSeriesData.java @@ -33,38 +33,41 @@ public void setSeriesKey(MetricEnrichedSeriesData seriesData, DimensionKey serie } @Override - public void setTimestampList(MetricEnrichedSeriesData seriesData, List timestampList) { - seriesData.setTimestampList(timestampList); + public void setTimestamps(MetricEnrichedSeriesData seriesData, List timestamps) { + seriesData.setTimestampList(timestamps); } @Override - public void setValueList(MetricEnrichedSeriesData seriesData, List valueList) { - seriesData.setValueList(valueList); + public void setMetricValues(MetricEnrichedSeriesData seriesData, List metricValues) { + seriesData.setValueList(metricValues); } @Override - public void setIsAnomalyList(MetricEnrichedSeriesData seriesData, List isAnomalyList) { - seriesData.setIsAnomalyList(isAnomalyList); + public void setIsAnomalyList(MetricEnrichedSeriesData seriesData, List isAnomaly) { + seriesData.setIsAnomalyList(isAnomaly); } @Override - public void setPeriodList(MetricEnrichedSeriesData seriesData, List periodList) { - seriesData.setPeriodList(periodList); + public void setPeriods(MetricEnrichedSeriesData seriesData, List periods) { + seriesData.setPeriodList(periods); } @Override - public void setExpectedValueList(MetricEnrichedSeriesData seriesData, List expectedValueList) { - seriesData.setExpectedValueList(expectedValueList); + public void setExpectedMetricValues(MetricEnrichedSeriesData seriesData, + List expectedMetricValues) { + seriesData.setExpectedValueList(expectedMetricValues); } @Override - public void setLowerBoundaryList(MetricEnrichedSeriesData seriesData, List lowerBoundaryList) { - seriesData.setLowerBoundaryList(lowerBoundaryList); + public void setLowerBoundaryValues(MetricEnrichedSeriesData seriesData, + List lowerBoundaryValues) { + seriesData.setLowerBoundaryList(lowerBoundaryValues); } @Override - public void setUpperBoundaryList(MetricEnrichedSeriesData seriesData, List upperBoundaryList) { - seriesData.setUpperBoundaryList(upperBoundaryList); + public void setUpperBoundaryValues(MetricEnrichedSeriesData seriesData, + List upperBoundaryValues) { + seriesData.setUpperBoundaryList(upperBoundaryValues); } }); } @@ -101,7 +104,7 @@ public List getMetricValues() { * * @return The anomaly statuses. */ - public List isAnomalyList() { + public List isAnomaly() { return Collections.unmodifiableList(this.isAnomaly); } @@ -145,31 +148,31 @@ void setSeriesKey(DimensionKey seriesKey) { this.seriesKey = seriesKey; } - void setTimestampList(List timestampList) { - this.timestampList = timestampList; + void setTimestampList(List timestamps) { + this.timestamps = timestamps; } - void setValueList(List valueList) { - this.valueList = valueList; + void setValueList(List metricValues) { + this.metricValues = metricValues; } - void setIsAnomalyList(List isAnomalyList) { - this.isAnomalyList = isAnomalyList; + void setIsAnomalyList(List isAnomaly) { + this.isAnomaly = isAnomaly; } - void setPeriodList(List periodList) { - this.periodList = periodList; + void setPeriodList(List periods) { + this.periods = periods; } - void setExpectedValueList(List expectedValueList) { - this.expectedValueList = expectedValueList; + void setExpectedValueList(List expectedMetricValues) { + this.expectedMetricValues = expectedMetricValues; } - void setLowerBoundaryList(List lowerBoundaryList) { - this.lowerBoundaryList = lowerBoundaryList; + void setLowerBoundaryList(List lowerBoundaryValues) { + this.lowerBoundaryValues = lowerBoundaryValues; } - void setUpperBoundaryList(List upperBoundaryList) { - this.upperBoundaryList = upperBoundaryList; + void setUpperBoundaryList(List upperBoundaryValues) { + this.upperBoundaryValues = upperBoundaryValues; } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricSeriesData.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricSeriesData.java index b5bfa272cdd1..bb9dcd7ac075 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricSeriesData.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/MetricSeriesData.java @@ -43,13 +43,13 @@ public void setSeriesKey(MetricSeriesData seriesData, DimensionKey seriesKey) { } @Override - public void setTimestampList(MetricSeriesData seriesData, List timestampList) { - seriesData.setTimestampList(timestampList); + public void setTimestampList(MetricSeriesData seriesData, List timestamps) { + seriesData.setTimestampList(timestamps); } @Override - public void setValueList(MetricSeriesData seriesData, List valueList) { - seriesData.setValueList(valueList); + public void setValueList(MetricSeriesData seriesData, List metricValues) { + seriesData.setValueList(metricValues); } }); } @@ -78,7 +78,7 @@ public DimensionKey getSeriesKey() { /** * Get the timestamps of the data related to this time series. * - * @return the timestampList value. + * @return the timestamps value. */ public List getTimestamps() { return this.timestamps; @@ -87,7 +87,7 @@ public List getTimestamps() { /** * Get the values of the data related to this time series. * - * @return the valueList value. + * @return the metricValues value. */ public List getMetricValues() { return this.metricValues; @@ -101,11 +101,11 @@ void setSeriesKey(DimensionKey seriesKey) { this.seriesKey = seriesKey; } - void setTimestampList(List timestampList) { - this.timestampList = timestampList; + void setTimestampList(List timestamps) { + this.timestamps = timestamps; } - void setValueList(List valueList) { - this.valueList = valueList; + void setValueList(List metricValues) { + this.metricValues = metricValues; } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Hook.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/NotificationHook.java similarity index 54% rename from sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Hook.java rename to sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/NotificationHook.java index dfbfd697dd3a..e0f60bc36349 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Hook.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/NotificationHook.java @@ -10,61 +10,61 @@ /** * Describes a hook that receives anomaly incident alerts. */ -public abstract class Hook { +public abstract class NotificationHook { private String id; - private List admins; + private List adminEmails; static { HookHelper.setAccessor(new HookHelper.HookAccessor() { @Override - public void setId(Hook hook, String id) { + public void setId(NotificationHook hook, String id) { hook.setId(id); } @Override - public void setAdmins(Hook hook, List admins) { - hook.setAdmins(admins); + public void setAdminEmails(NotificationHook hook, List adminEmails) { + hook.setAdminEmails(adminEmails); } }); } /** - * Gets the id. + * Gets the id of the NotificationHook. * - * @return The id. + * @return The id of the NotificationHook. */ public String getId() { return this.id; } /** - * Gets the name for the email hook. + * Gets the name for the Notification hook. * * @return The name. */ public abstract String getName(); /** - * Gets the description for the email hook. + * Gets the description for the Notification hook. * * @return The description. */ public abstract String getDescription(); /** - * The admins for the hook. + * The list of admin emails for the Notification hook. * - * @return The admins. + * @return The emails of admins. */ - public List getAdmins() { - return this.admins; + public List getAdminEmails() { + return this.adminEmails; } void setId(String id) { this.id = id; } - void setAdmins(List admins) { - this.admins = admins; + void setAdminEmails(List adminEmails) { + this.adminEmails = adminEmails; } -} \ No newline at end of file +} diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Severity.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Severity.java deleted file mode 100644 index 2b9533cf05ae..000000000000 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/Severity.java +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.ai.metricsadvisor.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for Severity. */ -public final class Severity extends ExpandableStringEnum { - /** Static value Low for Severity. */ - public static final Severity LOW = fromString("Low"); - - /** Static value Medium for Severity. */ - public static final Severity MEDIUM = fromString("Medium"); - - /** Static value High for Severity. */ - public static final Severity HIGH = fromString("High"); - - /** - * Creates or finds a Severity from its string representation. - * - * @param name a name to look for. - * @return the corresponding Severity. - */ - @JsonCreator - public static Severity fromString(String name) { - return fromString(name, Severity.class); - } - - /** @return known Severity values. */ - public static Collection values() { - return values(Severity.class); - } -} diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/SeverityCondition.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/SeverityCondition.java index 157b8b12b3b3..5c3cf0dc3cd8 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/SeverityCondition.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/SeverityCondition.java @@ -14,20 +14,20 @@ public final class SeverityCondition { * min alert severity */ @JsonProperty(value = "minAlertSeverity", required = true) - private Severity minAlertSeverity; + private AnomalySeverity minAlertSeverity; /* * max alert severity */ @JsonProperty(value = "maxAlertSeverity", required = true) - private Severity maxAlertSeverity; + private AnomalySeverity maxAlertSeverity; /** * Get the minAlertSeverity property: min alert severity. * * @return the minAlertSeverity value. */ - public Severity getMinAlertSeverity() { + public AnomalySeverity getMinAlertSeverity() { return this.minAlertSeverity; } @@ -37,7 +37,7 @@ public Severity getMinAlertSeverity() { * @param minAlertSeverity the minAlertSeverity value to set. * @return the SeverityCondition object itself. */ - public SeverityCondition setMinAlertSeverity(Severity minAlertSeverity) { + public SeverityCondition setMinAlertSeverity(AnomalySeverity minAlertSeverity) { this.minAlertSeverity = minAlertSeverity; return this; } @@ -47,7 +47,7 @@ public SeverityCondition setMinAlertSeverity(Severity minAlertSeverity) { * * @return the maxAlertSeverity value. */ - public Severity getMaxAlertSeverity() { + public AnomalySeverity getMaxAlertSeverity() { return this.maxAlertSeverity; } @@ -57,7 +57,7 @@ public Severity getMaxAlertSeverity() { * @param maxAlertSeverity the maxAlertSeverity value to set. * @return the SeverityCondition object itself. */ - public SeverityCondition setMaxAlertSeverity(Severity maxAlertSeverity) { + public SeverityCondition setMaxAlertSeverity(AnomalySeverity maxAlertSeverity) { this.maxAlertSeverity = maxAlertSeverity; return this; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/SnoozeScope.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/SnoozeScope.java index 62a30fd96b4f..3d9dcd757d88 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/SnoozeScope.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/SnoozeScope.java @@ -10,8 +10,8 @@ /** Defines values for SnoozeScope. */ public final class SnoozeScope extends ExpandableStringEnum { - /** Static value Metric for SnoozeScope. */ - public static final SnoozeScope METRIC = fromString("Metric"); + /** Static value DataFeedMetric for SnoozeScope. */ + public static final SnoozeScope METRIC = fromString("DataFeedMetric"); /** Static value Series for SnoozeScope. */ public static final SnoozeScope SERIES = fromString("Series"); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/TimeMode.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/TimeMode.java deleted file mode 100644 index b1f2b5b526bb..000000000000 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/TimeMode.java +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) AutoRest Code Generator. - -package com.azure.ai.metricsadvisor.models; - -import com.azure.core.util.ExpandableStringEnum; -import com.fasterxml.jackson.annotation.JsonCreator; -import java.util.Collection; - -/** Defines values for TimeMode. */ -public final class TimeMode extends ExpandableStringEnum { - /** Static value AnomalyTime for TimeMode. */ - public static final TimeMode ANOMALY_TIME = fromString("AnomalyTime"); - - /** Static value CreatedTime for TimeMode. */ - public static final TimeMode CREATED_TIME = fromString("CreatedTime"); - - /** Static value ModifiedTime for TimeMode. */ - public static final TimeMode MODIFIED_TIME = fromString("ModifiedTime"); - - /** - * Creates or finds a TimeMode from its string representation. - * - * @param name a name to look for. - * @return the corresponding TimeMode. - */ - @JsonCreator - public static TimeMode fromString(String name) { - return fromString(name, TimeMode.class); - } - - /** @return known TimeMode values. */ - public static Collection values() { - return values(TimeMode.class); - } -} diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/WebHook.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/WebNotificationHook.java similarity index 78% rename from sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/WebHook.java rename to sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/WebNotificationHook.java index ba2434551208..7c8e17eb2945 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/WebHook.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/WebNotificationHook.java @@ -8,7 +8,7 @@ /** * A hook that describes web-hook based incident alerts notification. */ -public final class WebHook extends Hook { +public final class WebNotificationHook extends NotificationHook { private String name; private String description; private String endpoint; @@ -20,12 +20,12 @@ public final class WebHook extends Hook { private HttpHeaders httpHeaders; /** - * Create a new instance of WebHook. + * Create a new instance of WebNotificationHook. * * @param name The web hook name. * @param endpoint The web endpoint to notify incident alerts. */ - public WebHook(String name, String endpoint) { + public WebNotificationHook(String name, String endpoint) { this.name = name; this.endpoint = endpoint; this.httpHeaders = new HttpHeaders(); @@ -108,9 +108,9 @@ public HttpHeaders getHttpHeaders() { * The web endpoint to notify incident alerts. * * @param endpoint The endpoint - * @return The WebHook object itself. + * @return The WebNotificationHook object itself. */ - public WebHook setEndPoint(String endpoint) { + public WebNotificationHook setEndPoint(String endpoint) { this.endpoint = endpoint; return this; } @@ -119,9 +119,9 @@ public WebHook setEndPoint(String endpoint) { * Sets web hook name. * * @param name The web hook name. - * @return The WebHook object itself. + * @return The WebNotificationHook object itself. */ - public WebHook setName(String name) { + public WebNotificationHook setName(String name) { this.name = name; return this; } @@ -130,9 +130,9 @@ public WebHook setName(String name) { * Sets web hook description. * * @param description The web hook description. - * @return The WebHook object itself. + * @return The WebNotificationHook object itself. */ - public WebHook setDescription(String description) { + public WebNotificationHook setDescription(String description) { this.description = description; return this; } @@ -141,9 +141,9 @@ public WebHook setDescription(String description) { * Sets the customized external link. * * @param externalLink The customized link. - * @return The WebHook object itself. + * @return The WebNotificationHook object itself. */ - public WebHook setExternalLink(String externalLink) { + public WebNotificationHook setExternalLink(String externalLink) { this.externalLink = externalLink; return this; } @@ -153,9 +153,9 @@ public WebHook setExternalLink(String externalLink) { * * @param username The user name. * @param password The password. - * @return The WebHook object itself. + * @return The WebNotificationHook object itself. */ - public WebHook setUserCredentials(String username, String password) { + public WebNotificationHook setUserCredentials(String username, String password) { this.username = username; this.userPassword = password; return this; @@ -166,9 +166,9 @@ public WebHook setUserCredentials(String username, String password) { * * @param certificate The certificate. * @param password The certificate password. - * @return The WebHook object itself. + * @return The WebNotificationHook object itself. */ - public WebHook setClientCertificate(String certificate, String password) { + public WebNotificationHook setClientCertificate(String certificate, String password) { this.clientCertificate = certificate; this.clientCertificatePassword = password; return this; @@ -178,9 +178,9 @@ public WebHook setClientCertificate(String certificate, String password) { * Sets the HTTP headers to send while sending alert to the endpoint. * * @param httpHeaders The HTTP headers. - * @return The WebHook object itself. + * @return The WebNotificationHook object itself. */ - public WebHook setHttpHeaders(HttpHeaders httpHeaders) { + public WebNotificationHook setHttpHeaders(HttpHeaders httpHeaders) { if (httpHeaders == null) { this.httpHeaders = new HttpHeaders(); return this; diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/README.md b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/README.md index fe1b0b3751c8..cb7c84aa29aa 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/README.md +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/README.md @@ -5,7 +5,7 @@ languages: products: - azure - azure-cognitive-services - - azure-metrics-advisor + - azure-dataFeedMetrics-advisor urlFragment: metricsadvisor-java-samples --- @@ -52,11 +52,11 @@ Querying API's |[ListIncidentRootCausesSample][list_incident_root_causes_sample] & [ListIncidentRootCausesAsyncSample][list_incident_root_causes_async_sample] | List root causes for an incident| |[ListIncidentsAlertedSample][list_incidents_alerted_sample] -& [ListIncidentsAlertedAsyncSample][list_incidents_alerted_async_sample] | List incidents in an alert| +& [ListIncidentsAlertedAsyncSample][list_incidents_alerted_async_sample] | List incidents in an anomalyAlert| |[ListIncidentsDetectedSample][list_incidents_sample] & [ListIncidentsDetectedAsyncSample][list_incidents_async_sample] | List incidents detected by a detection configuration| |[ListsAnomaliesForAlertsSample][list_anomaly_alert_sample] -& [ListsAnomaliesForAlertsAsyncSample][list_anomaly_alert_async_sample] | List anomalies triggered for an alert| +& [ListsAnomaliesForAlertsAsyncSample][list_anomaly_alert_async_sample] | List anomalies triggered for an anomalyAlert| |[ListsAnomaliesForDetectionConfigSample][list_anomalies_detection_config_sample] & [ListsAnomaliesForDetectionConfigAsyncSample][list_anomalies_detection_config_async_sample] | List anomalies identified by a detection configuration| |[ListSeriesDataForMetricAsyncSample][list_series_data_sample] diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsAsyncSample.java index 0395fd95efd4..8557a8333323 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsAsyncSample.java @@ -3,9 +3,9 @@ package com.azure.ai.metricsadvisor; +import com.azure.ai.metricsadvisor.models.AlertQueryTimeMode; import com.azure.ai.metricsadvisor.models.ListAlertOptions; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; -import com.azure.ai.metricsadvisor.models.TimeMode; import java.time.OffsetDateTime; @@ -27,7 +27,7 @@ public static void main(String[] args) { // - Each alert has 3 time attributes - anomaly-time, alert-created-time and alert-modified-time. // The ANOMALY_TIME mode selects the time attribute anomaly-time of Alerts // anomaly-time represents the time in which the anomaly occurred which triggered the alert. - final TimeMode timeMode = TimeMode.ANOMALY_TIME; + final AlertQueryTimeMode timeMode = AlertQueryTimeMode.ANOMALY_TIME; // - The time period for the time attribute selected. final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); @@ -37,7 +37,7 @@ public static void main(String[] args) { advisorAsyncClient.listAlerts(alertConfigurationId, options) .subscribe(alert -> { - System.out.printf("Alert Id: %s%n", alert.getId()); + System.out.printf("AnomalyAlert Id: %s%n", alert.getId()); System.out.printf("Created Time: %s%n", alert.getCreatedTime()); System.out.printf("Modified Time: %s%n", alert.getModifiedTime()); }); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsSample.java index fc79cec72938..3aeeeff09378 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsSample.java @@ -3,10 +3,10 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.Alert; +import com.azure.ai.metricsadvisor.models.AlertQueryTimeMode; +import com.azure.ai.metricsadvisor.models.AnomalyAlert; import com.azure.ai.metricsadvisor.models.ListAlertOptions; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; -import com.azure.ai.metricsadvisor.models.TimeMode; import com.azure.core.http.rest.PagedIterable; import java.time.OffsetDateTime; @@ -29,7 +29,7 @@ public static void main(String[] args) { // - Each alert has 3 time attributes - anomaly-time, alert-created-time and alert-modified-time. // The ANOMALY_TIME mode selects the time attribute anomaly-time of Alerts // anomaly-time represents the time in which the anomaly occurred which triggered the alert. - final TimeMode timeMode = TimeMode.ANOMALY_TIME; + final AlertQueryTimeMode timeMode = AlertQueryTimeMode.ANOMALY_TIME; // - The time period for the time attribute selected. final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); @@ -37,11 +37,11 @@ public static void main(String[] args) { final ListAlertOptions options = new ListAlertOptions(startTime, endTime, timeMode) .setTop(10); - PagedIterable alertsIterable = advisorClient.listAlerts(alertConfigurationId, options); - for (Alert alert : alertsIterable) { - System.out.printf("Alert Id: %s%n", alert.getId()); - System.out.printf("Created Time: %s%n", alert.getCreatedTime()); - System.out.printf("Modified Time: %s%n", alert.getModifiedTime()); + PagedIterable alertsIterable = advisorClient.listAlerts(alertConfigurationId, options); + for (AnomalyAlert anomalyAlert : alertsIterable) { + System.out.printf("AnomalyAlert Id: %s%n", anomalyAlert.getId()); + System.out.printf("Created Time: %s%n", anomalyAlert.getCreatedTime()); + System.out.printf("Modified Time: %s%n", anomalyAlert.getModifiedTime()); } } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricAsyncSample.java index 79073a50b3f1..2c4833e25536 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricAsyncSample.java @@ -26,9 +26,9 @@ public static void main(String[] args) { advisorAsyncClient.listMetricEnrichmentStatus(metricId, options) .doOnNext(enrichmentStatus -> { - System.out.printf("Metric enrichment status : %s%n", enrichmentStatus.getStatus()); - System.out.printf("Metric enrichment status message: %s%n", enrichmentStatus.getMessage()); - System.out.printf("Metric enrichment status data slice timestamp : %s%n", + System.out.printf("DataFeedMetric enrichment status : %s%n", enrichmentStatus.getStatus()); + System.out.printf("DataFeedMetric enrichment status message: %s%n", enrichmentStatus.getMessage()); + System.out.printf("DataFeedMetric enrichment status data slice timestamp : %s%n", enrichmentStatus.getTimestamp()); }) .blockLast(); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricSample.java index 824eb7729e6a..3a94a3d777c6 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricSample.java @@ -26,9 +26,9 @@ public static void main(String[] args) { advisorClient.listMetricEnrichmentStatus(metricId, options) .forEach(enrichmentStatus -> { - System.out.printf("Metric enrichment status : %s%n", enrichmentStatus.getStatus()); - System.out.printf("Metric enrichment status message: %s%n", enrichmentStatus.getMessage()); - System.out.printf("Metric enrichment status data slice timestamp : %s%n", + System.out.printf("DataFeedMetric enrichment status : %s%n", enrichmentStatus.getStatus()); + System.out.printf("DataFeedMetric enrichment status message: %s%n", enrichmentStatus.getMessage()); + System.out.printf("DataFeedMetric enrichment status data slice timestamp : %s%n", enrichmentStatus.getTimestamp()); }); } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentRootCausesAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentRootCausesAsyncSample.java index 7165655f82b0..1403fdb5bc9b 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentRootCausesAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentRootCausesAsyncSample.java @@ -19,7 +19,7 @@ public static void main(String[] args) { // List root causes for an incident under a detection configuration Id. // - The id of the DetectionConfiguration resource. final String detectionConfigurationId = "tyu3dvhkl-bbbb-41ec-a637-78877b813gt"; - // - The id of the Incident resource. + // - The id of the anomaly incident resource. final String incidentId = "yufrjo3bs-jjjj-41ec-kldn-opn67d2bs"; advisorAsyncClient.listIncidentRootCauses(detectionConfigurationId, incidentId) @@ -27,7 +27,7 @@ public static void main(String[] args) { System.out.printf("Description: %s%n", incidentRootCause.getDescription()); System.out.printf("Series Key: %s%n", incidentRootCause.getSeriesKey().asMap()); System.out.printf("Confidence for the detected incident root cause %.2f%n", - incidentRootCause.getConfidenceScore()); + incidentRootCause.getContributionScore()); System.out.printf("Trace the path for the incident root cause : %s%n"); incidentRootCause.getPaths().forEach(System.out::println); }).blockLast(); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentRootCausesSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentRootCausesSample.java index 9445f830a40c..f4a0f4fb164d 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentRootCausesSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentRootCausesSample.java @@ -19,7 +19,7 @@ public static void main(String[] args) { // List root causes for an incident under a detection configuration Id. // - The id of the DetectionConfiguration resource. final String detectionConfigurationId = "tyu3dvhkl-bbbb-41ec-a637-78877b813gt"; - // - The id of the Incident resource. + // - The id of the AnomalyIncident resource. final String incidentId = "yufrjo3bs-jjjj-41ec-kldn-opn67d2bs"; advisorClient.listIncidentRootCauses(detectionConfigurationId, incidentId) @@ -28,7 +28,7 @@ public static void main(String[] args) { System.out.printf("Series Key: %s%n"); System.out.println(incidentRootCause.getSeriesKey().asMap()); System.out.printf("Confidence for the detected incident root cause : %.2f%n", - incidentRootCause.getConfidenceScore()); + incidentRootCause.getContributionScore()); System.out.printf("Trace the path for the incident root cause: %s%n"); incidentRootCause.getPaths().forEach(System.out::println); }); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsAlertedAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsAlertedAsyncSample.java index 49952d0555f1..9336d43e3143 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsAlertedAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsAlertedAsyncSample.java @@ -3,7 +3,7 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.Incident; +import com.azure.ai.metricsadvisor.models.AnomalyIncident; import com.azure.ai.metricsadvisor.models.ListIncidentsAlertedOptions; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; import com.azure.core.http.rest.PagedFlux; @@ -24,19 +24,19 @@ public static void main(String[] args) { final ListIncidentsAlertedOptions options = new ListIncidentsAlertedOptions() .setTop(10); - PagedFlux incidentsPagedFlux = advisorAsyncClient.listIncidentsForAlert( + PagedFlux incidentsPagedFlux = advisorAsyncClient.listIncidentsForAlert( alertConfigurationId, alertId, options); incidentsPagedFlux.doOnNext(incident -> { - System.out.printf("Metric Id: %s%n", incident.getMetricId()); + System.out.printf("DataFeedMetric Id: %s%n", incident.getMetricId()); System.out.printf("Detection Configuration Id: %s%n", incident.getDetectionConfigurationId()); - System.out.printf("Incident Id: %s%n", incident.getId()); - System.out.printf("Incident Start Time: %s%n", incident.getStartTime()); - System.out.printf("Incident Severity: %s%n", incident.getSeverity()); - System.out.printf("Incident Status: %s%n", incident.getStatus()); - System.out.printf("Root Dimension Key: %s%n", incident.getRootDimensionKey().asMap()); + System.out.printf("Anomaly Incident Id: %s%n", incident.getId()); + System.out.printf("Anomaly Incident Start Time: %s%n", incident.getStartTime()); + System.out.printf("Anomaly Incident AnomalySeverity: %s%n", incident.getSeverity()); + System.out.printf("Anomaly Incident Status: %s%n", incident.getStatus()); + System.out.printf("Root DataFeedDimension Key: %s%n", incident.getRootDimensionKey().asMap()); }).blockLast(); /* 'blockLast()' will block until the above operation s completed. diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsAlertedSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsAlertedSample.java index d6dbbdf8bca4..89e8256e78bb 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsAlertedSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsAlertedSample.java @@ -3,7 +3,7 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.Incident; +import com.azure.ai.metricsadvisor.models.AnomalyIncident; import com.azure.ai.metricsadvisor.models.ListIncidentsAlertedOptions; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; import com.azure.core.http.rest.PagedIterable; @@ -24,19 +24,19 @@ public static void main(String[] args) { final ListIncidentsAlertedOptions options = new ListIncidentsAlertedOptions() .setTop(10); - PagedIterable incidentsIterable = advisorClient.listIncidentsForAlert( + PagedIterable incidentsIterable = advisorClient.listIncidentsForAlert( alertConfigurationId, alertId, options); - for (Incident incident : incidentsIterable) { - System.out.printf("Metric Id: %s%n", incident.getMetricId()); - System.out.printf("Detection Configuration Id: %s%n", incident.getDetectionConfigurationId()); - System.out.printf("Incident Id: %s%n", incident.getId()); - System.out.printf("Incident Start Time: %s%n", incident.getStartTime()); - System.out.printf("Incident Severity: %s%n", incident.getSeverity()); - System.out.printf("Incident Status: %s%n", incident.getStatus()); - System.out.printf("Root Dimension Key: %s%n", incident.getRootDimensionKey().asMap()); + for (AnomalyIncident anomalyIncident : incidentsIterable) { + System.out.printf("DataFeedMetric Id: %s%n", anomalyIncident.getMetricId()); + System.out.printf("Detection Configuration Id: %s%n", anomalyIncident.getDetectionConfigurationId()); + System.out.printf("Anomaly Incident Id: %s%n", anomalyIncident.getId()); + System.out.printf("Anomaly Incident Start Time: %s%n", anomalyIncident.getStartTime()); + System.out.printf("Anomaly Incident AnomalySeverity: %s%n", anomalyIncident.getSeverity()); + System.out.printf("Anomaly Incident Status: %s%n", anomalyIncident.getStatus()); + System.out.printf("Root DataFeedDimension Key: %s%n", anomalyIncident.getRootDimensionKey().asMap()); } } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsDetectedAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsDetectedAsyncSample.java index fccae5f4bf80..ce5089f31dc3 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsDetectedAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsDetectedAsyncSample.java @@ -3,7 +3,7 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.Incident; +import com.azure.ai.metricsadvisor.models.AnomalyIncident; import com.azure.ai.metricsadvisor.models.ListIncidentsDetectedOptions; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; import com.azure.core.http.rest.PagedFlux; @@ -27,17 +27,17 @@ public static void main(String[] args) { final ListIncidentsDetectedOptions options = new ListIncidentsDetectedOptions(startTime, endTime) .setTop(1000); - PagedFlux incidentsFlux - = advisorAsyncClient.listIncidentsForDetectionConfiguration(detectionConfigurationId, options); + PagedFlux incidentsFlux + = advisorAsyncClient.listIncidentsForDetectionConfig(detectionConfigurationId, options); incidentsFlux.doOnNext(incident -> { - System.out.printf("Metric Id: %s%n", incident.getMetricId()); + System.out.printf("DataFeedMetric Id: %s%n", incident.getMetricId()); System.out.printf("Detection Configuration Id: %s%n", incident.getDetectionConfigurationId()); - System.out.printf("Incident Id: %s%n", incident.getId()); - System.out.printf("Incident Start Time: %s%n", incident.getStartTime()); - System.out.printf("Incident Severity: %s%n", incident.getSeverity()); - System.out.printf("Incident Status: %s%n", incident.getStatus()); - System.out.printf("Root Dimension Key: %s%n", incident.getRootDimensionKey().asMap()); + System.out.printf("Anomaly Incident Id: %s%n", incident.getId()); + System.out.printf("Anomaly Incident Start Time: %s%n", incident.getStartTime()); + System.out.printf("Anomaly Incident AnomalySeverity: %s%n", incident.getSeverity()); + System.out.printf("Anomaly Incident Status: %s%n", incident.getStatus()); + System.out.printf("Root DataFeedDimension Key: %s%n", incident.getRootDimensionKey().asMap()); }).blockLast(); /* 'blockLast()' will block until the above operation s completed. diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsDetectedSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsDetectedSample.java index 601753624c26..8aa52349ce62 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsDetectedSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsDetectedSample.java @@ -3,7 +3,7 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.Incident; +import com.azure.ai.metricsadvisor.models.AnomalyIncident; import com.azure.ai.metricsadvisor.models.ListIncidentsDetectedOptions; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; import com.azure.core.http.rest.PagedIterable; @@ -27,17 +27,17 @@ public static void main(String[] args) { final ListIncidentsDetectedOptions options = new ListIncidentsDetectedOptions(startTime, endTime) .setTop(1000); - PagedIterable incidentsIterable - = advisorClient.listIncidentsForDetectionConfiguration(detectionConfigurationId, options); + PagedIterable incidentsIterable + = advisorClient.listIncidentsForDetectionConfig(detectionConfigurationId, options); - for (Incident incident : incidentsIterable) { - System.out.printf("Metric Id: %s%n", incident.getMetricId()); - System.out.printf("Detection Configuration Id: %s%n", incident.getDetectionConfigurationId()); - System.out.printf("Incident Id: %s%n", incident.getId()); - System.out.printf("Incident Start Time: %s%n", incident.getStartTime()); - System.out.printf("Incident Severity: %s%n", incident.getSeverity()); - System.out.printf("Incident Status: %s%n", incident.getStatus()); - System.out.printf("Root Dimension Key: %s%n", incident.getRootDimensionKey().asMap()); + for (AnomalyIncident anomalyIncident : incidentsIterable) { + System.out.printf("DataFeedMetric Id: %s%n", anomalyIncident.getMetricId()); + System.out.printf("Detection Configuration Id: %s%n", anomalyIncident.getDetectionConfigurationId()); + System.out.printf("Anomaly Incident Id: %s%n", anomalyIncident.getId()); + System.out.printf("Anomaly Incident Start Time: %s%n", anomalyIncident.getStartTime()); + System.out.printf("Anomaly Incident AnomalySeverity: %s%n", anomalyIncident.getSeverity()); + System.out.printf("Anomaly Incident Status: %s%n", anomalyIncident.getStatus()); + System.out.printf("Root DataFeedDimension Key: %s%n", anomalyIncident.getRootDimensionKey().asMap()); } } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDataForMetricAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDataForMetricAsyncSample.java index 6fb7cc80a8d0..bc863866f67c 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDataForMetricAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDataForMetricAsyncSample.java @@ -4,7 +4,6 @@ package com.azure.ai.metricsadvisor; import com.azure.ai.metricsadvisor.models.DimensionKey; -import com.azure.ai.metricsadvisor.models.ListMetricSeriesDataOptions; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; import java.time.OffsetDateTime; @@ -26,7 +25,7 @@ public static void main(String[] args) { advisorAsyncClient.listMetricSeriesData(metricId, Arrays.asList(new DimensionKey().put("cost", "redmond")), - new ListMetricSeriesDataOptions(startTime, endTime)) + startTime, endTime) .doOnNext(metricSeriesData -> { System.out.println("List of data points for this series:"); System.out.println(metricSeriesData.getMetricValues()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDataForMetricSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDataForMetricSample.java index b815af4b1ab1..4da6b50b409f 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDataForMetricSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDataForMetricSample.java @@ -4,7 +4,6 @@ package com.azure.ai.metricsadvisor; import com.azure.ai.metricsadvisor.models.DimensionKey; -import com.azure.ai.metricsadvisor.models.ListMetricSeriesDataOptions; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; import java.time.OffsetDateTime; @@ -26,7 +25,7 @@ public static void main(String[] args) { advisorClient.listMetricSeriesData(metricId, Arrays.asList(new DimensionKey().put("cost", "redmond")), - new ListMetricSeriesDataOptions(startTime, endTime)) + startTime, endTime) .forEach(metricSeriesData -> { System.out.println("List of data points for this series:"); System.out.println(metricSeriesData.getMetricValues()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDefinitionsForMetricAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDefinitionsForMetricAsyncSample.java index b2e448874883..21d091a0f01c 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDefinitionsForMetricAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDefinitionsForMetricAsyncSample.java @@ -32,7 +32,7 @@ public static void main(String[] args) { advisorAsyncClient.listMetricSeriesDefinitions(metricId, options) .doOnNext(metricSeriesDefinition -> { - System.out.printf("Metric Id : %s%n", metricSeriesDefinition.getMetricId()); + System.out.printf("DataFeedMetric Id : %s%n", metricSeriesDefinition.getMetricId()); System.out.printf("Series Key: %s%n", metricSeriesDefinition.getSeriesKey().asMap()); }).blockLast(); /* diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDefinitionsForMetricSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDefinitionsForMetricSample.java index 2b17d83d1cce..f2f371a90a99 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDefinitionsForMetricSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDefinitionsForMetricSample.java @@ -33,7 +33,7 @@ public static void main(String[] args) { advisorClient.listMetricSeriesDefinitions(metricId, options) .forEach(metricSeriesDefinition -> { - System.out.printf("Metric Id : %s%n", metricSeriesDefinition.getMetricId()); + System.out.printf("DataFeedMetric Id : %s%n", metricSeriesDefinition.getMetricId()); System.out.printf("Series Key: %s%n", metricSeriesDefinition.getSeriesKey().asMap()); }); } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForAlertsAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForAlertsAsyncSample.java index 909d02ba1bac..57b2ebbff24f 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForAlertsAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForAlertsAsyncSample.java @@ -26,12 +26,12 @@ public static void main(String[] args) { alertId, options) .doOnNext(anomaly -> { - System.out.printf("Metric Id: %s%n", anomaly.getMetricId()); + System.out.printf("DataFeedMetric Id: %s%n", anomaly.getMetricId()); System.out.printf("Detection Configuration Id: %s%n", anomaly.getDetectionConfigurationId()); - System.out.printf("Anomaly Created Time: %s%n", anomaly.getCreatedTime()); - System.out.printf("Anomaly Modified Time: %s%n", anomaly.getModifiedTime()); - System.out.printf("Anomaly Severity: %s%n", anomaly.getSeverity()); - System.out.printf("Anomaly Status: %s%n", anomaly.getStatus()); + System.out.printf("DataPoint Anomaly Created Time: %s%n", anomaly.getCreatedTime()); + System.out.printf("DataPoint Anomaly Modified Time: %s%n", anomaly.getModifiedTime()); + System.out.printf("DataPoint Anomaly AnomalySeverity: %s%n", anomaly.getSeverity()); + System.out.printf("DataPoint Anomaly Status: %s%n", anomaly.getStatus()); System.out.printf("Series Key: %s%n", anomaly.getSeriesKey().asMap()); }).blockLast(); /* diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForAlertsSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForAlertsSample.java index 780de28be330..cba6c86bffcd 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForAlertsSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForAlertsSample.java @@ -3,7 +3,7 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.Anomaly; +import com.azure.ai.metricsadvisor.models.DataPointAnomaly; import com.azure.ai.metricsadvisor.models.ListAnomaliesAlertedOptions; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; import com.azure.core.http.rest.PagedIterable; @@ -24,18 +24,18 @@ public static void main(String[] args) { final ListAnomaliesAlertedOptions options = new ListAnomaliesAlertedOptions() .setTop(10); - PagedIterable anomaliesIterable = advisorClient.listAnomaliesForAlert( + PagedIterable anomaliesIterable = advisorClient.listAnomaliesForAlert( alertConfigurationId, alertId); - for (Anomaly anomaly : anomaliesIterable) { - System.out.printf("Metric Id: %s%n", anomaly.getMetricId()); - System.out.printf("Detection Configuration Id: %s%n", anomaly.getDetectionConfigurationId()); - System.out.printf("Anomaly Created Time: %s%n", anomaly.getCreatedTime()); - System.out.printf("Anomaly Modified Time: %s%n", anomaly.getModifiedTime()); - System.out.printf("Anomaly Severity: %s%n", anomaly.getSeverity()); - System.out.printf("Anomaly Status: %s%n", anomaly.getStatus()); - System.out.printf("Series Key: %s%n", anomaly.getSeriesKey().asMap()); + for (DataPointAnomaly dataPointAnomaly : anomaliesIterable) { + System.out.printf("DataFeedMetric Id: %s%n", dataPointAnomaly.getMetricId()); + System.out.printf("Detection Configuration Id: %s%n", dataPointAnomaly.getDetectionConfigurationId()); + System.out.printf("DataPoint Anomaly Created Time: %s%n", dataPointAnomaly.getCreatedTime()); + System.out.printf("DataPoint Anomaly Modified Time: %s%n", dataPointAnomaly.getModifiedTime()); + System.out.printf("DataPoint Anomaly AnomalySeverity: %s%n", dataPointAnomaly.getSeverity()); + System.out.printf("DataPoint Anomaly Status: %s%n", dataPointAnomaly.getStatus()); + System.out.printf("Series Key: %s%n", dataPointAnomaly.getSeriesKey().asMap()); } } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigAsyncSample.java index 318064538bf0..e213a9af6af5 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigAsyncSample.java @@ -3,10 +3,10 @@ package com.azure.ai.metricsadvisor; +import com.azure.ai.metricsadvisor.models.AnomalySeverity; import com.azure.ai.metricsadvisor.models.ListAnomaliesDetectedFilter; import com.azure.ai.metricsadvisor.models.ListAnomaliesDetectedOptions; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; -import com.azure.ai.metricsadvisor.models.Severity; import java.time.OffsetDateTime; @@ -25,14 +25,14 @@ public static void main(String[] args) { final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); final ListAnomaliesDetectedFilter filter = new ListAnomaliesDetectedFilter() - .setSeverityRange(Severity.LOW, Severity.MEDIUM); + .setSeverityRange(AnomalySeverity.LOW, AnomalySeverity.MEDIUM); final ListAnomaliesDetectedOptions options = new ListAnomaliesDetectedOptions(startTime, endTime) .setTop(10) .setFilter(filter); - advisorAsyncClient.listAnomaliesForDetectionConfiguration(detectionConfigurationId, + advisorAsyncClient.listAnomaliesForDetectionConfig(detectionConfigurationId, options) .doOnNext(anomaly -> { - System.out.printf("Anomaly Severity: %s%n", anomaly.getSeverity()); + System.out.printf("DataPoint Anomaly AnomalySeverity: %s%n", anomaly.getSeverity()); System.out.printf("Series Key: %s%n", anomaly.getSeriesKey().asMap().entrySet()); }).blockLast(); /* diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigSample.java index 1ba624405da5..9a6e616884b6 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigSample.java @@ -3,11 +3,11 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.Anomaly; +import com.azure.ai.metricsadvisor.models.DataPointAnomaly; import com.azure.ai.metricsadvisor.models.ListAnomaliesDetectedFilter; import com.azure.ai.metricsadvisor.models.ListAnomaliesDetectedOptions; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; -import com.azure.ai.metricsadvisor.models.Severity; +import com.azure.ai.metricsadvisor.models.AnomalySeverity; import com.azure.core.http.rest.PagedIterable; import java.time.OffsetDateTime; @@ -27,17 +27,17 @@ public static void main(String[] args) { final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); final ListAnomaliesDetectedFilter filter = new ListAnomaliesDetectedFilter() - .setSeverityRange(Severity.LOW, Severity.MEDIUM); + .setSeverityRange(AnomalySeverity.LOW, AnomalySeverity.MEDIUM); final ListAnomaliesDetectedOptions options = new ListAnomaliesDetectedOptions(startTime, endTime) .setTop(10) .setFilter(filter); - PagedIterable anomaliesIterable - = advisorClient.listAnomaliesForDetectionConfiguration(detectionConfigurationId, + PagedIterable anomaliesIterable + = advisorClient.listAnomaliesForDetectionConfig(detectionConfigurationId, options); - for (Anomaly anomaly : anomaliesIterable) { - System.out.printf("Anomaly Severity: %s%n", anomaly.getSeverity()); - System.out.printf("Series Key: %s%n", anomaly.getSeriesKey().asMap().entrySet()); + for (DataPointAnomaly dataPointAnomaly : anomaliesIterable) { + System.out.printf("DataPoint Anomaly AnomalySeverity: %s%n", dataPointAnomaly.getSeverity()); + System.out.printf("Series Key: %s%n", dataPointAnomaly.getSeriesKey().asMap().entrySet()); } } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricFeedbackAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricFeedbackAsyncSample.java index d26216110608..98b7f60094fc 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricFeedbackAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricFeedbackAsyncSample.java @@ -30,47 +30,47 @@ public static void main(String[] args) { .credential(new MetricsAdvisorKeyCredential("subscription_key", "api_key")) .buildAsyncClient(); - // Create Metric Feedback + // Create DataFeedMetric Feedback final String metricId = "d3gh4i4-b804-4ab9-a70f-0da0c89cft3l"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final MetricChangePointFeedback metricChangePointFeedback = new MetricChangePointFeedback(startTime, endTime, ChangePointValue.AUTO_DETECT); - System.out.printf("Creating Metric Feedback%n"); + System.out.printf("Creating DataFeedMetric Feedback%n"); final Mono createdFeedbackMono = advisorAsyncClient.createMetricFeedback(metricId, metricChangePointFeedback); createdFeedbackMono .doOnSubscribe(__ -> - System.out.printf("Creating Metric Feedback%n")) + System.out.printf("Creating DataFeedMetric Feedback%n")) .doOnSuccess(feedback -> - System.out.printf("Created Metric Feedback: %s%n", feedback.getId())); + System.out.printf("Created DataFeedMetric Feedback: %s%n", feedback.getId())); // Retrieve the metric feedback that just created. Mono fetchFeedbackMono = createdFeedbackMono.flatMap(createdFeedback -> { return advisorAsyncClient.getMetricFeedback(createdFeedback.getId()) .doOnSubscribe(__ -> - System.out.printf("Fetching Metric Feedback: %s%n", createdFeedback.getId())) + System.out.printf("Fetching DataFeedMetric Feedback: %s%n", createdFeedback.getId())) .doOnSuccess(config -> - System.out.printf("Fetched Metric Feedback%n")) + System.out.printf("Fetched DataFeedMetric Feedback%n")) .doOnNext(feedback -> { - System.out.printf("Metric Feedback Id : %s%n", feedback.getId()); - System.out.printf("Metric Feedback created time : %s%n", feedback.getCreatedTime()); - System.out.printf("Metric Feedback user principal : %s%n", feedback.getUserPrincipal()); - System.out.printf("Metric feedback associated dimension filter: %s%n", + System.out.printf("DataFeedMetric Feedback Id : %s%n", feedback.getId()); + System.out.printf("DataFeedMetric Feedback created time : %s%n", feedback.getCreatedTime()); + System.out.printf("DataFeedMetric Feedback user principal : %s%n", feedback.getUserPrincipal()); + System.out.printf("DataFeedMetric feedback associated dimension filter: %s%n", feedback.getDimensionFilter().asMap()); if (CHANGE_POINT.equals(createdFeedback.getFeedbackType())) { MetricChangePointFeedback createdMetricChangePointFeedback = (MetricChangePointFeedback) createdFeedback; - System.out.printf("Metric feedback Id: %s%n", createdMetricChangePointFeedback.getId()); - System.out.printf("Metric feedback change point value: %s%n", + System.out.printf("DataFeedMetric feedback Id: %s%n", createdMetricChangePointFeedback.getId()); + System.out.printf("DataFeedMetric feedback change point value: %s%n", createdMetricChangePointFeedback.getChangePointValue().toString()); - System.out.printf("Metric feedback start time: %s%n", + System.out.printf("DataFeedMetric feedback start time: %s%n", createdMetricChangePointFeedback.getStartTime()); - System.out.printf("Metric feedback end time: %s%n", + System.out.printf("DataFeedMetric feedback end time: %s%n", createdMetricChangePointFeedback.getEndTime()); } }); @@ -87,39 +87,39 @@ public static void main(String[] args) { System.out.printf("Listing metric feedbacks%n"); advisorAsyncClient.listMetricFeedbacks(metricId) .doOnNext(feedbackItem -> { - System.out.printf("Metric Feedback Id : %s%n", feedbackItem.getId()); - System.out.printf("Metric Feedback created time : %s%n", feedbackItem.getCreatedTime()); - System.out.printf("Metric Feedback user principal : %s%n", feedbackItem.getUserPrincipal()); - System.out.printf("Metric feedback associated dimension filter: %s%n", + System.out.printf("DataFeedMetric Feedback Id : %s%n", feedbackItem.getId()); + System.out.printf("DataFeedMetric Feedback created time : %s%n", feedbackItem.getCreatedTime()); + System.out.printf("DataFeedMetric Feedback user principal : %s%n", feedbackItem.getUserPrincipal()); + System.out.printf("DataFeedMetric feedback associated dimension filter: %s%n", feedbackItem.getDimensionFilter().asMap()); if (CHANGE_POINT.equals(feedbackItem.getFeedbackType())) { MetricChangePointFeedback changePointFeedback = (MetricChangePointFeedback) feedbackItem; - System.out.printf("Metric feedback change point value: %s%n", + System.out.printf("DataFeedMetric feedback change point value: %s%n", changePointFeedback.getChangePointValue().toString()); - System.out.printf("Metric feedback start time: %s%n", + System.out.printf("DataFeedMetric feedback start time: %s%n", changePointFeedback.getStartTime()); - System.out.printf("Metric feedback end time: %s%n", + System.out.printf("DataFeedMetric feedback end time: %s%n", changePointFeedback.getEndTime()); } else if (PERIOD.equals(feedbackItem.getFeedbackType())) { MetricPeriodFeedback periodFeedback = (MetricPeriodFeedback) feedbackItem; - System.out.printf("Metric feedback type: %s%n", + System.out.printf("DataFeedMetric feedback type: %s%n", periodFeedback.getPeriodType().toString()); - System.out.printf("Metric feedback period value: %f%n", + System.out.printf("DataFeedMetric feedback period value: %f%n", periodFeedback.getPeriodValue()); } else if (ANOMALY.equals(feedbackItem.getFeedbackType())) { MetricAnomalyFeedback metricAnomalyFeedback = (MetricAnomalyFeedback) feedbackItem; - System.out.printf("Metric feedback anomaly value: %s%n", + System.out.printf("DataFeedMetric feedback anomaly value: %s%n", metricAnomalyFeedback.getAnomalyValue().toString()); - System.out.printf("Metric feedback associated detection configuration Id: %s%n", + System.out.printf("DataFeedMetric feedback associated detection configuration Id: %s%n", metricAnomalyFeedback.getDetectionConfigurationId()); } else if (COMMENT.equals(feedbackItem.getFeedbackType())) { MetricCommentFeedback metricCommentFeedback = (MetricCommentFeedback) feedbackItem; - System.out.printf("Metric feedback comment value: %s%n", + System.out.printf("DataFeedMetric feedback comment value: %s%n", metricCommentFeedback.getComment()); } }); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricFeedbackSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricFeedbackSample.java index 670e13f4ac45..9e3a3df4a8e3 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricFeedbackSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricFeedbackSample.java @@ -29,40 +29,40 @@ public static void main(String[] args) { .credential(new MetricsAdvisorKeyCredential("subscription_key", "api_key")) .buildClient(); - // Create Metric Feedback + // Create DataFeedMetric Feedback final String metricId = "d3gh4i4-b804-4ab9-a70f-0da0c89cft3l"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final MetricChangePointFeedback metricChangePointFeedback = new MetricChangePointFeedback(startTime, endTime, ChangePointValue.AUTO_DETECT); - System.out.printf("Creating Metric Feedback%n"); + System.out.printf("Creating DataFeedMetric Feedback%n"); final MetricFeedback createdFeedback = advisorClient.createMetricFeedback(metricId, metricChangePointFeedback); - System.out.printf("Created Metric Feedback: %s%n", createdFeedback.getId()); + System.out.printf("Created DataFeedMetric Feedback: %s%n", createdFeedback.getId()); - System.out.printf("Fetching Metric Feedback: %s%n", createdFeedback.getId()); + System.out.printf("Fetching DataFeedMetric Feedback: %s%n", createdFeedback.getId()); // Retrieve the metric feedback that just created. MetricFeedback fetchFeedback = advisorClient.getMetricFeedback(createdFeedback.getId()); - System.out.printf("Fetched Metric Feedback%n"); + System.out.printf("Fetched DataFeedMetric Feedback%n"); - System.out.printf("Metric Feedback Id : %s%n", fetchFeedback.getId()); - System.out.printf("Metric Feedback created time : %s%n", fetchFeedback.getCreatedTime()); - System.out.printf("Metric Feedback user principal : %s%n", fetchFeedback.getUserPrincipal()); - System.out.printf("Metric feedback associated dimension filter: %s%n", + System.out.printf("DataFeedMetric Feedback Id : %s%n", fetchFeedback.getId()); + System.out.printf("DataFeedMetric Feedback created time : %s%n", fetchFeedback.getCreatedTime()); + System.out.printf("DataFeedMetric Feedback user principal : %s%n", fetchFeedback.getUserPrincipal()); + System.out.printf("DataFeedMetric feedback associated dimension filter: %s%n", fetchFeedback.getDimensionFilter().asMap()); if (CHANGE_POINT.equals(createdFeedback.getFeedbackType())) { MetricChangePointFeedback createdMetricChangePointFeedback = (MetricChangePointFeedback) createdFeedback; - System.out.printf("Metric feedback Id: %s%n", createdMetricChangePointFeedback.getId()); - System.out.printf("Metric feedback change point value: %s%n", + System.out.printf("DataFeedMetric feedback Id: %s%n", createdMetricChangePointFeedback.getId()); + System.out.printf("DataFeedMetric feedback change point value: %s%n", createdMetricChangePointFeedback.getChangePointValue().toString()); - System.out.printf("Metric feedback start time: %s%n", + System.out.printf("DataFeedMetric feedback start time: %s%n", createdMetricChangePointFeedback.getStartTime()); - System.out.printf("Metric feedback end time: %s%n", + System.out.printf("DataFeedMetric feedback end time: %s%n", createdMetricChangePointFeedback.getEndTime()); } @@ -70,39 +70,39 @@ public static void main(String[] args) { System.out.printf("Listing metric feedbacks%n"); advisorClient.listMetricFeedbacks(metricId) .forEach(feedbackItem -> { - System.out.printf("Metric Feedback Id : %s%n", feedbackItem.getId()); - System.out.printf("Metric Feedback created time : %s%n", feedbackItem.getCreatedTime()); - System.out.printf("Metric Feedback user principal : %s%n", feedbackItem.getUserPrincipal()); - System.out.printf("Metric feedback associated dimension filter: %s%n", + System.out.printf("DataFeedMetric Feedback Id : %s%n", feedbackItem.getId()); + System.out.printf("DataFeedMetric Feedback created time : %s%n", feedbackItem.getCreatedTime()); + System.out.printf("DataFeedMetric Feedback user principal : %s%n", feedbackItem.getUserPrincipal()); + System.out.printf("DataFeedMetric feedback associated dimension filter: %s%n", feedbackItem.getDimensionFilter().asMap()); if (CHANGE_POINT.equals(feedbackItem.getFeedbackType())) { MetricChangePointFeedback changePointFeedback = (MetricChangePointFeedback) feedbackItem; - System.out.printf("Metric feedback change point value: %s%n", + System.out.printf("DataFeedMetric feedback change point value: %s%n", changePointFeedback.getChangePointValue().toString()); - System.out.printf("Metric feedback start time: %s%n", + System.out.printf("DataFeedMetric feedback start time: %s%n", changePointFeedback.getStartTime()); - System.out.printf("Metric feedback end time: %s%n", + System.out.printf("DataFeedMetric feedback end time: %s%n", changePointFeedback.getEndTime()); } else if (PERIOD.equals(feedbackItem.getFeedbackType())) { MetricPeriodFeedback periodFeedback = (MetricPeriodFeedback) feedbackItem; - System.out.printf("Metric feedback type: %s%n", + System.out.printf("DataFeedMetric feedback type: %s%n", periodFeedback.getPeriodType().toString()); - System.out.printf("Metric feedback period value: %f%n", + System.out.printf("DataFeedMetric feedback period value: %f%n", periodFeedback.getPeriodValue()); } else if (ANOMALY.equals(feedbackItem.getFeedbackType())) { MetricAnomalyFeedback metricAnomalyFeedback = (MetricAnomalyFeedback) feedbackItem; - System.out.printf("Metric feedback anomaly value: %s%n", + System.out.printf("DataFeedMetric feedback anomaly value: %s%n", metricAnomalyFeedback.getAnomalyValue().toString()); - System.out.printf("Metric feedback associated detection configuration Id: %s%n", + System.out.printf("DataFeedMetric feedback associated detection configuration Id: %s%n", metricAnomalyFeedback.getDetectionConfigurationId()); } else if (COMMENT.equals(feedbackItem.getFeedbackType())) { MetricCommentFeedback metricCommentFeedback = (MetricCommentFeedback) feedbackItem; - System.out.printf("Metric feedback comment value: %s%n", + System.out.printf("DataFeedMetric feedback comment value: %s%n", metricCommentFeedback.getComment()); } }); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClientJavaDocCodeSnippets.java index b585739885ed..ce4a85ce3b22 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClientJavaDocCodeSnippets.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClientJavaDocCodeSnippets.java @@ -3,10 +3,11 @@ package com.azure.ai.metricsadvisor; +import com.azure.ai.metricsadvisor.models.AlertQueryTimeMode; import com.azure.ai.metricsadvisor.models.ChangePointValue; import com.azure.ai.metricsadvisor.models.DimensionKey; import com.azure.ai.metricsadvisor.models.FeedbackQueryTimeMode; -import com.azure.ai.metricsadvisor.models.Incident; +import com.azure.ai.metricsadvisor.models.AnomalyIncident; import com.azure.ai.metricsadvisor.models.ListAlertOptions; import com.azure.ai.metricsadvisor.models.ListAnomaliesAlertedOptions; import com.azure.ai.metricsadvisor.models.ListAnomaliesDetectedFilter; @@ -18,7 +19,6 @@ import com.azure.ai.metricsadvisor.models.ListMetricEnrichmentStatusOptions; import com.azure.ai.metricsadvisor.models.ListMetricFeedbackFilter; import com.azure.ai.metricsadvisor.models.ListMetricFeedbackOptions; -import com.azure.ai.metricsadvisor.models.ListMetricSeriesDataOptions; import com.azure.ai.metricsadvisor.models.ListMetricSeriesDefinitionOptions; import com.azure.ai.metricsadvisor.models.MetricAnomalyFeedback; import com.azure.ai.metricsadvisor.models.MetricChangePointFeedback; @@ -27,8 +27,7 @@ import com.azure.ai.metricsadvisor.models.MetricFeedback; import com.azure.ai.metricsadvisor.models.MetricPeriodFeedback; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; -import com.azure.ai.metricsadvisor.models.Severity; -import com.azure.ai.metricsadvisor.models.TimeMode; +import com.azure.ai.metricsadvisor.models.AnomalySeverity; import com.azure.core.http.HttpPipeline; import com.azure.core.http.HttpPipelineBuilder; import com.azure.core.http.rest.PagedFlux; @@ -48,7 +47,7 @@ * Code snippet for {@link MetricsAdvisorAsyncClient} */ public class MetricsAdvisorAsyncClientJavaDocCodeSnippets { - MetricsAdvisorAsyncClient metricAdvisorAsyncClient = + MetricsAdvisorAsyncClient metricsAdvisorAsyncClient = new MetricsAdvisorClientBuilder().buildAsyncClient(); /** @@ -56,7 +55,7 @@ public class MetricsAdvisorAsyncClientJavaDocCodeSnippets { */ public void createMetricAdvisorAsyncClient() { // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.instantiation - MetricsAdvisorAsyncClient metricAdvisorAdministrationAsyncClient = + MetricsAdvisorAsyncClient metricsAdvisorAsyncClient = new MetricsAdvisorClientBuilder() .credential(new MetricsAdvisorKeyCredential("{subscription_key}", "{api_key}")) .endpoint("{endpoint}") @@ -73,7 +72,7 @@ public void createMetricAdvisorAsyncClientWithPipeline() { .policies(/* add policies */) .build(); - MetricsAdvisorAsyncClient metricAdvisorAdministrationAsyncClient = + MetricsAdvisorAsyncClient metricsAdvisorAsyncClient = new MetricsAdvisorClientBuilder() .credential(new MetricsAdvisorKeyCredential("{subscription_key}", "{api_key}")) .endpoint("{endpoint}") @@ -96,9 +95,9 @@ public void listMetricSeriesDefinitions() { put("Dim2", Collections.singletonList("Angelfish")); }}); - metricAdvisorAsyncClient.listMetricSeriesDefinitions(metricId, options) + metricsAdvisorAsyncClient.listMetricSeriesDefinitions(metricId, options) .subscribe(metricSeriesDefinition -> { - System.out.printf("Metric id for the retrieved series definition : %s%n", + System.out.printf("Data Feed Metric id for the retrieved series definition : %s%n", metricSeriesDefinition.getMetricId()); System.out.printf("Series Key:"); System.out.println(metricSeriesDefinition.getSeriesKey().asMap()); @@ -108,20 +107,18 @@ public void listMetricSeriesDefinitions() { /** * Code snippet for - * {@link MetricsAdvisorAsyncClient#listMetricSeriesData(String, List, ListMetricSeriesDataOptions)} + * {@link MetricsAdvisorAsyncClient#listMetricSeriesData(String, List, OffsetDateTime, OffsetDateTime)} */ public void listMetricSeriesData() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricSeriesData#String-List-ListMetricSeriesDataOptions + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricSeriesData#String-List-OffsetDateTime-OffsetDateTime final String metricId = "2dgfbbbb-41ec-a637-677e77b81455"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); - final ListMetricSeriesDataOptions options = new ListMetricSeriesDataOptions(startTime, endTime) - .setTop(10); final List seriesKeyFilter = Arrays.asList(new DimensionKey().put("cost", "redmond")); - metricAdvisorAsyncClient.listMetricSeriesData(metricId, seriesKeyFilter, options) + metricsAdvisorAsyncClient.listMetricSeriesData(metricId, seriesKeyFilter, startTime, endTime) .subscribe(metricSeriesData -> { System.out.println("List of data points for this series:"); System.out.println(metricSeriesData.getMetricValues()); @@ -130,7 +127,7 @@ public void listMetricSeriesData() { System.out.printf("Series Key:"); System.out.println(metricSeriesData.getSeriesKey().asMap()); }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricSeriesData#String-List-ListMetricSeriesDataOptions + // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricSeriesData#String-List-OffsetDateTime-OffsetDateTime } /** @@ -139,7 +136,7 @@ public void listMetricSeriesData() { public void listMetricDimensionValues() { // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricDimensionValues#String-String - metricAdvisorAsyncClient.listMetricDimensionValues("metricId", "dimension1") + metricsAdvisorAsyncClient.listMetricDimensionValues("metricId", "dimension1") .subscribe(System.out::println); // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricDimensionValues#String-String } @@ -150,7 +147,7 @@ public void listMetricDimensionValues() { */ public void listMetricDimensionValuesWithOptions() { // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricDimensionValues#String-String-ListMetricDimensionValuesOptions - metricAdvisorAsyncClient.listMetricDimensionValues("metricId", "dimension1", + metricsAdvisorAsyncClient.listMetricDimensionValues("metricId", "dimension1", new ListMetricDimensionValuesOptions().setDimensionValueToFilter("value1").setTop(3)) .subscribe(System.out::println); // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricDimensionValues#String-String-ListMetricDimensionValuesOptions @@ -166,18 +163,18 @@ public void listIncidentsForAlert() { final ListIncidentsAlertedOptions options = new ListIncidentsAlertedOptions() .setTop(10); - metricAdvisorAsyncClient.listIncidentsForAlert( + metricsAdvisorAsyncClient.listIncidentsForAlert( alertConfigurationId, alertId, options) .subscribe(incident -> { - System.out.printf("Metric Id: %s%n", incident.getMetricId()); + System.out.printf("Data Feed Metric Id: %s%n", incident.getMetricId()); System.out.printf("Detection Configuration Id: %s%n", incident.getDetectionConfigurationId()); - System.out.printf("Incident Id: %s%n", incident.getId()); - System.out.printf("Incident Start Time: %s%n", incident.getStartTime()); - System.out.printf("Incident Severity: %s%n", incident.getSeverity()); - System.out.printf("Incident Status: %s%n", incident.getStatus()); - System.out.printf("Root Dimension Key:"); + System.out.printf("Anomaly Incident Id: %s%n", incident.getId()); + System.out.printf("Anomaly Incident Start Time: %s%n", incident.getStartTime()); + System.out.printf("Anomaly Incident AnomalySeverity: %s%n", incident.getSeverity()); + System.out.printf("Anomaly Incident Status: %s%n", incident.getStatus()); + System.out.printf("Root DataFeedDimension Key:"); DimensionKey rootDimension = incident.getRootDimensionKey(); for (Map.Entry dimension : rootDimension.asMap().entrySet()) { System.out.printf("DimensionName: %s DimensionValue:%s%n", @@ -195,16 +192,16 @@ public void listAnomaliesForAlert() { final String alertConfigurationId = "ff3014a0-bbbb-41ec-a637-677e77b81299"; final String alertId = "1746b031c00"; - metricAdvisorAsyncClient.listAnomaliesForAlert( + metricsAdvisorAsyncClient.listAnomaliesForAlert( alertConfigurationId, alertId) .subscribe(anomaly -> { - System.out.printf("Metric Id: %s%n", anomaly.getMetricId()); + System.out.printf("Data Feed Metric Id: %s%n", anomaly.getMetricId()); System.out.printf("Detection Configuration Id: %s%n", anomaly.getDetectionConfigurationId()); - System.out.printf("Anomaly Created Time: %s%n", anomaly.getCreatedTime()); - System.out.printf("Anomaly Modified Time: %s%n", anomaly.getModifiedTime()); - System.out.printf("Anomaly Severity: %s%n", anomaly.getSeverity()); - System.out.printf("Anomaly Status: %s%n", anomaly.getStatus()); + System.out.printf("DataPoint Anomaly Created Time: %s%n", anomaly.getCreatedTime()); + System.out.printf("DataPoint Anomaly Modified Time: %s%n", anomaly.getModifiedTime()); + System.out.printf("DataPoint Anomaly AnomalySeverity: %s%n", anomaly.getSeverity()); + System.out.printf("DataPoint Anomaly Status: %s%n", anomaly.getStatus()); System.out.printf("Series Key:"); DimensionKey seriesKey = anomaly.getSeriesKey(); for (Map.Entry dimension : seriesKey.asMap().entrySet()) { @@ -224,17 +221,17 @@ public void listAnomaliesForAlertWithOptions() { final String alertId = "1746b031c00"; final ListAnomaliesAlertedOptions options = new ListAnomaliesAlertedOptions() .setTop(10); - metricAdvisorAsyncClient.listAnomaliesForAlert( + metricsAdvisorAsyncClient.listAnomaliesForAlert( alertConfigurationId, alertId, options) .subscribe(anomaly -> { - System.out.printf("Metric Id: %s%n", anomaly.getMetricId()); + System.out.printf("Data Feed Metric Id: %s%n", anomaly.getMetricId()); System.out.printf("Detection Configuration Id: %s%n", anomaly.getDetectionConfigurationId()); - System.out.printf("Anomaly Created Time: %s%n", anomaly.getCreatedTime()); - System.out.printf("Anomaly Modified Time: %s%n", anomaly.getModifiedTime()); - System.out.printf("Anomaly Severity: %s%n", anomaly.getSeverity()); - System.out.printf("Anomaly Status: %s%n", anomaly.getStatus()); + System.out.printf("DataPoint Anomaly Created Time: %s%n", anomaly.getCreatedTime()); + System.out.printf("DataPoint Anomaly Modified Time: %s%n", anomaly.getModifiedTime()); + System.out.printf("DataPoint Anomaly AnomalySeverity: %s%n", anomaly.getSeverity()); + System.out.printf("DataPoint Anomaly Status: %s%n", anomaly.getStatus()); System.out.printf("Series Key:"); System.out.println(anomaly.getSeriesKey().asMap()); }); @@ -249,13 +246,13 @@ public void listAlertForAlertConfiguration() { final String alertConfigurationId = "ff3014a0-bbbb-41ec-a637-677e77b81299"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); - final TimeMode timeMode = TimeMode.ANOMALY_TIME; + final AlertQueryTimeMode timeMode = AlertQueryTimeMode.ANOMALY_TIME; final ListAlertOptions options = new ListAlertOptions(startTime, endTime, timeMode) .setTop(10); - metricAdvisorAsyncClient.listAlerts(alertConfigurationId, options) + metricsAdvisorAsyncClient.listAlerts(alertConfigurationId, options) .subscribe(alert -> { - System.out.printf("Alert Id: %s%n", alert.getId()); + System.out.printf("Anomaly Alert Id: %s%n", alert.getId()); System.out.printf("Created Time: %s%n", alert.getCreatedTime()); System.out.printf("Modified Time: %s%n", alert.getModifiedTime()); }); @@ -275,58 +272,58 @@ public void listValuesOfDimensionWithAnomalies() { = new ListDimensionValuesWithAnomaliesOptions(startTime, endTime) .setTop(10); - metricAdvisorAsyncClient.listDimensionValuesWithAnomalies(detectionConfigurationId, + metricsAdvisorAsyncClient.listDimensionValuesWithAnomalies(detectionConfigurationId, dimensionName, options) .subscribe(dimensionValue -> { - System.out.printf("Dimension Value: %s%n", dimensionValue); + System.out.printf("DataFeedDimension Value: %s%n", dimensionValue); }); // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listDimensionValuesWithAnomalies#String-String-ListDimensionValuesWithAnomaliesOptions } /** - * Code snippet for {@link MetricsAdvisorAsyncClient#listIncidentsForDetectionConfiguration(String, ListIncidentsDetectedOptions)}. + * Code snippet for {@link MetricsAdvisorAsyncClient#listIncidentsForDetectionConfig(String, ListIncidentsDetectedOptions)}. */ - public void listIncidentsForDetectionConfiguration() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidentsForDetectionConfiguration#String-ListIncidentsDetectedOptions + public void listIncidentsForDetectionConfig() { + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidentsForDetectionConfig#String-ListIncidentsDetectedOptions final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); final ListIncidentsDetectedOptions options = new ListIncidentsDetectedOptions(startTime, endTime) .setTop(1000); - PagedFlux incidentsFlux - = metricAdvisorAsyncClient.listIncidentsForDetectionConfiguration(detectionConfigurationId, options); + PagedFlux incidentsFlux + = metricsAdvisorAsyncClient.listIncidentsForDetectionConfig(detectionConfigurationId, options); incidentsFlux.subscribe(incident -> { - System.out.printf("Metric Id: %s%n", incident.getMetricId()); + System.out.printf("Data Feed Metric Id: %s%n", incident.getMetricId()); System.out.printf("Detection Configuration Id: %s%n", incident.getDetectionConfigurationId()); - System.out.printf("Incident Id: %s%n", incident.getId()); - System.out.printf("Incident Start Time: %s%n", incident.getStartTime()); - System.out.printf("Incident Severity: %s%n", incident.getSeverity()); - System.out.printf("Incident Status: %s%n", incident.getStatus()); - System.out.printf("Root Dimension Key: %s%n", incident.getRootDimensionKey().asMap()); + System.out.printf("Anomaly Incident Id: %s%n", incident.getId()); + System.out.printf("Anomaly Incident Start Time: %s%n", incident.getStartTime()); + System.out.printf("Anomaly Incident AnomalySeverity: %s%n", incident.getSeverity()); + System.out.printf("Anomaly Incident Status: %s%n", incident.getStatus()); + System.out.printf("Root DataFeedDimension Key: %s%n", incident.getRootDimensionKey().asMap()); }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidentsForDetectionConfiguration#String-ListIncidentsDetectedOptions + // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidentsForDetectionConfig#String-ListIncidentsDetectedOptions } /** - * Code snippet for {@link MetricsAdvisorAsyncClient#listAnomaliesForDetectionConfiguration(String, ListAnomaliesDetectedOptions)}. + * Code snippet for {@link MetricsAdvisorAsyncClient#listAnomaliesForDetectionConfig(String, ListAnomaliesDetectedOptions)}. */ public void listAnomaliesForDetectionConfiguration() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAnomaliesForDetectionConfiguration#String-ListAnomaliesDetectedOptions + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAnomaliesForDetectionConfig#String-ListAnomaliesDetectedOptions final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); final ListAnomaliesDetectedFilter filter = new ListAnomaliesDetectedFilter() - .setSeverityRange(Severity.LOW, Severity.MEDIUM); + .setSeverityRange(AnomalySeverity.LOW, AnomalySeverity.MEDIUM); final ListAnomaliesDetectedOptions options = new ListAnomaliesDetectedOptions(startTime, endTime) .setTop(10) .setFilter(filter); - metricAdvisorAsyncClient.listAnomaliesForDetectionConfiguration(detectionConfigurationId, + metricsAdvisorAsyncClient.listAnomaliesForDetectionConfig(detectionConfigurationId, options) .subscribe(anomaly -> { - System.out.printf("Anomaly Severity: %s%n", anomaly.getSeverity()); + System.out.printf("DataPoint Anomaly AnomalySeverity: %s%n", anomaly.getSeverity()); System.out.printf("Series Key:"); DimensionKey seriesKey = anomaly.getSeriesKey(); for (Map.Entry dimension : seriesKey.asMap().entrySet()) { @@ -334,7 +331,7 @@ public void listAnomaliesForDetectionConfiguration() { dimension.getKey(), dimension.getValue()); } }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAnomaliesForDetectionConfiguration#String-ListAnomaliesDetectedOptions + // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAnomaliesForDetectionConfig#String-ListAnomaliesDetectedOptions } /* @@ -348,15 +345,15 @@ public void createMetricFeedback() { final MetricChangePointFeedback metricChangePointFeedback = new MetricChangePointFeedback(startTime, endTime, ChangePointValue.AUTO_DETECT); - metricAdvisorAsyncClient.createMetricFeedback(metricId, metricChangePointFeedback) + metricsAdvisorAsyncClient.createMetricFeedback(metricId, metricChangePointFeedback) .subscribe(metricFeedback -> { MetricChangePointFeedback createdMetricChangePointFeedback = (MetricChangePointFeedback) metricFeedback; - System.out.printf("Metric feedback Id: %s%n", createdMetricChangePointFeedback.getId()); - System.out.printf("Metric feedback change point value: %s%n", + System.out.printf("Data Feed Metric feedback Id: %s%n", createdMetricChangePointFeedback.getId()); + System.out.printf("Data Feed Metric feedback change point value: %s%n", createdMetricChangePointFeedback.getChangePointValue().toString()); - System.out.printf("Metric feedback start time: %s%n", + System.out.printf("Data Feed Metric feedback start time: %s%n", createdMetricChangePointFeedback.getStartTime()); - System.out.printf("Metric feedback end time: %s%n", + System.out.printf("Data Feed Metric feedback end time: %s%n", createdMetricChangePointFeedback.getEndTime()); }); // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.createMetricFeedback#String-MetricFeedback @@ -373,20 +370,20 @@ public void createMetricFeedbackWithResponse() { final MetricChangePointFeedback metricChangePointFeedback = new MetricChangePointFeedback(startTime, endTime, ChangePointValue.AUTO_DETECT); - metricAdvisorAsyncClient.createMetricFeedbackWithResponse(metricId, metricChangePointFeedback) + metricsAdvisorAsyncClient.createMetricFeedbackWithResponse(metricId, metricChangePointFeedback) .subscribe(metricFeedbackResponse -> { - System.out.printf("Metric feedback creation operation status %s%n", + System.out.printf("Data Feed Metric feedback creation operation status %s%n", metricFeedbackResponse.getStatusCode()); MetricChangePointFeedback createdMetricChangePointFeedback = (MetricChangePointFeedback) metricFeedbackResponse.getValue(); - System.out.printf("Metric feedback Id: %s%n", createdMetricChangePointFeedback.getId()); - System.out.printf("Metric feedback change point value: %s%n", + System.out.printf("Data Feed Metric feedback Id: %s%n", createdMetricChangePointFeedback.getId()); + System.out.printf("Data Feed Metric feedback change point value: %s%n", createdMetricChangePointFeedback.getChangePointValue().toString()); - System.out.printf("Metric feedback start time: %s%n", + System.out.printf("Data Feed Metric feedback start time: %s%n", createdMetricChangePointFeedback.getStartTime()); - System.out.printf("Metric feedback end time: %s%n", + System.out.printf("Data Feed Metric feedback end time: %s%n", createdMetricChangePointFeedback.getEndTime()); - System.out.printf("Metric feedback associated dimension filter: %s%n", + System.out.printf("Data Feed Metric feedback associated dimension filter: %s%n", createdMetricChangePointFeedback.getDimensionFilter().asMap()); }); // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.createMetricFeedbackWithResponse#String-MetricFeedback @@ -399,18 +396,18 @@ public void getMetricFeedback() { // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.getMetricFeedback#String final String feedbackId = "8i3h4i4-b804-4ab9-a70f-0da0c89cft3l"; - metricAdvisorAsyncClient.getMetricFeedback(feedbackId) + metricsAdvisorAsyncClient.getMetricFeedback(feedbackId) .subscribe(metricFeedback -> { - System.out.printf("Metric feedback Id: %s%n", metricFeedback.getId()); - System.out.printf("Metric feedback associated dimension filter: %s%n", + System.out.printf("Data Feed Metric feedback Id: %s%n", metricFeedback.getId()); + System.out.printf("Data Feed Metric feedback associated dimension filter: %s%n", metricFeedback.getDimensionFilter().asMap()); if (PERIOD.equals(metricFeedback.getFeedbackType())) { MetricPeriodFeedback createMetricPeriodFeedback = (MetricPeriodFeedback) metricFeedback; - System.out.printf("Metric feedback type: %s%n", + System.out.printf("Data Feed Metric feedback type: %s%n", createMetricPeriodFeedback.getPeriodType().toString()); - System.out.printf("Metric feedback period value: %f%n", + System.out.printf("Data Feed Metric feedback period value: %f%n", createMetricPeriodFeedback.getPeriodValue()); } }); @@ -424,19 +421,19 @@ public void getMetricFeedbackWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.getMetricFeedbackWithResponse#String final String feedbackId = "8i3h4i4-b804-4ab9-a70f-0da0c89cft3l"; - metricAdvisorAsyncClient.getMetricFeedbackWithResponse(feedbackId) + metricsAdvisorAsyncClient.getMetricFeedbackWithResponse(feedbackId) .subscribe(metricFeedbackResponse -> { final MetricFeedback metricFeedback = metricFeedbackResponse.getValue(); - System.out.printf("Metric feedback Id: %s%n", metricFeedback.getId()); - System.out.printf("Metric feedback associated dimension filter: %s%n", + System.out.printf("Data Feed Metric feedback Id: %s%n", metricFeedback.getId()); + System.out.printf("Data Feed Metric feedback associated dimension filter: %s%n", metricFeedback.getDimensionFilter().asMap()); if (PERIOD.equals(metricFeedback.getFeedbackType())) { MetricPeriodFeedback createMetricPeriodFeedback = (MetricPeriodFeedback) metricFeedback; - System.out.printf("Metric feedback type: %s%n", + System.out.printf("Data Feed Metric feedback type: %s%n", createMetricPeriodFeedback.getPeriodType().toString()); - System.out.printf("Metric feedback period value: %f%n", + System.out.printf("Data Feed Metric feedback period value: %f%n", createMetricPeriodFeedback.getPeriodValue()); } }); @@ -449,30 +446,30 @@ public void getMetricFeedbackWithResponse() { public void listMetricFeedbacks() { // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricFeedbacks#String final String metricId = "d3gh4i4-b804-4ab9-a70f-0da0c89cft3l"; - metricAdvisorAsyncClient.listMetricFeedbacks(metricId) + metricsAdvisorAsyncClient.listMetricFeedbacks(metricId) .subscribe(metricFeedback -> { - System.out.printf("Metric feedback Id: %s%n", metricFeedback.getId()); - System.out.printf("Metric feedback associated dimension filter: %s%n", + System.out.printf("Data Feed Metric feedback Id: %s%n", metricFeedback.getId()); + System.out.printf("Data Feed Metric feedback associated dimension filter: %s%n", metricFeedback.getDimensionFilter().asMap()); if (PERIOD.equals(metricFeedback.getFeedbackType())) { MetricPeriodFeedback periodFeedback = (MetricPeriodFeedback) metricFeedback; - System.out.printf("Metric feedback type: %s%n", + System.out.printf("Data Feed Metric feedback type: %s%n", periodFeedback.getPeriodType().toString()); - System.out.printf("Metric feedback period value: %f%n", + System.out.printf("Data Feed Metric feedback period value: %f%n", periodFeedback.getPeriodValue()); } else if (ANOMALY.equals(metricFeedback.getFeedbackType())) { MetricAnomalyFeedback metricAnomalyFeedback = (MetricAnomalyFeedback) metricFeedback; - System.out.printf("Metric feedback anomaly value: %s%n", + System.out.printf("Data Feed Metric feedback anomaly value: %s%n", metricAnomalyFeedback.getAnomalyValue().toString()); - System.out.printf("Metric feedback associated detection configuration: %s%n", + System.out.printf("Data Feed Metric feedback associated detection configuration: %s%n", metricAnomalyFeedback.getDetectionConfigurationId()); } else if (COMMENT.equals(metricFeedback.getFeedbackType())) { MetricCommentFeedback metricCommentFeedback = (MetricCommentFeedback) metricFeedback; - System.out.printf("Metric feedback comment value: %s%n", + System.out.printf("Data Feed Metric feedback comment value: %s%n", metricCommentFeedback.getComment()); } }); @@ -488,36 +485,36 @@ public void listMetricFeedbacksWithOptions() { final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); - metricAdvisorAsyncClient.listMetricFeedbacks(metricId, + metricsAdvisorAsyncClient.listMetricFeedbacks(metricId, new ListMetricFeedbackOptions() .setFilter(new ListMetricFeedbackFilter() .setStartTime(startTime) .setTimeMode(FeedbackQueryTimeMode.FEEDBACK_CREATED_TIME) .setEndTime(endTime))) .subscribe(metricFeedback -> { - System.out.printf("Metric feedback Id: %s%n", metricFeedback.getId()); - System.out.printf("Metric feedback associated dimension filter: %s%n", + System.out.printf("Data Feed Metric feedback Id: %s%n", metricFeedback.getId()); + System.out.printf("Data Feed Metric feedback associated dimension filter: %s%n", metricFeedback.getDimensionFilter().asMap()); - System.out.printf("Metric feedback created time %s%n", metricFeedback.getCreatedTime()); + System.out.printf("Data Feed Metric feedback created time %s%n", metricFeedback.getCreatedTime()); if (PERIOD.equals(metricFeedback.getFeedbackType())) { MetricPeriodFeedback periodFeedback = (MetricPeriodFeedback) metricFeedback; - System.out.printf("Metric feedback type: %s%n", + System.out.printf("Data Feed Metric feedback type: %s%n", periodFeedback.getPeriodType().toString()); - System.out.printf("Metric feedback period value: %f%n", + System.out.printf("Data Feed Metric feedback period value: %f%n", periodFeedback.getPeriodValue()); } else if (ANOMALY.equals(metricFeedback.getFeedbackType())) { MetricAnomalyFeedback metricAnomalyFeedback = (MetricAnomalyFeedback) metricFeedback; - System.out.printf("Metric feedback anomaly value: %s%n", + System.out.printf("Data Feed Metric feedback anomaly value: %s%n", metricAnomalyFeedback.getAnomalyValue().toString()); - System.out.printf("Metric feedback associated detection configuration: %s%n", + System.out.printf("Data Feed Metric feedback associated detection configuration: %s%n", metricAnomalyFeedback.getDetectionConfigurationId()); } else if (COMMENT.equals(metricFeedback.getFeedbackType())) { MetricCommentFeedback metricCommentFeedback = (MetricCommentFeedback) metricFeedback; - System.out.printf("Metric feedback comment value: %s%n", + System.out.printf("Data Feed Metric feedback comment value: %s%n", metricCommentFeedback.getComment()); } }); @@ -532,23 +529,23 @@ public void listIncidentRootCauses() { final String detectionConfigurationId = "c0dddf2539f-b804-4ab9-a70f-0da0c89c76d8"; final String incidentId = "c5thh0f2539f-b804-4ab9-a70f-0da0c89c456d"; - metricAdvisorAsyncClient.listIncidentRootCauses(detectionConfigurationId, incidentId) + metricsAdvisorAsyncClient.listIncidentRootCauses(detectionConfigurationId, incidentId) .subscribe(incidentRootCause -> { System.out.printf("Description: %s%n", incidentRootCause.getDescription()); System.out.println("Series Key:"); System.out.println(incidentRootCause.getSeriesKey().asMap()); System.out.printf("Confidence for the detected incident root cause: %.2f%n", - incidentRootCause.getConfidenceScore()); + incidentRootCause.getContributionScore()); }); // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidentRootCauses#String-String } /** - * Code snippet for {@link MetricsAdvisorAsyncClient#listIncidentRootCauses(Incident)}. + * Code snippet for {@link MetricsAdvisorAsyncClient#listIncidentRootCauses(AnomalyIncident)}. */ public void listIncidentRootCausesWithIncident() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidentRootCauses#Incident + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidentRootCauses#AnomalyIncident final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); @@ -556,9 +553,9 @@ public void listIncidentRootCausesWithIncident() { = new ListIncidentsDetectedOptions(startTime, endTime) .setTop(10); - metricAdvisorAsyncClient.listIncidentsForDetectionConfiguration(detectionConfigurationId, options) + metricsAdvisorAsyncClient.listIncidentsForDetectionConfig(detectionConfigurationId, options) .flatMap(incident -> { - return metricAdvisorAsyncClient.listIncidentRootCauses(incident); + return metricsAdvisorAsyncClient.listIncidentRootCauses(incident); }) .subscribe(incidentRootCause -> { System.out.printf("Description: %s%n", incidentRootCause.getDescription()); @@ -566,7 +563,7 @@ public void listIncidentRootCausesWithIncident() { System.out.println(incidentRootCause.getSeriesKey().asMap()); }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidentRootCauses#Incident + // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidentRootCauses#AnomalyIncident } /* @@ -579,11 +576,11 @@ public void listMetricEnrichmentStatus() { final String metricId = "d3gh4i4-b804-4ab9-a70f-0da0c89cft3l"; final ListMetricEnrichmentStatusOptions options = new ListMetricEnrichmentStatusOptions(startTime, endTime); - metricAdvisorAsyncClient.listMetricEnrichmentStatus(metricId, options) + metricsAdvisorAsyncClient.listMetricEnrichmentStatus(metricId, options) .subscribe(enrichmentStatus -> { - System.out.printf("Metric enrichment status : %s%n", enrichmentStatus.getStatus()); - System.out.printf("Metric enrichment status message: %s%n", enrichmentStatus.getMessage()); - System.out.printf("Metric enrichment status data slice timestamp : %s%n", + System.out.printf("Data Feed Metric enrichment status : %s%n", enrichmentStatus.getStatus()); + System.out.printf("Data Feed Metric enrichment status message: %s%n", enrichmentStatus.getMessage()); + System.out.printf("Data Feed Metric enrichment status data slice timestamp : %s%n", enrichmentStatus.getTimestamp()); }); // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricEnrichmentStatus#String-ListMetricEnrichmentStatusOptions @@ -602,7 +599,7 @@ public void listEnrichedSeries() { final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-12T00:00:00Z"); PagedFlux enrichedDataFlux - = metricAdvisorAsyncClient.listMetricEnrichedSeriesData(Arrays.asList(seriesKey), + = metricsAdvisorAsyncClient.listMetricEnrichedSeriesData(Arrays.asList(seriesKey), detectionConfigurationId, startTime, endTime); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java index 958d9c41cf4f..200bef60a705 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java @@ -3,12 +3,12 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.Alert; -import com.azure.ai.metricsadvisor.models.Anomaly; +import com.azure.ai.metricsadvisor.models.AnomalyAlert; +import com.azure.ai.metricsadvisor.models.AnomalyIncident; +import com.azure.ai.metricsadvisor.models.DataPointAnomaly; import com.azure.ai.metricsadvisor.models.ChangePointValue; import com.azure.ai.metricsadvisor.models.DimensionKey; import com.azure.ai.metricsadvisor.models.FeedbackQueryTimeMode; -import com.azure.ai.metricsadvisor.models.Incident; import com.azure.ai.metricsadvisor.models.IncidentRootCause; import com.azure.ai.metricsadvisor.models.ListAlertOptions; import com.azure.ai.metricsadvisor.models.ListAnomaliesAlertedOptions; @@ -21,7 +21,6 @@ import com.azure.ai.metricsadvisor.models.ListMetricEnrichmentStatusOptions; import com.azure.ai.metricsadvisor.models.ListMetricFeedbackFilter; import com.azure.ai.metricsadvisor.models.ListMetricFeedbackOptions; -import com.azure.ai.metricsadvisor.models.ListMetricSeriesDataOptions; import com.azure.ai.metricsadvisor.models.ListMetricSeriesDefinitionOptions; import com.azure.ai.metricsadvisor.models.MetricAnomalyFeedback; import com.azure.ai.metricsadvisor.models.MetricChangePointFeedback; @@ -30,8 +29,8 @@ import com.azure.ai.metricsadvisor.models.MetricFeedback; import com.azure.ai.metricsadvisor.models.MetricPeriodFeedback; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; -import com.azure.ai.metricsadvisor.models.Severity; -import com.azure.ai.metricsadvisor.models.TimeMode; +import com.azure.ai.metricsadvisor.models.AnomalySeverity; +import com.azure.ai.metricsadvisor.models.AlertQueryTimeMode; import com.azure.core.http.HttpPipeline; import com.azure.core.http.HttpPipelineBuilder; import com.azure.core.http.rest.PagedIterable; @@ -56,15 +55,15 @@ * Code snippet for {@link MetricsAdvisorClient} */ public class MetricsAdvisorClientJavaDocCodeSnippets { - MetricsAdvisorClient metricAdvisorClient = + MetricsAdvisorClient metricsAdvisorClient = new MetricsAdvisorClientBuilder().buildClient(); /** * Code snippet for creating a {@link MetricsAdvisorClient} */ - public void createMetricAdvisorAsyncClient() { + public void createMetricsAdvisorAsyncClient() { // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.instantiation - MetricsAdvisorClient metricAdvisorAdministrationClient = + MetricsAdvisorClient metricsAdvisorClient = new MetricsAdvisorClientBuilder() .credential(new MetricsAdvisorKeyCredential("{subscription_key}", "{api_key}")) .endpoint("{endpoint}") @@ -75,13 +74,13 @@ public void createMetricAdvisorAsyncClient() { /** * Code snippet for creating a {@link MetricsAdvisorClient} with pipeline */ - public void createMetricAdvisorAsyncClientWithPipeline() { + public void createMetricsAdvisorAsyncClientWithPipeline() { // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.pipeline.instantiation HttpPipeline pipeline = new HttpPipelineBuilder() .policies(/* add policies */) .build(); - MetricsAdvisorClient metricAdvisorAdministrationClient = + MetricsAdvisorClient metricsAdvisorClient = new MetricsAdvisorClientBuilder() .credential(new MetricsAdvisorKeyCredential("{subscription_key}", "{api_key}")) .endpoint("{endpoint}") @@ -97,7 +96,7 @@ public void createMetricAdvisorAsyncClientWithPipeline() { public void listMetricSeriesDefinitions() { // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesDefinitions#String-ListMetricSeriesDefinitionOptions - metricAdvisorClient.listMetricSeriesDefinitions( + metricsAdvisorClient.listMetricSeriesDefinitions( "metricId", new ListMetricSeriesDefinitionOptions(OffsetDateTime.now()) .setDimensionCombinationToFilter(new HashMap>() {{ @@ -105,9 +104,9 @@ public void listMetricSeriesDefinitions() { }}) .setTop(3)) .forEach(metricSeriesDefinition -> { - System.out.printf("Metric id for the retrieved series definition : %s%n", + System.out.printf("Data Feed Metric id for the retrieved series definition : %s%n", metricSeriesDefinition.getMetricId()); - System.out.printf("Metric dimension: %s%n", metricSeriesDefinition.getSeriesKey().asMap()); + System.out.printf("Data Feed Metric dimension: %s%n", metricSeriesDefinition.getSeriesKey().asMap()); }); // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesDefinitions#String-ListMetricSeriesDefinitionOptions } @@ -126,9 +125,9 @@ public void listMetricSeriesDefinitionsWithContext() { put("Dim2", Collections.singletonList("Angelfish")); }}); - metricAdvisorClient.listMetricSeriesDefinitions(metricId, options, Context.NONE) + metricsAdvisorClient.listMetricSeriesDefinitions(metricId, options, Context.NONE) .forEach(metricSeriesDefinition -> { - System.out.printf("Metric id for the retrieved series definition : %s%n", + System.out.printf("Data Feed Metric id for the retrieved series definition : %s%n", metricSeriesDefinition.getMetricId()); System.out.printf("Series Key:"); System.out.println(metricSeriesDefinition.getSeriesKey().asMap()); @@ -138,16 +137,17 @@ public void listMetricSeriesDefinitionsWithContext() { /** * Code snippet for - * {@link MetricsAdvisorClient#listMetricSeriesData(String, List, ListMetricSeriesDataOptions)} + * {@link MetricsAdvisorClient#listMetricSeriesData(String, List, OffsetDateTime, OffsetDateTime)} */ public void listMetricSeriesData() { // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesData#String-List-ListMetricSeriesDataOptions - metricAdvisorClient.listMetricSeriesData("metricId", + final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); + final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); + + metricsAdvisorClient.listMetricSeriesData("metricId", Arrays.asList(new DimensionKey(new HashMap() {{ put("Dim1", "value1"); - }})), - new ListMetricSeriesDataOptions(OffsetDateTime.parse("2020-01-01T00:00:00Z"), - OffsetDateTime.parse("2020-09-09T00:00:00Z"))) + }})), startTime, endTime) .forEach(metricSeriesData -> { System.out.println("List of data points for this series:"); System.out.println(metricSeriesData.getMetricValues()); @@ -161,23 +161,23 @@ public void listMetricSeriesData() { /** * Code snippet for - * {@link MetricsAdvisorClient#listMetricSeriesData(String, List, ListMetricSeriesDataOptions, Context)} + * {@link MetricsAdvisorClient#listMetricSeriesData(String, List, OffsetDateTime, OffsetDateTime, Context)} */ public void listMetricSeriesDataWithContext() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesData#String-List-ListMetricSeriesDataOptions-Context - metricAdvisorClient.listMetricSeriesData("metricId", + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesData#String-List-OffsetDateTime-OffsetDateTime-Context + final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); + final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); + metricsAdvisorClient.listMetricSeriesData("metricId", Arrays.asList(new DimensionKey(new HashMap() {{ put("Dim1", "value1"); - }})), - new ListMetricSeriesDataOptions(OffsetDateTime.parse("2020-01-01T00:00:00Z"), - OffsetDateTime.parse("2020-09-09T00:00:00Z"))) + }})), startTime, endTime) .forEach(metricSeriesData -> { System.out.printf("Data feed Id: %s%n", metricSeriesData.getMetricId()); System.out.printf("Data feed description: %s%n", metricSeriesData.getSeriesKey()); System.out.printf("Data feed source type: %.2f%n", metricSeriesData.getTimestamps()); System.out.printf("Data feed creator: %.2f%n", metricSeriesData.getMetricValues()); }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesData#String-List-ListMetricSeriesDataOptions-Context + // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesData#String-List-OffsetDateTime-OffsetDateTime-Context } /** @@ -186,7 +186,7 @@ public void listMetricSeriesDataWithContext() { public void listMetricDimensionValues() { // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricDimensionValues#String-String final String metricId = "gh3014a0-41ec-a637-677e77b81455"; - metricAdvisorClient.listMetricDimensionValues(metricId, "category") + metricsAdvisorClient.listMetricDimensionValues(metricId, "category") .forEach(System.out::println); // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricDimensionValues#String-String } @@ -198,7 +198,7 @@ public void listMetricDimensionValues() { public void listMetricDimensionValuesWithOptions() { // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricDimensionValues#String-String-ListMetricDimensionValuesOptions-Context final String metricId = "gh3014a0-41ec-a637-677e77b81455"; - metricAdvisorClient.listMetricDimensionValues(metricId, "category", + metricsAdvisorClient.listMetricDimensionValues(metricId, "category", new ListMetricDimensionValuesOptions().setDimensionValueToFilter("Electronics") .setTop(3), Context.NONE) .forEach(System.out::println); @@ -215,20 +215,20 @@ public void listIncidentsForAlert() { final ListIncidentsAlertedOptions options = new ListIncidentsAlertedOptions() .setTop(10); - PagedIterable incidentsIterable = metricAdvisorClient.listIncidentsForAlert( + PagedIterable incidentsIterable = metricsAdvisorClient.listIncidentsForAlert( alertConfigurationId, alertId, options); - for (Incident incident : incidentsIterable) { - System.out.printf("Metric Id: %s%n", incident.getMetricId()); - System.out.printf("Detection Configuration Id: %s%n", incident.getDetectionConfigurationId()); - System.out.printf("Incident Id: %s%n", incident.getId()); - System.out.printf("Incident Start Time: %s%n", incident.getStartTime()); - System.out.printf("Incident Severity: %s%n", incident.getSeverity()); - System.out.printf("Incident Status: %s%n", incident.getStatus()); - System.out.printf("Root Dimension Key:"); - DimensionKey rootDimension = incident.getRootDimensionKey(); + for (AnomalyIncident anomalyIncident : incidentsIterable) { + System.out.printf("Data Feed Metric Id: %s%n", anomalyIncident.getMetricId()); + System.out.printf("Detection Configuration Id: %s%n", anomalyIncident.getDetectionConfigurationId()); + System.out.printf("Anomaly Incident Id: %s%n", anomalyIncident.getId()); + System.out.printf("Anomaly Incident Start Time: %s%n", anomalyIncident.getStartTime()); + System.out.printf("Anomaly Incident AnomalySeverity: %s%n", anomalyIncident.getSeverity()); + System.out.printf("Anomaly Incident Status: %s%n", anomalyIncident.getStatus()); + System.out.printf("Root DataFeedDimension Key:"); + DimensionKey rootDimension = anomalyIncident.getRootDimensionKey(); for (Map.Entry dimension : rootDimension.asMap().entrySet()) { System.out.printf("DimensionName: %s DimensionValue:%s%n", dimension.getKey(), dimension.getValue()); @@ -247,26 +247,26 @@ public void listIncidentsForAlertWithContext() { final ListIncidentsAlertedOptions options = new ListIncidentsAlertedOptions() .setTop(10); - PagedIterable incidentsIterable = metricAdvisorClient.listIncidentsForAlert( + PagedIterable incidentsIterable = metricsAdvisorClient.listIncidentsForAlert( alertConfigurationId, alertId, options, Context.NONE); - Stream> incidentsPageStream = incidentsIterable.streamByPage(); + Stream> incidentsPageStream = incidentsIterable.streamByPage(); int[] pageCount = new int[1]; incidentsPageStream.forEach(incidentsPage -> { System.out.printf("Page: %d%n", pageCount[0]++); - IterableStream incidentsPageItems = incidentsPage.getElements(); - for (Incident incident : incidentsPageItems) { - System.out.printf("Metric Id: %s%n", incident.getMetricId()); - System.out.printf("Detection Configuration Id: %s%n", incident.getDetectionConfigurationId()); - System.out.printf("Incident Id: %s%n", incident.getId()); - System.out.printf("Incident Start Time: %s%n", incident.getStartTime()); - System.out.printf("Incident Severity: %s%n", incident.getSeverity()); - System.out.printf("Incident Status: %s%n", incident.getStatus()); - System.out.printf("Root Dimension Key:"); - DimensionKey rootDimension = incident.getRootDimensionKey(); + IterableStream incidentsPageItems = incidentsPage.getElements(); + for (AnomalyIncident anomalyIncident : incidentsPageItems) { + System.out.printf("Data Feed Metric Id: %s%n", anomalyIncident.getMetricId()); + System.out.printf("Detection Configuration Id: %s%n", anomalyIncident.getDetectionConfigurationId()); + System.out.printf("Anomaly Incident Id: %s%n", anomalyIncident.getId()); + System.out.printf("Anomaly Incident Start Time: %s%n", anomalyIncident.getStartTime()); + System.out.printf("Anomaly Incident AnomalySeverity: %s%n", anomalyIncident.getSeverity()); + System.out.printf("Anomaly Incident Status: %s%n", anomalyIncident.getStatus()); + System.out.printf("Root DataFeedDimension Key:"); + DimensionKey rootDimension = anomalyIncident.getRootDimensionKey(); for (Map.Entry dimension : rootDimension.asMap().entrySet()) { System.out.printf("DimensionKey: %s DimensionValue:%s%n", dimension.getKey(), dimension.getValue()); @@ -285,20 +285,20 @@ public void listAnomaliesForAlert() { final String alertId = "1746b031c00"; final ListAnomaliesAlertedOptions options = new ListAnomaliesAlertedOptions() .setTop(10); - PagedIterable anomaliesIterable = metricAdvisorClient.listAnomaliesForAlert( + PagedIterable anomaliesIterable = metricsAdvisorClient.listAnomaliesForAlert( alertConfigurationId, alertId ); - for (Anomaly anomaly : anomaliesIterable) { - System.out.printf("Metric Id: %s%n", anomaly.getMetricId()); - System.out.printf("Detection Configuration Id: %s%n", anomaly.getDetectionConfigurationId()); - System.out.printf("Anomaly Created Time: %s%n", anomaly.getCreatedTime()); - System.out.printf("Anomaly Modified Time: %s%n", anomaly.getModifiedTime()); - System.out.printf("Anomaly Severity: %s%n", anomaly.getSeverity()); - System.out.printf("Anomaly Status: %s%n", anomaly.getStatus()); + for (DataPointAnomaly dataPointAnomaly : anomaliesIterable) { + System.out.printf("Data Feed Metric Id: %s%n", dataPointAnomaly.getMetricId()); + System.out.printf("Detection Configuration Id: %s%n", dataPointAnomaly.getDetectionConfigurationId()); + System.out.printf("DataPoint Anomaly Created Time: %s%n", dataPointAnomaly.getCreatedTime()); + System.out.printf("DataPoint Anomaly Modified Time: %s%n", dataPointAnomaly.getModifiedTime()); + System.out.printf("DataPoint Anomaly AnomalySeverity: %s%n", dataPointAnomaly.getSeverity()); + System.out.printf("DataPoint Anomaly Status: %s%n", dataPointAnomaly.getStatus()); System.out.printf("Series Key:"); - System.out.println(anomaly.getSeriesKey().asMap()); + System.out.println(dataPointAnomaly.getSeriesKey().asMap()); } // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForAlert#String-String-ListAnomaliesAlertedOptions } @@ -312,26 +312,26 @@ public void listAnomaliesForAlertWithContext() { final String alertId = "1746b031c00"; final ListAnomaliesAlertedOptions options = new ListAnomaliesAlertedOptions() .setTop(10); - PagedIterable anomaliesIterable = metricAdvisorClient.listAnomaliesForAlert( + PagedIterable anomaliesIterable = metricsAdvisorClient.listAnomaliesForAlert( alertConfigurationId, alertId, options, Context.NONE); - Stream> anomaliesPageStream = anomaliesIterable.streamByPage(); + Stream> anomaliesPageStream = anomaliesIterable.streamByPage(); int[] pageCount = new int[1]; anomaliesPageStream.forEach(anomaliesPage -> { System.out.printf("Page: %d%n", pageCount[0]++); - IterableStream anomaliesPageItems = anomaliesPage.getElements(); - for (Anomaly anomaly : anomaliesPageItems) { - System.out.printf("Metric Id: %s%n", anomaly.getMetricId()); - System.out.printf("Detection Configuration Id: %s%n", anomaly.getDetectionConfigurationId()); - System.out.printf("Anomaly Created Time: %s%n", anomaly.getCreatedTime()); - System.out.printf("Anomaly Modified Time: %s%n", anomaly.getModifiedTime()); - System.out.printf("Anomaly Severity: %s%n", anomaly.getSeverity()); - System.out.printf("Anomaly Status: %s%n", anomaly.getStatus()); + IterableStream anomaliesPageItems = anomaliesPage.getElements(); + for (DataPointAnomaly dataPointAnomaly : anomaliesPageItems) { + System.out.printf("Data Feed Metric Id: %s%n", dataPointAnomaly.getMetricId()); + System.out.printf("Detection Configuration Id: %s%n", dataPointAnomaly.getDetectionConfigurationId()); + System.out.printf("DataPoint Anomaly Created Time: %s%n", dataPointAnomaly.getCreatedTime()); + System.out.printf("DataPoint Anomaly Modified Time: %s%n", dataPointAnomaly.getModifiedTime()); + System.out.printf("DataPoint Anomaly AnomalySeverity: %s%n", dataPointAnomaly.getSeverity()); + System.out.printf("DataPoint Anomaly Status: %s%n", dataPointAnomaly.getStatus()); System.out.printf("Series Key:"); - System.out.println(anomaly.getSeriesKey().asMap()); + System.out.println(dataPointAnomaly.getSeriesKey().asMap()); } }); // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForAlert#String-String-ListAnomaliesAlertedOptions-Context @@ -345,17 +345,17 @@ public void listAlertForAlertConfiguration() { final String alertConfigurationId = "ff3014a0-bbbb-41ec-a637-677e77b81299"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); - final TimeMode timeMode = TimeMode.ANOMALY_TIME; + final AlertQueryTimeMode timeMode = AlertQueryTimeMode.ANOMALY_TIME; final ListAlertOptions options = new ListAlertOptions(startTime, endTime, timeMode) .setTop(10); - PagedIterable alertsIterable - = metricAdvisorClient.listAlerts(alertConfigurationId, options); + PagedIterable alertsIterable + = metricsAdvisorClient.listAlerts(alertConfigurationId, options); - for (Alert alert : alertsIterable) { - System.out.printf("Alert Id: %s%n", alert.getId()); - System.out.printf("Created Time: %s%n", alert.getCreatedTime()); - System.out.printf("Modified Time: %s%n", alert.getModifiedTime()); + for (AnomalyAlert anomalyAlert : alertsIterable) { + System.out.printf("Anomaly Alert Id: %s%n", anomalyAlert.getId()); + System.out.printf("Created Time: %s%n", anomalyAlert.getCreatedTime()); + System.out.printf("Modified Time: %s%n", anomalyAlert.getModifiedTime()); } // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAlerts#String-ListAlertOptions } @@ -368,22 +368,22 @@ public void listAlertForAlertConfigurationWithContext() { final String alertConfigurationId = "ff3014a0-bbbb-41ec-a637-677e77b81299"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); - final TimeMode timeMode = TimeMode.ANOMALY_TIME; + final AlertQueryTimeMode timeMode = AlertQueryTimeMode.ANOMALY_TIME; final ListAlertOptions options = new ListAlertOptions(startTime, endTime, timeMode) .setTop(10); - PagedIterable alertsIterable - = metricAdvisorClient.listAlerts(alertConfigurationId, options, Context.NONE); + PagedIterable alertsIterable + = metricsAdvisorClient.listAlerts(alertConfigurationId, options, Context.NONE); - Stream> alertsPageStream = alertsIterable.streamByPage(); + Stream> alertsPageStream = alertsIterable.streamByPage(); int[] pageCount = new int[1]; alertsPageStream.forEach(alertsPage -> { System.out.printf("Page: %d%n", pageCount[0]++); - IterableStream alertsPageItems = alertsPage.getElements(); - for (Alert alert : alertsPageItems) { - System.out.printf("Alert Id: %s%n", alert.getId()); - System.out.printf("Created Time: %s%n", alert.getCreatedTime()); - System.out.printf("Modified Time: %s%n", alert.getModifiedTime()); + IterableStream alertsPageItems = alertsPage.getElements(); + for (AnomalyAlert anomalyAlert : alertsPageItems) { + System.out.printf("AnomalyAlert Id: %s%n", anomalyAlert.getId()); + System.out.printf("Created Time: %s%n", anomalyAlert.getCreatedTime()); + System.out.printf("Modified Time: %s%n", anomalyAlert.getModifiedTime()); } }); // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAlerts#String-ListAlertOptions-Context @@ -403,12 +403,12 @@ public void listValuesOfDimensionWithAnomalies() { .setTop(10); PagedIterable dimensionValueIterable - = metricAdvisorClient.listDimensionValuesWithAnomalies(detectionConfigurationId, + = metricsAdvisorClient.listDimensionValuesWithAnomalies(detectionConfigurationId, dimensionName, options); for (String dimensionValue : dimensionValueIterable) { - System.out.printf("Dimension Value: %s%n", dimensionValue); + System.out.printf("DataFeedDimension Value: %s%n", dimensionValue); } // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listDimensionValuesWithAnomalies#String-String-ListDimensionValuesWithAnomaliesOptions } @@ -427,7 +427,7 @@ public void listValuesOfDimensionWithAnomaliesWithContext() { .setTop(10); PagedIterable dimensionValueIterable - = metricAdvisorClient.listDimensionValuesWithAnomalies(detectionConfigurationId, + = metricsAdvisorClient.listDimensionValuesWithAnomalies(detectionConfigurationId, dimensionName, options, Context.NONE); @@ -438,136 +438,136 @@ public void listValuesOfDimensionWithAnomaliesWithContext() { System.out.printf("Page: %d%n", pageCount[0]++); IterableStream dimensionValuePageItems = dimensionValuePage.getElements(); for (String dimensionValue : dimensionValuePageItems) { - System.out.printf("Dimension Value: %s%n", dimensionValue); + System.out.printf("DataFeedDimension Value: %s%n", dimensionValue); } }); // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listDimensionValuesWithAnomalies#String-String-ListDimensionValuesWithAnomaliesOptions-Context } /** - * Code snippet for {@link MetricsAdvisorClient#listIncidentsForDetectionConfiguration(String, ListIncidentsDetectedOptions)}. + * Code snippet for {@link MetricsAdvisorClient#listIncidentsForDetectionConfig(String, ListIncidentsDetectedOptions)}. */ - public void listIncidentsForDetectionConfiguration() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentsForDetectionConfiguration#String-ListIncidentsDetectedOptions + public void listIncidentsForDetectionConfig() { + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentsForDetectionConfig#String-ListIncidentsDetectedOptions final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); final ListIncidentsDetectedOptions options = new ListIncidentsDetectedOptions(startTime, endTime) .setTop(1000); - PagedIterable incidentsIterable - = metricAdvisorClient.listIncidentsForDetectionConfiguration(detectionConfigurationId, options); - - for (Incident incident : incidentsIterable) { - System.out.printf("Metric Id: %s%n", incident.getMetricId()); - System.out.printf("Detection Configuration Id: %s%n", incident.getDetectionConfigurationId()); - System.out.printf("Incident Id: %s%n", incident.getId()); - System.out.printf("Incident Start Time: %s%n", incident.getStartTime()); - System.out.printf("Incident Severity: %s%n", incident.getSeverity()); - System.out.printf("Incident Status: %s%n", incident.getStatus()); - System.out.printf("Root Dimension Key: %s%n", incident.getRootDimensionKey().asMap()); + PagedIterable incidentsIterable + = metricsAdvisorClient.listIncidentsForDetectionConfig(detectionConfigurationId, options); + + for (AnomalyIncident anomalyIncident : incidentsIterable) { + System.out.printf("Data Feed Metric Id: %s%n", anomalyIncident.getMetricId()); + System.out.printf("Detection Configuration Id: %s%n", anomalyIncident.getDetectionConfigurationId()); + System.out.printf("Anomaly Incident Id: %s%n", anomalyIncident.getId()); + System.out.printf("Anomaly Incident Start Time: %s%n", anomalyIncident.getStartTime()); + System.out.printf("Anomaly Incident AnomalySeverity: %s%n", anomalyIncident.getSeverity()); + System.out.printf("Anomaly Incident Status: %s%n", anomalyIncident.getStatus()); + System.out.printf("Root DataFeedDimension Key: %s%n", anomalyIncident.getRootDimensionKey().asMap()); } - // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentsForDetectionConfiguration#String-ListIncidentsDetectedOptions + // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentsForDetectionConfig#String-ListIncidentsDetectedOptions } /** - * Code snippet for {@link MetricsAdvisorClient#listIncidentsForDetectionConfiguration(String, ListIncidentsDetectedOptions, Context)}. + * Code snippet for {@link MetricsAdvisorClient#listIncidentsForDetectionConfig(String, ListIncidentsDetectedOptions, Context)}. */ - public void listIncidentsForDetectionConfigurationWithContext() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentsForDetectionConfiguration#String-ListIncidentsDetectedOptions-Context + public void listIncidentsForDetectionConfigWithContext() { + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentsForDetectionConfig#String-ListIncidentsDetectedOptions-Context final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); final ListIncidentsDetectedOptions options = new ListIncidentsDetectedOptions(startTime, endTime) .setTop(1000); - PagedIterable incidentsIterable - = metricAdvisorClient.listIncidentsForDetectionConfiguration(detectionConfigurationId, + PagedIterable incidentsIterable + = metricsAdvisorClient.listIncidentsForDetectionConfig(detectionConfigurationId, options, Context.NONE); - Stream> incidentsPageStream = incidentsIterable.streamByPage(); + Stream> incidentsPageStream = incidentsIterable.streamByPage(); int[] pageCount = new int[1]; incidentsPageStream.forEach(incidentsPage -> { System.out.printf("Page: %d%n", pageCount[0]++); - IterableStream pageElements = incidentsPage.getElements(); - for (Incident incident : pageElements) { - System.out.printf("Metric Id: %s%n", incident.getMetricId()); - System.out.printf("Detection Configuration Id: %s%n", incident.getDetectionConfigurationId()); - System.out.printf("Incident Id: %s%n", incident.getId()); - System.out.printf("Incident Start Time: %s%n", incident.getStartTime()); - System.out.printf("Incident Severity: %s%n", incident.getSeverity()); - System.out.printf("Incident Status: %s%n", incident.getStatus()); - System.out.printf("Root Dimension Key:"); - System.out.printf("Root Dimension Key: %s%n", incident.getRootDimensionKey().asMap()); + IterableStream pageElements = incidentsPage.getElements(); + for (AnomalyIncident anomalyIncident : pageElements) { + System.out.printf("Data Feed Metric Id: %s%n", anomalyIncident.getMetricId()); + System.out.printf("Detection Configuration Id: %s%n", anomalyIncident.getDetectionConfigurationId()); + System.out.printf("Anomaly Incident Id: %s%n", anomalyIncident.getId()); + System.out.printf("Anomaly Incident Start Time: %s%n", anomalyIncident.getStartTime()); + System.out.printf("Anomaly Incident AnomalySeverity: %s%n", anomalyIncident.getSeverity()); + System.out.printf("Anomaly Incident Status: %s%n", anomalyIncident.getStatus()); + System.out.printf("Root DataFeedDimension Key:"); + System.out.printf("Root DataFeedDimension Key: %s%n", anomalyIncident.getRootDimensionKey().asMap()); } }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentsForDetectionConfiguration#String-ListIncidentsDetectedOptions-Context + // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentsForDetectionConfig#String-ListIncidentsDetectedOptions-Context } /* - * Code snippet for {@link MetricsAdvisorClient#listAnomaliesForDetectionConfiguration(String, ListAnomaliesDetectedOptions)}. + * Code snippet for {@link MetricsAdvisorClient#listAnomaliesForDetectionConfig(String, ListAnomaliesDetectedOptions)}. */ public void listAnomaliesForDetectionConfiguration() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForDetectionConfiguration#String-ListAnomaliesDetectedOptions + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForDetectionConfig#String-ListAnomaliesDetectedOptions final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); final ListAnomaliesDetectedFilter filter = new ListAnomaliesDetectedFilter() - .setSeverityRange(Severity.LOW, Severity.MEDIUM); + .setSeverityRange(AnomalySeverity.LOW, AnomalySeverity.MEDIUM); final ListAnomaliesDetectedOptions options = new ListAnomaliesDetectedOptions(startTime, endTime) .setTop(10) .setFilter(filter); - PagedIterable anomaliesIterable - = metricAdvisorClient.listAnomaliesForDetectionConfiguration(detectionConfigurationId, options); + PagedIterable anomaliesIterable + = metricsAdvisorClient.listAnomaliesForDetectionConfig(detectionConfigurationId, options); - for (Anomaly anomaly : anomaliesIterable) { - System.out.printf("Anomaly Severity: %s%n", anomaly.getSeverity()); + for (DataPointAnomaly dataPointAnomaly : anomaliesIterable) { + System.out.printf("DataPointAnomaly AnomalySeverity: %s%n", dataPointAnomaly.getSeverity()); System.out.printf("Series Key:"); - DimensionKey seriesKey = anomaly.getSeriesKey(); + DimensionKey seriesKey = dataPointAnomaly.getSeriesKey(); for (Map.Entry dimension : seriesKey.asMap().entrySet()) { System.out.printf("DimensionName: %s DimensionValue:%s%n", dimension.getKey(), dimension.getValue()); } } - // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForDetectionConfiguration#String-ListAnomaliesDetectedOptions + // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForDetectionConfig#String-ListAnomaliesDetectedOptions } /** - * Code snippet for {@link MetricsAdvisorClient#listAnomaliesForDetectionConfiguration(String, ListAnomaliesDetectedOptions, Context)}. + * Code snippet for {@link MetricsAdvisorClient#listAnomaliesForDetectionConfig(String, ListAnomaliesDetectedOptions, Context)}. */ public void listAnomaliesForDetectionConfigurationWithContext() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForDetectionConfiguration#String-ListAnomaliesDetectedOptions-Context + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForDetectionConfig#String-ListAnomaliesDetectedOptions-Context final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); final ListAnomaliesDetectedFilter filter = new ListAnomaliesDetectedFilter() - .setSeverityRange(Severity.LOW, Severity.MEDIUM); + .setSeverityRange(AnomalySeverity.LOW, AnomalySeverity.MEDIUM); final ListAnomaliesDetectedOptions options = new ListAnomaliesDetectedOptions(startTime, endTime) .setTop(10) .setFilter(filter); - PagedIterable anomaliesIterable - = metricAdvisorClient.listAnomaliesForDetectionConfiguration(detectionConfigurationId, + PagedIterable anomaliesIterable + = metricsAdvisorClient.listAnomaliesForDetectionConfig(detectionConfigurationId, options, Context.NONE); - Stream> anomaliesPageStream = anomaliesIterable.streamByPage(); + Stream> anomaliesPageStream = anomaliesIterable.streamByPage(); int[] pageCount = new int[1]; anomaliesPageStream.forEach(anomaliesPage -> { System.out.printf("Page: %d%n", pageCount[0]++); - IterableStream anomaliesPageItems = anomaliesPage.getElements(); - for (Anomaly anomaly : anomaliesPageItems) { - System.out.printf("Anomaly Severity: %s%n", anomaly.getSeverity()); + IterableStream anomaliesPageItems = anomaliesPage.getElements(); + for (DataPointAnomaly dataPointAnomaly : anomaliesPageItems) { + System.out.printf("DataPoint Anomaly AnomalySeverity: %s%n", dataPointAnomaly.getSeverity()); System.out.printf("Series Key:"); - DimensionKey seriesKey = anomaly.getSeriesKey(); + DimensionKey seriesKey = dataPointAnomaly.getSeriesKey(); for (Map.Entry dimension : seriesKey.asMap().entrySet()) { System.out.printf("DimensionName: %s DimensionValue:%s%n", dimension.getKey(), dimension.getValue()); } } }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForDetectionConfiguration#String-ListAnomaliesDetectedOptions-Context + // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForDetectionConfig#String-ListAnomaliesDetectedOptions-Context } /* @@ -582,15 +582,15 @@ public void createMetricFeedback() { = new MetricChangePointFeedback(startTime, endTime, ChangePointValue.AUTO_DETECT); final MetricFeedback metricFeedback - = metricAdvisorClient.createMetricFeedback(metricId, metricChangePointFeedback); + = metricsAdvisorClient.createMetricFeedback(metricId, metricChangePointFeedback); MetricChangePointFeedback createdMetricChangePointFeedback = (MetricChangePointFeedback) metricFeedback; - System.out.printf("Metric feedback Id: %s%n", createdMetricChangePointFeedback.getId()); - System.out.printf("Metric feedback change point value: %s%n", + System.out.printf("Data Feed Metric feedback Id: %s%n", createdMetricChangePointFeedback.getId()); + System.out.printf("Data Feed Metric feedback change point value: %s%n", createdMetricChangePointFeedback.getChangePointValue().toString()); - System.out.printf("Metric feedback start time: %s%n", + System.out.printf("Data Feed Metric feedback start time: %s%n", createdMetricChangePointFeedback.getStartTime()); - System.out.printf("Metric feedback end time: %s%n", + System.out.printf("Data Feed Metric feedback end time: %s%n", createdMetricChangePointFeedback.getEndTime()); // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.createMetricFeedback#String-MetricFeedback } @@ -607,19 +607,19 @@ public void createMetricFeedbackWithResponse() { = new MetricChangePointFeedback(startTime, endTime, ChangePointValue.AUTO_DETECT); final Response metricFeedbackResponse - = metricAdvisorClient.createMetricFeedbackWithResponse(metricId, metricChangePointFeedback, Context.NONE); + = metricsAdvisorClient.createMetricFeedbackWithResponse(metricId, metricChangePointFeedback, Context.NONE); - System.out.printf("Metric feedback creation operation status %s%n", metricFeedbackResponse.getStatusCode()); + System.out.printf("Data Feed Metric feedback creation operation status %s%n", metricFeedbackResponse.getStatusCode()); MetricChangePointFeedback createdMetricChangePointFeedback = (MetricChangePointFeedback) metricFeedbackResponse.getValue(); - System.out.printf("Metric feedback Id: %s%n", createdMetricChangePointFeedback.getId()); - System.out.printf("Metric feedback change point value: %s%n", + System.out.printf("Data Feed Metric feedback Id: %s%n", createdMetricChangePointFeedback.getId()); + System.out.printf("Data Feed Metric feedback change point value: %s%n", createdMetricChangePointFeedback.getChangePointValue().toString()); - System.out.printf("Metric feedback start time: %s%n", + System.out.printf("Data Feed Metric feedback start time: %s%n", createdMetricChangePointFeedback.getStartTime()); - System.out.printf("Metric feedback end time: %s%n", + System.out.printf("Data Feed Metric feedback end time: %s%n", createdMetricChangePointFeedback.getEndTime()); - System.out.printf("Metric feedback associated dimension filter: %s%n", + System.out.printf("Data Feed Metric feedback associated dimension filter: %s%n", createdMetricChangePointFeedback.getDimensionFilter().asMap()); // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.createMetricFeedbackWithResponse#String-MetricFeedback-Context } @@ -631,17 +631,17 @@ public void getMetricFeedback() { // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.getMetricFeedback#String final String feedbackId = "8i3h4i4-b804-4ab9-a70f-0da0c89cft3l"; - final MetricFeedback metricFeedback = metricAdvisorClient.getMetricFeedback(feedbackId); - System.out.printf("Metric feedback Id: %s%n", metricFeedback.getId()); - System.out.printf("Metric feedback associated dimension filter: %s%n", + final MetricFeedback metricFeedback = metricsAdvisorClient.getMetricFeedback(feedbackId); + System.out.printf("Data Feed Metric feedback Id: %s%n", metricFeedback.getId()); + System.out.printf("Data Feed Metric feedback associated dimension filter: %s%n", metricFeedback.getDimensionFilter().asMap()); if (PERIOD.equals(metricFeedback.getFeedbackType())) { MetricPeriodFeedback createMetricPeriodFeedback = (MetricPeriodFeedback) metricFeedback; - System.out.printf("Metric feedback type: %s%n", + System.out.printf("Data Feed Metric feedback type: %s%n", createMetricPeriodFeedback.getPeriodType().toString()); - System.out.printf("Metric feedback period value: %f%n", + System.out.printf("Data Feed Metric feedback period value: %f%n", createMetricPeriodFeedback.getPeriodValue()); } // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.getMetricFeedback#String @@ -655,18 +655,18 @@ public void getMetricFeedbackWithResponse() { final String feedbackId = "8i3h4i4-b804-4ab9-a70f-0da0c89cft3l"; final Response metricFeedbackResponse - = metricAdvisorClient.getMetricFeedbackWithResponse(feedbackId, Context.NONE); + = metricsAdvisorClient.getMetricFeedbackWithResponse(feedbackId, Context.NONE); final MetricFeedback metricFeedback = metricFeedbackResponse.getValue(); - System.out.printf("Metric feedback Id: %s%n", metricFeedback.getId()); - System.out.printf("Metric feedback associated dimension filter: %s%n", + System.out.printf("Data Feed Metric feedback Id: %s%n", metricFeedback.getId()); + System.out.printf("Data Feed Metric feedback associated dimension filter: %s%n", metricFeedback.getDimensionFilter().asMap()); if (PERIOD.equals(metricFeedback.getFeedbackType())) { MetricPeriodFeedback createMetricPeriodFeedback = (MetricPeriodFeedback) metricFeedback; - System.out.printf("Metric feedback type: %s%n", + System.out.printf("Data Feed Metric feedback type: %s%n", createMetricPeriodFeedback.getPeriodType().toString()); - System.out.printf("Metric feedback period value: %f%n", + System.out.printf("Data Feed Metric feedback period value: %f%n", createMetricPeriodFeedback.getPeriodValue()); } // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.getMetricFeedbackWithResponse#String-Context @@ -678,30 +678,30 @@ public void getMetricFeedbackWithResponse() { public void listMetricFeedbacks() { // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricFeedbacks#String final String metricId = "d3gh4i4-b804-4ab9-a70f-0da0c89cft3l"; - metricAdvisorClient.listMetricFeedbacks(metricId) + metricsAdvisorClient.listMetricFeedbacks(metricId) .forEach(metricFeedback -> { - System.out.printf("Metric feedback Id: %s%n", metricFeedback.getId()); - System.out.printf("Metric feedback associated dimension filter: %s%n", + System.out.printf("Data Feed Metric feedback Id: %s%n", metricFeedback.getId()); + System.out.printf("Data Feed Metric feedback associated dimension filter: %s%n", metricFeedback.getDimensionFilter().asMap()); if (PERIOD.equals(metricFeedback.getFeedbackType())) { MetricPeriodFeedback periodFeedback = (MetricPeriodFeedback) metricFeedback; - System.out.printf("Metric feedback type: %s%n", + System.out.printf("Data Feed Metric feedback type: %s%n", periodFeedback.getPeriodType().toString()); - System.out.printf("Metric feedback period value: %f%n", + System.out.printf("Data Feed Metric feedback period value: %f%n", periodFeedback.getPeriodValue()); } else if (ANOMALY.equals(metricFeedback.getFeedbackType())) { MetricAnomalyFeedback metricAnomalyFeedback = (MetricAnomalyFeedback) metricFeedback; - System.out.printf("Metric feedback anomaly value: %s%n", + System.out.printf("Data Feed Metric feedback anomaly value: %s%n", metricAnomalyFeedback.getAnomalyValue().toString()); - System.out.printf("Metric feedback associated detection configuration: %s%n", + System.out.printf("Data Feed Metric feedback associated detection configuration: %s%n", metricAnomalyFeedback.getDetectionConfigurationId()); } else if (COMMENT.equals(metricFeedback.getFeedbackType())) { MetricCommentFeedback metricCommentFeedback = (MetricCommentFeedback) metricFeedback; - System.out.printf("Metric feedback comment value: %s%n", + System.out.printf("Data Feed Metric feedback comment value: %s%n", metricCommentFeedback.getComment()); } }); @@ -717,36 +717,36 @@ public void listMetricFeedbacksWithOptions() { final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); - metricAdvisorClient.listMetricFeedbacks(metricId, + metricsAdvisorClient.listMetricFeedbacks(metricId, new ListMetricFeedbackOptions() .setFilter(new ListMetricFeedbackFilter() .setStartTime(startTime) .setTimeMode(FeedbackQueryTimeMode.FEEDBACK_CREATED_TIME) .setEndTime(endTime)), Context.NONE) .forEach(metricFeedback -> { - System.out.printf("Metric feedback Id: %s%n", metricFeedback.getId()); - System.out.printf("Metric feedback associated dimension filter: %s%n", + System.out.printf("Data Feed Metric feedback Id: %s%n", metricFeedback.getId()); + System.out.printf("Data Feed Metric feedback associated dimension filter: %s%n", metricFeedback.getDimensionFilter().asMap()); - System.out.printf("Metric feedback created time %s%n", metricFeedback.getCreatedTime()); + System.out.printf("Data Feed Metric feedback created time %s%n", metricFeedback.getCreatedTime()); if (PERIOD.equals(metricFeedback.getFeedbackType())) { MetricPeriodFeedback periodFeedback = (MetricPeriodFeedback) metricFeedback; - System.out.printf("Metric feedback type: %s%n", + System.out.printf("Data Feed Metric feedback type: %s%n", periodFeedback.getPeriodType().toString()); - System.out.printf("Metric feedback period value: %f%n", + System.out.printf("Data Feed Metric feedback period value: %f%n", periodFeedback.getPeriodValue()); } else if (ANOMALY.equals(metricFeedback.getFeedbackType())) { MetricAnomalyFeedback metricAnomalyFeedback = (MetricAnomalyFeedback) metricFeedback; - System.out.printf("Metric feedback anomaly value: %s%n", + System.out.printf("Data Feed Metric feedback anomaly value: %s%n", metricAnomalyFeedback.getAnomalyValue().toString()); - System.out.printf("Metric feedback associated detection configuration: %s%n", + System.out.printf("Data Feed Metric feedback associated detection configuration: %s%n", metricAnomalyFeedback.getDetectionConfigurationId()); } else if (COMMENT.equals(metricFeedback.getFeedbackType())) { MetricCommentFeedback metricCommentFeedback = (MetricCommentFeedback) metricFeedback; - System.out.printf("Metric feedback comment value: %s%n", + System.out.printf("Data Feed Metric feedback comment value: %s%n", metricCommentFeedback.getComment()); } }); @@ -761,13 +761,13 @@ public void listIncidentRootCauses() { final String detectionConfigurationId = "c0dddf2539f-b804-4ab9-a70f-0da0c89c76d8"; final String incidentId = "c5thh0f2539f-b804-4ab9-a70f-0da0c89c456d"; - metricAdvisorClient.listIncidentRootCauses(detectionConfigurationId, incidentId) + metricsAdvisorClient.listIncidentRootCauses(detectionConfigurationId, incidentId) .forEach(incidentRootCause -> { System.out.printf("Description: %s%n", incidentRootCause.getDescription()); System.out.printf("Series Key:"); System.out.println(incidentRootCause.getSeriesKey().asMap()); System.out.printf("Confidence for the detected incident root cause %.2f%n", - incidentRootCause.getConfidenceScore()); + incidentRootCause.getContributionScore()); }); // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentRootCauses#String-String @@ -782,7 +782,7 @@ public void listIncidentRootCausesWithContext() { final String incidentId = "c5thh0f2539f-b804-4ab9-a70f-0da0c89c456d"; PagedIterable rootCauseIterable - = metricAdvisorClient.listIncidentRootCauses(detectionConfigurationId, incidentId, Context.NONE); + = metricsAdvisorClient.listIncidentRootCauses(detectionConfigurationId, incidentId, Context.NONE); Stream> rootCausePageIterable = rootCauseIterable.streamByPage(); rootCausePageIterable.forEach(response -> { System.out.printf("Response StatusCode: %s%n", response.getStatusCode()); @@ -792,7 +792,7 @@ public void listIncidentRootCausesWithContext() { System.out.printf("Series Key:"); System.out.println(incidentRootCause.getSeriesKey().asMap()); System.out.printf("Confidence for the detected incident root cause %.2f%n", - incidentRootCause.getConfidenceScore()); + incidentRootCause.getContributionScore()); } }); @@ -800,10 +800,10 @@ public void listIncidentRootCausesWithContext() { } /** - * Code snippet for {@link MetricsAdvisorClient#listIncidentRootCauses(Incident)}. + * Code snippet for {@link MetricsAdvisorClient#listIncidentRootCauses(AnomalyIncident)}. */ public void listIncidentRootCausesWithIncident() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentRootCauses#Incident + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentRootCauses#AnomalyIncident final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); @@ -811,18 +811,18 @@ public void listIncidentRootCausesWithIncident() { = new ListIncidentsDetectedOptions(startTime, endTime) .setTop(10); - metricAdvisorClient.listIncidentsForDetectionConfiguration(detectionConfigurationId, options) + metricsAdvisorClient.listIncidentsForDetectionConfig(detectionConfigurationId, options) .forEach(incident -> { - metricAdvisorClient.listIncidentRootCauses(incident) + metricsAdvisorClient.listIncidentRootCauses(incident) .forEach(incidentRootCause -> { System.out.printf("Description: %s%n", incidentRootCause.getDescription()); System.out.printf("Series Key:"); System.out.println(incidentRootCause.getSeriesKey().asMap()); System.out.printf("Confidence for the detected incident root cause %.2f%n", - incidentRootCause.getConfidenceScore()); + incidentRootCause.getContributionScore()); }); }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentRootCauses#Incident + // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentRootCauses#AnomalyIncident } /* @@ -834,11 +834,11 @@ public void listMetricEnrichmentStatus() { final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final String metricId = "d3gh4i4-b804-4ab9-a70f-0da0c89cft3l"; final ListMetricEnrichmentStatusOptions options = new ListMetricEnrichmentStatusOptions(startTime, endTime); - metricAdvisorClient.listMetricEnrichmentStatus(metricId, options) + metricsAdvisorClient.listMetricEnrichmentStatus(metricId, options) .forEach(enrichmentStatus -> { - System.out.printf("Metric enrichment status : %s%n", enrichmentStatus.getStatus()); - System.out.printf("Metric enrichment status message: %s%n", enrichmentStatus.getMessage()); - System.out.printf("Metric enrichment status data slice timestamp : %s%n", + System.out.printf("Data Feed Metric enrichment status : %s%n", enrichmentStatus.getStatus()); + System.out.printf("Data Feed Metric enrichment status message: %s%n", enrichmentStatus.getMessage()); + System.out.printf("Data Feed Metric enrichment status data slice timestamp : %s%n", enrichmentStatus.getTimestamp()); }); // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricEnrichmentStatus#String-ListMetricEnrichmentStatusOptions @@ -854,11 +854,11 @@ public void listMetricEnrichmentStatusWithContext() { final String metricId = "d3gh4i4-b804-4ab9-a70f-0da0c89cft3l"; final ListMetricEnrichmentStatusOptions options = new ListMetricEnrichmentStatusOptions(startTime, endTime); - metricAdvisorClient.listMetricEnrichmentStatus(metricId, options, Context.NONE) + metricsAdvisorClient.listMetricEnrichmentStatus(metricId, options, Context.NONE) .forEach(enrichmentStatus -> { - System.out.printf("Metric enrichment status : %s%n", enrichmentStatus.getStatus()); - System.out.printf("Metric enrichment status message: %s%n", enrichmentStatus.getMessage()); - System.out.printf("Metric enrichment status data slice timestamp : %s%n", + System.out.printf("Data Feed Metric enrichment status : %s%n", enrichmentStatus.getStatus()); + System.out.printf("Data Feed Metric enrichment status message: %s%n", enrichmentStatus.getMessage()); + System.out.printf("Data Feed Metric enrichment status data slice timestamp : %s%n", enrichmentStatus.getTimestamp()); }); // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricEnrichmentStatus#String-ListMetricEnrichmentStatusOptions-Context @@ -877,7 +877,7 @@ public void listEnrichedSeries() { final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-12T00:00:00Z"); PagedIterable enrichedDataIterable - = metricAdvisorClient.listMetricEnrichedSeriesData(Arrays.asList(seriesKey), + = metricsAdvisorClient.listMetricEnrichedSeriesData(Arrays.asList(seriesKey), detectionConfigurationId, startTime, endTime); @@ -911,7 +911,7 @@ public void listEnrichedSeriesWithContext() { final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-12T00:00:00Z"); PagedIterable enrichedDataIterable - = metricAdvisorClient.listMetricEnrichedSeriesData(Arrays.asList(seriesKey), + = metricsAdvisorClient.listMetricEnrichedSeriesData(Arrays.asList(seriesKey), detectionConfigurationId, startTime, endTime); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java index bda7cd546417..53fec9b463d1 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java @@ -8,22 +8,23 @@ import com.azure.ai.metricsadvisor.models.AnomalyAlertConfiguration; import com.azure.ai.metricsadvisor.models.AnomalyDetectionConfiguration; import com.azure.ai.metricsadvisor.models.AnomalyDetectorDirection; +import com.azure.ai.metricsadvisor.models.AnomalySeverity; import com.azure.ai.metricsadvisor.models.ChangeThresholdCondition; import com.azure.ai.metricsadvisor.models.DataFeed; import com.azure.ai.metricsadvisor.models.DataFeedGranularity; import com.azure.ai.metricsadvisor.models.DataFeedGranularityType; import com.azure.ai.metricsadvisor.models.DataFeedIngestionSettings; +import com.azure.ai.metricsadvisor.models.DataFeedMetric; import com.azure.ai.metricsadvisor.models.DataFeedOptions; import com.azure.ai.metricsadvisor.models.DataFeedRollupSettings; import com.azure.ai.metricsadvisor.models.DataFeedRollupType; import com.azure.ai.metricsadvisor.models.DataFeedSchema; import com.azure.ai.metricsadvisor.models.DetectionConditionsOperator; -import com.azure.ai.metricsadvisor.models.EmailHook; +import com.azure.ai.metricsadvisor.models.EmailNotificationHook; import com.azure.ai.metricsadvisor.models.HardThresholdCondition; -import com.azure.ai.metricsadvisor.models.Hook; +import com.azure.ai.metricsadvisor.models.NotificationHook; import com.azure.ai.metricsadvisor.models.ListAlertOptions; import com.azure.ai.metricsadvisor.models.ListDataFeedIngestionOptions; -import com.azure.ai.metricsadvisor.models.Metric; import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConditions; import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConfiguration; import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConfigurationsOperator; @@ -32,11 +33,10 @@ import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; import com.azure.ai.metricsadvisor.models.MySqlDataFeedSource; import com.azure.ai.metricsadvisor.models.SQLServerDataFeedSource; -import com.azure.ai.metricsadvisor.models.Severity; import com.azure.ai.metricsadvisor.models.SeverityCondition; import com.azure.ai.metricsadvisor.models.SmartDetectionCondition; import com.azure.ai.metricsadvisor.models.SuppressCondition; -import com.azure.ai.metricsadvisor.models.TimeMode; +import com.azure.ai.metricsadvisor.models.AlertQueryTimeMode; import com.azure.core.exception.HttpResponseException; import java.time.OffsetDateTime; @@ -89,8 +89,8 @@ public void createDataFeed() { .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) .setSchema(new DataFeedSchema( Arrays.asList( - new Metric().setName("metric1"), - new Metric().setName("metric2") + new DataFeedMetric().setName("metric1"), + new DataFeedMetric().setName("metric2") ) )) .setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse("2020-01-01T00:00:00Z"))) @@ -160,9 +160,9 @@ public void configureAnomalyDetection() { .setSuppressCondition(new SuppressCondition().setMinNumber(1).setMinRatio(2)); final AnomalyDetectionConfiguration anomalyDetectionConfiguration = - metricsAdvisorAdminClient.createMetricAnomalyDetectionConfiguration( + metricsAdvisorAdminClient.createMetricAnomalyDetectionConfig( metricId, - new AnomalyDetectionConfiguration("My Anomaly detection configuration") + new AnomalyDetectionConfiguration("My dataPoint anomaly detection configuration") .setDescription("anomaly detection config description") .setWholeSeriesDetectionCondition( new MetricWholeSeriesDetectionCondition() @@ -177,18 +177,19 @@ public void configureAnomalyDetection() { * Code snippet for creating an email hook alert. */ public void createHook() { - Hook emailHook = new EmailHook("email hook") - .setDescription("my email hook") + NotificationHook emailNotificationHook = new EmailNotificationHook("email Hook") + .setDescription("my email Hook") .addEmailToAlert("alertme@alertme.com") .setExternalLink("https://adwiki.azurewebsites.net/articles/howto/alerts/create-hooks.html"); - final Hook hook = metricsAdvisorAdminClient.createHook(emailHook); - EmailHook createdEmailHook = (EmailHook) hook; - System.out.printf("Hook Id: %s%n", createdEmailHook.getId()); - System.out.printf("Hook Name: %s%n", createdEmailHook.getName()); - System.out.printf("Hook Description: %s%n", createdEmailHook.getDescription()); - System.out.printf("Hook External Link: %s%n", createdEmailHook.getExternalLink()); - System.out.printf("Hook Emails: %s%n", String.join(",", createdEmailHook.getEmailsToAlert())); + final NotificationHook notificationHook = metricsAdvisorAdminClient.createHook(emailNotificationHook); + EmailNotificationHook createdEmailHook = (EmailNotificationHook) notificationHook; + System.out.printf("Email Hook Id: %s%n", createdEmailHook.getId()); + System.out.printf("Email Hook name: %s%n", createdEmailHook.getName()); + System.out.printf("Email Hook description: %s%n", createdEmailHook.getDescription()); + System.out.printf("Email Hook external Link: %s%n", createdEmailHook.getExternalLink()); + System.out.printf("Email Hook emails to alert: %s%n", + String.join(",", createdEmailHook.getEmailsToAlert())); } /** @@ -201,8 +202,8 @@ public void configureAlert() { String hookId2 = "8i48er30-6e6e-4391-b78f-b00dfee1e6f5"; final AnomalyAlertConfiguration anomalyAlertConfiguration - = metricsAdvisorAdminClient.createAnomalyAlertConfiguration( - new AnomalyAlertConfiguration("My Alert config name") + = metricsAdvisorAdminClient.createAnomalyAlertConfig( + new AnomalyAlertConfiguration("My anomaly alert config name") .setDescription("alert config description") .setMetricAlertConfigurations( Arrays.asList( @@ -212,7 +213,7 @@ public void configureAlert() { MetricAnomalyAlertScope.forWholeSeries()) .setAlertConditions(new MetricAnomalyAlertConditions() .setSeverityRangeCondition(new SeverityCondition() - .setMaxAlertSeverity(Severity.HIGH))) + .setMaxAlertSeverity(AnomalySeverity.HIGH))) )) .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.AND) .setIdOfHooksToAlert(Arrays.asList(hookId1, hookId2))); @@ -221,26 +222,26 @@ public void configureAlert() { /** * Code snippet for querying anomaly detection. */ - public void queryAnomalyDetection() { + public void queryAlertsForDetection() { String alertConfigurationId = "9ol48er30-6e6e-4391-b78f-b00dfee1e6f5"; metricsAdvisorClient.listAlerts( alertConfigurationId, new ListAlertOptions(OffsetDateTime.parse("2020-01-01T00:00:00Z"), OffsetDateTime.now(), - TimeMode.ANOMALY_TIME)) + AlertQueryTimeMode.ANOMALY_TIME)) .forEach(alert -> { - System.out.printf("Alert Id: %s%n", alert.getId()); - System.out.printf("Alert created on: %s%n", alert.getCreatedTime()); + System.out.printf("AnomalyAlert Id: %s%n", alert.getId()); + System.out.printf("AnomalyAlert created on: %s%n", alert.getCreatedTime()); // List anomalies for returned alerts metricsAdvisorClient.listAnomaliesForAlert( alertConfigurationId, alert.getId()) .forEach(anomaly -> { - System.out.printf("Anomaly was created on: %s%n", anomaly.getCreatedTime()); - System.out.printf("Anomaly severity: %s%n", anomaly.getSeverity().toString()); - System.out.printf("Anomaly status: %s%n", anomaly.getStatus()); - System.out.printf("Anomaly related series key: %s%n", anomaly.getSeriesKey().asMap()); + System.out.printf("DataPoint Anomaly was created on: %s%n", anomaly.getCreatedTime()); + System.out.printf("DataPoint Anomaly severity: %s%n", anomaly.getSeverity().toString()); + System.out.printf("DataPoint Anomaly status: %s%n", anomaly.getStatus()); + System.out.printf("DataPoint Anomaly related series key: %s%n", anomaly.getSeriesKey().asMap()); }); }); } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/AnomalyDetectionConfigurationAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/AnomalyDetectionConfigurationAsyncSample.java index 10dc8ad14cb3..933df11ffc42 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/AnomalyDetectionConfigurationAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/AnomalyDetectionConfigurationAsyncSample.java @@ -37,7 +37,7 @@ public static void main(String[] args) { // Create the detection configuration. Mono createDetectionConfigMono = advisorAdministrationAsyncClient - .createMetricAnomalyDetectionConfiguration(metricId, prepareDetectionConfigurationObject()); + .createMetricAnomalyDetectionConfig(metricId, prepareDetectionConfigurationObject()); createDetectionConfigMono .doOnSubscribe(__ -> @@ -48,7 +48,7 @@ public static void main(String[] args) { // Retrieve the detection configuration that just created. Mono fetchDetectionConfigMono = createDetectionConfigMono .flatMap(createdDetectionConfig -> { - return advisorAdministrationAsyncClient.getMetricAnomalyDetectionConfiguration( + return advisorAdministrationAsyncClient.getMetricAnomalyDetectionConfig( createdDetectionConfig.getId()) .doOnSubscribe(__ -> System.out.printf("Fetching detection configuration: %s%n", createdDetectionConfig.getId())) @@ -64,7 +64,7 @@ public static void main(String[] args) { .flatMap(detectionConfig -> { final String detectionConfigId = detectionConfig.getId(); detectionConfig = updateDetectionConfigurationObject(detectionConfig); - return advisorAdministrationAsyncClient.updateMetricAnomalyDetectionConfiguration(detectionConfig) + return advisorAdministrationAsyncClient.updateMetricAnomalyDetectionConfig(detectionConfig) .doOnSubscribe(__ -> System.out.printf("Updating detection configuration: %s%n", detectionConfigId)) .doOnSuccess(config -> @@ -90,7 +90,7 @@ public static void main(String[] args) { // List configurations System.out.printf("Listing detection configurations%n"); PagedFlux detectionConfigsFlux - = advisorAdministrationAsyncClient.listMetricAnomalyDetectionConfigurations(metricId); + = advisorAdministrationAsyncClient.listMetricAnomalyDetectionConfigs(metricId); detectionConfigsFlux.doOnNext(detectionConfig -> printDetectionConfiguration(detectionConfig)) .blockLast(); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/AnomalyDetectionConfigurationSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/AnomalyDetectionConfigurationSample.java index c2b661947b8b..f3457a28a453 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/AnomalyDetectionConfigurationSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/AnomalyDetectionConfigurationSample.java @@ -37,30 +37,30 @@ public static void main(String[] args) { System.out.printf("Creating detection configuration for metric: %s%n", metricId); AnomalyDetectionConfiguration config = advisorAdministrationClient - .createMetricAnomalyDetectionConfiguration(metricId, prepareDetectionConfigurationObject()); + .createMetricAnomalyDetectionConfig(metricId, prepareDetectionConfigurationObject()); System.out.printf("Created detection configuration: %s%n", config.getId()); // Retrieve the detection configuration that just created. System.out.printf("Fetching detection configuration: %s%n", config.getId()); - config = advisorAdministrationClient.getMetricAnomalyDetectionConfiguration( + config = advisorAdministrationClient.getMetricAnomalyDetectionConfig( config.getId()); printDetectionConfiguration(config); // Update the detection configuration. System.out.printf("Updating detection configuration: %s%n", config.getId()); config = updateDetectionConfigurationObject(config); - advisorAdministrationClient.updateMetricAnomalyDetectionConfiguration(config); + advisorAdministrationClient.updateMetricAnomalyDetectionConfig(config); System.out.printf("Updated detection configuration%n"); // Delete the detection configuration. System.out.printf("Deleting detection configuration: %s%n", config.getId()); - advisorAdministrationClient.deleteMetricAnomalyDetectionConfiguration(config.getId()); + advisorAdministrationClient.deleteMetricAnomalyDetectionConfig(config.getId()); System.out.printf("Deleted detection configuration%n"); // List configurations System.out.printf("Listing detection configurations%n"); PagedIterable detectionConfigsIterable - = advisorAdministrationClient.listMetricAnomalyDetectionConfigurations(metricId); + = advisorAdministrationClient.listMetricAnomalyDetectionConfigs(metricId); for (AnomalyDetectionConfiguration detectionConfig : detectionConfigsIterable) { printDetectionConfiguration(detectionConfig); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedAsyncSample.java index 3567946affbf..46b2addcc117 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedAsyncSample.java @@ -9,10 +9,10 @@ import com.azure.ai.metricsadvisor.models.DataFeedGranularity; import com.azure.ai.metricsadvisor.models.DataFeedGranularityType; import com.azure.ai.metricsadvisor.models.DataFeedIngestionSettings; +import com.azure.ai.metricsadvisor.models.DataFeedMetric; import com.azure.ai.metricsadvisor.models.DataFeedOptions; import com.azure.ai.metricsadvisor.models.DataFeedSchema; -import com.azure.ai.metricsadvisor.models.Dimension; -import com.azure.ai.metricsadvisor.models.Metric; +import com.azure.ai.metricsadvisor.models.DataFeedDimension; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; import reactor.core.publisher.Mono; @@ -39,12 +39,12 @@ public static void main(String[] args) { .setSchema( new DataFeedSchema( Arrays.asList( - new Metric().setName("cost"), - new Metric().setName("revenue") + new DataFeedMetric().setName("cost"), + new DataFeedMetric().setName("revenue") )).setDimensions( Arrays.asList( - new Dimension().setName("city"), - new Dimension().setName("category") + new DataFeedDimension().setName("city"), + new DataFeedDimension().setName("category") )) ).setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse("2020-07-01T00:00:00Z"))); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedSample.java index 4c4b3cd16701..5db947fd74d0 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/DatafeedSample.java @@ -6,13 +6,13 @@ import com.azure.ai.metricsadvisor.implementation.models.DataSourceType; import com.azure.ai.metricsadvisor.models.AzureAppInsightsDataFeedSource; import com.azure.ai.metricsadvisor.models.DataFeed; +import com.azure.ai.metricsadvisor.models.DataFeedDimension; import com.azure.ai.metricsadvisor.models.DataFeedGranularity; import com.azure.ai.metricsadvisor.models.DataFeedGranularityType; import com.azure.ai.metricsadvisor.models.DataFeedIngestionSettings; +import com.azure.ai.metricsadvisor.models.DataFeedMetric; import com.azure.ai.metricsadvisor.models.DataFeedOptions; import com.azure.ai.metricsadvisor.models.DataFeedSchema; -import com.azure.ai.metricsadvisor.models.Dimension; -import com.azure.ai.metricsadvisor.models.Metric; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; import java.time.OffsetDateTime; @@ -38,12 +38,12 @@ public static void main(String[] args) { .setSchema( new DataFeedSchema( Arrays.asList( - new Metric().setName("cost"), - new Metric().setName("revenue") + new DataFeedMetric().setName("cost"), + new DataFeedMetric().setName("revenue") )).setDimensions( Arrays.asList( - new Dimension().setName("city"), - new Dimension().setName("category") + new DataFeedDimension().setName("city"), + new DataFeedDimension().setName("category") )) ).setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse("2020-07-01T00:00:00Z"))); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/HookAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/HookAsyncSample.java index 35f8d38c239c..f991e60921e8 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/HookAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/HookAsyncSample.java @@ -3,10 +3,10 @@ package com.azure.ai.metricsadvisor.administration; -import com.azure.ai.metricsadvisor.models.EmailHook; -import com.azure.ai.metricsadvisor.models.Hook; +import com.azure.ai.metricsadvisor.models.EmailNotificationHook; +import com.azure.ai.metricsadvisor.models.NotificationHook; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; -import com.azure.ai.metricsadvisor.models.WebHook; +import com.azure.ai.metricsadvisor.models.WebNotificationHook; import com.azure.core.http.rest.PagedFlux; import reactor.core.publisher.Mono; @@ -22,62 +22,62 @@ public static void main(String[] args) { .buildAsyncClient(); // Create email hook. - Hook emailHookToCreate = new EmailHook("email hook") + NotificationHook emailNotificationHookToCreate = new EmailNotificationHook("email hook") .setDescription("my email hook") .addEmailToAlert("alertme@alertme.com") .setExternalLink("https://adwiki.azurewebsites.net/articles/howto/alerts/create-hooks.html"); - Mono createHookMono + Mono createHookMono = advisorAdministrationAsyncClient - .createHook(emailHookToCreate); + .createHook(emailNotificationHookToCreate); createHookMono .doOnSubscribe(__ -> - System.out.printf("Creating Hook%n")) + System.out.printf("Creating NotificationHook%n")) .doOnSuccess(hook -> System.out.printf("Created hook: %s%n", hook.getId())); // Retrieve the hook that just created. - Mono fetchHookMono = createHookMono + Mono fetchHookMono = createHookMono .flatMap(createdHook -> { return advisorAdministrationAsyncClient.getHook( createdHook.getId()) .doOnSubscribe(__ -> - System.out.printf("Fetching Hook: %s%n", createdHook.getId())) + System.out.printf("Fetching NotificationHook: %s%n", createdHook.getId())) .doOnSuccess(config -> - System.out.printf("Fetched Hook%n")) + System.out.printf("Fetched NotificationHook%n")) .doOnNext(hook -> { - EmailHook createdEmailHook = (EmailHook) hook; - System.out.printf("Hook Id: %s%n", createdEmailHook.getId()); - System.out.printf("Hook Name: %s%n", createdEmailHook.getName()); - System.out.printf("Hook Description: %s%n", createdEmailHook.getDescription()); - System.out.printf("Hook External Link: %s%n", createdEmailHook.getExternalLink()); - System.out.printf("Hook Emails: %s%n", String.join(",", createdEmailHook.getEmailsToAlert())); + EmailNotificationHook createdEmailHook = (EmailNotificationHook) hook; + System.out.printf("NotificationHook Id: %s%n", createdEmailHook.getId()); + System.out.printf("NotificationHook Name: %s%n", createdEmailHook.getName()); + System.out.printf("NotificationHook Description: %s%n", createdEmailHook.getDescription()); + System.out.printf("NotificationHook External Link: %s%n", createdEmailHook.getExternalLink()); + System.out.printf("NotificationHook Emails: %s%n", String.join(",", createdEmailHook.getEmailsToAlert())); }); }); // Update the hook. - Mono updateHookMono = fetchHookMono + Mono updateHookMono = fetchHookMono .flatMap(hook -> { - EmailHook emailHookToUpdate = (EmailHook) hook; + EmailNotificationHook emailHookToUpdate = (EmailNotificationHook) hook; emailHookToUpdate .removeEmailToAlert("alertme@alertme.com") .addEmailToAlert("alertme2@alertme.com") .addEmailToAlert("alertme3@alertme.com"); return advisorAdministrationAsyncClient.updateHook(emailHookToUpdate) .doOnSubscribe(__ -> - System.out.printf("Updating Hook: %s%n", hook.getId())) + System.out.printf("Updating Notification Hook: %s%n", hook.getId())) .doOnSuccess(config -> - System.out.printf("Updated Hook%n")); + System.out.printf("Updated Notification Hook%n")); }); // Delete the hook. Mono deleteHookMono = updateHookMono.flatMap(hook -> { return advisorAdministrationAsyncClient.deleteHook(hook.getId()) .doOnSubscribe(__ -> - System.out.printf("Deleting Hook: %s%n", hook.getId())) + System.out.printf("Deleting Notification Hook: %s%n", hook.getId())) .doOnSuccess(config -> - System.out.printf("Deleted Hook%n")); + System.out.printf("Deleted Notification Hook%n")); }); /* @@ -88,15 +88,15 @@ public static void main(String[] args) { deleteHookMono.block(); // Create a web hook - Hook webHookToCreate = new WebHook("web hook", "https://httpbin.org/post") + NotificationHook webNotificationHookToCreate = new WebNotificationHook("web hook", "https://httpbin.org/post") .setDescription("my web hook") .setUserCredentials("web-user", "web-user-pwd!") .setExternalLink("https://adwiki.azurewebsites.net/articles/howto/alerts/create-hooks.html"); - Mono createWebHookMono - = advisorAdministrationAsyncClient.createHook(webHookToCreate) + Mono createWebHookMono + = advisorAdministrationAsyncClient.createHook(webNotificationHookToCreate) .doOnSubscribe(__ -> - System.out.printf("Creating Hook%n")) + System.out.printf("Creating NotificationHook%n")) .doOnSuccess(hook -> System.out.printf("Created hook: %s%n", hook.getId())); @@ -109,25 +109,25 @@ public static void main(String[] args) { // List configurations System.out.printf("Listing hooks%n"); - PagedFlux hooksFlux + PagedFlux hooksFlux = advisorAdministrationAsyncClient.listHooks(); hooksFlux.doOnNext(hook -> { - if (hook instanceof EmailHook) { - EmailHook emailHook = (EmailHook) hook; - System.out.printf("Hook Id: %s%n", emailHook.getId()); - System.out.printf("Hook Name: %s%n", emailHook.getName()); - System.out.printf("Hook Description: %s%n", emailHook.getDescription()); - System.out.printf("Hook External Link: %s%n", emailHook.getExternalLink()); - System.out.printf("Hook Emails: %s%n", String.join(",", emailHook.getEmailsToAlert())); - } else if (hook instanceof WebHook) { - WebHook webHook = (WebHook) hook; - System.out.printf("Hook Id: %s%n", webHook.getId()); - System.out.printf("Hook Name: %s%n", webHook.getName()); - System.out.printf("Hook Description: %s%n", webHook.getDescription()); - System.out.printf("Hook External Link: %s%n", webHook.getExternalLink()); - System.out.printf("Hook Endpoint: %s%n", webHook.getEndpoint()); - System.out.printf("Hook Headers: %s%n", webHook.getHttpHeaders()); + if (hook instanceof EmailNotificationHook) { + EmailNotificationHook emailHook = (EmailNotificationHook) hook; + System.out.printf("NotificationHook Id: %s%n", emailHook.getId()); + System.out.printf("NotificationHook Name: %s%n", emailHook.getName()); + System.out.printf("NotificationHook Description: %s%n", emailHook.getDescription()); + System.out.printf("NotificationHook External Link: %s%n", emailHook.getExternalLink()); + System.out.printf("NotificationHook Emails: %s%n", String.join(",", emailHook.getEmailsToAlert())); + } else if (hook instanceof WebNotificationHook) { + WebNotificationHook webHook = (WebNotificationHook) hook; + System.out.printf("NotificationHook Id: %s%n", webHook.getId()); + System.out.printf("NotificationHook Name: %s%n", webHook.getName()); + System.out.printf("NotificationHook Description: %s%n", webHook.getDescription()); + System.out.printf("NotificationHook External Link: %s%n", webHook.getExternalLink()); + System.out.printf("NotificationHook Endpoint: %s%n", webHook.getEndpoint()); + System.out.printf("NotificationHook Headers: %s%n", webHook.getHttpHeaders()); } }).blockLast(); } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/HookSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/HookSample.java index 029c97c706a5..f410ca2e2952 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/HookSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/HookSample.java @@ -3,10 +3,10 @@ package com.azure.ai.metricsadvisor.administration; -import com.azure.ai.metricsadvisor.models.EmailHook; -import com.azure.ai.metricsadvisor.models.Hook; +import com.azure.ai.metricsadvisor.models.EmailNotificationHook; +import com.azure.ai.metricsadvisor.models.NotificationHook; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; -import com.azure.ai.metricsadvisor.models.WebHook; +import com.azure.ai.metricsadvisor.models.WebNotificationHook; import com.azure.core.http.rest.PagedIterable; /** @@ -20,69 +20,69 @@ public static void main(String[] args) { .credential(new MetricsAdvisorKeyCredential("subscription_key", "api_key")) .buildClient(); - // Create email hook. - System.out.printf("Creating Hook%n"); - Hook emailHookToCreate = new EmailHook("email hook") - .setDescription("my email hook") + // Create email notificationHook. + System.out.printf("Creating NotificationHook%n"); + NotificationHook emailNotificationHookToCreate = new EmailNotificationHook("email notification Hook") + .setDescription("my email notification Hook") .addEmailToAlert("alertme@alertme.com") .setExternalLink("https://adwiki.azurewebsites.net/articles/howto/alerts/create-hooks.html"); - Hook hook = advisorAdministrationClient.createHook(emailHookToCreate); - System.out.printf("Created hook: %s%n", hook.getId()); + NotificationHook notificationHook = advisorAdministrationClient.createHook(emailNotificationHookToCreate); + System.out.printf("Created notification Hook: %s%n", notificationHook.getId()); - // Retrieve the hook that just created. - System.out.printf("Fetching hook: %s%n", hook.getId()); - hook = advisorAdministrationClient.getHook(hook.getId()); - EmailHook createdEmailHook = (EmailHook) hook; - System.out.printf("Hook Id: %s%n", createdEmailHook.getId()); - System.out.printf("Hook Name: %s%n", createdEmailHook.getName()); - System.out.printf("Hook Description: %s%n", createdEmailHook.getDescription()); - System.out.printf("Hook External Link: %s%n", createdEmailHook.getExternalLink()); - System.out.printf("Hook Emails: %s%n", String.join(",", createdEmailHook.getEmailsToAlert())); + // Retrieve the notification Hook that just created. + System.out.printf("Fetching notification Hook: %s%n", notificationHook.getId()); + notificationHook = advisorAdministrationClient.getHook(notificationHook.getId()); + EmailNotificationHook createdEmailHook = (EmailNotificationHook) notificationHook; + System.out.printf("Email Hook Id: %s%n", createdEmailHook.getId()); + System.out.printf("Email Hook Name: %s%n", createdEmailHook.getName()); + System.out.printf("Email Hook Description: %s%n", createdEmailHook.getDescription()); + System.out.printf("Email Hook External Link: %s%n", createdEmailHook.getExternalLink()); + System.out.printf("Email Hook Emails: %s%n", String.join(",", createdEmailHook.getEmailsToAlert())); - // Update the hook. - System.out.printf("Updating hook: %s%n", hook.getId()); - EmailHook emailHookToUpdate = (EmailHook) hook; + // Update the notificationHook. + System.out.printf("Updating notification Hook: %s%n", notificationHook.getId()); + EmailNotificationHook emailHookToUpdate = (EmailNotificationHook) notificationHook; emailHookToUpdate .removeEmailToAlert("alertme@alertme.com") .addEmailToAlert("alertme2@alertme.com") .addEmailToAlert("alertme3@alertme.com"); advisorAdministrationClient.updateHook(emailHookToUpdate); - System.out.printf("Updated hook: %s%n", hook.getId()); + System.out.printf("Updated notification Hook: %s%n", notificationHook.getId()); - // Delete the hook. - System.out.printf("Deleting Hook: %s%n", hook.getId()); - advisorAdministrationClient.deleteHook(hook.getId()); - System.out.printf("Deleted Hook%n"); + // Delete the notificationHook. + System.out.printf("Deleting Notification Hook: %s%n", notificationHook.getId()); + advisorAdministrationClient.deleteHook(notificationHook.getId()); + System.out.printf("Deleted Notification Hook%n"); - // Create a web hook - System.out.printf("Creating web Hook%n"); - Hook webHookToCreate = new WebHook("web hook", "https://httpbin.org/post") - .setDescription("my web hook") + // Create a web notification Hook + System.out.printf("Creating web NotificationHook%n"); + NotificationHook webNotificationHookToCreate = new WebNotificationHook("web notification Hook", "https://httpbin.org/post") + .setDescription("my web notification Hook") .setUserCredentials("web-user", "web-user-pwd!") .setExternalLink("https://adwiki.azurewebsites.net/articles/howto/alerts/create-hooks.html"); - advisorAdministrationClient.createHook(webHookToCreate); - System.out.printf("Created web hook: %s%n", hook.getId()); + advisorAdministrationClient.createHook(webNotificationHookToCreate); + System.out.printf("Created web notification Hook: %s%n", notificationHook.getId()); // List hooks. System.out.printf("Listing hooks%n"); - PagedIterable hooksIterable + PagedIterable hooksIterable = advisorAdministrationClient.listHooks(); - for (Hook hookItem : hooksIterable) { - if (hookItem instanceof EmailHook) { - EmailHook emailHook = (EmailHook) hookItem; - System.out.printf("Hook Id: %s%n", emailHook.getId()); - System.out.printf("Hook Name: %s%n", emailHook.getName()); - System.out.printf("Hook Description: %s%n", emailHook.getDescription()); - System.out.printf("Hook External Link: %s%n", emailHook.getExternalLink()); - System.out.printf("Hook Emails: %s%n", String.join(",", emailHook.getEmailsToAlert())); - } else if (hookItem instanceof WebHook) { - WebHook webHook = (WebHook) hookItem; - System.out.printf("Hook Id: %s%n", webHook.getId()); - System.out.printf("Hook Name: %s%n", webHook.getName()); - System.out.printf("Hook Description: %s%n", webHook.getDescription()); - System.out.printf("Hook External Link: %s%n", webHook.getExternalLink()); - System.out.printf("Hook Endpoint: %s%n", webHook.getEndpoint()); - System.out.printf("Hook Headers: %s%n", webHook.getHttpHeaders()); + for (NotificationHook notificationHookItem : hooksIterable) { + if (notificationHookItem instanceof EmailNotificationHook) { + EmailNotificationHook emailHook = (EmailNotificationHook) notificationHookItem; + System.out.printf("Email Hook Id: %s%n", emailHook.getId()); + System.out.printf("Email Hook Name: %s%n", emailHook.getName()); + System.out.printf("Email Hook Description: %s%n", emailHook.getDescription()); + System.out.printf("Email Hook External Link: %s%n", emailHook.getExternalLink()); + System.out.printf("Email Hook Emails: %s%n", String.join(",", emailHook.getEmailsToAlert())); + } else if (notificationHookItem instanceof WebNotificationHook) { + WebNotificationHook webHook = (WebNotificationHook) notificationHookItem; + System.out.printf("Web Hook Id: %s%n", webHook.getId()); + System.out.printf("Web Hook Name: %s%n", webHook.getName()); + System.out.printf("Web Hook Description: %s%n", webHook.getDescription()); + System.out.printf("Web Hook External Link: %s%n", webHook.getExternalLink()); + System.out.printf("Web Hook Endpoint: %s%n", webHook.getEndpoint()); + System.out.printf("Web Hook Headers: %s%n", webHook.getHttpHeaders()); } } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets.java index 970a293411d2..dcd7660bd915 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets.java @@ -19,14 +19,14 @@ import com.azure.ai.metricsadvisor.models.DataFeedStatus; import com.azure.ai.metricsadvisor.models.DetectionConditionsOperator; import com.azure.ai.metricsadvisor.models.DimensionKey; -import com.azure.ai.metricsadvisor.models.EmailHook; +import com.azure.ai.metricsadvisor.models.EmailNotificationHook; import com.azure.ai.metricsadvisor.models.HardThresholdCondition; -import com.azure.ai.metricsadvisor.models.Hook; +import com.azure.ai.metricsadvisor.models.NotificationHook; import com.azure.ai.metricsadvisor.models.ListDataFeedFilter; import com.azure.ai.metricsadvisor.models.ListDataFeedIngestionOptions; import com.azure.ai.metricsadvisor.models.ListDataFeedOptions; import com.azure.ai.metricsadvisor.models.ListHookOptions; -import com.azure.ai.metricsadvisor.models.Metric; +import com.azure.ai.metricsadvisor.models.DataFeedMetric; import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConditions; import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConfiguration; import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConfigurationsOperator; @@ -36,11 +36,11 @@ import com.azure.ai.metricsadvisor.models.MetricWholeSeriesDetectionCondition; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; import com.azure.ai.metricsadvisor.models.MySqlDataFeedSource; -import com.azure.ai.metricsadvisor.models.Severity; +import com.azure.ai.metricsadvisor.models.AnomalySeverity; import com.azure.ai.metricsadvisor.models.SeverityCondition; import com.azure.ai.metricsadvisor.models.SmartDetectionCondition; import com.azure.ai.metricsadvisor.models.SuppressCondition; -import com.azure.ai.metricsadvisor.models.WebHook; +import com.azure.ai.metricsadvisor.models.WebNotificationHook; import com.azure.core.http.HttpPipeline; import com.azure.core.http.HttpPipelineBuilder; import com.azure.core.util.Context; @@ -100,8 +100,8 @@ public void createDataFeed() { .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) .setSchema(new DataFeedSchema( Arrays.asList( - new Metric().setName("metric1"), - new Metric().setName("metric2") + new DataFeedMetric().setName("metric1"), + new DataFeedMetric().setName("metric2") ) )) .setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse("2020-01-01T00:00:00Z"))) @@ -131,8 +131,8 @@ public void createDataFeedWithResponse() { .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) .setSchema(new DataFeedSchema( Arrays.asList( - new Metric().setName("metric1"), - new Metric().setName("metric2") + new DataFeedMetric().setName("metric1"), + new DataFeedMetric().setName("metric2") ) )) .setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse("2020-01-01T00:00:00Z"))) @@ -292,48 +292,50 @@ public void listDataFeedWithOptions() { } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#createHook(Hook)}. + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#createHook(NotificationHook)}. */ public void createHook() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createHook#Hook - Hook emailHook = new EmailHook("email hook") + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createHook#NotificationHook + NotificationHook emailNotificationHook = new EmailNotificationHook("email hook") .setDescription("my email hook") .addEmailToAlert("alertme@alertme.com") .setExternalLink("https://adwiki.azurewebsites.net/articles/howto/alerts/create-hooks.html"); - metricsAdvisorAdminAsyncClient.createHook(emailHook) + metricsAdvisorAdminAsyncClient.createHook(emailNotificationHook) .subscribe(hook -> { - EmailHook createdEmailHook = (EmailHook) hook; - System.out.printf("Hook Id: %s%n", createdEmailHook.getId()); - System.out.printf("Hook Name: %s%n", createdEmailHook.getName()); - System.out.printf("Hook Description: %s%n", createdEmailHook.getDescription()); - System.out.printf("Hook External Link: %s%n", createdEmailHook.getExternalLink()); - System.out.printf("Hook Emails: %s%n", String.join(",", createdEmailHook.getEmailsToAlert())); + EmailNotificationHook createdEmailHook = (EmailNotificationHook) hook; + System.out.printf("NotificationHook Id: %s%n", createdEmailHook.getId()); + System.out.printf("NotificationHook Name: %s%n", createdEmailHook.getName()); + System.out.printf("NotificationHook Description: %s%n", createdEmailHook.getDescription()); + System.out.printf("NotificationHook External Link: %s%n", createdEmailHook.getExternalLink()); + System.out.printf("NotificationHook Emails: %s%n", String.join(",", + createdEmailHook.getEmailsToAlert())); }); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createHook#Hook + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createHook#NotificationHook } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#createHookWithResponse(Hook)}. + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#createHookWithResponse(NotificationHook)}. */ public void createHookWithResponse() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createHookWithResponse#Hook - Hook emailHook = new EmailHook("email hook") + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createHookWithResponse#NotificationHook + NotificationHook emailNotificationHook = new EmailNotificationHook("email hook") .setDescription("my email hook") .addEmailToAlert("alertme@alertme.com") .setExternalLink("https://adwiki.azurewebsites.net/articles/howto/alerts/create-hooks.html"); - metricsAdvisorAdminAsyncClient.createHookWithResponse(emailHook) + metricsAdvisorAdminAsyncClient.createHookWithResponse(emailNotificationHook) .subscribe(response -> { System.out.printf("Response statusCode: %d%n", response.getStatusCode()); - EmailHook createdEmailHook = (EmailHook) response.getValue(); - System.out.printf("Hook Id: %s%n", createdEmailHook.getId()); - System.out.printf("Hook Name: %s%n", createdEmailHook.getName()); - System.out.printf("Hook Description: %s%n", createdEmailHook.getDescription()); - System.out.printf("Hook External Link: %s%n", createdEmailHook.getExternalLink()); - System.out.printf("Hook Emails: %s%n", String.join(",", createdEmailHook.getEmailsToAlert())); + EmailNotificationHook createdEmailHook = (EmailNotificationHook) response.getValue(); + System.out.printf("NotificationHook Id: %s%n", createdEmailHook.getId()); + System.out.printf("NotificationHook Name: %s%n", createdEmailHook.getName()); + System.out.printf("NotificationHook Description: %s%n", createdEmailHook.getDescription()); + System.out.printf("NotificationHook External Link: %s%n", createdEmailHook.getExternalLink()); + System.out.printf("NotificationHook Emails: %s%n", String.join(",", + createdEmailHook.getEmailsToAlert())); }); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createHookWithResponse#Hook + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createHookWithResponse#NotificationHook } /** @@ -344,21 +346,22 @@ public void getHook() { final String hookId = "f00853f1-6627-447f-bacf-8dccf2e86fed"; metricsAdvisorAdminAsyncClient.getHook(hookId) .subscribe(hook -> { - if (hook instanceof EmailHook) { - EmailHook emailHook = (EmailHook) hook; - System.out.printf("Hook Id: %s%n", emailHook.getId()); - System.out.printf("Hook Name: %s%n", emailHook.getName()); - System.out.printf("Hook Description: %s%n", emailHook.getDescription()); - System.out.printf("Hook External Link: %s%n", emailHook.getExternalLink()); - System.out.printf("Hook Emails: %s%n", String.join(",", emailHook.getEmailsToAlert())); - } else if (hook instanceof WebHook) { - WebHook webHook = (WebHook) hook; - System.out.printf("Hook Id: %s%n", webHook.getId()); - System.out.printf("Hook Name: %s%n", webHook.getName()); - System.out.printf("Hook Description: %s%n", webHook.getDescription()); - System.out.printf("Hook External Link: %s%n", webHook.getExternalLink()); - System.out.printf("Hook Endpoint: %s%n", webHook.getEndpoint()); - System.out.printf("Hook Headers: %s%n", webHook.getHttpHeaders()); + if (hook instanceof EmailNotificationHook) { + EmailNotificationHook emailHook = (EmailNotificationHook) hook; + System.out.printf("Email Hook Id: %s%n", emailHook.getId()); + System.out.printf("Email Hook Name: %s%n", emailHook.getName()); + System.out.printf("Email Hook Description: %s%n", emailHook.getDescription()); + System.out.printf("Email Hook External Link: %s%n", emailHook.getExternalLink()); + System.out.printf("Email Hook Emails: %s%n", String.join(",", + emailHook.getEmailsToAlert())); + } else if (hook instanceof WebNotificationHook) { + WebNotificationHook webHook = (WebNotificationHook) hook; + System.out.printf("Web Hook Id: %s%n", webHook.getId()); + System.out.printf("Web Hook Name: %s%n", webHook.getName()); + System.out.printf("Web Hook Description: %s%n", webHook.getDescription()); + System.out.printf("Web Hook External Link: %s%n", webHook.getExternalLink()); + System.out.printf("Web Hook Endpoint: %s%n", webHook.getEndpoint()); + System.out.printf("Web Hook Headers: %s%n", webHook.getHttpHeaders()); } }); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getHook#String @@ -373,36 +376,36 @@ public void getHookWithResponse() { metricsAdvisorAdminAsyncClient.getHookWithResponse(hookId) .subscribe(response -> { System.out.printf("Response status code: %d%n", response.getStatusCode()); - Hook hook = response.getValue(); - if (hook instanceof EmailHook) { - EmailHook emailHook = (EmailHook) hook; - System.out.printf("Hook Id: %s%n", emailHook.getId()); - System.out.printf("Hook Name: %s%n", emailHook.getName()); - System.out.printf("Hook Description: %s%n", emailHook.getDescription()); - System.out.printf("Hook External Link: %s%n", emailHook.getExternalLink()); - System.out.printf("Hook Emails: %s%n", String.join(",", emailHook.getEmailsToAlert())); - } else if (hook instanceof WebHook) { - WebHook webHook = (WebHook) hook; - System.out.printf("Hook Id: %s%n", webHook.getId()); - System.out.printf("Hook Name: %s%n", webHook.getName()); - System.out.printf("Hook Description: %s%n", webHook.getDescription()); - System.out.printf("Hook External Link: %s%n", webHook.getExternalLink()); - System.out.printf("Hook Endpoint: %s%n", webHook.getEndpoint()); - System.out.printf("Hook Headers: %s%n", webHook.getHttpHeaders()); + NotificationHook notificationHook = response.getValue(); + if (notificationHook instanceof EmailNotificationHook) { + EmailNotificationHook emailHook = (EmailNotificationHook) notificationHook; + System.out.printf("Email Hook Id: %s%n", emailHook.getId()); + System.out.printf("Email Hook Name: %s%n", emailHook.getName()); + System.out.printf("Email Hook Description: %s%n", emailHook.getDescription()); + System.out.printf("Email Hook External Link: %s%n", emailHook.getExternalLink()); + System.out.printf("Email Hook Emails: %s%n", String.join(",", emailHook.getEmailsToAlert())); + } else if (notificationHook instanceof WebNotificationHook) { + WebNotificationHook webHook = (WebNotificationHook) notificationHook; + System.out.printf("Web Hook Id: %s%n", webHook.getId()); + System.out.printf("Web Hook Name: %s%n", webHook.getName()); + System.out.printf("Web Hook Description: %s%n", webHook.getDescription()); + System.out.printf("Web Hook External Link: %s%n", webHook.getExternalLink()); + System.out.printf("Web Hook Endpoint: %s%n", webHook.getEndpoint()); + System.out.printf("Web Hook Headers: %s%n", webHook.getHttpHeaders()); } }); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getHookWithResponse#String } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#updateHook(Hook)}. + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#updateHook(NotificationHook)}. */ public void updateHook() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateHook#Hook + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateHook#NotificationHook final String emailHookId = "f00853f1-6627-447f-bacf-8dccf2e86fed"; metricsAdvisorAdminAsyncClient.getHook(emailHookId) .flatMap(hook -> { - EmailHook emailHook = (EmailHook) hook; + EmailNotificationHook emailHook = (EmailNotificationHook) hook; emailHook .removeEmailToAlert("alertme@alertme.com") .addEmailToAlert("alertme2@alertme.com") @@ -410,25 +413,25 @@ public void updateHook() { return metricsAdvisorAdminAsyncClient.updateHook(emailHook); }) .subscribe(hook -> { - EmailHook emailHook = (EmailHook) hook; - System.out.printf("Hook Id: %s%n", emailHook.getId()); - System.out.printf("Hook Name: %s%n", emailHook.getName()); - System.out.printf("Hook Description: %s%n", emailHook.getDescription()); - System.out.printf("Hook External Link: %s%n", emailHook.getExternalLink()); - System.out.printf("Hook Emails: %s%n", String.join(",", emailHook.getEmailsToAlert())); + EmailNotificationHook emailHook = (EmailNotificationHook) hook; + System.out.printf("Email Hook Id: %s%n", emailHook.getId()); + System.out.printf("Email Hook Name: %s%n", emailHook.getName()); + System.out.printf("Email Hook Description: %s%n", emailHook.getDescription()); + System.out.printf("Email Hook External Link: %s%n", emailHook.getExternalLink()); + System.out.printf("Email Hook Emails: %s%n", String.join(",", emailHook.getEmailsToAlert())); }); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateHook#Hook + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateHook#NotificationHook } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#updateHookWithResponse(Hook)}. + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#updateHookWithResponse(NotificationHook)}. */ public void updateHookWithResponse() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateHookWithResponse#Hook + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateHookWithResponse#NotificationHook final String emailHookId = "f00853f1-6627-447f-bacf-8dccf2e86fed"; metricsAdvisorAdminAsyncClient.getHookWithResponse(emailHookId) .flatMap(response -> { - EmailHook emailHook = (EmailHook) response.getValue(); + EmailNotificationHook emailHook = (EmailNotificationHook) response.getValue(); emailHook .removeEmailToAlert("alertme@alertme.com") .addEmailToAlert("alertme2@alertme.com") @@ -437,14 +440,14 @@ public void updateHookWithResponse() { }) .subscribe(response -> { System.out.printf("Response statusCode: %d%n", response.getStatusCode()); - EmailHook emailHook = (EmailHook) response.getValue(); - System.out.printf("Hook Id: %s%n", emailHook.getId()); - System.out.printf("Hook Name: %s%n", emailHook.getName()); - System.out.printf("Hook Description: %s%n", emailHook.getDescription()); - System.out.printf("Hook External Link: %s%n", emailHook.getExternalLink()); - System.out.printf("Hook Emails: %s%n", String.join(",", emailHook.getEmailsToAlert())); + EmailNotificationHook emailHook = (EmailNotificationHook) response.getValue(); + System.out.printf("Email Hook Id: %s%n", emailHook.getId()); + System.out.printf("Email Hook Name: %s%n", emailHook.getName()); + System.out.printf("Email Hook Description: %s%n", emailHook.getDescription()); + System.out.printf("Email Hook External Link: %s%n", emailHook.getExternalLink()); + System.out.printf("Email Hook Emails: %s%n", String.join(",", emailHook.getEmailsToAlert())); }); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateHookWithResponse#Hook + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateHookWithResponse#NotificationHook } /** @@ -477,21 +480,21 @@ public void listHooks() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listHooks metricsAdvisorAdminAsyncClient.listHooks() .subscribe(hook -> { - if (hook instanceof EmailHook) { - EmailHook emailHook = (EmailHook) hook; - System.out.printf("Hook Id: %s%n", emailHook.getId()); - System.out.printf("Hook Name: %s%n", emailHook.getName()); - System.out.printf("Hook Description: %s%n", emailHook.getDescription()); - System.out.printf("Hook External Link: %s%n", emailHook.getExternalLink()); - System.out.printf("Hook Emails: %s%n", String.join(",", emailHook.getEmailsToAlert())); - } else if (hook instanceof WebHook) { - WebHook webHook = (WebHook) hook; - System.out.printf("Hook Id: %s%n", webHook.getId()); - System.out.printf("Hook Name: %s%n", webHook.getName()); - System.out.printf("Hook Description: %s%n", webHook.getDescription()); - System.out.printf("Hook External Link: %s%n", webHook.getExternalLink()); - System.out.printf("Hook Endpoint: %s%n", webHook.getEndpoint()); - System.out.printf("Hook Headers: %s%n", webHook.getHttpHeaders()); + if (hook instanceof EmailNotificationHook) { + EmailNotificationHook emailHook = (EmailNotificationHook) hook; + System.out.printf("Email Hook Id: %s%n", emailHook.getId()); + System.out.printf("Email Hook Name: %s%n", emailHook.getName()); + System.out.printf("Email Hook Description: %s%n", emailHook.getDescription()); + System.out.printf("Email Hook External Link: %s%n", emailHook.getExternalLink()); + System.out.printf("Email Hook Emails: %s%n", String.join(",", emailHook.getEmailsToAlert())); + } else if (hook instanceof WebNotificationHook) { + WebNotificationHook webHook = (WebNotificationHook) hook; + System.out.printf("Web Hook Id: %s%n", webHook.getId()); + System.out.printf("Web Hook Name: %s%n", webHook.getName()); + System.out.printf("Web Hook Description: %s%n", webHook.getDescription()); + System.out.printf("Web Hook External Link: %s%n", webHook.getExternalLink()); + System.out.printf("Web Hook Endpoint: %s%n", webHook.getEndpoint()); + System.out.printf("Web Hook Headers: %s%n", webHook.getHttpHeaders()); } }); // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listHooks @@ -509,24 +512,24 @@ public void listHooksWithOptions() { metricsAdvisorAdminAsyncClient.listHooks(options).byPage() .subscribe(hookPage -> { System.out.printf("Page: %d%n", pageCount[0]++); - for (Hook hook : hookPage.getElements()) { - if (hook instanceof EmailHook) { - EmailHook emailHook = (EmailHook) hook; - System.out.printf("Hook Id: %s%n", emailHook.getId()); - System.out.printf("Hook Name: %s%n", emailHook.getName()); - System.out.printf("Hook Description: %s%n", emailHook.getDescription()); - System.out.printf("Hook External Link: %s%n", emailHook.getExternalLink()); - System.out.printf("Hook Emails: %s%n", String.join(",", emailHook.getEmailsToAlert())); - System.out.printf("Hook Admins: %s%n", String.join(",", emailHook.getAdminEmails())); - } else if (hook instanceof WebHook) { - WebHook webHook = (WebHook) hook; - System.out.printf("Hook Id: %s%n", webHook.getId()); - System.out.printf("Hook Name: %s%n", webHook.getName()); - System.out.printf("Hook Description: %s%n", webHook.getDescription()); - System.out.printf("Hook External Link: %s%n", webHook.getExternalLink()); - System.out.printf("Hook Endpoint: %s%n", webHook.getEndpoint()); - System.out.printf("Hook Headers: %s%n", webHook.getHttpHeaders()); - System.out.printf("Hook Admins: %s%n", String.join(",", webHook.getAdminEmails())); + for (NotificationHook notificationHook : hookPage.getElements()) { + if (notificationHook instanceof EmailNotificationHook) { + EmailNotificationHook emailHook = (EmailNotificationHook) notificationHook; + System.out.printf("Email Hook Id: %s%n", emailHook.getId()); + System.out.printf("Email Hook Name: %s%n", emailHook.getName()); + System.out.printf("Email Hook Description: %s%n", emailHook.getDescription()); + System.out.printf("Email Hook External Link: %s%n", emailHook.getExternalLink()); + System.out.printf("Email Hook Emails: %s%n", String.join(",", emailHook.getEmailsToAlert())); + System.out.printf("Email Hook Admins: %s%n", String.join(",", emailHook.getAdminEmails())); + } else if (notificationHook instanceof WebNotificationHook) { + WebNotificationHook webHook = (WebNotificationHook) notificationHook; + System.out.printf("Web Hook Id: %s%n", webHook.getId()); + System.out.printf("Web Hook Name: %s%n", webHook.getName()); + System.out.printf("Web Hook Description: %s%n", webHook.getDescription()); + System.out.printf("Web Hook External Link: %s%n", webHook.getExternalLink()); + System.out.printf("Web Hook Endpoint: %s%n", webHook.getEndpoint()); + System.out.printf("Web Hook Headers: %s%n", webHook.getHttpHeaders()); + System.out.printf("Web Hook Admins: %s%n", String.join(",", webHook.getAdminEmails())); } } }); @@ -613,10 +616,10 @@ public void getDataFeedIngestionProgressWithResponse() { } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#createMetricAnomalyDetectionConfiguration(String, AnomalyDetectionConfiguration)}. + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#createMetricAnomalyDetectionConfig(String, AnomalyDetectionConfiguration)}. */ public void createDetectionConfiguration() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createMetricAnomalyDetectionConfiguration#String-AnomalyDetectionConfiguration + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createMetricAnomalyDetectionConfig#String-AnomalyDetectionConfiguration final MetricWholeSeriesDetectionCondition wholeSeriesCondition = new MetricWholeSeriesDetectionCondition() .setCrossConditionOperator(DetectionConditionsOperator.OR) .setSmartDetectionCondition(new SmartDetectionCondition() @@ -644,21 +647,21 @@ public void createDetectionConfiguration() { final String metricId = "0b836da8-10e6-46cd-8f4f-28262e113a62"; metricsAdvisorAdminAsyncClient - .createMetricAnomalyDetectionConfiguration(metricId, detectionConfig) + .createMetricAnomalyDetectionConfig(metricId, detectionConfig) .subscribe(createdDetectionConfig -> { System.out.printf("Detection config Id: %s%n", createdDetectionConfig.getId()); System.out.printf("Name: %s%n", createdDetectionConfig.getName()); System.out.printf("Description: %s%n", createdDetectionConfig.getDescription()); System.out.printf("MetricId: %s%n", createdDetectionConfig.getMetricId()); }); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createMetricAnomalyDetectionConfiguration#String-AnomalyDetectionConfiguration + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createMetricAnomalyDetectionConfig#String-AnomalyDetectionConfiguration } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#createMetricAnomalyDetectionConfigurationWithResponse(String, AnomalyDetectionConfiguration)}. + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#createMetricAnomalyDetectionConfigWithResponse(String, AnomalyDetectionConfiguration)}. */ public void createDetectionConfigurationWithResponse() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createMetricAnomalyDetectionConfigurationWithResponse#String-AnomalyDetectionConfiguration + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createMetricAnomalyDetectionConfigWithResponse#String-AnomalyDetectionConfiguration final MetricWholeSeriesDetectionCondition wholeSeriesCondition = new MetricWholeSeriesDetectionCondition() .setCrossConditionOperator(DetectionConditionsOperator.OR) .setSmartDetectionCondition(new SmartDetectionCondition() @@ -686,7 +689,7 @@ public void createDetectionConfigurationWithResponse() { final String metricId = "0b836da8-10e6-46cd-8f4f-28262e113a62"; metricsAdvisorAdminAsyncClient - .createMetricAnomalyDetectionConfigurationWithResponse(metricId, detectionConfig) + .createMetricAnomalyDetectionConfigWithResponse(metricId, detectionConfig) .subscribe(response -> { System.out.printf("Response statusCode: %d%n", response.getStatusCode()); AnomalyDetectionConfiguration createdDetectionConfig = response.getValue(); @@ -695,17 +698,17 @@ public void createDetectionConfigurationWithResponse() { System.out.printf("Description: %s%n", createdDetectionConfig.getDescription()); System.out.printf("MetricId: %s%n", createdDetectionConfig.getMetricId()); }); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createMetricAnomalyDetectionConfigurationWithResponse#String-AnomalyDetectionConfiguration + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createMetricAnomalyDetectionConfigWithResponse#String-AnomalyDetectionConfiguration } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#getMetricAnomalyDetectionConfiguration(String)}. + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#getMetricAnomalyDetectionConfig(String)}. */ public void getDetectionConfiguration() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getMetricAnomalyDetectionConfiguration#String + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getMetricAnomalyDetectionConfig#String final String detectionConfigId = "7b8069a1-1564-46da-9f50-b5d0dd9129ab"; metricsAdvisorAdminAsyncClient - .getMetricAnomalyDetectionConfiguration(detectionConfigId) + .getMetricAnomalyDetectionConfig(detectionConfigId) .subscribe(detectionConfig -> { System.out.printf("Detection config Id: %s%n", detectionConfig.getId()); System.out.printf("Name: %s%n", detectionConfig.getName()); @@ -872,17 +875,17 @@ public void getDetectionConfiguration() { .getSuppressCondition().getMinRatio()); } }); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getMetricAnomalyDetectionConfiguration#String + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getMetricAnomalyDetectionConfig#String } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#getMetricAnomalyDetectionConfigurationWithResponse(String)}. + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#getMetricAnomalyDetectionConfigWithResponse(String)}. */ public void getDetectionConfigurationWithResponse() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getMetricAnomalyDetectionConfigurationWithResponse#String + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getMetricAnomalyDetectionConfigWithResponse#String final String detectionConfigId = "7b8069a1-1564-46da-9f50-b5d0dd9129ab"; metricsAdvisorAdminAsyncClient - .getMetricAnomalyDetectionConfigurationWithResponse(detectionConfigId) + .getMetricAnomalyDetectionConfigWithResponse(detectionConfigId) .subscribe(response -> { System.out.printf("Response statusCode: %d%n", response.getStatusCode()); @@ -1052,33 +1055,33 @@ public void getDetectionConfigurationWithResponse() { .getSuppressCondition().getMinRatio()); } }); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getMetricAnomalyDetectionConfigurationWithResponse#String + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getMetricAnomalyDetectionConfigWithResponse#String } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#listMetricAnomalyDetectionConfigurations(String)}. + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#listMetricAnomalyDetectionConfigs(String)}. */ public void listDetectionConfigurations() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listMetricAnomalyDetectionConfigurations#String + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listMetricAnomalyDetectionConfigs#String final String metricId = "0b836da8-10e6-46cd-8f4f-28262e113a62"; - metricsAdvisorAdminAsyncClient.listMetricAnomalyDetectionConfigurations(metricId) + metricsAdvisorAdminAsyncClient.listMetricAnomalyDetectionConfigs(metricId) .subscribe(detectionConfig -> { System.out.printf("Detection config Id: %s%n", detectionConfig.getId()); System.out.printf("Name: %s%n", detectionConfig.getName()); System.out.printf("Description: %s%n", detectionConfig.getDescription()); System.out.printf("MetricId: %s%n", detectionConfig.getMetricId()); }); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listMetricAnomalyDetectionConfigurations#String + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listMetricAnomalyDetectionConfigs#String } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#updateMetricAnomalyDetectionConfiguration(AnomalyDetectionConfiguration)}. + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#updateMetricAnomalyDetectionConfig(AnomalyDetectionConfiguration)}. */ public void updateDetectionConfiguration() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateMetricAnomalyDetectionConfiguration#AnomalyDetectionConfiguration + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateMetricAnomalyDetectionConfig#AnomalyDetectionConfiguration final String detectionConfigId = "7b8069a1-1564-46da-9f50-b5d0dd9129ab"; metricsAdvisorAdminAsyncClient - .getMetricAnomalyDetectionConfiguration(detectionConfigId) + .getMetricAnomalyDetectionConfig(detectionConfigId) .flatMap(detectionConfig -> { detectionConfig.setName("updated config name"); detectionConfig.setDescription("updated with more detection conditions"); @@ -1092,7 +1095,7 @@ public void updateDetectionConfiguration() { .setAnomalyDetectorDirection(AnomalyDetectorDirection.UP) .setSuppressCondition(new SuppressCondition().setMinNumber(2).setMinRatio(2)))); return metricsAdvisorAdminAsyncClient - .updateMetricAnomalyDetectionConfiguration(detectionConfig); + .updateMetricAnomalyDetectionConfig(detectionConfig); }) .subscribe(updatedDetectionConfig -> { System.out.printf("Detection config Id: %s%n", updatedDetectionConfig.getId()); @@ -1100,17 +1103,17 @@ public void updateDetectionConfiguration() { System.out.printf("Description: %s%n", updatedDetectionConfig.getDescription()); System.out.printf("MetricId: %s%n", updatedDetectionConfig.getMetricId()); }); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateMetricAnomalyDetectionConfiguration#AnomalyDetectionConfiguration + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateMetricAnomalyDetectionConfig#AnomalyDetectionConfiguration } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#updateMetricAnomalyDetectionConfigurationWithResponse(AnomalyDetectionConfiguration)} + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#updateMetricAnomalyDetectionConfigWithResponse(AnomalyDetectionConfiguration)} */ public void updateDetectionConfigurationWithResponse() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateMetricAnomalyDetectionConfigurationWithResponse#AnomalyDetectionConfiguration + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateMetricAnomalyDetectionConfigWithResponse#AnomalyDetectionConfiguration final String detectionConfigId = "7b8069a1-1564-46da-9f50-b5d0dd9129ab"; metricsAdvisorAdminAsyncClient - .getMetricAnomalyDetectionConfigurationWithResponse(detectionConfigId) + .getMetricAnomalyDetectionConfigWithResponse(detectionConfigId) .flatMap(response -> { AnomalyDetectionConfiguration detectionConfig = response.getValue(); detectionConfig.setName("updated config name"); @@ -1124,7 +1127,7 @@ public void updateDetectionConfigurationWithResponse() { .setAnomalyDetectorDirection(AnomalyDetectorDirection.UP) .setSuppressCondition(new SuppressCondition().setMinNumber(2).setMinRatio(2)))); return metricsAdvisorAdminAsyncClient - .updateMetricAnomalyDetectionConfigurationWithResponse(detectionConfig); + .updateMetricAnomalyDetectionConfigWithResponse(detectionConfig); }) .subscribe(response -> { AnomalyDetectionConfiguration updatedDetectionConfig = response.getValue(); @@ -1133,46 +1136,46 @@ public void updateDetectionConfigurationWithResponse() { System.out.printf("Description: %s%n", updatedDetectionConfig.getDescription()); System.out.printf("MetricId: %s%n", updatedDetectionConfig.getMetricId()); }); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateMetricAnomalyDetectionConfigurationWithResponse#AnomalyDetectionConfiguration + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateMetricAnomalyDetectionConfigWithResponse#AnomalyDetectionConfiguration } /** * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#deleteMetricAnomalyDetectionConfiguration(String)}. */ public void deleteDetectionConfiguration() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteMetricAnomalyDetectionConfiguration#String + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteMetricAnomalyDetectionConfig#String final String detectionConfigId = "7b8069a1-1564-46da-9f50-b5d0dd9129ab"; metricsAdvisorAdminAsyncClient .deleteMetricAnomalyDetectionConfiguration(detectionConfigId) .subscribe(); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteMetricAnomalyDetectionConfiguration#String + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteMetricAnomalyDetectionConfig#String } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#deleteMetricAnomalyDetectionConfigurationWithResponse(String)}. + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#deleteMetricAnomalyDetectionConfigWithResponse(String)}. */ public void deleteDetectionConfigurationWithResponse() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteMetricAnomalyDetectionConfigurationWithResponse#String + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteMetricAnomalyDetectionConfigWithResponse#String final String detectionConfigId = "7b8069a1-1564-46da-9f50-b5d0dd9129ab"; metricsAdvisorAdminAsyncClient - .deleteMetricAnomalyDetectionConfigurationWithResponse(detectionConfigId) + .deleteMetricAnomalyDetectionConfigWithResponse(detectionConfigId) .subscribe(response -> System.out.printf("Response statusCode: %d%n", response.getStatusCode())); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteMetricAnomalyDetectionConfigurationWithResponse#String + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteMetricAnomalyDetectionConfigWithResponse#String } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#createAnomalyAlertConfiguration(AnomalyAlertConfiguration)} + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#createAnomalyAlertConfig(AnomalyAlertConfiguration)} */ public void createAnomalyAlertConfiguration() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createAnomalyAlertConfiguration#AnomalyAlertConfiguration + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createAnomalyAlertConfig#AnomalyAlertConfiguration String detectionConfigurationId1 = "9ol48er30-6e6e-4391-b78f-b00dfee1e6f5"; String detectionConfigurationId2 = "3e58er30-6e6e-4391-b78f-b00dfee1e6f5"; String hookId1 = "5f48er30-6e6e-4391-b78f-b00dfee1e6f5"; String hookId2 = "8i48er30-6e6e-4391-b78f-b00dfee1e6f5"; - metricsAdvisorAdminAsyncClient.createAnomalyAlertConfiguration( - new AnomalyAlertConfiguration("My Alert config name") + metricsAdvisorAdminAsyncClient.createAnomalyAlertConfig( + new AnomalyAlertConfiguration("My AnomalyAlert config name") .setDescription("alert config description") .setMetricAlertConfigurations(Arrays.asList( new MetricAnomalyAlertConfiguration(detectionConfigurationId1, @@ -1180,34 +1183,34 @@ public void createAnomalyAlertConfiguration() { new MetricAnomalyAlertConfiguration(detectionConfigurationId2, MetricAnomalyAlertScope.forWholeSeries()) .setAlertConditions(new MetricAnomalyAlertConditions() - .setSeverityRangeCondition(new SeverityCondition().setMaxAlertSeverity(Severity.HIGH))))) + .setSeverityRangeCondition(new SeverityCondition().setMaxAlertSeverity(AnomalySeverity.HIGH))))) .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.AND) .setIdOfHooksToAlert(Arrays.asList(hookId1, hookId2))) .subscribe(anomalyAlertConfiguration -> { - System.out.printf("Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); - System.out.printf("Anomaly alert configuration description: %s%n", + System.out.printf("DataPoint Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); + System.out.printf("DataPoint Anomaly alert configuration description: %s%n", anomalyAlertConfiguration.getDescription()); - System.out.printf("Anomaly alert configuration hook ids: %s%n", + System.out.printf("DataPoint Anomaly alert configuration hook ids: %s%n", anomalyAlertConfiguration.getIdOfHooksToAlert()); - System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", + System.out.printf("DataPoint Anomaly alert configuration cross metrics operator: %s%n", anomalyAlertConfiguration.getCrossMetricsOperator().toString()); }); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createAnomalyAlertConfiguration#AnomalyAlertConfiguration + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createAnomalyAlertConfig#AnomalyAlertConfiguration } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#createAnomalyAlertConfigurationWithResponse(AnomalyAlertConfiguration)} + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#createAnomalyAlertConfigWithResponse(AnomalyAlertConfiguration)} */ public void createAnomalyAlertConfigurationWithResponse() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createAnomalyAlertConfigurationWithResponse#AnomalyAlertConfiguration + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createAnomalyAlertConfigWithResponse#AnomalyAlertConfiguration String detectionConfigurationId1 = "9ol48er30-6e6e-4391-b78f-b00dfee1e6f5"; String detectionConfigurationId2 = "3e58er30-6e6e-4391-b78f-b00dfee1e6f5"; String hookId1 = "5f48er30-6e6e-4391-b78f-b00dfee1e6f5"; String hookId2 = "8i48er30-6e6e-4391-b78f-b00dfee1e6f5"; - metricsAdvisorAdminAsyncClient.createAnomalyAlertConfigurationWithResponse( - new AnomalyAlertConfiguration("My Alert config name") + metricsAdvisorAdminAsyncClient.createAnomalyAlertConfigWithResponse( + new AnomalyAlertConfiguration("My AnomalyAlert config name") .setDescription("alert config description") .setMetricAlertConfigurations(Arrays.asList( new MetricAnomalyAlertConfiguration(detectionConfigurationId1, @@ -1215,79 +1218,79 @@ public void createAnomalyAlertConfigurationWithResponse() { new MetricAnomalyAlertConfiguration(detectionConfigurationId2, MetricAnomalyAlertScope.forWholeSeries()) .setAlertConditions(new MetricAnomalyAlertConditions() - .setSeverityRangeCondition(new SeverityCondition().setMaxAlertSeverity(Severity.HIGH))))) + .setSeverityRangeCondition(new SeverityCondition().setMaxAlertSeverity(AnomalySeverity.HIGH))))) .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.AND) .setIdOfHooksToAlert(Arrays.asList(hookId1, hookId2))) .subscribe(alertConfigurationResponse -> { - System.out.printf("Anomaly alert creation operation status: %s%n", + System.out.printf("DataPoint Anomaly alert creation operation status: %s%n", alertConfigurationResponse.getStatusCode()); final AnomalyAlertConfiguration anomalyAlertConfiguration = alertConfigurationResponse.getValue(); - System.out.printf("Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); - System.out.printf("Anomaly alert configuration description: %s%n", + System.out.printf("DataPoint Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); + System.out.printf("DataPoint Anomaly alert configuration description: %s%n", anomalyAlertConfiguration.getDescription()); - System.out.printf("Anomaly alert configuration hook ids: %s%n", + System.out.printf("DataPoint Anomaly alert configuration hook ids: %s%n", anomalyAlertConfiguration.getIdOfHooksToAlert()); - System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", + System.out.printf("DataPoint Anomaly alert configuration cross metrics operator: %s%n", anomalyAlertConfiguration.getCrossMetricsOperator().toString()); }); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createAnomalyAlertConfigurationWithResponse#AnomalyAlertConfiguration + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.createAnomalyAlertConfigWithResponse#AnomalyAlertConfiguration } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#getAnomalyAlertConfiguration(String)} + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#getAnomalyAlertConfig(String)} */ public void getAnomalyAlertConfiguration() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getAnomalyAlertConfiguration#String + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getAnomalyAlertConfig#String String alertConfigId = "1p0f8er30-6e6e-4391-b78f-bpfdfee1e6f5"; - metricsAdvisorAdminAsyncClient.getAnomalyAlertConfiguration(alertConfigId) + metricsAdvisorAdminAsyncClient.getAnomalyAlertConfig(alertConfigId) .subscribe(anomalyAlertConfiguration -> { - System.out.printf("Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); - System.out.printf("Anomaly alert configuration description: %s%n", + System.out.printf("DataPoint Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); + System.out.printf("DataPoint Anomaly alert configuration description: %s%n", anomalyAlertConfiguration.getDescription()); - System.out.printf("Anomaly alert configuration hook ids: %s%n", + System.out.printf("DataPoint Anomaly alert configuration hook ids: %s%n", anomalyAlertConfiguration.getIdOfHooksToAlert()); - System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", + System.out.printf("DataPoint Anomaly alert configuration cross metrics operator: %s%n", anomalyAlertConfiguration.getCrossMetricsOperator().toString()); }); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getAnomalyAlertConfiguration#String + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getAnomalyAlertConfig#String } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#getAnomalyAlertConfigurationWithResponse(String)} + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#getAnomalyAlertConfigWithResponse(String)} */ public void getAnomalyAlertConfigurationWithResponse() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getAnomalyAlertConfigurationWithResponse#String + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getAnomalyAlertConfigWithResponse#String String alertConfigId = "1p0f8er30-6e6e-4391-b78f-bpfdfee1e6f5"; - metricsAdvisorAdminAsyncClient.getAnomalyAlertConfigurationWithResponse(alertConfigId) + metricsAdvisorAdminAsyncClient.getAnomalyAlertConfigWithResponse(alertConfigId) .subscribe(alertConfigurationResponse -> { - System.out.printf("Anomaly alert creation operation status: %s%n", + System.out.printf("DataPointAnomaly alert creation operation status: %s%n", alertConfigurationResponse.getStatusCode()); final AnomalyAlertConfiguration anomalyAlertConfiguration = alertConfigurationResponse.getValue(); - System.out.printf("Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); - System.out.printf("Anomaly alert configuration description: %s%n", + System.out.printf("DataPoint Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); + System.out.printf("DataPoint Anomaly alert configuration description: %s%n", anomalyAlertConfiguration.getDescription()); - System.out.printf("Anomaly alert configuration hook ids: %s%n", + System.out.printf("DataPoint Anomaly alert configuration hook ids: %s%n", anomalyAlertConfiguration.getIdOfHooksToAlert()); - System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", + System.out.printf("DataPoint Anomaly alert configuration cross metrics operator: %s%n", anomalyAlertConfiguration.getCrossMetricsOperator().toString()); }); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getAnomalyAlertConfigurationWithResponse#String + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.getAnomalyAlertConfigWithResponse#String } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#updateAnomalyAlertConfiguration(AnomalyAlertConfiguration)} + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#updateAnomalyAlertConfig(AnomalyAlertConfiguration)} */ public void updateAnomalyAlertConfiguration() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateAnomalyAlertConfiguration#AnomalyAlertConfiguration + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateAnomalyAlertConfig#AnomalyAlertConfiguration String alertConfigId = "1p0f8er30-6e6e-4391-b78f-bpfdfee1e6f5"; String additionalHookId = "2gh8er30-6e6e-4391-b78f-bpfdfee1e6f5"; - metricsAdvisorAdminAsyncClient.getAnomalyAlertConfiguration(alertConfigId) + metricsAdvisorAdminAsyncClient.getAnomalyAlertConfig(alertConfigId) .flatMap(existingAnomalyConfig -> { - return metricsAdvisorAdminAsyncClient.updateAnomalyAlertConfiguration( + return metricsAdvisorAdminAsyncClient.updateAnomalyAlertConfig( existingAnomalyConfig .addIdOfHookToAlert(additionalHookId) .setDescription("updated to add more hook ids")); @@ -1299,21 +1302,21 @@ public void updateAnomalyAlertConfiguration() { System.out.printf("Updated anomaly alert configuration hook ids: %s%n", updateAnomalyAlertConfiguration.getIdOfHooksToAlert()); }); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateAnomalyAlertConfiguration#AnomalyAlertConfiguration + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateAnomalyAlertConfig#AnomalyAlertConfiguration } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#updateAnomalyAlertConfigurationWithResponse(AnomalyAlertConfiguration)} + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#updateAnomalyAlertConfigWithResponse(AnomalyAlertConfiguration)} */ public void updateAnomalyAlertConfigurationWithResponse() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateAnomalyAlertConfigurationWithResponse#AnomalyAlertConfiguration + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateAnomalyAlertConfigWithResponse#AnomalyAlertConfiguration String alertConfigId = "1p0f8er30-6e6e-4391-b78f-bpfdfee1e6f5"; String additionalHookId = "2gh8er30-6e6e-4391-b78f-bpfdfee1e6f5"; - metricsAdvisorAdminAsyncClient.getAnomalyAlertConfiguration(alertConfigId) + metricsAdvisorAdminAsyncClient.getAnomalyAlertConfig(alertConfigId) .flatMap(existingAnomalyConfig -> { - return metricsAdvisorAdminAsyncClient.updateAnomalyAlertConfigurationWithResponse( + return metricsAdvisorAdminAsyncClient.updateAnomalyAlertConfigWithResponse( existingAnomalyConfig .addIdOfHookToAlert(additionalHookId) .setDescription("updated to add more hook ids")); @@ -1328,49 +1331,50 @@ public void updateAnomalyAlertConfigurationWithResponse() { System.out.printf("Updated anomaly alert configuration hook ids: %s%n", updatAnomalyAlertConfiguration.getIdOfHooksToAlert()); }); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateAnomalyAlertConfigurationWithResponse#AnomalyAlertConfiguration + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.updateAnomalyAlertConfigWithResponse#AnomalyAlertConfiguration } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#deleteAnomalyAlertConfiguration(String)}. + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#deleteAnomalyAlertConfig(String)}. */ public void deleteAnomalyAlertConfiguration() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteAnomalyAlertConfiguration#String + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteAnomalyAlertConfig#String String alertConfigId = "1p0f8er30-6e6e-4391-b78f-bpfdfee1e6f5"; - metricsAdvisorAdminAsyncClient.deleteAnomalyAlertConfiguration(alertConfigId); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteAnomalyAlertConfiguration#String + metricsAdvisorAdminAsyncClient.deleteAnomalyAlertConfig(alertConfigId); + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteAnomalyAlertConfig#String } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#deleteAnomalyAlertConfigurationWithResponse(String)} + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#deleteAnomalyAlertConfigWithResponse(String)} */ public void deleteAnomalyAlertConfigurationWithResponse() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteAnomalyAlertConfigurationWithResponse#String + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteAnomalyAlertConfigWithResponse#String String alertConfigId = "1p0f8er30-6e6e-4391-b78f-bpfdfee1e6f5"; - metricsAdvisorAdminAsyncClient.deleteAnomalyAlertConfigurationWithResponse(alertConfigId) + metricsAdvisorAdminAsyncClient.deleteAnomalyAlertConfigWithResponse(alertConfigId) .subscribe(response -> { - System.out.printf("Anomaly alert config delete operation status : %s%n", response.getStatusCode()); + System.out.printf("DataPoint Anomaly alert config delete operation status : %s%n", + response.getStatusCode()); }); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteAnomalyAlertConfigurationWithResponse#String + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.deleteAnomalyAlertConfigWithResponse#String } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#listAnomalyAlertConfigurations(String)}. + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#listAnomalyAlertConfigs(String)}. */ public void listAnomalyAlertConfigurations() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listAnomalyAlertConfigurations#String + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listAnomalyAlertConfigs#String String detectionConfigId = "3rt98er30-6e6e-4391-b78f-bpfdfee1e6f5"; - metricsAdvisorAdminAsyncClient.listAnomalyAlertConfigurations(detectionConfigId) + metricsAdvisorAdminAsyncClient.listAnomalyAlertConfigs(detectionConfigId) .subscribe(anomalyAlertConfiguration -> { - System.out.printf("Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); - System.out.printf("Anomaly alert configuration description: %s%n", + System.out.printf("DataPoint Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); + System.out.printf("DataPoint Anomaly alert configuration description: %s%n", anomalyAlertConfiguration.getDescription()); - System.out.printf("Anomaly alert configuration hook ids: %s%n", + System.out.printf("DataPoint Anomaly alert configuration hook ids: %s%n", anomalyAlertConfiguration.getIdOfHooksToAlert()); - System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", + System.out.printf("DataPoint Anomaly alert configuration cross metrics operator: %s%n", anomalyAlertConfiguration.getCrossMetricsOperator().toString()); }); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listAnomalyAlertConfigurations#String + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient.listAnomalyAlertConfigs#String } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClientJavaDocCodeSnippets.java index abc9eafa5bd1..89d91f727af7 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClientJavaDocCodeSnippets.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClientJavaDocCodeSnippets.java @@ -5,6 +5,7 @@ import com.azure.ai.metricsadvisor.models.AnomalyDetectionConfiguration; import com.azure.ai.metricsadvisor.models.AnomalyDetectorDirection; +import com.azure.ai.metricsadvisor.models.AnomalySeverity; import com.azure.ai.metricsadvisor.models.ChangeThresholdCondition; import com.azure.ai.metricsadvisor.models.AnomalyAlertConfiguration; import com.azure.ai.metricsadvisor.models.DataFeed; @@ -20,14 +21,14 @@ import com.azure.ai.metricsadvisor.models.DataFeedStatus; import com.azure.ai.metricsadvisor.models.DetectionConditionsOperator; import com.azure.ai.metricsadvisor.models.DimensionKey; -import com.azure.ai.metricsadvisor.models.EmailHook; +import com.azure.ai.metricsadvisor.models.EmailNotificationHook; import com.azure.ai.metricsadvisor.models.HardThresholdCondition; -import com.azure.ai.metricsadvisor.models.Hook; +import com.azure.ai.metricsadvisor.models.NotificationHook; import com.azure.ai.metricsadvisor.models.ListDataFeedFilter; import com.azure.ai.metricsadvisor.models.ListDataFeedIngestionOptions; import com.azure.ai.metricsadvisor.models.ListDataFeedOptions; import com.azure.ai.metricsadvisor.models.ListHookOptions; -import com.azure.ai.metricsadvisor.models.Metric; +import com.azure.ai.metricsadvisor.models.DataFeedMetric; import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConditions; import com.azure.ai.metricsadvisor.models.MetricSeriesGroupDetectionCondition; import com.azure.ai.metricsadvisor.models.MetricSingleSeriesDetectionCondition; @@ -37,11 +38,10 @@ import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertScope; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; import com.azure.ai.metricsadvisor.models.MySqlDataFeedSource; -import com.azure.ai.metricsadvisor.models.Severity; import com.azure.ai.metricsadvisor.models.SeverityCondition; import com.azure.ai.metricsadvisor.models.SmartDetectionCondition; import com.azure.ai.metricsadvisor.models.SuppressCondition; -import com.azure.ai.metricsadvisor.models.WebHook; +import com.azure.ai.metricsadvisor.models.WebNotificationHook; import com.azure.core.http.HttpPipeline; import com.azure.core.http.HttpPipelineBuilder; import com.azure.core.http.rest.PagedIterable; @@ -106,8 +106,8 @@ public void createDataFeed() { .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) .setSchema(new DataFeedSchema( Arrays.asList( - new Metric().setName("metric1"), - new Metric().setName("metric2") + new DataFeedMetric().setName("metric1"), + new DataFeedMetric().setName("metric2") ) )) .setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse("2020-01-01T00:00:00Z"))) @@ -136,8 +136,8 @@ public void createDataFeedWithResponse() { .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) .setSchema(new DataFeedSchema( Arrays.asList( - new Metric().setName("metric1"), - new Metric().setName("metric2") + new DataFeedMetric().setName("metric1"), + new DataFeedMetric().setName("metric2") ) )) .setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse("2020-01-01T00:00:00Z"))) @@ -285,44 +285,47 @@ public void listDataFeedWithOptions() { } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#createHook(Hook)}. + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#createHook(NotificationHook)}. */ public void createHook() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createHook#Hook - Hook emailHook = new EmailHook("email hook") - .setDescription("my email hook") + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createHook#NotificationHook + NotificationHook emailNotificationHook = new EmailNotificationHook("email notificationHook") + .setDescription("my email notificationHook") .addEmailToAlert("alertme@alertme.com") .setExternalLink("https://adwiki.azurewebsites.net/articles/howto/alerts/create-hooks.html"); - Hook hook = metricsAdvisorAdminClient.createHook(emailHook); - EmailHook createdEmailHook = (EmailHook) hook; - System.out.printf("Hook Id: %s%n", createdEmailHook.getId()); - System.out.printf("Hook Name: %s%n", createdEmailHook.getName()); - System.out.printf("Hook Description: %s%n", createdEmailHook.getDescription()); - System.out.printf("Hook External Link: %s%n", createdEmailHook.getExternalLink()); - System.out.printf("Hook Emails: %s%n", String.join(",", createdEmailHook.getEmailsToAlert())); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createHook#Hook + NotificationHook notificationHook = metricsAdvisorAdminClient.createHook(emailNotificationHook); + EmailNotificationHook createdEmailHook = (EmailNotificationHook) notificationHook; + System.out.printf("NotificationHook Id: %s%n", createdEmailHook.getId()); + System.out.printf("NotificationHook Name: %s%n", createdEmailHook.getName()); + System.out.printf("NotificationHook Description: %s%n", createdEmailHook.getDescription()); + System.out.printf("NotificationHook External Link: %s%n", createdEmailHook.getExternalLink()); + System.out.printf("NotificationHook Emails: %s%n", String.join(",", + createdEmailHook.getEmailsToAlert())); + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createHook#NotificationHook } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#createHookWithResponse(Hook)}. + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#createHookWithResponse(NotificationHook)}. */ public void createHookWithResponse() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createHookWithResponse#Hook-Context - Hook emailHook = new EmailHook("email hook") + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createHookWithResponse#NotificationHook-Context + NotificationHook emailNotificationHook = new EmailNotificationHook("email hook") .setDescription("my email hook") .addEmailToAlert("alertme@alertme.com") .setExternalLink("https://adwiki.azurewebsites.net/articles/howto/alerts/create-hooks.html"); - Response response = metricsAdvisorAdminClient.createHookWithResponse(emailHook, Context.NONE); + Response response + = metricsAdvisorAdminClient.createHookWithResponse(emailNotificationHook, Context.NONE); System.out.printf("Response statusCode: %d%n", response.getStatusCode()); - EmailHook createdEmailHook = (EmailHook) response.getValue(); - System.out.printf("Hook Id: %s%n", createdEmailHook.getId()); - System.out.printf("Hook Name: %s%n", createdEmailHook.getName()); - System.out.printf("Hook Description: %s%n", createdEmailHook.getDescription()); - System.out.printf("Hook External Link: %s%n", createdEmailHook.getExternalLink()); - System.out.printf("Hook Emails: %s%n", String.join(",", createdEmailHook.getEmailsToAlert())); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createHookWithResponse#Hook-Context + EmailNotificationHook createdEmailHook = (EmailNotificationHook) response.getValue(); + System.out.printf("NotificationHook Id: %s%n", createdEmailHook.getId()); + System.out.printf("NotificationHook Name: %s%n", createdEmailHook.getName()); + System.out.printf("NotificationHook Description: %s%n", createdEmailHook.getDescription()); + System.out.printf("NotificationHook External Link: %s%n", createdEmailHook.getExternalLink()); + System.out.printf("NotificationHook Emails: %s%n", String.join(",", + createdEmailHook.getEmailsToAlert())); + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createHookWithResponse#NotificationHook-Context } /** @@ -331,22 +334,22 @@ public void createHookWithResponse() { public void getHook() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getHook#String final String hookId = "f00853f1-6627-447f-bacf-8dccf2e86fed"; - Hook hook = metricsAdvisorAdminClient.getHook(hookId); - if (hook instanceof EmailHook) { - EmailHook emailHook = (EmailHook) hook; - System.out.printf("Hook Id: %s%n", emailHook.getId()); - System.out.printf("Hook Name: %s%n", emailHook.getName()); - System.out.printf("Hook Description: %s%n", emailHook.getDescription()); - System.out.printf("Hook External Link: %s%n", emailHook.getExternalLink()); - System.out.printf("Hook Emails: %s%n", String.join(",", emailHook.getEmailsToAlert())); - } else if (hook instanceof WebHook) { - WebHook webHook = (WebHook) hook; - System.out.printf("Hook Id: %s%n", webHook.getId()); - System.out.printf("Hook Name: %s%n", webHook.getName()); - System.out.printf("Hook Description: %s%n", webHook.getDescription()); - System.out.printf("Hook External Link: %s%n", webHook.getExternalLink()); - System.out.printf("Hook Endpoint: %s%n", webHook.getEndpoint()); - System.out.printf("Hook Headers: %s%n", webHook.getHttpHeaders()); + NotificationHook notificationHook = metricsAdvisorAdminClient.getHook(hookId); + if (notificationHook instanceof EmailNotificationHook) { + EmailNotificationHook emailHook = (EmailNotificationHook) notificationHook; + System.out.printf("NotificationHook Id: %s%n", emailHook.getId()); + System.out.printf("NotificationHook Name: %s%n", emailHook.getName()); + System.out.printf("NotificationHook Description: %s%n", emailHook.getDescription()); + System.out.printf("NotificationHook External Link: %s%n", emailHook.getExternalLink()); + System.out.printf("NotificationHook Emails: %s%n", String.join(",", emailHook.getEmailsToAlert())); + } else if (notificationHook instanceof WebNotificationHook) { + WebNotificationHook webHook = (WebNotificationHook) notificationHook; + System.out.printf("NotificationHook Id: %s%n", webHook.getId()); + System.out.printf("NotificationHook Name: %s%n", webHook.getName()); + System.out.printf("NotificationHook Description: %s%n", webHook.getDescription()); + System.out.printf("NotificationHook External Link: %s%n", webHook.getExternalLink()); + System.out.printf("NotificationHook Endpoint: %s%n", webHook.getEndpoint()); + System.out.printf("NotificationHook Headers: %s%n", webHook.getHttpHeaders()); } // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getHook#String } @@ -357,72 +360,74 @@ public void getHook() { public void getHookWithResponse() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getHookWithResponse#String-Context final String hookId = "f00853f1-6627-447f-bacf-8dccf2e86fed"; - Response response = metricsAdvisorAdminClient.getHookWithResponse(hookId, Context.NONE); + Response response = metricsAdvisorAdminClient.getHookWithResponse(hookId, Context.NONE); System.out.printf("Response statusCode: %d%n", response.getStatusCode()); - Hook hook = response.getValue(); - if (hook instanceof EmailHook) { - EmailHook emailHook = (EmailHook) hook; - System.out.printf("Hook Id: %s%n", emailHook.getId()); - System.out.printf("Hook Name: %s%n", emailHook.getName()); - System.out.printf("Hook Description: %s%n", emailHook.getDescription()); - System.out.printf("Hook External Link: %s%n", emailHook.getExternalLink()); - System.out.printf("Hook Emails: %s%n", String.join(",", emailHook.getEmailsToAlert())); - } else if (hook instanceof WebHook) { - WebHook webHook = (WebHook) hook; - System.out.printf("Hook Id: %s%n", webHook.getId()); - System.out.printf("Hook Name: %s%n", webHook.getName()); - System.out.printf("Hook Description: %s%n", webHook.getDescription()); - System.out.printf("Hook External Link: %s%n", webHook.getExternalLink()); - System.out.printf("Hook Endpoint: %s%n", webHook.getEndpoint()); - System.out.printf("Hook Headers: %s%n", webHook.getHttpHeaders()); + NotificationHook notificationHook = response.getValue(); + if (notificationHook instanceof EmailNotificationHook) { + EmailNotificationHook emailHook = (EmailNotificationHook) notificationHook; + System.out.printf("NotificationHook Id: %s%n", emailHook.getId()); + System.out.printf("NotificationHook Name: %s%n", emailHook.getName()); + System.out.printf("NotificationHook Description: %s%n", emailHook.getDescription()); + System.out.printf("NotificationHook External Link: %s%n", emailHook.getExternalLink()); + System.out.printf("NotificationHook Emails: %s%n", String.join(",", emailHook.getEmailsToAlert())); + } else if (notificationHook instanceof WebNotificationHook) { + WebNotificationHook webHook = (WebNotificationHook) notificationHook; + System.out.printf("NotificationHook Id: %s%n", webHook.getId()); + System.out.printf("NotificationHook Name: %s%n", webHook.getName()); + System.out.printf("NotificationHook Description: %s%n", webHook.getDescription()); + System.out.printf("NotificationHook External Link: %s%n", webHook.getExternalLink()); + System.out.printf("NotificationHook Endpoint: %s%n", webHook.getEndpoint()); + System.out.printf("NotificationHook Headers: %s%n", webHook.getHttpHeaders()); } // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getHookWithResponse#String-Context } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#updateHook(Hook)}. + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#updateHook(NotificationHook)}. */ public void updateHook() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateHook#Hook + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateHook#NotificationHook final String emailHookId = "f00853f1-6627-447f-bacf-8dccf2e86fed"; - Hook hook = metricsAdvisorAdminClient.getHook(emailHookId); - EmailHook emailHook = (EmailHook) hook; + NotificationHook notificationHook = metricsAdvisorAdminClient.getHook(emailHookId); + EmailNotificationHook emailHook = (EmailNotificationHook) notificationHook; emailHook .removeEmailToAlert("alertme@alertme.com") .addEmailToAlert("alertme2@alertme.com") .addEmailToAlert("alertme3@alertme.com"); - Hook updatedHook = metricsAdvisorAdminClient.updateHook(emailHook); - EmailHook updatedEmailHook = (EmailHook) updatedHook; - System.out.printf("Hook Id: %s%n", updatedEmailHook.getId()); - System.out.printf("Hook Name: %s%n", updatedEmailHook.getName()); - System.out.printf("Hook Description: %s%n", updatedEmailHook.getDescription()); - System.out.printf("Hook External Link: %s%n", updatedEmailHook.getExternalLink()); - System.out.printf("Hook Emails: %s%n", String.join(",", updatedEmailHook.getEmailsToAlert())); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateHook#Hook + NotificationHook updatedNotificationHook = metricsAdvisorAdminClient.updateHook(emailHook); + EmailNotificationHook updatedEmailHook = (EmailNotificationHook) updatedNotificationHook; + System.out.printf("NotificationHook Id: %s%n", updatedEmailHook.getId()); + System.out.printf("NotificationHook Name: %s%n", updatedEmailHook.getName()); + System.out.printf("NotificationHook Description: %s%n", updatedEmailHook.getDescription()); + System.out.printf("NotificationHook External Link: %s%n", updatedEmailHook.getExternalLink()); + System.out.printf("NotificationHook Emails: %s%n", String.join(",", + updatedEmailHook.getEmailsToAlert())); + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateHook#NotificationHook } /** - * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#updateHookWithResponse(Hook)}. + * Code snippet for {@link MetricsAdvisorAdministrationAsyncClient#updateHookWithResponse(NotificationHook)}. */ public void updateHookWithResponse() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateHookWithResponse#Hook-Context + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateHookWithResponse#NotificationHook-Context final String emailHookId = "f00853f1-6627-447f-bacf-8dccf2e86fed"; - Response response + Response response = metricsAdvisorAdminClient.getHookWithResponse(emailHookId, Context.NONE); - EmailHook emailHook = (EmailHook) response.getValue(); + EmailNotificationHook emailHook = (EmailNotificationHook) response.getValue(); emailHook .removeEmailToAlert("alertme@alertme.com") .addEmailToAlert("alertme2@alertme.com") .addEmailToAlert("alertme3@alertme.com"); - Response updateResponse + Response updateResponse = metricsAdvisorAdminClient.updateHookWithResponse(emailHook, Context.NONE); - EmailHook updatedEmailHook = (EmailHook) updateResponse.getValue(); - System.out.printf("Hook Id: %s%n", updatedEmailHook.getId()); - System.out.printf("Hook Name: %s%n", updatedEmailHook.getName()); - System.out.printf("Hook Description: %s%n", updatedEmailHook.getDescription()); - System.out.printf("Hook External Link: %s%n", updatedEmailHook.getExternalLink()); - System.out.printf("Hook Emails: %s%n", String.join(",", updatedEmailHook.getEmailsToAlert())); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateHookWithResponse#Hook-Context + EmailNotificationHook updatedEmailHook = (EmailNotificationHook) updateResponse.getValue(); + System.out.printf("Email Hook Id: %s%n", updatedEmailHook.getId()); + System.out.printf("Email Hook Name: %s%n", updatedEmailHook.getName()); + System.out.printf("Email Hook Description: %s%n", updatedEmailHook.getDescription()); + System.out.printf("Email Hook External Link: %s%n", updatedEmailHook.getExternalLink()); + System.out.printf("Email Hook Emails: %s%n", String.join(",", + updatedEmailHook.getEmailsToAlert())); + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateHookWithResponse#NotificationHook-Context } /** @@ -452,23 +457,23 @@ public void deleteHookWithResponse() { */ public void listHooks() { // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listHooks - PagedIterable hooks = metricsAdvisorAdminClient.listHooks(); - for (Hook hook : hooks) { - if (hook instanceof EmailHook) { - EmailHook emailHook = (EmailHook) hook; - System.out.printf("Hook Id: %s%n", emailHook.getId()); - System.out.printf("Hook Name: %s%n", emailHook.getName()); - System.out.printf("Hook Description: %s%n", emailHook.getDescription()); - System.out.printf("Hook External Link: %s%n", emailHook.getExternalLink()); - System.out.printf("Hook Emails: %s%n", String.join(",", emailHook.getEmailsToAlert())); - } else if (hook instanceof WebHook) { - WebHook webHook = (WebHook) hook; - System.out.printf("Hook Id: %s%n", webHook.getId()); - System.out.printf("Hook Name: %s%n", webHook.getName()); - System.out.printf("Hook Description: %s%n", webHook.getDescription()); - System.out.printf("Hook External Link: %s%n", webHook.getExternalLink()); - System.out.printf("Hook Endpoint: %s%n", webHook.getEndpoint()); - System.out.printf("Hook Headers: %s%n", webHook.getHttpHeaders()); + PagedIterable hooks = metricsAdvisorAdminClient.listHooks(); + for (NotificationHook notificationHook : hooks) { + if (notificationHook instanceof EmailNotificationHook) { + EmailNotificationHook emailHook = (EmailNotificationHook) notificationHook; + System.out.printf("Email Hook Id: %s%n", emailHook.getId()); + System.out.printf("Email Hook Name: %s%n", emailHook.getName()); + System.out.printf("Email Hook Description: %s%n", emailHook.getDescription()); + System.out.printf("Email Hook External Link: %s%n", emailHook.getExternalLink()); + System.out.printf("Email Hook Emails: %s%n", String.join(",", emailHook.getEmailsToAlert())); + } else if (notificationHook instanceof WebNotificationHook) { + WebNotificationHook webHook = (WebNotificationHook) notificationHook; + System.out.printf("Web Hook Id: %s%n", webHook.getId()); + System.out.printf("Web Hook Name: %s%n", webHook.getName()); + System.out.printf("Web Hook Description: %s%n", webHook.getDescription()); + System.out.printf("Web Hook External Link: %s%n", webHook.getExternalLink()); + System.out.printf("Web Hook Endpoint: %s%n", webHook.getEndpoint()); + System.out.printf("Web Hook Headers: %s%n", webHook.getHttpHeaders()); } } // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listHooks @@ -482,29 +487,30 @@ public void listHooksWithOptions() { ListHookOptions options = new ListHookOptions() .setSkip(100) .setTop(20); - PagedIterable hooks = metricsAdvisorAdminClient.listHooks(options, Context.NONE); - Stream> hooksPageStream = hooks.streamByPage(); + PagedIterable hooks = metricsAdvisorAdminClient.listHooks(options, Context.NONE); + Stream> hooksPageStream = hooks.streamByPage(); int[] pageCount = new int[1]; hooksPageStream.forEach(hookPage -> { System.out.printf("Page: %d%n", pageCount[0]++); - for (Hook hook : hookPage.getElements()) { - if (hook instanceof EmailHook) { - EmailHook emailHook = (EmailHook) hook; - System.out.printf("Hook Id: %s%n", emailHook.getId()); - System.out.printf("Hook Name: %s%n", emailHook.getName()); - System.out.printf("Hook Description: %s%n", emailHook.getDescription()); - System.out.printf("Hook External Link: %s%n", emailHook.getExternalLink()); - System.out.printf("Hook Emails: %s%n", String.join(",", emailHook.getEmailsToAlert())); - System.out.printf("Hook Admins: %s%n", String.join(",", emailHook.getAdminEmails())); - } else if (hook instanceof WebHook) { - WebHook webHook = (WebHook) hook; - System.out.printf("Hook Id: %s%n", webHook.getId()); - System.out.printf("Hook Name: %s%n", webHook.getName()); - System.out.printf("Hook Description: %s%n", webHook.getDescription()); - System.out.printf("Hook External Link: %s%n", webHook.getExternalLink()); - System.out.printf("Hook Endpoint: %s%n", webHook.getEndpoint()); - System.out.printf("Hook Headers: %s%n", webHook.getHttpHeaders()); - System.out.printf("Hook Admins: %s%n", String.join(",", webHook.getAdminEmails())); + for (NotificationHook notificationHook : hookPage.getElements()) { + if (notificationHook instanceof EmailNotificationHook) { + EmailNotificationHook emailHook = (EmailNotificationHook) notificationHook; + System.out.printf("Email Hook Id: %s%n", emailHook.getId()); + System.out.printf("Email Hook Name: %s%n", emailHook.getName()); + System.out.printf("Email Hook Description: %s%n", emailHook.getDescription()); + System.out.printf("Email Hook External Link: %s%n", emailHook.getExternalLink()); + System.out.printf("Email Hook Emails: %s%n", String.join(",", + emailHook.getEmailsToAlert())); + System.out.printf("Email Hook Admins: %s%n", String.join(",", emailHook.getAdminEmails())); + } else if (notificationHook instanceof WebNotificationHook) { + WebNotificationHook webHook = (WebNotificationHook) notificationHook; + System.out.printf("Web Hook Id: %s%n", webHook.getId()); + System.out.printf("Web Hook Name: %s%n", webHook.getName()); + System.out.printf("Web Hook Description: %s%n", webHook.getDescription()); + System.out.printf("Web Hook External Link: %s%n", webHook.getExternalLink()); + System.out.printf("Web Hook Endpoint: %s%n", webHook.getEndpoint()); + System.out.printf("Web Hook Headers: %s%n", webHook.getHttpHeaders()); + System.out.printf("Web Hook Admins: %s%n", String.join(",", webHook.getAdminEmails())); } } }); @@ -614,10 +620,10 @@ public void getDataFeedIngestionProgressWithResponse() { } /** - * Code snippet for {@link MetricsAdvisorAdministrationClient#createMetricAnomalyDetectionConfiguration(String, AnomalyDetectionConfiguration)}. + * Code snippet for {@link MetricsAdvisorAdministrationClient#createMetricAnomalyDetectionConfig(String, AnomalyDetectionConfiguration)}. */ public void createDetectionConfiguration() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createMetricAnomalyDetectionConfiguration#String-AnomalyDetectionConfiguration + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createMetricAnomalyDetectionConfig#String-AnomalyDetectionConfiguration final MetricWholeSeriesDetectionCondition wholeSeriesCondition = new MetricWholeSeriesDetectionCondition() .setCrossConditionOperator(DetectionConditionsOperator.OR) .setSmartDetectionCondition(new SmartDetectionCondition() @@ -645,20 +651,20 @@ public void createDetectionConfiguration() { final String metricId = "0b836da8-10e6-46cd-8f4f-28262e113a62"; AnomalyDetectionConfiguration createdDetectionConfig = metricsAdvisorAdminClient - .createMetricAnomalyDetectionConfiguration(metricId, detectionConfig); + .createMetricAnomalyDetectionConfig(metricId, detectionConfig); System.out.printf("Detection config Id: %s%n", createdDetectionConfig.getId()); System.out.printf("Name: %s%n", createdDetectionConfig.getName()); System.out.printf("Description: %s%n", createdDetectionConfig.getDescription()); System.out.printf("MetricId: %s%n", createdDetectionConfig.getMetricId()); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createMetricAnomalyDetectionConfiguration#String-AnomalyDetectionConfiguration + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createMetricAnomalyDetectionConfig#String-AnomalyDetectionConfiguration } /** - * Code snippet for {@link MetricsAdvisorAdministrationClient#createMetricAnomalyDetectionConfigurationWithResponse(String, AnomalyDetectionConfiguration, Context)}. + * Code snippet for {@link MetricsAdvisorAdministrationClient#createMetricAnomalyDetectionConfigWithResponse(String, AnomalyDetectionConfiguration, Context)}. */ public void createDetectionConfigurationWithResponse() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createMetricAnomalyDetectionConfigurationWithResponse#String-AnomalyDetectionConfiguration-Context + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createMetricAnomalyDetectionConfigWithResponse#String-AnomalyDetectionConfiguration-Context final MetricWholeSeriesDetectionCondition wholeSeriesCondition = new MetricWholeSeriesDetectionCondition() .setCrossConditionOperator(DetectionConditionsOperator.OR) .setSmartDetectionCondition(new SmartDetectionCondition() @@ -686,24 +692,24 @@ public void createDetectionConfigurationWithResponse() { final String metricId = "0b836da8-10e6-46cd-8f4f-28262e113a62"; Response response = metricsAdvisorAdminClient - .createMetricAnomalyDetectionConfigurationWithResponse(metricId, detectionConfig, Context.NONE); + .createMetricAnomalyDetectionConfigWithResponse(metricId, detectionConfig, Context.NONE); System.out.printf("Response statusCode: %d%n", response.getStatusCode()); AnomalyDetectionConfiguration createdDetectionConfig = response.getValue(); System.out.printf("Detection config Id: %s%n", createdDetectionConfig.getId()); System.out.printf("Name: %s%n", createdDetectionConfig.getName()); System.out.printf("Description: %s%n", createdDetectionConfig.getDescription()); System.out.printf("MetricId: %s%n", createdDetectionConfig.getMetricId()); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createMetricAnomalyDetectionConfigurationWithResponse#String-AnomalyDetectionConfiguration-Context + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createMetricAnomalyDetectionConfigWithResponse#String-AnomalyDetectionConfiguration-Context } /** - * Code snippet for {@link MetricsAdvisorAdministrationClient#getMetricAnomalyDetectionConfiguration(String)}. + * Code snippet for {@link MetricsAdvisorAdministrationClient#getMetricAnomalyDetectionConfig(String)}. */ public void getDetectionConfiguration() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getMetricAnomalyDetectionConfiguration#String + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getMetricAnomalyDetectionConfig#String final String detectionConfigId = "7b8069a1-1564-46da-9f50-b5d0dd9129ab"; AnomalyDetectionConfiguration detectionConfig = metricsAdvisorAdminClient - .getMetricAnomalyDetectionConfiguration(detectionConfigId); + .getMetricAnomalyDetectionConfig(detectionConfigId); System.out.printf("Detection config Id: %s%n", detectionConfig.getId()); System.out.printf("Name: %s%n", detectionConfig.getName()); System.out.printf("Description: %s%n", detectionConfig.getDescription()); @@ -868,17 +874,17 @@ public void getDetectionConfiguration() { seriesGroupDetectionCondition.getChangeThresholdCondition() .getSuppressCondition().getMinRatio()); } - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getMetricAnomalyDetectionConfiguration#String + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getMetricAnomalyDetectionConfig#String } /** - * Code snippet for {@link MetricsAdvisorAdministrationClient#getMetricAnomalyDetectionConfigurationWithResponse(String, Context)}. + * Code snippet for {@link MetricsAdvisorAdministrationClient#getMetricAnomalyDetectionConfigWithResponse(String, Context)}. */ public void getDetectionConfigurationWithResponse() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getMetricAnomalyDetectionConfigurationWithResponse#String-Context + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getMetricAnomalyDetectionConfigWithResponse#String-Context final String detectionConfigId = "7b8069a1-1564-46da-9f50-b5d0dd9129ab"; Response response = metricsAdvisorAdminClient - .getMetricAnomalyDetectionConfigurationWithResponse(detectionConfigId, Context.NONE); + .getMetricAnomalyDetectionConfigWithResponse(detectionConfigId, Context.NONE); System.out.printf("Response statusCode: %d%n", response.getStatusCode()); AnomalyDetectionConfiguration detectionConfig = response.getValue(); System.out.printf("Detection config Id: %s%n", detectionConfig.getId()); @@ -1045,17 +1051,17 @@ public void getDetectionConfigurationWithResponse() { seriesGroupDetectionCondition.getChangeThresholdCondition() .getSuppressCondition().getMinRatio()); } - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getMetricAnomalyDetectionConfigurationWithResponse#String-Context + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getMetricAnomalyDetectionConfigWithResponse#String-Context } /** - * Code snippet for {@link MetricsAdvisorAdministrationClient#listMetricAnomalyDetectionConfigurations(String)}. + * Code snippet for {@link MetricsAdvisorAdministrationClient#listMetricAnomalyDetectionConfigs(String)}. */ public void listDetectionConfigurations() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listMetricAnomalyDetectionConfigurations#String + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listMetricAnomalyDetectionConfigs#String final String metricId = "0b836da8-10e6-46cd-8f4f-28262e113a62"; PagedIterable configsIterable - = metricsAdvisorAdminClient.listMetricAnomalyDetectionConfigurations(metricId); + = metricsAdvisorAdminClient.listMetricAnomalyDetectionConfigs(metricId); for (AnomalyDetectionConfiguration detectionConfig : configsIterable) { System.out.printf("Detection config Id: %s%n", detectionConfig.getId()); @@ -1063,17 +1069,17 @@ public void listDetectionConfigurations() { System.out.printf("Description: %s%n", detectionConfig.getDescription()); System.out.printf("MetricId: %s%n", detectionConfig.getMetricId()); } - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listMetricAnomalyDetectionConfigurations#String + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listMetricAnomalyDetectionConfigs#String } /** - * Code snippet for {@link MetricsAdvisorAdministrationClient#listMetricAnomalyDetectionConfigurations(String, Context)}. + * Code snippet for {@link MetricsAdvisorAdministrationClient#listMetricAnomalyDetectionConfigs(String, Context)}. */ public void listDetectionConfigurationsWithContext() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listMetricAnomalyDetectionConfigurations#String-Context + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listMetricAnomalyDetectionConfigs#String-Context final String metricId = "0b836da8-10e6-46cd-8f4f-28262e113a62"; PagedIterable configsIterable - = metricsAdvisorAdminClient.listMetricAnomalyDetectionConfigurations(metricId, Context.NONE); + = metricsAdvisorAdminClient.listMetricAnomalyDetectionConfigs(metricId, Context.NONE); Stream> configByPageStream = configsIterable.streamByPage(); @@ -1087,17 +1093,17 @@ public void listDetectionConfigurationsWithContext() { System.out.printf("MetricId: %s%n", detectionConfig.getMetricId()); } }); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listMetricAnomalyDetectionConfigurations#String-Context + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listMetricAnomalyDetectionConfigs#String-Context } /** - * Code snippet for {@link MetricsAdvisorAdministrationClient#updateMetricAnomalyDetectionConfiguration(AnomalyDetectionConfiguration)}. + * Code snippet for {@link MetricsAdvisorAdministrationClient#updateMetricAnomalyDetectionConfig(AnomalyDetectionConfiguration)}. */ public void updateDetectionConfiguration() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateMetricAnomalyDetectionConfiguration#AnomalyDetectionConfiguration + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateMetricAnomalyDetectionConfig#AnomalyDetectionConfiguration final String detectionConfigId = "7b8069a1-1564-46da-9f50-b5d0dd9129ab"; AnomalyDetectionConfiguration detectionConfig = metricsAdvisorAdminClient - .getMetricAnomalyDetectionConfiguration(detectionConfigId); + .getMetricAnomalyDetectionConfig(detectionConfigId); detectionConfig.setName("updated config name"); detectionConfig.setDescription("updated with more detection conditions"); @@ -1111,23 +1117,23 @@ public void updateDetectionConfiguration() { .setSuppressCondition(new SuppressCondition().setMinNumber(2).setMinRatio(2)))); AnomalyDetectionConfiguration updatedDetectionConfig = metricsAdvisorAdminClient - .updateMetricAnomalyDetectionConfiguration(detectionConfig); + .updateMetricAnomalyDetectionConfig(detectionConfig); System.out.printf("Detection config Id: %s%n", updatedDetectionConfig.getId()); System.out.printf("Name: %s%n", updatedDetectionConfig.getName()); System.out.printf("Description: %s%n", updatedDetectionConfig.getDescription()); System.out.printf("MetricId: %s%n", updatedDetectionConfig.getMetricId()); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateMetricAnomalyDetectionConfiguration#AnomalyDetectionConfiguration + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateMetricAnomalyDetectionConfig#AnomalyDetectionConfiguration } /** - * Code snippet for {@link MetricsAdvisorAdministrationClient#updateMetricAnomalyDetectionConfigurationWithResponse(AnomalyDetectionConfiguration, Context)} + * Code snippet for {@link MetricsAdvisorAdministrationClient#updateMetricAnomalyDetectionConfigWithResponse(AnomalyDetectionConfiguration, Context)} */ public void updateDetectionConfigurationWithResponse() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateMetricAnomalyDetectionConfigurationWithResponse#AnomalyDetectionConfiguration-Context + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateMetricAnomalyDetectionConfigWithResponse#AnomalyDetectionConfiguration-Context final String detectionConfigId = "7b8069a1-1564-46da-9f50-b5d0dd9129ab"; Response getResponse = metricsAdvisorAdminClient - .getMetricAnomalyDetectionConfigurationWithResponse(detectionConfigId, Context.NONE); + .getMetricAnomalyDetectionConfigWithResponse(detectionConfigId, Context.NONE); AnomalyDetectionConfiguration detectionConfig = getResponse.getValue(); detectionConfig.setName("updated config name"); detectionConfig.setDescription("updated with more detection conditions"); @@ -1141,7 +1147,7 @@ public void updateDetectionConfigurationWithResponse() { .setSuppressCondition(new SuppressCondition().setMinNumber(2).setMinRatio(2)))); Response updateResponse = metricsAdvisorAdminClient - .updateMetricAnomalyDetectionConfigurationWithResponse(detectionConfig, Context.NONE); + .updateMetricAnomalyDetectionConfigWithResponse(detectionConfig, Context.NONE); System.out.printf("Response StatusCode: %s%n", updateResponse.getStatusCode()); AnomalyDetectionConfiguration updatedDetectionConfig = updateResponse.getValue(); @@ -1149,45 +1155,45 @@ public void updateDetectionConfigurationWithResponse() { System.out.printf("Name: %s%n", updatedDetectionConfig.getName()); System.out.printf("Description: %s%n", updatedDetectionConfig.getDescription()); System.out.printf("MetricId: %s%n", updatedDetectionConfig.getMetricId()); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateMetricAnomalyDetectionConfigurationWithResponse#AnomalyDetectionConfiguration-Context + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateMetricAnomalyDetectionConfigWithResponse#AnomalyDetectionConfiguration-Context } /** - * Code snippet for {@link MetricsAdvisorAdministrationClient#deleteMetricAnomalyDetectionConfiguration(String)}. + * Code snippet for {@link MetricsAdvisorAdministrationClient#deleteMetricAnomalyDetectionConfig(String)}. */ public void deleteDetectionConfiguration() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteMetricAnomalyDetectionConfiguration#String + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteMetricAnomalyDetectionConfig#String final String detectionConfigId = "7b8069a1-1564-46da-9f50-b5d0dd9129ab"; metricsAdvisorAdminClient - .deleteMetricAnomalyDetectionConfiguration(detectionConfigId); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteMetricAnomalyDetectionConfiguration#String + .deleteMetricAnomalyDetectionConfig(detectionConfigId); + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteMetricAnomalyDetectionConfig#String } /** - * Code snippet for {@link MetricsAdvisorAdministrationClient#deleteMetricAnomalyDetectionConfigurationWithResponse(String, Context)}. + * Code snippet for {@link MetricsAdvisorAdministrationClient#deleteMetricAnomalyDetectionConfigWithResponse(String, Context)}. */ public void deleteDetectionConfigurationWithResponse() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteMetricAnomalyDetectionConfigurationWithResponse#String-Context + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteMetricAnomalyDetectionConfigWithResponse#String-Context final String detectionConfigId = "7b8069a1-1564-46da-9f50-b5d0dd9129ab"; Response response = metricsAdvisorAdminClient - .deleteMetricAnomalyDetectionConfigurationWithResponse(detectionConfigId, Context.NONE); + .deleteMetricAnomalyDetectionConfigWithResponse(detectionConfigId, Context.NONE); System.out.printf("Response Status Code: %s%n", response.getStatusCode()); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteMetricAnomalyDetectionConfigurationWithResponse#String-Context + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteMetricAnomalyDetectionConfigWithResponse#String-Context } /** - * Code snippet for {@link MetricsAdvisorAdministrationClient#createAnomalyAlertConfiguration(AnomalyAlertConfiguration)} + * Code snippet for {@link MetricsAdvisorAdministrationClient#createAnomalyAlertConfig(AnomalyAlertConfiguration)} */ public void createAnomalyAlertConfiguration() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createAnomalyAlertConfiguration#AnomalyAlertConfiguration + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createAnomalyAlertConfig#AnomalyAlertConfiguration String detectionConfigurationId1 = "9ol48er30-6e6e-4391-b78f-b00dfee1e6f5"; String detectionConfigurationId2 = "3e58er30-6e6e-4391-b78f-b00dfee1e6f5"; String hookId1 = "5f48er30-6e6e-4391-b78f-b00dfee1e6f5"; String hookId2 = "8i48er30-6e6e-4391-b78f-b00dfee1e6f5"; final AnomalyAlertConfiguration anomalyAlertConfiguration - = metricsAdvisorAdminClient.createAnomalyAlertConfiguration( - new AnomalyAlertConfiguration("My Alert config name") + = metricsAdvisorAdminClient.createAnomalyAlertConfig( + new AnomalyAlertConfiguration("My AnomalyAlert config name") .setDescription("alert config description") .setMetricAlertConfigurations(Arrays.asList( new MetricAnomalyAlertConfiguration(detectionConfigurationId1, @@ -1195,24 +1201,27 @@ public void createAnomalyAlertConfiguration() { new MetricAnomalyAlertConfiguration(detectionConfigurationId2, MetricAnomalyAlertScope.forWholeSeries()) .setAlertConditions(new MetricAnomalyAlertConditions() - .setSeverityRangeCondition(new SeverityCondition().setMaxAlertSeverity(Severity.HIGH))))) + .setSeverityRangeCondition(new SeverityCondition() + .setMaxAlertSeverity(AnomalySeverity.HIGH))))) .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.AND) .setIdOfHooksToAlert(Arrays.asList(hookId1, hookId2))); - System.out.printf("Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); - System.out.printf("Anomaly alert configuration description: %s%n", anomalyAlertConfiguration.getDescription()); - System.out.printf("Anomaly alert configuration hook ids: %s%n", + System.out.printf("DataPoint Anomaly alert configuration Id: %s%n", + anomalyAlertConfiguration.getId()); + System.out.printf("DataPoint Anomaly alert configuration description: %s%n", + anomalyAlertConfiguration.getDescription()); + System.out.printf("DataPoint Anomaly alert configuration hook ids: %s%n", anomalyAlertConfiguration.getIdOfHooksToAlert()); - System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", + System.out.printf("DataPoint Anomaly alert configuration cross metrics operator: %s%n", anomalyAlertConfiguration.getCrossMetricsOperator().toString()); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createAnomalyAlertConfiguration#AnomalyAlertConfiguration + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createAnomalyAlertConfig#AnomalyAlertConfiguration } /** - * Code snippet for {@link MetricsAdvisorAdministrationClient#createAnomalyAlertConfigurationWithResponse(AnomalyAlertConfiguration, Context)} + * Code snippet for {@link MetricsAdvisorAdministrationClient#createAnomalyAlertConfigWithResponse(AnomalyAlertConfiguration, Context)} */ public void createAnomalyAlertConfigurationWithResponse() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createAnomalyAlertConfigurationWithResponse#AnomalyAlertConfiguration-Context + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createAnomalyAlertConfigWithResponse#AnomalyAlertConfiguration-Context String detectionConfigurationId1 = "9ol48er30-6e6e-4391-b78f-b00dfee1e6f5"; String detectionConfigurationId2 = "3e58er30-6e6e-4391-b78f-b00dfee1e6f5"; @@ -1220,8 +1229,8 @@ public void createAnomalyAlertConfigurationWithResponse() { String hookId2 = "8i48er30-6e6e-4391-b78f-b00dfee1e6f5"; final Response alertConfigurationResponse - = metricsAdvisorAdminClient.createAnomalyAlertConfigurationWithResponse( - new AnomalyAlertConfiguration("My Alert config name") + = metricsAdvisorAdminClient.createAnomalyAlertConfigWithResponse( + new AnomalyAlertConfiguration("My AnomalyAlert config name") .setDescription("alert config description") .setMetricAlertConfigurations(Arrays.asList( new MetricAnomalyAlertConfiguration(detectionConfigurationId1, @@ -1229,73 +1238,80 @@ public void createAnomalyAlertConfigurationWithResponse() { new MetricAnomalyAlertConfiguration(detectionConfigurationId2, MetricAnomalyAlertScope.forWholeSeries()) .setAlertConditions(new MetricAnomalyAlertConditions() - .setSeverityRangeCondition(new SeverityCondition().setMaxAlertSeverity(Severity.HIGH))))) + .setSeverityRangeCondition(new SeverityCondition() + .setMaxAlertSeverity(AnomalySeverity.HIGH))))) .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.AND) .setIdOfHooksToAlert(Arrays.asList(hookId1, hookId2)), Context.NONE); - System.out.printf("Anomaly alert creation operation status: %s%n", alertConfigurationResponse.getStatusCode()); + System.out.printf("DataPoint Anomaly alert creation operation status: %s%n", + alertConfigurationResponse.getStatusCode()); final AnomalyAlertConfiguration anomalyAlertConfiguration = alertConfigurationResponse.getValue(); - System.out.printf("Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); - System.out.printf("Anomaly alert configuration description: %s%n", anomalyAlertConfiguration.getDescription()); - System.out.printf("Anomaly alert configuration hook ids: %s%n", + System.out.printf("DataPoint Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); + System.out.printf("DataPoint Anomaly alert configuration description: %s%n", + anomalyAlertConfiguration.getDescription()); + System.out.printf("DataPoint Anomaly alert configuration hook ids: %s%n", anomalyAlertConfiguration.getIdOfHooksToAlert()); - System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", + System.out.printf("DataPoint Anomaly alert configuration cross metrics operator: %s%n", anomalyAlertConfiguration.getCrossMetricsOperator().toString()); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createAnomalyAlertConfigurationWithResponse#AnomalyAlertConfiguration-Context + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.createAnomalyAlertConfigWithResponse#AnomalyAlertConfiguration-Context } /** - * Code snippet for {@link MetricsAdvisorAdministrationClient#getAnomalyAlertConfiguration(String)} + * Code snippet for {@link MetricsAdvisorAdministrationClient#getAnomalyAlertConfig(String)} */ public void getAnomalyAlertConfiguration() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getAnomalyAlertConfiguration#String + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getAnomalyAlertConfig#String String alertConfigId = "1p0f8er30-6e6e-4391-b78f-bpfdfee1e6f5"; AnomalyAlertConfiguration anomalyAlertConfiguration - = metricsAdvisorAdminClient.getAnomalyAlertConfiguration(alertConfigId); - System.out.printf("Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); - System.out.printf("Anomaly alert configuration description: %s%n", anomalyAlertConfiguration.getDescription()); - System.out.printf("Anomaly alert configuration hook ids: %s%n", + = metricsAdvisorAdminClient.getAnomalyAlertConfig(alertConfigId); + System.out.printf("DataPoint Anomaly alert configuration Id: %s%n", + anomalyAlertConfiguration.getId()); + System.out.printf("DataPoint Anomaly alert configuration description: %s%n", + anomalyAlertConfiguration.getDescription()); + System.out.printf("DataPoint Anomaly alert configuration hook ids: %s%n", anomalyAlertConfiguration.getIdOfHooksToAlert()); - System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", + System.out.printf("DataPoint Anomaly alert configuration cross metrics operator: %s%n", anomalyAlertConfiguration.getCrossMetricsOperator().toString()); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getAnomalyAlertConfiguration#String + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getAnomalyAlertConfig#String } /** - * Code snippet for {@link MetricsAdvisorAdministrationClient#getAnomalyAlertConfigurationWithResponse(String, Context)} + * Code snippet for {@link MetricsAdvisorAdministrationClient#getAnomalyAlertConfigWithResponse(String, Context)} */ public void getAnomalyAlertConfigurationWithResponse() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getAnomalyAlertConfigurationWithResponse#String-Context + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getAnomalyAlertConfigWithResponse#String-Context String alertConfigId = "1p0f8er30-6e6e-4391-b78f-bpfdfee1e6f5"; Response alertConfigurationResponse - = metricsAdvisorAdminClient.getAnomalyAlertConfigurationWithResponse(alertConfigId, Context.NONE); + = metricsAdvisorAdminClient.getAnomalyAlertConfigWithResponse(alertConfigId, Context.NONE); - System.out.printf("Anomaly alert creation operation status: %s%n", alertConfigurationResponse.getStatusCode()); + System.out.printf("DataPoint Anomaly alert creation operation status: %s%n", + alertConfigurationResponse.getStatusCode()); final AnomalyAlertConfiguration anomalyAlertConfiguration = alertConfigurationResponse.getValue(); - System.out.printf("Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); - System.out.printf("Anomaly alert configuration description: %s%n", anomalyAlertConfiguration.getDescription()); - System.out.printf("Anomaly alert configuration hook ids: %s%n", + System.out.printf("DataPoint Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); + System.out.printf("DataPoint Anomaly alert configuration description: %s%n", + anomalyAlertConfiguration.getDescription()); + System.out.printf("DataPoint Anomaly alert configuration hook ids: %s%n", anomalyAlertConfiguration.getIdOfHooksToAlert()); - System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", + System.out.printf("DataPoint Anomaly alert configuration cross metrics operator: %s%n", anomalyAlertConfiguration.getCrossMetricsOperator().toString()); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getAnomalyAlertConfigurationWithResponse#String-Context + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.getAnomalyAlertConfigWithResponse#String-Context } /** - * Code snippet for {@link MetricsAdvisorAdministrationClient#updateAnomalyAlertConfiguration(AnomalyAlertConfiguration)} + * Code snippet for {@link MetricsAdvisorAdministrationClient#updateAnomalyAlertConfig(AnomalyAlertConfiguration)} */ public void updateAnomalyAlertConfiguration() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateAnomalyAlertConfiguration#AnomalyAlertConfiguration + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateAnomalyAlertConfig#AnomalyAlertConfiguration String alertConfigId = "1p0f8er30-6e6e-4391-b78f-bpfdfee1e6f5"; String additionalHookId = "2gh8er30-6e6e-4391-b78f-bpfdfee1e6f5"; AnomalyAlertConfiguration existingAnomalyConfig - = metricsAdvisorAdminClient.getAnomalyAlertConfiguration(alertConfigId); + = metricsAdvisorAdminClient.getAnomalyAlertConfig(alertConfigId); final AnomalyAlertConfiguration updatAnomalyAlertConfiguration - = metricsAdvisorAdminClient.updateAnomalyAlertConfiguration( + = metricsAdvisorAdminClient.updateAnomalyAlertConfig( existingAnomalyConfig .addIdOfHookToAlert(additionalHookId) .setDescription("updated to add more hook ids") @@ -1306,22 +1322,22 @@ public void updateAnomalyAlertConfiguration() { updatAnomalyAlertConfiguration.getDescription()); System.out.printf("Updated anomaly alert configuration hook ids: %s%n", updatAnomalyAlertConfiguration.getIdOfHooksToAlert()); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateAnomalyAlertConfiguration#AnomalyAlertConfiguration + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateAnomalyAlertConfig#AnomalyAlertConfiguration } /** - * Code snippet for {@link MetricsAdvisorAdministrationClient#updateAnomalyAlertConfigurationWithResponse(AnomalyAlertConfiguration, Context)} + * Code snippet for {@link MetricsAdvisorAdministrationClient#updateAnomalyAlertConfigWithResponse(AnomalyAlertConfiguration, Context)} */ public void updateAnomalyAlertConfigurationWithResponse() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateAnomalyAlertConfigurationWithResponse#AnomalyAlertConfiguration-Context + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateAnomalyAlertConfigWithResponse#AnomalyAlertConfiguration-Context String alertConfigId = "1p0f8er30-6e6e-4391-b78f-bpfdfee1e6f5"; String additionalHookId = "2gh8er30-6e6e-4391-b78f-bpfdfee1e6f5"; AnomalyAlertConfiguration existingAnomalyConfig - = metricsAdvisorAdminClient.getAnomalyAlertConfiguration(alertConfigId); + = metricsAdvisorAdminClient.getAnomalyAlertConfig(alertConfigId); final Response alertConfigurationResponse - = metricsAdvisorAdminClient.updateAnomalyAlertConfigurationWithResponse( + = metricsAdvisorAdminClient.updateAnomalyAlertConfigWithResponse( existingAnomalyConfig .addIdOfHookToAlert(additionalHookId) .setDescription("updated to add more hook ids"), Context.NONE); @@ -1333,67 +1349,67 @@ public void updateAnomalyAlertConfigurationWithResponse() { updatAnomalyAlertConfiguration.getDescription()); System.out.printf("Updated anomaly alert configuration hook ids: %sf%n", updatAnomalyAlertConfiguration.getIdOfHooksToAlert()); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateAnomalyAlertConfigurationWithResponse#AnomalyAlertConfiguration-Context + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.updateAnomalyAlertConfigWithResponse#AnomalyAlertConfiguration-Context } /** - * Code snippet for {@link MetricsAdvisorAdministrationClient#deleteAnomalyAlertConfiguration(String)}. + * Code snippet for {@link MetricsAdvisorAdministrationClient#deleteAnomalyAlertConfig(String)}. */ public void deleteAnomalyAlertConfiguration() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteAnomalyAlertConfiguration#String + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteAnomalyAlertConfig#String String alertConfigId = "1p0f8er30-6e6e-4391-b78f-bpfdfee1e6f5"; - metricsAdvisorAdminClient.deleteAnomalyAlertConfiguration(alertConfigId); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteAnomalyAlertConfiguration#String + metricsAdvisorAdminClient.deleteAnomalyAlertConfig(alertConfigId); + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteAnomalyAlertConfig#String } /** - * Code snippet for {@link MetricsAdvisorAdministrationClient#deleteAnomalyAlertConfigurationWithResponse(String, Context)} + * Code snippet for {@link MetricsAdvisorAdministrationClient#deleteAnomalyAlertConfigWithResponse(String, Context)} */ public void deleteAnomalyAlertConfigurationWithResponse() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteAnomalyAlertConfigurationWithResponse#String-Context + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteAnomalyAlertConfigWithResponse#String-Context String alertConfigId = "1p0f8er30-6e6e-4391-b78f-bpfdfee1e6f5"; final Response response = - metricsAdvisorAdminClient.deleteAnomalyAlertConfigurationWithResponse(alertConfigId, Context.NONE); + metricsAdvisorAdminClient.deleteAnomalyAlertConfigWithResponse(alertConfigId, Context.NONE); - System.out.printf("Anomaly alert config delete operation status : %s%n", response.getStatusCode()); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteAnomalyAlertConfigurationWithResponse#String-Context + System.out.printf("DataPoint Anomaly alert config delete operation status : %s%n", response.getStatusCode()); + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.deleteAnomalyAlertConfigWithResponse#String-Context } /** - * Code snippet for {@link MetricsAdvisorAdministrationClient#listAnomalyAlertConfigurations(String)}. + * Code snippet for {@link MetricsAdvisorAdministrationClient#listAnomalyAlertConfigs(String)}. */ public void listAnomalyAlertConfigurations() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listAnomalyAlertConfigurations#String + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listAnomalyAlertConfigs#String String detectionConfigId = "3rt98er30-6e6e-4391-b78f-bpfdfee1e6f5"; - metricsAdvisorAdminClient.listAnomalyAlertConfigurations(detectionConfigId) + metricsAdvisorAdminClient.listAnomalyAlertConfigs(detectionConfigId) .forEach(anomalyAlertConfiguration -> { - System.out.printf("Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); - System.out.printf("Anomaly alert configuration description: %s%n", + System.out.printf("DataPoint Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); + System.out.printf("DataPoint Anomaly alert configuration description: %s%n", anomalyAlertConfiguration.getDescription()); - System.out.printf("Anomaly alert configuration hook ids: %s%n", + System.out.printf("DataPoint Anomaly alert configuration hook ids: %s%n", anomalyAlertConfiguration.getIdOfHooksToAlert()); - System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", + System.out.printf("DataPoint Anomaly alert configuration cross metrics operator: %s%n", anomalyAlertConfiguration.getCrossMetricsOperator().toString()); }); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listAnomalyAlertConfigurations#String + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listAnomalyAlertConfigs#String } /** - * Code snippet for {@link MetricsAdvisorAdministrationClient#listAnomalyAlertConfigurations(String, Context)}. + * Code snippet for {@link MetricsAdvisorAdministrationClient#listAnomalyAlertConfigs(String, Context)}. */ public void listAnomalyAlertConfigurationsWithContext() { - // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listAnomalyAlertConfigurations#String-Context + // BEGIN: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listAnomalyAlertConfigs#String-Context String detectionConfigId = "3rt98er30-6e6e-4391-b78f-bpfdfee1e6f5"; - metricsAdvisorAdminClient.listAnomalyAlertConfigurations(detectionConfigId, Context.NONE) + metricsAdvisorAdminClient.listAnomalyAlertConfigs(detectionConfigId, Context.NONE) .forEach(anomalyAlertConfiguration -> { - System.out.printf("Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); - System.out.printf("Anomaly alert configuration description: %s%n", + System.out.printf("DataPoint Anomaly alert configuration Id: %s%n", anomalyAlertConfiguration.getId()); + System.out.printf("DataPoint Anomaly alert configuration description: %s%n", anomalyAlertConfiguration.getDescription()); - System.out.printf("Anomaly alert configuration hook ids: %s%n", + System.out.printf("DataPoint Anomaly alert configuration hook ids: %s%n", anomalyAlertConfiguration.getIdOfHooksToAlert()); - System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", + System.out.printf("DataPoint Anomaly alert configuration cross metrics operator: %s%n", anomalyAlertConfiguration.getCrossMetricsOperator().toString()); }); - // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listAnomalyAlertConfigurations#String-Context + // END: com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient.listAnomalyAlertConfigs#String-Context } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAnomalyAlertConfigOperationsAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAnomalyAlertConfigOperationsAsyncSample.java index 7c5cd5d36798..86e1dc6f410f 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAnomalyAlertConfigOperationsAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAnomalyAlertConfigOperationsAsyncSample.java @@ -4,12 +4,12 @@ package com.azure.ai.metricsadvisor.administration; import com.azure.ai.metricsadvisor.models.AnomalyAlertConfiguration; +import com.azure.ai.metricsadvisor.models.AnomalySeverity; import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConditions; import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConfiguration; import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConfigurationsOperator; import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertScope; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; -import com.azure.ai.metricsadvisor.models.Severity; import com.azure.ai.metricsadvisor.models.SeverityCondition; import reactor.core.publisher.Mono; @@ -26,16 +26,16 @@ public static void main(String[] args) { .credential(new MetricsAdvisorKeyCredential("subscription_key", "api_key")) .buildAsyncClient(); - // Create Anomaly alert config - System.out.printf("Creating Anomaly alert config%n"); + // Create DataPointAnomaly alert config + System.out.printf("Creating DataPointAnomaly alert config%n"); String detectionConfigurationId1 = "9ol48er30-6e6e-4391-b78f-b00dfee1e6f5"; String detectionConfigurationId2 = "3e58er30-6e6e-4391-b78f-b00dfee1e6f5"; String hookId1 = "5f48er30-6e6e-4391-b78f-b00dfee1e6f5"; String hookId2 = "8i48er30-6e6e-4391-b78f-b00dfee1e6f5"; final Mono createdAnomalyAlertConfigMono = - advisorAdministrationAsyncClient.createAnomalyAlertConfiguration( - new AnomalyAlertConfiguration("My Alert config name") + advisorAdministrationAsyncClient.createAnomalyAlertConfig( + new AnomalyAlertConfiguration("My AnomalyAlert config name") .setDescription("alert config description") .setMetricAlertConfigurations(Arrays.asList( new MetricAnomalyAlertConfiguration(detectionConfigurationId1, @@ -43,40 +43,40 @@ public static void main(String[] args) { new MetricAnomalyAlertConfiguration(detectionConfigurationId2, MetricAnomalyAlertScope.forWholeSeries()) .setAlertConditions(new MetricAnomalyAlertConditions() - .setSeverityRangeCondition(new SeverityCondition().setMaxAlertSeverity(Severity.HIGH))))) + .setSeverityRangeCondition(new SeverityCondition().setMaxAlertSeverity(AnomalySeverity.HIGH))))) .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.AND) .setIdOfHooksToAlert(Arrays.asList(hookId1, hookId2))); createdAnomalyAlertConfigMono .doOnSubscribe(__ -> - System.out.printf("Creating Anomaly alert config%n")) + System.out.printf("Creating DataPoint Anomaly alert config%n")) .doOnSuccess(anomalyAlertConfig -> - System.out.printf("Created Anomaly alert config: %s%n", anomalyAlertConfig.getId())); + System.out.printf("Created DataPoint Anomaly alert config: %s%n", anomalyAlertConfig.getId())); // Retrieve the anomaly alert config that just created. Mono fetchAnomalyAlertConfig = createdAnomalyAlertConfigMono.flatMap(createdConfig -> { - return advisorAdministrationAsyncClient.getAnomalyAlertConfiguration(createdConfig.getId()) + return advisorAdministrationAsyncClient.getAnomalyAlertConfig(createdConfig.getId()) .doOnSubscribe(__ -> - System.out.printf("Fetching Anomaly alert config: %s%n", createdConfig.getId())) + System.out.printf("Fetching DataPoint Anomaly alert config: %s%n", createdConfig.getId())) .doOnSuccess(config -> - System.out.printf("Fetched Anomaly alert config%n")) + System.out.printf("Fetched DataPoint Anomaly alert config%n")) .doOnNext(anomalyAlertConfig -> { - System.out.printf("Anomaly alert config Id : %s%n", anomalyAlertConfig.getId()); - System.out.printf("Anomaly alert config name : %s%n", anomalyAlertConfig.getName()); - System.out.printf("Anomaly alert config description : %s%n", anomalyAlertConfig.getDescription()); - System.out.println("Anomaly alert configuration hook ids:"); + System.out.printf("DataPoint Anomaly alert config Id : %s%n", anomalyAlertConfig.getId()); + System.out.printf("DataPoint Anomaly alert config name : %s%n", anomalyAlertConfig.getName()); + System.out.printf("DataPoint Anomaly alert config description : %s%n", anomalyAlertConfig.getDescription()); + System.out.println("DataPoint Anomaly alert configuration hook ids:"); anomalyAlertConfig.getIdOfHooksToAlert().forEach(System.out::println); - System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", + System.out.printf("DataPoint Anomaly alert configuration cross metrics operator: %s%n", anomalyAlertConfig.getCrossMetricsOperator().toString()); - System.out.println("Metric level alert configurations for this anomaly alert config:"); + System.out.println("DataFeedMetric level alert configurations for this anomaly alert config:"); anomalyAlertConfig.getMetricAlertConfigurations(). forEach(metricAnomalyAlertConfiguration -> { - System.out.printf("Alert detection configuration Id: %s%n", + System.out.printf("AnomalyAlert detection configuration Id: %s%n", metricAnomalyAlertConfiguration.getDetectionConfigurationId()); - System.out.printf("Alert configuration negation value", + System.out.printf("AnomalyAlert configuration negation value", metricAnomalyAlertConfiguration.isNegationOperationEnabled()); - System.out.printf("Alert configuration scope type", + System.out.printf("AnomalyAlert configuration scope type", metricAnomalyAlertConfiguration.getAlertScope().getScopeType().toString()); }); }); @@ -85,7 +85,7 @@ public static void main(String[] args) { // Update the anomaly alert config. Mono updatedAlertConfigMono = fetchAnomalyAlertConfig .flatMap(anomalyAlertConfig -> { - return advisorAdministrationAsyncClient.updateAnomalyAlertConfiguration( + return advisorAdministrationAsyncClient.updateAnomalyAlertConfig( anomalyAlertConfig .removeHookToAlert(hookId2) .setDescription("updated to remove hookId2")) @@ -100,7 +100,7 @@ public static void main(String[] args) { // Delete the anomaly alert config. Mono deletedAnomalyAlertConfigMono = updatedAlertConfigMono.flatMap(anomalyAlertConfig -> { - return advisorAdministrationAsyncClient.deleteAnomalyAlertConfiguration(anomalyAlertConfig.getId()) + return advisorAdministrationAsyncClient.deleteAnomalyAlertConfig(anomalyAlertConfig.getId()) .doOnSubscribe(__ -> System.out.printf("Deleting anomaly alert config: %s%n", anomalyAlertConfig.getId())) .doOnSuccess(config -> @@ -114,16 +114,16 @@ public static void main(String[] args) { */ deletedAnomalyAlertConfigMono.block(); - // List Anomaly alert configs. - System.out.printf("Listing Anomaly alert configs for a detection configurations%n"); - advisorAdministrationAsyncClient.listAnomalyAlertConfigurations(detectionConfigurationId1) + // List DataPointAnomaly alert configs. + System.out.printf("Listing DataPoint Anomaly alert configs for a detection configurations%n"); + advisorAdministrationAsyncClient.listAnomalyAlertConfigs(detectionConfigurationId1) .doOnNext(anomalyAlertConfigurationItem -> { - System.out.printf("Anomaly alert config Id : %s%n", anomalyAlertConfigurationItem.getId()); - System.out.printf("Anomaly alert config name : %s%n", anomalyAlertConfigurationItem.getName()); - System.out.printf("Anomaly alert config description : %s%n", anomalyAlertConfigurationItem.getDescription()); - System.out.println("Anomaly alert configuration hook ids:"); + System.out.printf("DataPoint Anomaly alert config Id : %s%n", anomalyAlertConfigurationItem.getId()); + System.out.printf("DataPoint Anomaly alert config name : %s%n", anomalyAlertConfigurationItem.getName()); + System.out.printf("DataPoint Anomaly alert config description : %s%n", anomalyAlertConfigurationItem.getDescription()); + System.out.println("DataPoint Anomaly alert configuration hook ids:"); anomalyAlertConfigurationItem.getIdOfHooksToAlert().forEach(System.out::println); - System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", + System.out.printf("DataPoint Anomaly alert configuration cross metrics operator: %s%n", anomalyAlertConfigurationItem.getCrossMetricsOperator().toString()); }); } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAnomalyAlertConfigOperationsSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAnomalyAlertConfigOperationsSample.java index a5586306e893..74cae7747bde 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAnomalyAlertConfigOperationsSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAnomalyAlertConfigOperationsSample.java @@ -4,12 +4,12 @@ package com.azure.ai.metricsadvisor.administration; import com.azure.ai.metricsadvisor.models.AnomalyAlertConfiguration; +import com.azure.ai.metricsadvisor.models.AnomalySeverity; import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConditions; import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConfiguration; import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConfigurationsOperator; import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertScope; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; -import com.azure.ai.metricsadvisor.models.Severity; import com.azure.ai.metricsadvisor.models.SeverityCondition; import java.util.Arrays; @@ -25,17 +25,17 @@ public static void main(String[] args) { .credential(new MetricsAdvisorKeyCredential("subscription_key", "api_key")) .buildClient(); - // Create Anomaly alert config - System.out.printf("Creating Anomaly alert config%n"); + // Create DataPointAnomaly alert config + System.out.printf("Creating DataPoint Anomaly alert config%n"); String detectionConfigurationId1 = "9ol48er30-6e6e-4391-b78f-b00dfee1e6f5"; String detectionConfigurationId2 = "3e58er30-6e6e-4391-b78f-b00dfee1e6f5"; String hookId1 = "5f48er30-6e6e-4391-b78f-b00dfee1e6f5"; String hookId2 = "8i48er30-6e6e-4391-b78f-b00dfee1e6f5"; - System.out.println("Creating Anomaly alert config%n"); + System.out.println("Creating DataPoint Anomaly alert config%n"); final AnomalyAlertConfiguration createdAnomalyAlertConfig = - advisorAdministrationClient.createAnomalyAlertConfiguration( - new AnomalyAlertConfiguration("My Alert config name") + advisorAdministrationClient.createAnomalyAlertConfig( + new AnomalyAlertConfiguration("My AnomalyAlert config name") .setDescription("alert config description") .setMetricAlertConfigurations(Arrays.asList( new MetricAnomalyAlertConfiguration(detectionConfigurationId1, @@ -43,32 +43,32 @@ public static void main(String[] args) { new MetricAnomalyAlertConfiguration(detectionConfigurationId2, MetricAnomalyAlertScope.forWholeSeries()) .setAlertConditions(new MetricAnomalyAlertConditions() - .setSeverityRangeCondition(new SeverityCondition().setMaxAlertSeverity(Severity.HIGH))))) + .setSeverityRangeCondition(new SeverityCondition().setMaxAlertSeverity(AnomalySeverity.HIGH))))) .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.AND) .setIdOfHooksToAlert(Arrays.asList(hookId1, hookId2))); - System.out.printf("Created Anomaly alert config: %s%n", createdAnomalyAlertConfig.getId()); + System.out.printf("Created DataPoint Anomaly alert config: %s%n", createdAnomalyAlertConfig.getId()); // Retrieve the anomaly alert config that just created. - System.out.printf("Fetching Anomaly alert config: %s%n", createdAnomalyAlertConfig.getId()); + System.out.printf("Fetching DataPoint Anomaly alert config: %s%n", createdAnomalyAlertConfig.getId()); final AnomalyAlertConfiguration fetchAnomalyAlertConfig = - advisorAdministrationClient.getAnomalyAlertConfiguration(createdAnomalyAlertConfig.getId()); - System.out.printf("Anomaly alert config Id : %s%n", fetchAnomalyAlertConfig.getId()); - System.out.printf("Anomaly alert config name : %s%n", fetchAnomalyAlertConfig.getName()); - System.out.printf("Anomaly alert config description : %s%n", fetchAnomalyAlertConfig.getDescription()); - System.out.println("Anomaly alert configuration hook ids:"); + advisorAdministrationClient.getAnomalyAlertConfig(createdAnomalyAlertConfig.getId()); + System.out.printf("DataPoint Anomaly alert config Id : %s%n", fetchAnomalyAlertConfig.getId()); + System.out.printf("DataPoint Anomaly alert config name : %s%n", fetchAnomalyAlertConfig.getName()); + System.out.printf("DataPoint Anomaly alert config description : %s%n", fetchAnomalyAlertConfig.getDescription()); + System.out.println("DataPoint Anomaly alert configuration hook ids:"); fetchAnomalyAlertConfig.getIdOfHooksToAlert().forEach(System.out::println); - System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", + System.out.printf("DataPoint Anomaly alert configuration cross metrics operator: %s%n", fetchAnomalyAlertConfig.getCrossMetricsOperator().toString()); - System.out.println("Metric level alert configurations for this anomaly alert config:"); + System.out.println("DataFeedMetric level alert configurations for this anomaly alert config:"); fetchAnomalyAlertConfig.getMetricAlertConfigurations(). forEach(metricAnomalyAlertConfiguration -> { - System.out.printf("Alert detection configuration Id: %s%n", + System.out.printf("AnomalyAlert detection configuration Id: %s%n", metricAnomalyAlertConfiguration.getDetectionConfigurationId()); - System.out.printf("Alert configuration negation value", + System.out.printf("AnomalyAlert configuration negation value", metricAnomalyAlertConfiguration.isNegationOperationEnabled()); - System.out.printf("Alert configuration scope type", + System.out.printf("AnomalyAlert configuration scope type", metricAnomalyAlertConfiguration.getAlertScope().getScopeType().toString()); }); @@ -76,7 +76,7 @@ public static void main(String[] args) { System.out.printf("Updating anomaly alert config: %s%n", fetchAnomalyAlertConfig.getId()); final AnomalyAlertConfiguration updatedAnomalyAlertConfig - = advisorAdministrationClient.updateAnomalyAlertConfiguration( + = advisorAdministrationClient.updateAnomalyAlertConfig( fetchAnomalyAlertConfig .removeHookToAlert(hookId2) .setDescription("updated to remove hookId2")); @@ -89,21 +89,21 @@ public static void main(String[] args) { // Delete the anomaly alert config. System.out.printf("Deleting anomaly alert config: %s%n", updatedAnomalyAlertConfig.getId()); - advisorAdministrationClient.deleteAnomalyAlertConfiguration(updatedAnomalyAlertConfig.getId()); + advisorAdministrationClient.deleteAnomalyAlertConfig(updatedAnomalyAlertConfig.getId()); System.out.printf("Deleted anomaly alert config%n"); - // List Anomaly alert configs. - System.out.printf("Listing Anomaly alert configs for a detection configurations%n"); - advisorAdministrationClient.listAnomalyAlertConfigurations(detectionConfigurationId1) + // List DataPointAnomaly alert configs. + System.out.printf("Listing DataPoint Anomaly alert configs for a detection configurations%n"); + advisorAdministrationClient.listAnomalyAlertConfigs(detectionConfigurationId1) .forEach(anomalyAlertConfigurationItem -> { - System.out.printf("Anomaly alert config Id : %s%n", anomalyAlertConfigurationItem.getId()); - System.out.printf("Anomaly alert config name : %s%n", anomalyAlertConfigurationItem.getName()); - System.out.printf("Anomaly alert config description : %s%n", + System.out.printf("DataPoint Anomaly alert config Id : %s%n", anomalyAlertConfigurationItem.getId()); + System.out.printf("DataPoint Anomaly alert config name : %s%n", anomalyAlertConfigurationItem.getName()); + System.out.printf("DataPoint Anomaly alert config description : %s%n", anomalyAlertConfigurationItem.getDescription()); - System.out.println("Anomaly alert configuration hook ids:"); + System.out.println("DataPoint Anomaly alert configuration hook ids:"); anomalyAlertConfigurationItem.getIdOfHooksToAlert().forEach(System.out::println); - System.out.printf("Anomaly alert configuration cross metrics operator: %s%n", + System.out.printf("DataPoint Anomaly alert configuration cross metrics operator: %s%n", anomalyAlertConfigurationItem.getCrossMetricsOperator().toString()); }); } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertAsyncTest.java index 287a6e78a3c2..1eb025776229 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertAsyncTest.java @@ -3,7 +3,7 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.Alert; +import com.azure.ai.metricsadvisor.models.AnomalyAlert; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.PagedFlux; @@ -21,7 +21,7 @@ public final class AlertAsyncTest extends AlertTestBase { public void listAlerts(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { MetricsAdvisorAsyncClient client = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildAsyncClient(); - PagedFlux alertsFlux + PagedFlux alertsFlux = client.listAlerts(ListAlertsInput.INSTANCE.alertConfigurationId, ListAlertsInput.INSTANCE.options); Assertions.assertNotNull(alertsFlux); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertTest.java index 78f39866c8e4..d6b9088956a5 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertTest.java @@ -3,7 +3,7 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.Alert; +import com.azure.ai.metricsadvisor.models.AnomalyAlert; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.PagedIterable; @@ -37,11 +37,11 @@ static void afterAll() { public void listAlerts(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { MetricsAdvisorClient client = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildClient(); - PagedIterable alertsIterable + PagedIterable alertsIterable = client.listAlerts(ListAlertsInput.INSTANCE.alertConfigurationId, ListAlertsInput.INSTANCE.options); int[] cnt = new int[1]; - for (Alert alert : alertsIterable) { + for (AnomalyAlert alert : alertsIterable) { cnt[0]++; assertAlertOutput(alert); } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertTestBase.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertTestBase.java index ca306c399b8b..98c7b6ff675a 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertTestBase.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertTestBase.java @@ -3,16 +3,19 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.Alert; +import com.azure.ai.metricsadvisor.models.AlertQueryTimeMode; +import com.azure.ai.metricsadvisor.models.AnomalyAlert; import com.azure.ai.metricsadvisor.models.ListAlertOptions; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; -import com.azure.ai.metricsadvisor.models.TimeMode; import com.azure.core.http.HttpClient; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.time.OffsetDateTime; public abstract class AlertTestBase extends MetricsAdvisorClientTestBase { + + @Test public abstract void listAlerts(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion); public static final String ALERT_CONFIG_ID = "204a211a-c5f4-45f3-a30e-512fb25d1d2c"; @@ -21,7 +24,7 @@ protected static class ListAlertsInput { static final ListAlertsInput INSTANCE = new ListAlertsInput(); final OffsetDateTime startTime = OffsetDateTime.parse("2020-10-10T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-10-21T00:00:00Z"); - final TimeMode timeMode = TimeMode.ANOMALY_TIME; + final AlertQueryTimeMode timeMode = AlertQueryTimeMode.ANOMALY_TIME; final ListAlertOptions options = new ListAlertOptions(startTime, endTime, timeMode) .setTop(10); final String alertConfigurationId = ALERT_CONFIG_ID; @@ -32,16 +35,16 @@ protected static class ListAlertsOutput { final int expectedAlerts = 4; } - protected void assertAlertOutput(Alert alert) { - Assertions.assertNotNull(alert); - Assertions.assertNotNull(alert.getId()); - Assertions.assertNotNull(alert.getCreatedTime()); - Assertions.assertNotNull(alert.getModifiedTime()); - Assertions.assertNotNull(alert.getTimestamp()); - boolean isInRange = (alert.getTimestamp().isEqual(ListAlertsInput.INSTANCE.startTime) - || alert.getTimestamp().isAfter(ListAlertsInput.INSTANCE.startTime)) - && (alert.getTimestamp().isEqual(ListAlertsInput.INSTANCE.endTime) - || alert.getTimestamp().isBefore(ListAlertsInput.INSTANCE.endTime)); + protected void assertAlertOutput(AnomalyAlert anomalyAlert) { + Assertions.assertNotNull(anomalyAlert); + Assertions.assertNotNull(anomalyAlert.getId()); + Assertions.assertNotNull(anomalyAlert.getCreatedTime()); + Assertions.assertNotNull(anomalyAlert.getModifiedTime()); + Assertions.assertNotNull(anomalyAlert.getTimestamp()); + boolean isInRange = (anomalyAlert.getTimestamp().isEqual(ListAlertsInput.INSTANCE.startTime) + || anomalyAlert.getTimestamp().isAfter(ListAlertsInput.INSTANCE.startTime)) + && (anomalyAlert.getTimestamp().isEqual(ListAlertsInput.INSTANCE.endTime) + || anomalyAlert.getTimestamp().isBefore(ListAlertsInput.INSTANCE.endTime)); Assertions.assertTrue(isInRange); } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyAlertAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyAlertAsyncTest.java index a11cc357797c..a965e2312ad4 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyAlertAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyAlertAsyncTest.java @@ -4,6 +4,7 @@ package com.azure.ai.metricsadvisor; import com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient; +import com.azure.ai.metricsadvisor.models.AnomalyAlert; import com.azure.ai.metricsadvisor.models.AnomalyAlertConfiguration; import com.azure.ai.metricsadvisor.models.ErrorCodeException; import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConfiguration; @@ -11,10 +12,12 @@ import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertScope; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; +import com.azure.core.http.rest.PagedFlux; import com.azure.core.test.TestBase; import com.azure.core.util.CoreUtils; import io.netty.handler.codec.http.HttpResponseStatus; import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -65,12 +68,12 @@ void testListAnomalyAlert(HttpClient httpClient, MetricsAdvisorServiceVersion se List actualAnomalyAlertList = new ArrayList<>(); List expectedAnomalyAlertList = inputAnomalyAlertList.stream().map(inputAnomalyAlert -> - client.createAnomalyAlertConfiguration(inputAnomalyAlert).block()) + client.createAnomalyAlertConfig(inputAnomalyAlert).block()) .collect(Collectors.toList()); // Act final AtomicInteger i = new AtomicInteger(-1); - StepVerifier.create(client.listAnomalyAlertConfigurations(inputAnomalyAlertList.get(i.incrementAndGet()) + StepVerifier.create(client.listAnomalyAlertConfigs(inputAnomalyAlertList.get(i.incrementAndGet()) .getMetricAlertConfigurations().get(i.get()).getDetectionConfigurationId())) .thenConsumeWhile(actualAnomalyAlertList::add) .verifyComplete(); @@ -94,7 +97,7 @@ void testListAnomalyAlert(HttpClient httpClient, MetricsAdvisorServiceVersion se } finally { if (!CoreUtils.isNullOrEmpty(expectedAnomalyAlertIdList.get())) { expectedAnomalyAlertIdList.get().forEach(inputConfigId -> - StepVerifier.create(client.deleteAnomalyAlertConfiguration(inputConfigId)).verifyComplete()); + StepVerifier.create(client.deleteAnomalyAlertConfig(inputConfigId)).verifyComplete()); } } } @@ -112,7 +115,7 @@ public void getAnomalyAlertNullId(HttpClient httpClient, MetricsAdvisorServiceVe client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); // Act & Assert - StepVerifier.create(client.getAnomalyAlertConfiguration(null)) + StepVerifier.create(client.getAnomalyAlertConfig(null)) .expectErrorMatches(throwable -> throwable instanceof NullPointerException && throwable.getMessage().equals("'alertConfigurationId' is required.")) .verify(); @@ -128,7 +131,7 @@ public void getAnomalyAlertInvalidId(HttpClient httpClient, MetricsAdvisorServic client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); // Act & Assert - StepVerifier.create(client.getAnomalyAlertConfiguration(INCORRECT_UUID)) + StepVerifier.create(client.getAnomalyAlertConfig(INCORRECT_UUID)) .expectErrorMatches(throwable -> throwable instanceof IllegalArgumentException && throwable.getMessage().equals(INCORRECT_UUID_ERROR)) .verify(); @@ -146,21 +149,21 @@ public void getAnomalyAlertValidId(HttpClient httpClient, MetricsAdvisorServiceV creatAnomalyAlertRunner(inputAnomalyAlertConfiguration -> { final AnomalyAlertConfiguration createdAnomalyAlert = - client.createAnomalyAlertConfiguration(inputAnomalyAlertConfiguration).block(); + client.createAnomalyAlertConfig(inputAnomalyAlertConfiguration).block(); assertNotNull(createdAnomalyAlert); alertConfigurationId.set(createdAnomalyAlert.getId()); // Act & Assert - StepVerifier.create(client.getAnomalyAlertConfigurationWithResponse(alertConfigurationId.get())) + StepVerifier.create(client.getAnomalyAlertConfigWithResponse(alertConfigurationId.get())) .assertNext(anomalyAlertConfigurationResponse -> { assertEquals(anomalyAlertConfigurationResponse.getStatusCode(), HttpResponseStatus.OK.code()); validateAnomalyAlertResult(createdAnomalyAlert, anomalyAlertConfigurationResponse.getValue()); }); }); - Mono deleteAnomalyAlertConfiguration = client.deleteAnomalyAlertConfiguration(alertConfigurationId.get()); + Mono deleteAnomalyAlertConfig = client.deleteAnomalyAlertConfig(alertConfigurationId.get()); - StepVerifier.create(deleteAnomalyAlertConfiguration).verifyComplete(); + StepVerifier.create(deleteAnomalyAlertConfig).verifyComplete(); } // Create Anomaly alert configuration @@ -170,7 +173,7 @@ public void getAnomalyAlertValidId(HttpClient httpClient, MetricsAdvisorServiceV */ @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - public void createAnomalyAlertConfiguration(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { + public void createAnomalyAlertConfig(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { final AtomicReference alertConfigurationId = new AtomicReference<>(); try { // Arrange @@ -178,7 +181,7 @@ public void createAnomalyAlertConfiguration(HttpClient httpClient, MetricsAdviso creatAnomalyAlertRunner(inputAnomalyAlert -> // Act & Assert - StepVerifier.create(client.createAnomalyAlertConfiguration(inputAnomalyAlert)) + StepVerifier.create(client.createAnomalyAlertConfig(inputAnomalyAlert)) .assertNext(createdAnomalyAlert -> { alertConfigurationId.set(createdAnomalyAlert.getId()); validateAnomalyAlertResult(inputAnomalyAlert, createdAnomalyAlert); @@ -186,9 +189,9 @@ public void createAnomalyAlertConfiguration(HttpClient httpClient, MetricsAdviso .verifyComplete()); } finally { if (!CoreUtils.isNullOrEmpty(alertConfigurationId.get())) { - Mono deleteAnomalyAlertConfiguration - = client.deleteAnomalyAlertConfiguration(alertConfigurationId.get()); - StepVerifier.create(deleteAnomalyAlertConfiguration).verifyComplete(); + Mono deleteAnomalyAlertConfig + = client.deleteAnomalyAlertConfig(alertConfigurationId.get()); + StepVerifier.create(deleteAnomalyAlertConfig).verifyComplete(); } } } @@ -203,15 +206,15 @@ public void deleteAnomalyAlertWithResponse(HttpClient httpClient, MetricsAdvisor client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); creatAnomalyAlertRunner(inputAnomalyAlertConfig -> { final AnomalyAlertConfiguration createdAnomalyAlert = - client.createAnomalyAlertConfiguration(inputAnomalyAlertConfig).block(); + client.createAnomalyAlertConfig(inputAnomalyAlertConfig).block(); assertNotNull(createdAnomalyAlert); - StepVerifier.create(client.deleteAnomalyAlertConfigurationWithResponse(createdAnomalyAlert.getId())) + StepVerifier.create(client.deleteAnomalyAlertConfigWithResponse(createdAnomalyAlert.getId())) .assertNext(response -> assertEquals(HttpResponseStatus.NO_CONTENT.code(), response.getStatusCode())) .verifyComplete(); // Act & Assert - StepVerifier.create(client.getAnomalyAlertConfigurationWithResponse(createdAnomalyAlert.getId())) + StepVerifier.create(client.getAnomalyAlertConfigWithResponse(createdAnomalyAlert.getId())) .verifyErrorSatisfies(throwable -> { assertEquals(ErrorCodeException.class, throwable.getClass()); final ErrorCodeException errorCodeException = (ErrorCodeException) throwable; @@ -236,7 +239,7 @@ public void updateAnomalyAlertHappyPath(HttpClient httpClient, MetricsAdvisorSer creatAnomalyAlertRunner(inputAnomalyAlert -> { // Arrange final AnomalyAlertConfiguration createdAnomalyAlert = - client.createAnomalyAlertConfiguration(inputAnomalyAlert).block(); + client.createAnomalyAlertConfig(inputAnomalyAlert).block(); assertNotNull(createdAnomalyAlert); alertConfigId.set(createdAnomalyAlert.getId()); @@ -250,7 +253,7 @@ public void updateAnomalyAlertHappyPath(HttpClient httpClient, MetricsAdvisorSer // Act & Assert // add metricAnomalyAlertConfiguration and operator - StepVerifier.create(client.updateAnomalyAlertConfiguration( + StepVerifier.create(client.updateAnomalyAlertConfig( createdAnomalyAlert.setMetricAlertConfigurations( Arrays.asList(metricAnomalyAlertConfiguration, metricAnomalyAlertConfiguration2)) .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.XOR))) @@ -262,7 +265,7 @@ public void updateAnomalyAlertHappyPath(HttpClient httpClient, MetricsAdvisorSer }).verifyComplete(); // clear the set configurations, not allowed - StepVerifier.create(client.updateAnomalyAlertConfiguration( + StepVerifier.create(client.updateAnomalyAlertConfig( createdAnomalyAlert.setMetricAlertConfigurations(null))) .verifyErrorSatisfies(throwable -> assertEquals( "'alertConfiguration.metricAnomalyAlertConfigurations' is required and cannot be empty", @@ -270,9 +273,9 @@ public void updateAnomalyAlertHappyPath(HttpClient httpClient, MetricsAdvisorSer }); } finally { if (!CoreUtils.isNullOrEmpty(alertConfigId.get())) { - Mono deleteAnomalyAlertConfiguration - = client.deleteAnomalyAlertConfiguration(alertConfigId.get()); - StepVerifier.create(deleteAnomalyAlertConfiguration).verifyComplete(); + Mono deleteAnomalyAlertConfig + = client.deleteAnomalyAlertConfig(alertConfigId.get()); + StepVerifier.create(deleteAnomalyAlertConfig).verifyComplete(); } } } @@ -291,30 +294,27 @@ public void updateAnomalyAlertHappyPath(HttpClient httpClient, MetricsAdvisorSer // creatAnomalyAlertRunner(inputAnomalyAlert -> { // // Arrange // final AnomalyAlertConfiguration createdAnomalyAlert = - // client.createAnomalyAlertConfiguration(inputAnomalyAlert).block(); + // client.createAnomalyAlertConfig(inputAnomalyAlert).block(); // // inputAnomalyAlertConfigId.set(createdAnomalyAlert.getId()); // // // Act & Assert - // StepVerifier.create(client.updateAnomalyAlertConfiguration( + // StepVerifier.create(client.updateAnomalyAlertConfig( // createdAnomalyAlert.setDescription("updated_description") // .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.XOR))) // .assertNext(updatedAnomalyAlert -> // assertEquals("updated_description", updatedAnomalyAlert.getDescription())).verifyComplete(); // // // clear the set description, not allowed - // StepVerifier.create(client.updateAnomalyAlertConfiguration( + // StepVerifier.create(client.updateAnomalyAlertConfig( // createdAnomalyAlert.setDescription(null))) // .assertNext(anomalyAlertConfiguration -> assertNull(anomalyAlertConfiguration.getDescription())) // .verifyComplete(); // // }); - // client.deleteAnomalyAlertConfigurationWithResponse(inputAnomalyAlertConfigId.get()).block(); + // client.deleteAnomalyAlertConfigWithResponse(inputAnomalyAlertConfigId.get()).block(); // } - /** - * Verifies update for a removing hooks from a previously created anomaly alert configuration's. - */ @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") public void updateAnomalyAlertRemoveHooks(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { @@ -325,13 +325,13 @@ public void updateAnomalyAlertRemoveHooks(HttpClient httpClient, MetricsAdvisorS creatAnomalyAlertRunner(inputAnomalyAlert -> { // Arrange final AnomalyAlertConfiguration createdAnomalyAlert = - client.createAnomalyAlertConfiguration(inputAnomalyAlert).block(); + client.createAnomalyAlertConfig(inputAnomalyAlert).block(); assertNotNull(createdAnomalyAlert); alertConfigId.set(createdAnomalyAlert.getId()); // Act & Assert - StepVerifier.create(client.updateAnomalyAlertConfiguration( + StepVerifier.create(client.updateAnomalyAlertConfig( createdAnomalyAlert.removeHookToAlert(ALERT_HOOK_ID))) .assertNext(updatedAnomalyAlert -> assertEquals(0, updatedAnomalyAlert.getIdOfHooksToAlert().size())) @@ -340,9 +340,9 @@ public void updateAnomalyAlertRemoveHooks(HttpClient httpClient, MetricsAdvisorS }); } finally { if (!CoreUtils.isNullOrEmpty(alertConfigId.get())) { - Mono deleteAnomalyAlertConfiguration - = client.deleteAnomalyAlertConfiguration(alertConfigId.get()); - StepVerifier.create(deleteAnomalyAlertConfiguration).verifyComplete(); + Mono deleteAnomalyAlertConfig + = client.deleteAnomalyAlertConfig(alertConfigId.get()); + StepVerifier.create(deleteAnomalyAlertConfig).verifyComplete(); } } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyAlertTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyAlertTest.java index e1d7907a98e4..6a0c7affabc0 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyAlertTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyAlertTest.java @@ -3,7 +3,9 @@ package com.azure.ai.metricsadvisor; +import com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient; import com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient; +import com.azure.ai.metricsadvisor.models.AnomalyAlert; import com.azure.ai.metricsadvisor.models.AnomalyAlertConfiguration; import com.azure.ai.metricsadvisor.models.ErrorCodeException; import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConfiguration; @@ -11,10 +13,13 @@ import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertScope; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; +import com.azure.core.http.rest.PagedIterable; import com.azure.core.http.rest.Response; +import com.azure.core.test.TestBase; import com.azure.core.util.Context; import io.netty.handler.codec.http.HttpResponseStatus; import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -35,11 +40,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -public class AnomalyAlertTest extends AnomalyAlertTestBase { +public final class AnomalyAlertTest extends AnomalyAlertTestBase { private MetricsAdvisorAdministrationClient client; @BeforeAll static void beforeAll() { + TestBase.setupClass(); StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); } @@ -61,12 +67,12 @@ void testListAnomalyAlert(HttpClient httpClient, MetricsAdvisorServiceVersion se List actualAnomalyAlertList = new ArrayList<>(); List expectedAnomalyAlertList = inputAnomalyAlertList.stream().map(inputAnomalyAlert -> - client.createAnomalyAlertConfiguration(inputAnomalyAlert)) + client.createAnomalyAlertConfig(inputAnomalyAlert)) .collect(Collectors.toList()); // Act final AtomicInteger i = new AtomicInteger(-1); - client.listAnomalyAlertConfigurations(inputAnomalyAlertList.get(i.incrementAndGet()) + client.listAnomalyAlertConfigs(inputAnomalyAlertList.get(i.incrementAndGet()) .getMetricAlertConfigurations().get(i.get()).getDetectionConfigurationId()) .forEach(actualAnomalyAlertList::add); @@ -87,7 +93,7 @@ void testListAnomalyAlert(HttpClient httpClient, MetricsAdvisorServiceVersion se expectedAnomalyAlertList.forEach(expectedAnomalyAlert -> validateAnomalyAlertResult(expectedAnomalyAlert, actualList.get(i.get()))); - expectedAnomalyAlertIdList.forEach(inputConfigId -> client.deleteAnomalyAlertConfiguration(inputConfigId)); + expectedAnomalyAlertIdList.forEach(inputConfigId -> client.deleteAnomalyAlertConfig(inputConfigId)); }); } @@ -104,7 +110,7 @@ public void getAnomalyAlertNullId(HttpClient httpClient, MetricsAdvisorServiceVe client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); // Act & Assert Exception exception = assertThrows(NullPointerException.class, () -> - client.getAnomalyAlertConfiguration(null)); + client.getAnomalyAlertConfig(null)); assertEquals(exception.getMessage(), "'alertConfigurationId' is required."); } @@ -119,7 +125,7 @@ public void getAnomalyAlertInvalidId(HttpClient httpClient, MetricsAdvisorServic // Act & Assert Exception exception = assertThrows(IllegalArgumentException.class, () -> - client.getAnomalyAlertConfiguration(INCORRECT_UUID)); + client.getAnomalyAlertConfig(INCORRECT_UUID)); assertEquals(exception.getMessage(), INCORRECT_UUID_ERROR); } @@ -136,16 +142,16 @@ public void getAnomalyAlertValidId(HttpClient httpClient, MetricsAdvisorServiceV listAnomalyAlertRunner(anomalyAlertConfigurationList -> { final AnomalyAlertConfiguration inputAnomalyAlertConfiguration = anomalyAlertConfigurationList.get(0); final AnomalyAlertConfiguration createdAnomalyAlert = - client.createAnomalyAlertConfiguration(inputAnomalyAlertConfiguration); + client.createAnomalyAlertConfig(inputAnomalyAlertConfiguration); alertConfigurationId.set(createdAnomalyAlert.getId()); // Act & Assert Response anomalyAlertConfigurationResponse = - client.getAnomalyAlertConfigurationWithResponse(alertConfigurationId.get(), Context.NONE); + client.getAnomalyAlertConfigWithResponse(alertConfigurationId.get(), Context.NONE); assertEquals(anomalyAlertConfigurationResponse.getStatusCode(), HttpResponseStatus.OK.code()); validateAnomalyAlertResult(createdAnomalyAlert, anomalyAlertConfigurationResponse.getValue()); }); - client.deleteAnomalyAlertConfiguration(alertConfigurationId.get()); + client.deleteAnomalyAlertConfig(alertConfigurationId.get()); } // Create Anomaly alert configuration @@ -155,18 +161,18 @@ public void getAnomalyAlertValidId(HttpClient httpClient, MetricsAdvisorServiceV */ @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - public void createAnomalyAlertConfiguration(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { + public void createAnomalyAlertConfig(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { // Arrange client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); final AtomicReference alertConfigurationId = new AtomicReference<>(); creatAnomalyAlertRunner(inputAnomalyAlertConfig -> { // Act & Assert AnomalyAlertConfiguration createdAnomalyAlertConfig = - client.createAnomalyAlertConfiguration(inputAnomalyAlertConfig); + client.createAnomalyAlertConfig(inputAnomalyAlertConfig); alertConfigurationId.set(createdAnomalyAlertConfig.getId()); validateAnomalyAlertResult(inputAnomalyAlertConfig, createdAnomalyAlertConfig); }); - client.deleteAnomalyAlertConfiguration(alertConfigurationId.get()); + client.deleteAnomalyAlertConfig(alertConfigurationId.get()); } /** @@ -179,15 +185,15 @@ public void deleteAnomalyAlertWithResponse(HttpClient httpClient, MetricsAdvisor client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); creatAnomalyAlertRunner(inputAnomalyAlertConfig -> { final AnomalyAlertConfiguration createdAnomalyAlert = - client.createAnomalyAlertConfiguration(inputAnomalyAlertConfig); + client.createAnomalyAlertConfig(inputAnomalyAlertConfig); - Response response = client.deleteAnomalyAlertConfigurationWithResponse(createdAnomalyAlert.getId(), + Response response = client.deleteAnomalyAlertConfigWithResponse(createdAnomalyAlert.getId(), Context.NONE); assertEquals(response.getStatusCode(), HttpResponseStatus.NO_CONTENT.code()); // Act & Assert Exception exception = assertThrows(ErrorCodeException.class, () -> - client.getAnomalyAlertConfiguration(createdAnomalyAlert.getId())); + client.getAnomalyAlertConfig(createdAnomalyAlert.getId())); assertEquals(ErrorCodeException.class, exception.getClass()); final ErrorCodeException errorCodeException = ((ErrorCodeException) exception); assertEquals(HttpResponseStatus.NOT_FOUND.code(), errorCodeException.getResponse().getStatusCode()); @@ -209,7 +215,7 @@ public void updateAnomalyAlertHappyPath(HttpClient httpClient, MetricsAdvisorSer creatAnomalyAlertRunner(inputAnomalyAlert -> { // Arrange final AnomalyAlertConfiguration createdAnomalyAlert = - client.createAnomalyAlertConfiguration(inputAnomalyAlert); + client.createAnomalyAlertConfig(inputAnomalyAlert); inputAnomalyAlertConfigId.set(createdAnomalyAlert.getId()); @@ -222,7 +228,7 @@ public void updateAnomalyAlertHappyPath(HttpClient httpClient, MetricsAdvisorSer // Act & Assert // add metricAnomalyAlertConfiguration and operator - final AnomalyAlertConfiguration updatedAnomalyAlertConfiguration = client.updateAnomalyAlertConfiguration( + final AnomalyAlertConfiguration updatedAnomalyAlertConfiguration = client.updateAnomalyAlertConfig( createdAnomalyAlert.setMetricAlertConfigurations( Arrays.asList(metricAnomalyAlertConfiguration, metricAnomalyAlertConfiguration2)) .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.XOR)); @@ -234,12 +240,12 @@ public void updateAnomalyAlertHappyPath(HttpClient httpClient, MetricsAdvisorSer // clear the set configurations, not allowed Exception exception = assertThrows(NullPointerException.class, () -> - client.updateAnomalyAlertConfiguration(createdAnomalyAlert.setMetricAlertConfigurations(null))); + client.updateAnomalyAlertConfig(createdAnomalyAlert.setMetricAlertConfigurations(null))); assertEquals("'alertConfiguration.metricAnomalyAlertConfigurations' is " + "required and cannot be empty", exception.getMessage()); }); - client.deleteAnomalyAlertConfiguration(inputAnomalyAlertConfigId.get()); + client.deleteAnomalyAlertConfig(inputAnomalyAlertConfigId.get()); } // TODO (savaity) update cannot be used to clear a set description? @@ -255,48 +261,24 @@ public void updateAnomalyAlertHappyPath(HttpClient httpClient, MetricsAdvisorSer // creatAnomalyAlertRunner(inputAnomalyAlert -> { // // Arrange // final AnomalyAlertConfiguration createdAnomalyAlert = - // client.createAnomalyAlertConfiguration(inputAnomalyAlert).block(); + // client.createAnomalyAlertConfig(inputAnomalyAlert).block(); // // inputAnomalyAlertConfigId.set(createdAnomalyAlert.getId()); // // // Act & Assert - // StepVerifier.create(client.updateAnomalyAlertConfiguration( + // StepVerifier.create(client.updateAnomalyAlertConfig( // createdAnomalyAlert.setDescription("updated_description") // .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.XOR))) // .assertNext(updatedAnomalyAlert -> // assertEquals("updated_description", updatedAnomalyAlert.getDescription())).verifyComplete(); // // // clear the set description, not allowed - // StepVerifier.create(client.updateAnomalyAlertConfiguration( + // StepVerifier.create(client.updateAnomalyAlertConfig( // createdAnomalyAlert.setDescription(null))) // .assertNext(anomalyAlertConfiguration -> assertNull(anomalyAlertConfiguration.getDescription())) // .verifyComplete(); // // }); - // client.deleteAnomalyAlertConfigurationWithResponse(inputAnomalyAlertConfigId.get()).block(); + // client.deleteAnomalyAlertConfigWithResponse(inputAnomalyAlertConfigId.get()).block(); // } - - /** - * Verifies update for a removing hooks from a previously created anomaly alert configuration's. - */ - @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) - @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - public void updateAnomalyAlertRemoveHooks(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { - // Arrange - client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); - final AtomicReference inputAnomalyAlertConfigId = new AtomicReference<>(); - creatAnomalyAlertRunner(inputAnomalyAlert -> { - // Arrange - final AnomalyAlertConfiguration createdAnomalyAlert = - client.createAnomalyAlertConfiguration(inputAnomalyAlert); - - inputAnomalyAlertConfigId.set(createdAnomalyAlert.getId()); - - // Act & Assert - final AnomalyAlertConfiguration updatedAnomalyAlertConfiguration = client.updateAnomalyAlertConfiguration( - createdAnomalyAlert.removeHookToAlert(ALERT_HOOK_ID)); - assertEquals(0, updatedAnomalyAlertConfiguration.getIdOfHooksToAlert().size()); - }); - client.deleteAnomalyAlertConfiguration(inputAnomalyAlertConfigId.get()); - } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForAlertTestBase.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForAlertTestBase.java index ac833cd49cf5..139dabb56358 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForAlertTestBase.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForAlertTestBase.java @@ -3,7 +3,7 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.Anomaly; +import com.azure.ai.metricsadvisor.models.DataPointAnomaly; import com.azure.ai.metricsadvisor.models.ListAnomaliesAlertedOptions; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; @@ -28,16 +28,16 @@ protected static class ListAnomaliesForAlertOutput { final int expectedAnomalies = 2; } - protected void assertListAnomaliesForAlertOutput(Anomaly anomaly) { - Assertions.assertNotNull(anomaly); - Assertions.assertNotNull(anomaly.getMetricId()); - Assertions.assertNotNull(anomaly.getSeverity()); - Assertions.assertNotNull(anomaly.getStatus()); - Assertions.assertNotNull(anomaly.getCreatedTime()); - Assertions.assertNotNull(anomaly.getModifiedTime()); - Assertions.assertNotNull(anomaly.getTimestamp()); - Assertions.assertNotNull(anomaly.getDetectionConfigurationId()); - Assertions.assertNotNull(anomaly.getSeriesKey()); - Assertions.assertFalse(anomaly.getSeriesKey().asMap().isEmpty()); + protected void assertListAnomaliesForAlertOutput(DataPointAnomaly dataPointAnomaly) { + Assertions.assertNotNull(dataPointAnomaly); + Assertions.assertNotNull(dataPointAnomaly.getMetricId()); + Assertions.assertNotNull(dataPointAnomaly.getSeverity()); + Assertions.assertNotNull(dataPointAnomaly.getStatus()); + Assertions.assertNotNull(dataPointAnomaly.getCreatedTime()); + Assertions.assertNotNull(dataPointAnomaly.getModifiedTime()); + Assertions.assertNotNull(dataPointAnomaly.getTimestamp()); + Assertions.assertNotNull(dataPointAnomaly.getDetectionConfigurationId()); + Assertions.assertNotNull(dataPointAnomaly.getSeriesKey()); + Assertions.assertFalse(dataPointAnomaly.getSeriesKey().asMap().isEmpty()); } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForDetectionConfigTestBase.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForDetectionConfigTestBase.java index d666344e03b2..ea2fc16a2f0b 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForDetectionConfigTestBase.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForDetectionConfigTestBase.java @@ -3,11 +3,11 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.Anomaly; +import com.azure.ai.metricsadvisor.models.AnomalySeverity; +import com.azure.ai.metricsadvisor.models.DataPointAnomaly; import com.azure.ai.metricsadvisor.models.ListAnomaliesDetectedFilter; import com.azure.ai.metricsadvisor.models.ListAnomaliesDetectedOptions; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; -import com.azure.ai.metricsadvisor.models.Severity; import com.azure.core.http.HttpClient; import org.junit.jupiter.api.Assertions; @@ -28,17 +28,17 @@ protected static class ListAnomaliesForDetectionConfigInput { final OffsetDateTime startTime = TIME_SERIES_START_TIME; final OffsetDateTime endTime = TIME_SERIES_END_TIME; final ListAnomaliesDetectedFilter filter = new ListAnomaliesDetectedFilter() - .setSeverityRange(Severity.LOW, Severity.MEDIUM); + .setSeverityRange(AnomalySeverity.LOW, AnomalySeverity.MEDIUM); final ListAnomaliesDetectedOptions options = new ListAnomaliesDetectedOptions(startTime, endTime) .setTop(10) .setFilter(filter); } - protected void assertListAnomaliesDetectionConfigOutput(Anomaly anomaly) { - Assertions.assertNotNull(anomaly); - Assertions.assertNotNull(anomaly.getSeverity()); - Assertions.assertNotNull(anomaly.getTimestamp()); - Assertions.assertNotNull(anomaly.getSeriesKey()); - Assertions.assertFalse(anomaly.getSeriesKey().asMap().isEmpty()); + protected void assertListAnomaliesDetectionConfigOutput(DataPointAnomaly dataPointAnomaly) { + Assertions.assertNotNull(dataPointAnomaly); + Assertions.assertNotNull(dataPointAnomaly.getSeverity()); + Assertions.assertNotNull(dataPointAnomaly.getTimestamp()); + Assertions.assertNotNull(dataPointAnomaly.getSeriesKey()); + Assertions.assertFalse(dataPointAnomaly.getSeriesKey().asMap().isEmpty()); } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentDetectedAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentDetectedAsyncTest.java similarity index 88% rename from sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentDetectedAsyncTest.java rename to sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentDetectedAsyncTest.java index 1e3efb2362ff..2b7b1ddb5940 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentDetectedAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentDetectedAsyncTest.java @@ -3,7 +3,7 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.Incident; +import com.azure.ai.metricsadvisor.models.AnomalyIncident; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.PagedFlux; @@ -20,7 +20,7 @@ import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; import static org.junit.jupiter.api.Assertions.assertEquals; -public class IncidentDetectedAsyncTest extends IncidentDetectedTestBase { +public class AnomalyIncidentDetectedAsyncTest extends IncidentDetectedTestBase { @BeforeAll static void beforeAll() { @@ -39,8 +39,8 @@ static void afterAll() { public void listIncidentsDetected(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { MetricsAdvisorAsyncClient client = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildAsyncClient(); - PagedFlux incidentsFlux - = client.listIncidentsForDetectionConfiguration( + PagedFlux incidentsFlux + = client.listIncidentsForDetectionConfig( ListIncidentsDetectedInput.INSTANCE.detectionConfigurationId, ListIncidentsDetectedInput.INSTANCE.options); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentDetectedTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentDetectedTest.java similarity index 72% rename from sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentDetectedTest.java rename to sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentDetectedTest.java index 74f825f3296b..aad9a739fa6e 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentDetectedTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentDetectedTest.java @@ -3,7 +3,7 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.Incident; +import com.azure.ai.metricsadvisor.models.AnomalyIncident; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.PagedIterable; @@ -12,7 +12,7 @@ import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; -public class IncidentDetectedTest extends IncidentDetectedTestBase { +public class AnomalyIncidentDetectedTest extends IncidentDetectedTestBase { @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") @@ -20,13 +20,13 @@ public class IncidentDetectedTest extends IncidentDetectedTestBase { public void listIncidentsDetected(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { MetricsAdvisorClient client = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildClient(); - PagedIterable incidentsIterable - = client.listIncidentsForDetectionConfiguration( + PagedIterable incidentsIterable + = client.listIncidentsForDetectionConfig( ListIncidentsDetectedInput.INSTANCE.detectionConfigurationId, ListIncidentsDetectedInput.INSTANCE.options); - for (Incident incident : incidentsIterable) { - assertListIncidentsDetectedOutput(incident); + for (AnomalyIncident anomalyIncident : incidentsIterable) { + assertListIncidentsDetectedOutput(anomalyIncident); } } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentForAlertAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentForAlertAsyncTest.java similarity index 90% rename from sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentForAlertAsyncTest.java rename to sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentForAlertAsyncTest.java index e087ca1056f9..772cab8d1980 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentForAlertAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentForAlertAsyncTest.java @@ -3,7 +3,7 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.Incident; +import com.azure.ai.metricsadvisor.models.AnomalyIncident; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.PagedFlux; @@ -19,7 +19,7 @@ import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; -public class IncidentForAlertAsyncTest extends IncidentForAlertTestBase { +public class AnomalyIncidentForAlertAsyncTest extends IncidentForAlertTestBase { @BeforeAll static void beforeAll() { TestBase.setupClass(); @@ -37,7 +37,7 @@ static void afterAll() { public void listIncidentsForAlert(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { MetricsAdvisorAsyncClient client = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildAsyncClient(); - PagedFlux incidentsFlux + PagedFlux incidentsFlux = client.listIncidentsForAlert( ListIncidentsForAlertInput.INSTANCE.alertConfigurationId, ListIncidentsForAlertInput.INSTANCE.alertId, diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentForAlertTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentForAlertTest.java similarity index 81% rename from sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentForAlertTest.java rename to sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentForAlertTest.java index 2c952ea5a1a5..c94b2f672ba8 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentForAlertTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentForAlertTest.java @@ -5,7 +5,7 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.Incident; +import com.azure.ai.metricsadvisor.models.AnomalyIncident; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.PagedIterable; @@ -15,23 +15,23 @@ import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; -public class IncidentForAlertTest extends IncidentForAlertTestBase { +public class AnomalyIncidentForAlertTest extends IncidentForAlertTestBase { @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") @Override public void listIncidentsForAlert(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { MetricsAdvisorClient client = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildClient(); - PagedIterable incidentsIterable + PagedIterable incidentsIterable = client.listIncidentsForAlert( ListIncidentsForAlertInput.INSTANCE.alertConfigurationId, ListIncidentsForAlertInput.INSTANCE.alertId, ListIncidentsForAlertInput.INSTANCE.options); int[] cnt = new int[1]; - for (Incident incident : incidentsIterable) { + for (AnomalyIncident anomalyIncident : incidentsIterable) { cnt[0]++; - assertListIncidentsForAlertOutput(incident); + assertListIncidentsForAlertOutput(anomalyIncident); } Assertions.assertEquals(ListIncidentsForAlertOutput.INSTANCE.expectedIncidents, cnt[0]); } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentRootCauseAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentRootCauseAsyncTest.java similarity index 96% rename from sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentRootCauseAsyncTest.java rename to sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentRootCauseAsyncTest.java index dba955a61977..05ead6dd3db2 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentRootCauseAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentRootCauseAsyncTest.java @@ -20,7 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -public class IncidentRootCauseAsyncTest extends IncidentRootCauseTestBase { +public class AnomalyIncidentRootCauseAsyncTest extends IncidentRootCauseTestBase { private MetricsAdvisorAsyncClient client; diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentRootCauseTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentRootCauseTest.java similarity index 96% rename from sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentRootCauseTest.java rename to sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentRootCauseTest.java index dbe4659a4986..e9f58ec9166d 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentRootCauseTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentRootCauseTest.java @@ -20,7 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -public class IncidentRootCauseTest extends IncidentRootCauseTestBase { +public class AnomalyIncidentRootCauseTest extends IncidentRootCauseTestBase { private MetricsAdvisorClient client; diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedClientTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedClientTest.java index 0b1bb26887c7..f7426a393024 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedClientTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedClientTest.java @@ -7,6 +7,7 @@ import com.azure.ai.metricsadvisor.models.DataFeed; import com.azure.ai.metricsadvisor.models.DataFeedGranularity; import com.azure.ai.metricsadvisor.models.DataFeedGranularityType; +import com.azure.ai.metricsadvisor.models.DataFeedMetric; import com.azure.ai.metricsadvisor.models.DataFeedSchema; import com.azure.ai.metricsadvisor.models.DataFeedSourceType; import com.azure.ai.metricsadvisor.models.DataFeedStatus; @@ -14,7 +15,6 @@ import com.azure.ai.metricsadvisor.models.ErrorCodeException; import com.azure.ai.metricsadvisor.models.ListDataFeedFilter; import com.azure.ai.metricsadvisor.models.ListDataFeedOptions; -import com.azure.ai.metricsadvisor.models.Metric; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.ai.metricsadvisor.models.PostgreSqlDataFeedSource; import com.azure.core.http.HttpClient; @@ -704,14 +704,14 @@ void createDataFeedRequiredParams(HttpClient httpClient, MetricsAdvisorServiceVe new DataFeed() .setName("name") .setSource(new PostgreSqlDataFeedSource("conn-string", "query")) - .setSchema(new DataFeedSchema(Collections.singletonList(new Metric().setName("name")))))); + .setSchema(new DataFeedSchema(Collections.singletonList(new DataFeedMetric().setName("name")))))); assertEquals("'dataFeedGranularity.granularityType' is required and cannot be null.", ex.getMessage()); ex = assertThrows(NullPointerException.class, () -> client.createDataFeed( new DataFeed() .setName("name") .setSource(new PostgreSqlDataFeedSource("conn-string", "query")) - .setSchema(new DataFeedSchema(Collections.singletonList(new Metric().setName("name")))) + .setSchema(new DataFeedSchema(Collections.singletonList(new DataFeedMetric().setName("name")))) .setGranularity(new DataFeedGranularity().setGranularityType(DAILY)))); assertEquals("'dataFeedIngestionSettings.ingestionStartTime' cannot be null or empty.", ex.getMessage()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DimensionKeyTests.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedDimensionKeyTests.java similarity index 98% rename from sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DimensionKeyTests.java rename to sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedDimensionKeyTests.java index 2ed2ba676f2d..e00725fe9816 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DimensionKeyTests.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedDimensionKeyTests.java @@ -11,7 +11,7 @@ import java.util.Map; import java.util.Set; -public class DimensionKeyTests { +public class DataFeedDimensionKeyTests { @Test public void equalityCheckTests() { DimensionKey dimensionKey1 = new DimensionKey(); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedTestBase.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedTestBase.java index 7c99c645b8f4..c8728803902a 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedTestBase.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedTestBase.java @@ -14,6 +14,7 @@ import com.azure.ai.metricsadvisor.models.DataFeedGranularity; import com.azure.ai.metricsadvisor.models.DataFeedGranularityType; import com.azure.ai.metricsadvisor.models.DataFeedIngestionSettings; +import com.azure.ai.metricsadvisor.models.DataFeedMetric; import com.azure.ai.metricsadvisor.models.DataFeedMissingDataPointFillSettings; import com.azure.ai.metricsadvisor.models.DataFeedOptions; import com.azure.ai.metricsadvisor.models.DataFeedRollupSettings; @@ -21,11 +22,10 @@ import com.azure.ai.metricsadvisor.models.DataFeedSchema; import com.azure.ai.metricsadvisor.models.DataFeedSourceType; import com.azure.ai.metricsadvisor.models.DataFeedMissingDataPointFillType; -import com.azure.ai.metricsadvisor.models.Dimension; +import com.azure.ai.metricsadvisor.models.DataFeedDimension; import com.azure.ai.metricsadvisor.models.ElasticsearchDataFeedSource; import com.azure.ai.metricsadvisor.models.HttpRequestDataFeedSource; import com.azure.ai.metricsadvisor.models.InfluxDBDataFeedSource; -import com.azure.ai.metricsadvisor.models.Metric; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.ai.metricsadvisor.models.MongoDBDataFeedSource; import com.azure.ai.metricsadvisor.models.MySqlDataFeedSource; @@ -171,11 +171,11 @@ void creatDataFeedRunner(Consumer testRunner, DataFeedSourceType dataF throw new IllegalStateException("Unexpected value: " + dataFeedSourceType); } testRunner.accept(dataFeed.setSchema(new DataFeedSchema(Arrays.asList( - new Metric().setName("cost").setDisplayName("cost"), - new Metric().setName("revenue").setDisplayName("revenue"))) + new DataFeedMetric().setName("cost").setDisplayName("cost"), + new DataFeedMetric().setName("revenue").setDisplayName("revenue"))) .setDimensions(Arrays.asList( - new Dimension().setName("city").setDisplayName("city"), - new Dimension().setName("category").setDisplayName("category")))) + new DataFeedDimension().setName("city").setDisplayName("city"), + new DataFeedDimension().setName("category").setDisplayName("category")))) .setName("java_create_data_feed_test_sample" + UUID.randomUUID()) .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) .setIngestionSettings(new DataFeedIngestionSettings(INGESTION_START_TIME))); @@ -376,11 +376,11 @@ private void validateRollUpSettings(DataFeedRollupSettings expectedRollUpSetting private void validateDataFeedSchema(DataFeedSchema expectedDataFeedSchema, DataFeedSchema actualDataFeedSchema) { assertEquals(expectedDataFeedSchema.getDimensions().size(), actualDataFeedSchema.getDimensions().size()); - expectedDataFeedSchema.getDimensions().sort(Comparator.comparing(Dimension::getName)); - actualDataFeedSchema.getDimensions().sort(Comparator.comparing(Dimension::getName)); + expectedDataFeedSchema.getDimensions().sort(Comparator.comparing(DataFeedDimension::getName)); + actualDataFeedSchema.getDimensions().sort(Comparator.comparing(DataFeedDimension::getName)); for (int i = 0; i < expectedDataFeedSchema.getDimensions().size(); i++) { - Dimension expectedDimension = expectedDataFeedSchema.getDimensions().get(i); - Dimension actualDimension = actualDataFeedSchema.getDimensions().get(i); + DataFeedDimension expectedDimension = expectedDataFeedSchema.getDimensions().get(i); + DataFeedDimension actualDimension = actualDataFeedSchema.getDimensions().get(i); assertEquals(expectedDimension.getName(), actualDimension.getName()); assertNotNull(actualDimension.getDisplayName()); if (expectedDimension.getDisplayName() != null) { @@ -391,11 +391,11 @@ private void validateDataFeedSchema(DataFeedSchema expectedDataFeedSchema, DataF } assertEquals(expectedDataFeedSchema.getMetrics().size(), actualDataFeedSchema.getMetrics().size()); - expectedDataFeedSchema.getMetrics().sort(Comparator.comparing(Metric::getName)); - actualDataFeedSchema.getMetrics().sort(Comparator.comparing(Metric::getName)); + expectedDataFeedSchema.getMetrics().sort(Comparator.comparing(DataFeedMetric::getName)); + actualDataFeedSchema.getMetrics().sort(Comparator.comparing(DataFeedMetric::getName)); for (int i = 0; i < expectedDataFeedSchema.getMetrics().size(); i++) { - Metric expectedMetric = expectedDataFeedSchema.getMetrics().get(i); - Metric actualMetric = actualDataFeedSchema.getMetrics().get(i); + DataFeedMetric expectedMetric = expectedDataFeedSchema.getMetrics().get(i); + DataFeedMetric actualMetric = actualDataFeedSchema.getMetrics().get(i); assertNotNull(actualMetric.getId()); assertEquals(expectedMetric.getName(), actualMetric.getName()); if (expectedMetric.getDescription() != null) { diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyAlertAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyAlertAsyncTest.java new file mode 100644 index 000000000000..8541bb9c2c22 --- /dev/null +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyAlertAsyncTest.java @@ -0,0 +1,315 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.ai.metricsadvisor; + +import com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient; +import com.azure.ai.metricsadvisor.models.AnomalyAlertConfiguration; +import com.azure.ai.metricsadvisor.models.ErrorCodeException; +import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConfiguration; +import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConfigurationsOperator; +import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertScope; +import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; +import com.azure.core.http.HttpClient; +import com.azure.core.test.TestBase; +import io.netty.handler.codec.http.HttpResponseStatus; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; +import reactor.test.StepVerifier; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; + +import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; +import static com.azure.ai.metricsadvisor.TestUtils.INCORRECT_UUID; +import static com.azure.ai.metricsadvisor.TestUtils.INCORRECT_UUID_ERROR; +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class DataPointAnomalyAlertAsyncTest extends AnomalyAlertTestBase { + private MetricsAdvisorAdministrationAsyncClient client; + + @BeforeAll + static void beforeAll() { + TestBase.setupClass(); + StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + } + + @AfterAll + static void afterAll() { + StepVerifier.resetDefaultTimeout(); + } + + /** + * Verifies the result of the list anomaly alert configuration method when no options specified. + */ + @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) + @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") + void testListAnomalyAlert(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { + // Arrange + client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); + + listAnomalyAlertRunner(inputAnomalyAlertList -> { + List actualAnomalyAlertList = new ArrayList<>(); + List expectedAnomalyAlertList = + inputAnomalyAlertList.stream().map(inputAnomalyAlert -> + client.createAnomalyAlertConfig(inputAnomalyAlert).block()) + .collect(Collectors.toList()); + + // Act + final AtomicInteger i = new AtomicInteger(-1); + StepVerifier.create(client.listAnomalyAlertConfigs(inputAnomalyAlertList.get(i.incrementAndGet()) + .getMetricAlertConfigurations().get(i.get()).getDetectionConfigurationId())) + .thenConsumeWhile(actualAnomalyAlertList::add) + .verifyComplete(); + + final List expectedAnomalyAlertIdList = expectedAnomalyAlertList.stream() + .map(AnomalyAlertConfiguration::getId) + .collect(Collectors.toList()); + + final List actualList = + actualAnomalyAlertList.stream().filter(actualConfiguration -> expectedAnomalyAlertIdList + .contains(actualConfiguration.getId())) + .collect(Collectors.toList()); + + // Assert + assertEquals(inputAnomalyAlertList.size(), actualList.size()); + expectedAnomalyAlertList.sort(Comparator.comparing(AnomalyAlertConfiguration::getName)); + actualList.sort(Comparator.comparing(AnomalyAlertConfiguration::getName)); + expectedAnomalyAlertList.forEach(expectedAnomalyAlert -> validateAnomalyAlertResult(expectedAnomalyAlert, + actualList.get(i.get()))); + + expectedAnomalyAlertIdList.forEach(inputAnomalyAlertConfigId -> + client.deleteAnomalyAlertConfig(inputAnomalyAlertList.get(i.get()) + .getMetricAlertConfigurations().get(i.get()).getDetectionConfigurationId()).block()); + }); + } + + + // Get DataPointAnomaly AnomalyAlert Configuration + + /** + * Verifies that an exception is thrown for null detection configuration Id parameter. + */ + @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) + @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") + public void getAnomalyAlertNullId(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { + // Arrange + client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); + + // Act & Assert + StepVerifier.create(client.getAnomalyAlertConfig(null)) + .expectErrorMatches(throwable -> throwable instanceof NullPointerException + && throwable.getMessage().equals("'alertConfigurationId' is required.")) + .verify(); + } + + /** + * Verifies that an exception is thrown for invalid detection configuration Id. + */ + @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) + @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") + public void getAnomalyAlertInvalidId(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { + // Arrange + client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); + + // Act & Assert + StepVerifier.create(client.getAnomalyAlertConfig(INCORRECT_UUID)) + .expectErrorMatches(throwable -> throwable instanceof IllegalArgumentException + && throwable.getMessage().equals(INCORRECT_UUID_ERROR)) + .verify(); + } + + /** + * Verifies a valid alert configuration info is returned with response for a valid alert configuration Id. + */ + @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) + @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") + public void getAnomalyAlertValidId(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { + // Arrange + client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); + final AtomicReference alertConfigurationId = new AtomicReference<>(); + + creatAnomalyAlertRunner(inputAnomalyAlertConfiguration -> { + final AnomalyAlertConfiguration createdAnomalyAlert = + client.createAnomalyAlertConfig(inputAnomalyAlertConfiguration).block(); + alertConfigurationId.set(createdAnomalyAlert.getId()); + + // Act & Assert + StepVerifier.create(client.getAnomalyAlertConfigWithResponse(alertConfigurationId.get())) + .assertNext(anomalyAlertConfigurationResponse -> { + assertEquals(anomalyAlertConfigurationResponse.getStatusCode(), HttpResponseStatus.OK.code()); + validateAnomalyAlertResult(createdAnomalyAlert, anomalyAlertConfigurationResponse.getValue()); + }); + }); + client.deleteAnomalyAlertConfig(alertConfigurationId.get()).block(); + } + + // Create DataPointAnomaly alert configuration + + /** + * Verifies valid anomaly alert configuration created for required anomaly alert configuration details. + */ + @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) + @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") + public void createAnomalyAlertConfiguration(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { + // Arrange + client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); + final AtomicReference alertConfigurationId = new AtomicReference<>(); + creatAnomalyAlertRunner(inputAnomalyAlert -> + + // Act & Assert + StepVerifier.create(client.createAnomalyAlertConfig(inputAnomalyAlert)) + .assertNext(createdAnomalyAlert -> { + alertConfigurationId.set(createdAnomalyAlert.getId()); + validateAnomalyAlertResult(inputAnomalyAlert, createdAnomalyAlert); + }) + .verifyComplete()); + + client.deleteAnomalyAlertConfig(alertConfigurationId.get()).block(); + } + + /** + * Verifies happy path for delete anomaly alert configuration. + */ + @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) + @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") + public void deleteAnomalyAlertWithResponse(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { + // Arrange + client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); + creatAnomalyAlertRunner(inputAnomalyAlertConfig -> { + final AnomalyAlertConfiguration createdAnomalyAlert = + client.createAnomalyAlertConfig(inputAnomalyAlertConfig).block(); + + StepVerifier.create(client.deleteAnomalyAlertConfigWithResponse(createdAnomalyAlert.getId())) + .assertNext(response -> assertEquals(HttpResponseStatus.NO_CONTENT.code(), response.getStatusCode())) + .verifyComplete(); + + // Act & Assert + StepVerifier.create(client.getAnomalyAlertConfigWithResponse(createdAnomalyAlert.getId())) + .verifyErrorSatisfies(throwable -> { + assertEquals(ErrorCodeException.class, throwable.getClass()); + final ErrorCodeException errorCodeException = (ErrorCodeException) throwable; + assertEquals(HttpResponseStatus.NOT_FOUND.code(), errorCodeException.getResponse().getStatusCode()); + }); + }); + } + + // Update anomaly alert configuration + + /** + * Verifies previously created anomaly alert configuration can be updated successfully to update the metrics + * operator. + */ + @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) + @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") + public void updateAnomalyAlertHappyPath(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { + // Arrange + client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); + final AtomicReference inputAnomalyAlertConfigId = new AtomicReference<>(); + creatAnomalyAlertRunner(inputAnomalyAlert -> { + // Arrange + final AnomalyAlertConfiguration createdAnomalyAlert = + client.createAnomalyAlertConfig(inputAnomalyAlert).block(); + + inputAnomalyAlertConfigId.set(createdAnomalyAlert.getId()); + + final MetricAnomalyAlertConfiguration metricAnomalyAlertConfiguration + = new MetricAnomalyAlertConfiguration(DETECTION_CONFIGURATION_ID, + MetricAnomalyAlertScope.forWholeSeries()); + final MetricAnomalyAlertConfiguration metricAnomalyAlertConfiguration2 + = new MetricAnomalyAlertConfiguration("bd309211-64b5-4a7a-bb81-a2789599c526", + MetricAnomalyAlertScope.forWholeSeries()); + + // Act & Assert + // add metricAnomalyAlertConfiguration and operator + StepVerifier.create(client.updateAnomalyAlertConfig( + createdAnomalyAlert.setMetricAlertConfigurations( + Arrays.asList(metricAnomalyAlertConfiguration, metricAnomalyAlertConfiguration2)) + .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.XOR))) + .assertNext(updatedAnomalyAlert -> { + validateAnomalyAlertResult(inputAnomalyAlert + .addMetricAlertConfiguration(metricAnomalyAlertConfiguration2), updatedAnomalyAlert); + assertEquals(MetricAnomalyAlertConfigurationsOperator.XOR.toString(), + updatedAnomalyAlert.getCrossMetricsOperator().toString()); + }).verifyComplete(); + + // clear the set configurations, not allowed + StepVerifier.create(client.updateAnomalyAlertConfig( + createdAnomalyAlert.setMetricAlertConfigurations(null))) + .verifyErrorSatisfies(throwable -> assertEquals( + "'alertConfiguration.metricAnomalyAlertConfigurations' is required and cannot be empty", + throwable.getMessage())); + }); + client.deleteAnomalyAlertConfigWithResponse(inputAnomalyAlertConfigId.get()).block(); + } + + // TODO (savaity) update cannot be used to clear a set description? + // anything set to null as a value not sent over the wire? + // /** + // * Verifies update for a previously created anomaly alert configuration's description and clear off description. + // */ + // @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) + // @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") + // public void updateAnomalyAlertConfigDescription(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { + // // Arrange + // client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); + // final AtomicReference inputAnomalyAlertConfigId = new AtomicReference<>(); + // creatAnomalyAlertRunner(inputAnomalyAlert -> { + // // Arrange + // final AnomalyAlertConfiguration createdAnomalyAlert = + // client.createAnomalyAlertConfig(inputAnomalyAlert).block(); + // + // inputAnomalyAlertConfigId.set(createdAnomalyAlert.getId()); + // + // // Act & Assert + // StepVerifier.create(client.updateAnomalyAlertConfig( + // createdAnomalyAlert.setDescription("updated_description") + // .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.XOR))) + // .assertNext(updatedAnomalyAlert -> + // assertEquals("updated_description", updatedAnomalyAlert.getDescription())).verifyComplete(); + // + // // clear the set description, not allowed + // StepVerifier.create(client.updateAnomalyAlertConfig( + // createdAnomalyAlert.setDescription(null))) + // .assertNext(anomalyAlertConfiguration -> assertNull(anomalyAlertConfiguration.getDescription())) + // .verifyComplete(); + // + // }); + // client.deleteAnomalyAlertConfigWithResponse(inputAnomalyAlertConfigId.get()).block(); + // } + + /** + * Verifies update for a removing hooks from a previously created anomaly alert configuration's. + */ + @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) + @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") + public void updateAnomalyAlertRemoveHooks(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { + // Arrange + client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); + final AtomicReference inputAnomalyAlertConfigId = new AtomicReference<>(); + creatAnomalyAlertRunner(inputAnomalyAlert -> { + // Arrange + final AnomalyAlertConfiguration createdAnomalyAlert = + client.createAnomalyAlertConfig(inputAnomalyAlert).block(); + + inputAnomalyAlertConfigId.set(createdAnomalyAlert.getId()); + + // Act & Assert + StepVerifier.create(client.updateAnomalyAlertConfig( + createdAnomalyAlert.removeHookToAlert(ALERT_HOOK_ID))) + .assertNext(updatedAnomalyAlert -> + assertEquals(0, updatedAnomalyAlert.getIdOfHooksToAlert().size())) + .verifyComplete(); + + }); + client.deleteAnomalyAlertConfigWithResponse(inputAnomalyAlertConfigId.get()).block(); + } +} diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyAlertTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyAlertTest.java new file mode 100644 index 000000000000..3a6aa650b1d8 --- /dev/null +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyAlertTest.java @@ -0,0 +1,304 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.ai.metricsadvisor; + +import com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient; +import com.azure.ai.metricsadvisor.models.AnomalyAlertConfiguration; +import com.azure.ai.metricsadvisor.models.ErrorCodeException; +import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConfiguration; +import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConfigurationsOperator; +import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertScope; +import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; +import com.azure.core.http.HttpClient; +import com.azure.core.http.rest.Response; +import com.azure.core.util.Context; +import io.netty.handler.codec.http.HttpResponseStatus; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; +import reactor.test.StepVerifier; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; + +import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; +import static com.azure.ai.metricsadvisor.TestUtils.INCORRECT_UUID; +import static com.azure.ai.metricsadvisor.TestUtils.INCORRECT_UUID_ERROR; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +public class DataPointAnomalyAlertTest extends AnomalyAlertTestBase { + private MetricsAdvisorAdministrationClient client; + + @BeforeAll + static void beforeAll() { + StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); + } + + @AfterAll + static void afterAll() { + StepVerifier.resetDefaultTimeout(); + } + + /** + * Verifies the result of the list anomaly alert configuration method when no options specified. + */ + @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) + @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") + void testListAnomalyAlert(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { + // Arrange + client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); + + listAnomalyAlertRunner(inputAnomalyAlertList -> { + List actualAnomalyAlertList = new ArrayList<>(); + List expectedAnomalyAlertList = + inputAnomalyAlertList.stream().map(inputAnomalyAlert -> + client.createAnomalyAlertConfig(inputAnomalyAlert)) + .collect(Collectors.toList()); + + // Act + final AtomicInteger i = new AtomicInteger(-1); + client.listAnomalyAlertConfigs(inputAnomalyAlertList.get(i.incrementAndGet()) + .getMetricAlertConfigurations().get(i.get()).getDetectionConfigurationId()) + .forEach(actualAnomalyAlertList::add); + + final List expectedAnomalyAlertIdList = expectedAnomalyAlertList + .stream() + .map(AnomalyAlertConfiguration::getId) + .collect(Collectors.toList()); + + final List actualList = + actualAnomalyAlertList.stream().filter(actualConfiguration -> expectedAnomalyAlertIdList + .contains(actualConfiguration.getId())) + .collect(Collectors.toList()); + + // Assert + assertEquals(inputAnomalyAlertList.size(), actualList.size()); + expectedAnomalyAlertList.sort(Comparator.comparing(AnomalyAlertConfiguration::getName)); + actualList.sort(Comparator.comparing(AnomalyAlertConfiguration::getName)); + expectedAnomalyAlertList.forEach(expectedAnomalyAlert -> validateAnomalyAlertResult(expectedAnomalyAlert, + actualList.get(i.get()))); + + expectedAnomalyAlertIdList.forEach(inputAnomalyAlertConfigId -> + client.deleteAnomalyAlertConfig(inputAnomalyAlertList.get(i.get()) + .getMetricAlertConfigurations().get(i.get()).getDetectionConfigurationId())); + }); + } + + + // Get DataPointAnomaly AnomalyAlert Configuration + + /** + * Verifies that an exception is thrown for null detection configuration Id parameter. + */ + @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) + @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") + public void getAnomalyAlertNullId(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { + // Arrange + client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); + // Act & Assert + Exception exception = assertThrows(NullPointerException.class, () -> + client.getAnomalyAlertConfig(null)); + assertEquals(exception.getMessage(), "'alertConfigurationId' is required."); + } + + /** + * Verifies that an exception is thrown for invalid alert configuration Id. + */ + @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) + @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") + public void getAnomalyAlertInvalidId(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { + // Arrange + client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); + + // Act & Assert + Exception exception = assertThrows(IllegalArgumentException.class, () -> + client.getAnomalyAlertConfig(INCORRECT_UUID)); + assertEquals(exception.getMessage(), INCORRECT_UUID_ERROR); + } + + /** + * Verifies a valid alert configuration info is returned with response for a valid alert configuration Id. + */ + @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) + @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") + public void getAnomalyAlertValidId(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { + // Arrange + client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); + final AtomicReference alertConfigurationId = new AtomicReference<>(); + + listAnomalyAlertRunner(anomalyAlertConfigurationList -> { + final AnomalyAlertConfiguration inputAnomalyAlertConfiguration = anomalyAlertConfigurationList.get(0); + final AnomalyAlertConfiguration createdAnomalyAlert = + client.createAnomalyAlertConfig(inputAnomalyAlertConfiguration); + alertConfigurationId.set(createdAnomalyAlert.getId()); + + // Act & Assert + Response anomalyAlertConfigurationResponse = + client.getAnomalyAlertConfigWithResponse(alertConfigurationId.get(), Context.NONE); + assertEquals(anomalyAlertConfigurationResponse.getStatusCode(), HttpResponseStatus.OK.code()); + validateAnomalyAlertResult(createdAnomalyAlert, anomalyAlertConfigurationResponse.getValue()); + }); + client.deleteAnomalyAlertConfig(alertConfigurationId.get()); + } + + // Create DataPointAnomaly alert configuration + + /** + * Verifies valid anomaly alert configuration created for required anomaly alert configuration details. + */ + @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) + @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") + public void createAnomalyAlertConfiguration(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { + // Arrange + client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); + final AtomicReference alertConfigurationId = new AtomicReference<>(); + creatAnomalyAlertRunner(inputAnomalyAlertConfig -> { + // Act & Assert + AnomalyAlertConfiguration createdAnomalyAlertConfig = + client.createAnomalyAlertConfig(inputAnomalyAlertConfig); + alertConfigurationId.set(createdAnomalyAlertConfig.getId()); + validateAnomalyAlertResult(inputAnomalyAlertConfig, createdAnomalyAlertConfig); + }); + client.deleteAnomalyAlertConfig(alertConfigurationId.get()); + } + + /** + * Verifies happy path for delete anomaly alert configuration. + */ + @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) + @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") + public void deleteAnomalyAlertWithResponse(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { + // Arrange + client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); + creatAnomalyAlertRunner(inputAnomalyAlertConfig -> { + final AnomalyAlertConfiguration createdAnomalyAlert = + client.createAnomalyAlertConfig(inputAnomalyAlertConfig); + + Response response = client.deleteAnomalyAlertConfigWithResponse(createdAnomalyAlert.getId(), + Context.NONE); + assertEquals(response.getStatusCode(), HttpResponseStatus.NO_CONTENT.code()); + + // Act & Assert + Exception exception = assertThrows(ErrorCodeException.class, () -> + client.getAnomalyAlertConfig(createdAnomalyAlert.getId())); + assertEquals(ErrorCodeException.class, exception.getClass()); + final ErrorCodeException errorCodeException = ((ErrorCodeException) exception); + assertEquals(HttpResponseStatus.NOT_FOUND.code(), errorCodeException.getResponse().getStatusCode()); + }); + } + + // Update anomaly alert configuration + + /** + * Verifies previously created anomaly alert configuration can be updated successfully to update the metrics + * operator. + */ + @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) + @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") + public void updateAnomalyAlertHappyPath(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { + // Arrange + client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); + final AtomicReference inputAnomalyAlertConfigId = new AtomicReference<>(); + creatAnomalyAlertRunner(inputAnomalyAlert -> { + // Arrange + final AnomalyAlertConfiguration createdAnomalyAlert = + client.createAnomalyAlertConfig(inputAnomalyAlert); + + inputAnomalyAlertConfigId.set(createdAnomalyAlert.getId()); + + final MetricAnomalyAlertConfiguration metricAnomalyAlertConfiguration + = new MetricAnomalyAlertConfiguration(DETECTION_CONFIGURATION_ID, + MetricAnomalyAlertScope.forWholeSeries()); + final MetricAnomalyAlertConfiguration metricAnomalyAlertConfiguration2 + = new MetricAnomalyAlertConfiguration("bd309211-64b5-4a7a-bb81-a2789599c526", + MetricAnomalyAlertScope.forWholeSeries()); + + // Act & Assert + // add metricAnomalyAlertConfiguration and operator + final AnomalyAlertConfiguration updatedAnomalyAlertConfiguration = client.updateAnomalyAlertConfig( + createdAnomalyAlert.setMetricAlertConfigurations( + Arrays.asList(metricAnomalyAlertConfiguration, metricAnomalyAlertConfiguration2)) + .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.XOR)); + validateAnomalyAlertResult(inputAnomalyAlert + .addMetricAlertConfiguration(metricAnomalyAlertConfiguration2), updatedAnomalyAlertConfiguration); + assertEquals(MetricAnomalyAlertConfigurationsOperator.XOR.toString(), + updatedAnomalyAlertConfiguration.getCrossMetricsOperator().toString()); + + + // clear the set configurations, not allowed + Exception exception = assertThrows(NullPointerException.class, () -> + client.updateAnomalyAlertConfig(createdAnomalyAlert.setMetricAlertConfigurations(null))); + assertEquals("'alertConfiguration.metricAnomalyAlertConfigurations' is " + + "required and cannot be empty", exception.getMessage()); + }); + + client.deleteAnomalyAlertConfig(inputAnomalyAlertConfigId.get()); + } + + // TODO (savaity) update cannot be used to clear a set description? + // /** + // * Verifies update for a previously created anomaly alert configuration's description and clear off description. + // */ + // @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) + // @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") + // public void updateAnomalyAlertConfigDescription(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { + // // Arrange + // client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); + // final AtomicReference inputAnomalyAlertConfigId = new AtomicReference<>(); + // creatAnomalyAlertRunner(inputAnomalyAlert -> { + // // Arrange + // final AnomalyAlertConfiguration createdAnomalyAlert = + // client.createAnomalyAlertConfig(inputAnomalyAlert).block(); + // + // inputAnomalyAlertConfigId.set(createdAnomalyAlert.getId()); + // + // // Act & Assert + // StepVerifier.create(client.updateAnomalyAlertConfig( + // createdAnomalyAlert.setDescription("updated_description") + // .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.XOR))) + // .assertNext(updatedAnomalyAlert -> + // assertEquals("updated_description", updatedAnomalyAlert.getDescription())).verifyComplete(); + // + // // clear the set description, not allowed + // StepVerifier.create(client.updateAnomalyAlertConfig( + // createdAnomalyAlert.setDescription(null))) + // .assertNext(anomalyAlertConfiguration -> assertNull(anomalyAlertConfiguration.getDescription())) + // .verifyComplete(); + // + // }); + // client.deleteAnomalyAlertConfigWithResponse(inputAnomalyAlertConfigId.get()).block(); + // } + + /** + * Verifies update for a removing hooks from a previously created anomaly alert configuration's. + */ + @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) + @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") + public void updateAnomalyAlertRemoveHooks(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { + // Arrange + client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); + final AtomicReference inputAnomalyAlertConfigId = new AtomicReference<>(); + creatAnomalyAlertRunner(inputAnomalyAlert -> { + // Arrange + final AnomalyAlertConfiguration createdAnomalyAlert = + client.createAnomalyAlertConfig(inputAnomalyAlert); + + inputAnomalyAlertConfigId.set(createdAnomalyAlert.getId()); + + // Act & Assert + final AnomalyAlertConfiguration updatedAnomalyAlertConfiguration = client.updateAnomalyAlertConfig( + createdAnomalyAlert.removeHookToAlert(ALERT_HOOK_ID)); + assertEquals(0, updatedAnomalyAlertConfiguration.getIdOfHooksToAlert().size()); + }); + client.deleteAnomalyAlertConfig(inputAnomalyAlertConfigId.get()); + } +} diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForAlertAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForAlertAsyncTest.java similarity index 90% rename from sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForAlertAsyncTest.java rename to sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForAlertAsyncTest.java index 87880236b49a..6a81378f162d 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForAlertAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForAlertAsyncTest.java @@ -3,7 +3,7 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.Anomaly; +import com.azure.ai.metricsadvisor.models.DataPointAnomaly; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.PagedFlux; @@ -19,7 +19,7 @@ import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; -public class AnomalyForAlertAsyncTest extends AnomalyForAlertTestBase { +public class DataPointAnomalyForAlertAsyncTest extends AnomalyForAlertTestBase { @BeforeAll static void beforeAll() { TestBase.setupClass(); @@ -37,7 +37,7 @@ static void afterAll() { public void listAnomaliesForAlert(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { MetricsAdvisorAsyncClient client = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildAsyncClient(); - PagedFlux anomaliesFlux + PagedFlux anomaliesFlux = client.listAnomaliesForAlert( ListAnomaliesForAlertInput.INSTANCE.alertConfigurationId, ListAnomaliesForAlertInput.INSTANCE.alertId, diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForAlertTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForAlertTest.java similarity index 81% rename from sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForAlertTest.java rename to sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForAlertTest.java index 8494c8667199..32d59aae80ed 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForAlertTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForAlertTest.java @@ -5,7 +5,7 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.Anomaly; +import com.azure.ai.metricsadvisor.models.DataPointAnomaly; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.PagedIterable; @@ -16,14 +16,14 @@ import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; -public class AnomalyForAlertTest extends AnomalyForAlertTestBase { +public class DataPointAnomalyForAlertTest extends AnomalyForAlertTestBase { @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") @Override public void listAnomaliesForAlert(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { MetricsAdvisorClient client = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildClient(); - PagedIterable anomaliesIterable + PagedIterable anomaliesIterable = client.listAnomaliesForAlert( ListAnomaliesForAlertInput.INSTANCE.alertConfigurationId, ListAnomaliesForAlertInput.INSTANCE.alertId, @@ -32,9 +32,9 @@ public void listAnomaliesForAlert(HttpClient httpClient, MetricsAdvisorServiceVe ); int[] cnt = new int[1]; - for (Anomaly anomaly : anomaliesIterable) { + for (DataPointAnomaly dataPointAnomaly : anomaliesIterable) { cnt[0]++; - assertListAnomaliesForAlertOutput(anomaly); + assertListAnomaliesForAlertOutput(dataPointAnomaly); } Assertions.assertEquals(ListAnomaliesForAlertOutput.INSTANCE.expectedAnomalies, cnt[0]); } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForDetectionConfigAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForDetectionConfigAsyncTest.java similarity index 74% rename from sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForDetectionConfigAsyncTest.java rename to sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForDetectionConfigAsyncTest.java index 5e618eab119d..beee30fc4366 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForDetectionConfigAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForDetectionConfigAsyncTest.java @@ -3,7 +3,7 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.Anomaly; +import com.azure.ai.metricsadvisor.models.DataPointAnomaly; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.PagedFlux; @@ -17,7 +17,7 @@ import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; -public class AnomalyForDetectionConfigAsyncTest extends AnomalyForDetectionConfigTestBase { +public class DataPointAnomalyForDetectionConfigAsyncTest extends AnomalyForDetectionConfigTestBase { @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") @Override @@ -26,20 +26,20 @@ public void listAnomaliesForDetectionConfig(HttpClient httpClient, MetricsAdvisorAsyncClient client = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildAsyncClient(); - PagedFlux anomaliesFlux - = client.listAnomaliesForDetectionConfiguration( + PagedFlux anomaliesFlux + = client.listAnomaliesForDetectionConfig( ListAnomaliesForDetectionConfigInput.INSTANCE.detectionConfigurationId, ListAnomaliesForDetectionConfigInput.INSTANCE.options); Assertions.assertNotNull(anomaliesFlux); - List anomaliesList = new ArrayList<>(); + List anomaliesList = new ArrayList<>(); StepVerifier.create(anomaliesFlux) .thenConsumeWhile(anomaliesList::add) .verifyComplete(); - for (Anomaly anomaly : anomaliesList) { - assertListAnomaliesDetectionConfigOutput(anomaly); + for (DataPointAnomaly dataPointAnomaly : anomaliesList) { + assertListAnomaliesDetectionConfigOutput(dataPointAnomaly); } } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForDetectionConfigTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForDetectionConfigTest.java similarity index 72% rename from sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForDetectionConfigTest.java rename to sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForDetectionConfigTest.java index 6ac8d1bf5dc1..ed35f2e9eef8 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForDetectionConfigTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForDetectionConfigTest.java @@ -3,7 +3,7 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.Anomaly; +import com.azure.ai.metricsadvisor.models.DataPointAnomaly; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.PagedIterable; @@ -12,7 +12,7 @@ import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; -public class AnomalyForDetectionConfigTest extends AnomalyForDetectionConfigTestBase { +public class DataPointAnomalyForDetectionConfigTest extends AnomalyForDetectionConfigTestBase { @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") @Override @@ -20,13 +20,13 @@ public void listAnomaliesForDetectionConfig(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { MetricsAdvisorClient client = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildClient(); - PagedIterable anomaliesIterable - = client.listAnomaliesForDetectionConfiguration( + PagedIterable anomaliesIterable + = client.listAnomaliesForDetectionConfig( ListAnomaliesForDetectionConfigInput.INSTANCE.detectionConfigurationId, ListAnomaliesForDetectionConfigInput.INSTANCE.options); - for (Anomaly anomaly : anomaliesIterable) { - assertListAnomaliesDetectionConfigOutput(anomaly); + for (DataPointAnomaly dataPointAnomaly : anomaliesIterable) { + assertListAnomaliesDetectionConfigOutput(dataPointAnomaly); } } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationAsyncTest.java index d83df0ec9196..cb863517149a 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationAsyncTest.java @@ -6,7 +6,7 @@ import com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient; import com.azure.ai.metricsadvisor.models.AnomalyDetectionConfiguration; import com.azure.ai.metricsadvisor.models.DataFeed; -import com.azure.ai.metricsadvisor.models.Metric; +import com.azure.ai.metricsadvisor.models.DataFeedMetric; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; import com.azure.core.test.TestBase; @@ -48,15 +48,15 @@ public void createDetectionConfigurationForWholeSeries(HttpClient httpClient, try { dataFeed = super.createDataFeed(httpClient, serviceVersion); - Optional optMetric = dataFeed.getSchema().getMetrics() + Optional optMetric = dataFeed.getSchema().getMetrics() .stream() .filter(m -> m.getName().equalsIgnoreCase("cost")) .findFirst(); - final Metric costMetric = optMetric.get(); + final DataFeedMetric costMetric = optMetric.get(); final String costMetricId = costMetric.getId(); - StepVerifier.create(client.createMetricAnomalyDetectionConfiguration(costMetricId, + StepVerifier.create(client.createMetricAnomalyDetectionConfig(costMetricId, CreateDetectionConfigurationForWholeSeriesInput.INSTANCE.detectionConfiguration)) .assertNext(configuration -> { id.set(configuration.getId()); @@ -86,15 +86,15 @@ public void createDetectionConfigurationForSeriesAndGroup(HttpClient httpClient, final AtomicReference id = new AtomicReference<>(); try { dataFeed = super.createDataFeed(httpClient, serviceVersion); - Optional optMetric = dataFeed.getSchema().getMetrics() + Optional optMetric = dataFeed.getSchema().getMetrics() .stream() .filter(m -> m.getName().equalsIgnoreCase("cost")) .findFirst(); - final Metric costMetric = optMetric.get(); + final DataFeedMetric costMetric = optMetric.get(); final String costMetricId = costMetric.getId(); - StepVerifier.create(client.createMetricAnomalyDetectionConfiguration(costMetricId, + StepVerifier.create(client.createMetricAnomalyDetectionConfig(costMetricId, CreateDetectionConfigurationForSeriesAndGroupInput.INSTANCE.detectionConfiguration)) .assertNext(configuration -> { assertNotNull(configuration); @@ -125,15 +125,15 @@ public void createDetectionConfigurationForMultipleSeriesAndGroup(HttpClient htt try { dataFeed = super.createDataFeed(httpClient, serviceVersion); - Optional optMetric = dataFeed.getSchema().getMetrics() + Optional optMetric = dataFeed.getSchema().getMetrics() .stream() .filter(m -> m.getName().equalsIgnoreCase("cost")) .findFirst(); - final Metric costMetric = optMetric.get(); + final DataFeedMetric costMetric = optMetric.get(); final String costMetricId = costMetric.getId(); - StepVerifier.create(client.createMetricAnomalyDetectionConfiguration(costMetricId, + StepVerifier.create(client.createMetricAnomalyDetectionConfig(costMetricId, CreateDetectionConfigurationForMultipleSeriesAndGroupInput.INSTANCE.detectionConfiguration)) .assertNext(configuration -> { assertNotNull(configuration); @@ -142,7 +142,7 @@ public void createDetectionConfigurationForMultipleSeriesAndGroup(HttpClient htt }) .verifyComplete(); - StepVerifier.create(client.listMetricAnomalyDetectionConfigurations(costMetricId)) + StepVerifier.create(client.listMetricAnomalyDetectionConfigs(costMetricId)) // Expect 2 config: Default + the one just created. .assertNext(configuration -> assertNotNull(configuration)) .assertNext(configuration -> assertNotNull(configuration)) @@ -169,16 +169,16 @@ public void updateDetectionConfiguration(HttpClient httpClient, MetricsAdvisorSe try { dataFeed = super.createDataFeed(httpClient, serviceVersion); - Optional optMetric = dataFeed.getSchema().getMetrics() + Optional optMetric = dataFeed.getSchema().getMetrics() .stream() .filter(m -> m.getName().equalsIgnoreCase("cost")) .findFirst(); - final Metric costMetric = optMetric.get(); + final DataFeedMetric costMetric = optMetric.get(); final String costMetricId = costMetric.getId(); final AnomalyDetectionConfiguration[] configs = new AnomalyDetectionConfiguration[1]; - StepVerifier.create(client.createMetricAnomalyDetectionConfiguration(costMetricId, + StepVerifier.create(client.createMetricAnomalyDetectionConfig(costMetricId, UpdateDetectionConfigurationInput.INSTANCE.detectionConfiguration)) .assertNext(configuration -> { assertNotNull(configuration); @@ -196,7 +196,7 @@ public void updateDetectionConfiguration(HttpClient httpClient, MetricsAdvisorSe .INSTANCE .seriesGroupConditionToAddOnUpdate); - StepVerifier.create(client.updateMetricAnomalyDetectionConfiguration(config)) + StepVerifier.create(client.updateMetricAnomalyDetectionConfig(config)) .assertNext(configuration -> { id.set(configuration.getId()); super.assertUpdateDetectionConfigurationOutput(configuration, costMetricId); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationTest.java index ea15f3fa55dc..d83be99ba255 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationTest.java @@ -6,7 +6,7 @@ import com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient; import com.azure.ai.metricsadvisor.models.AnomalyDetectionConfiguration; import com.azure.ai.metricsadvisor.models.DataFeed; -import com.azure.ai.metricsadvisor.models.Metric; +import com.azure.ai.metricsadvisor.models.DataFeedMetric; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; import com.azure.core.util.CoreUtils; @@ -34,16 +34,16 @@ public void createDetectionConfigurationForWholeSeries(HttpClient httpClient, try { dataFeed = super.createDataFeed(httpClient, serviceVersion); - Optional optMetric = dataFeed.getSchema().getMetrics() + Optional optMetric = dataFeed.getSchema().getMetrics() .stream() .filter(m -> m.getName().equalsIgnoreCase("cost")) .findFirst(); - final Metric costMetric = optMetric.get(); + final DataFeedMetric costMetric = optMetric.get(); final String costMetricId = costMetric.getId(); AnomalyDetectionConfiguration configuration - = client.createMetricAnomalyDetectionConfiguration(costMetricId, + = client.createMetricAnomalyDetectionConfig(costMetricId, CreateDetectionConfigurationForWholeSeriesInput.INSTANCE.detectionConfiguration); assertNotNull(configuration); @@ -52,7 +52,7 @@ public void createDetectionConfigurationForWholeSeries(HttpClient httpClient, } finally { if (!CoreUtils.isNullOrEmpty(id.get())) { - client.deleteMetricAnomalyDetectionConfiguration(id.get()); + client.deleteMetricAnomalyDetectionConfig(id.get()); } if (dataFeed != null) { super.deleteDateFeed(dataFeed, httpClient, serviceVersion); @@ -72,16 +72,16 @@ public void createDetectionConfigurationForSeriesAndGroup(HttpClient httpClient, try { dataFeed = super.createDataFeed(httpClient, serviceVersion); - Optional optMetric = dataFeed.getSchema().getMetrics() + Optional optMetric = dataFeed.getSchema().getMetrics() .stream() .filter(m -> m.getName().equalsIgnoreCase("cost")) .findFirst(); - final Metric costMetric = optMetric.get(); + final DataFeedMetric costMetric = optMetric.get(); final String costMetricId = costMetric.getId(); AnomalyDetectionConfiguration configuration - = client.createMetricAnomalyDetectionConfiguration(costMetricId, + = client.createMetricAnomalyDetectionConfig(costMetricId, CreateDetectionConfigurationForSeriesAndGroupInput.INSTANCE.detectionConfiguration); assertNotNull(configuration); id.set(configuration.getId()); @@ -89,7 +89,7 @@ public void createDetectionConfigurationForSeriesAndGroup(HttpClient httpClient, super.assertCreateDetectionConfigurationForSeriesAndGroupOutput(configuration, costMetricId); } finally { if (!CoreUtils.isNullOrEmpty(id.get())) { - client.deleteMetricAnomalyDetectionConfiguration(id.get()); + client.deleteMetricAnomalyDetectionConfig(id.get()); } if (dataFeed != null) { super.deleteDateFeed(dataFeed, httpClient, serviceVersion); @@ -109,27 +109,27 @@ public void createDetectionConfigurationForMultipleSeriesAndGroup(HttpClient htt try { dataFeed = super.createDataFeed(httpClient, serviceVersion); - Optional optMetric = dataFeed.getSchema().getMetrics() + Optional optMetric = dataFeed.getSchema().getMetrics() .stream() .filter(m -> m.getName().equalsIgnoreCase("cost")) .findFirst(); - final Metric costMetric = optMetric.get(); + final DataFeedMetric costMetric = optMetric.get(); final String costMetricId = costMetric.getId(); AnomalyDetectionConfiguration configuration - = client.createMetricAnomalyDetectionConfiguration(costMetricId, + = client.createMetricAnomalyDetectionConfig(costMetricId, CreateDetectionConfigurationForMultipleSeriesAndGroupInput.INSTANCE.detectionConfiguration); super.assertCreateDetectionConfigurationForMultipleSeriesAndGroupOutput(configuration, costMetricId); assertNotNull(configuration); id.set(configuration.getId()); - client.listMetricAnomalyDetectionConfigurations(costMetricId) + client.listMetricAnomalyDetectionConfigs(costMetricId) .forEach(config -> Assertions.assertNotNull(config)); } finally { if (!CoreUtils.isNullOrEmpty(id.get())) { - client.deleteMetricAnomalyDetectionConfiguration(id.get()); + client.deleteMetricAnomalyDetectionConfig(id.get()); } if (dataFeed != null) { super.deleteDateFeed(dataFeed, httpClient, serviceVersion); @@ -149,16 +149,16 @@ public void updateDetectionConfiguration(HttpClient httpClient, try { dataFeed = super.createDataFeed(httpClient, serviceVersion); - Optional optMetric = dataFeed.getSchema().getMetrics() + Optional optMetric = dataFeed.getSchema().getMetrics() .stream() .filter(m -> m.getName().equalsIgnoreCase("cost")) .findFirst(); - final Metric costMetric = optMetric.get(); + final DataFeedMetric costMetric = optMetric.get(); final String costMetricId = costMetric.getId(); AnomalyDetectionConfiguration configuration - = client.createMetricAnomalyDetectionConfiguration(costMetricId, + = client.createMetricAnomalyDetectionConfig(costMetricId, UpdateDetectionConfigurationInput.INSTANCE.detectionConfiguration); Assertions.assertNotNull(configuration); @@ -171,12 +171,12 @@ public void updateDetectionConfiguration(HttpClient httpClient, .INSTANCE .seriesGroupConditionToAddOnUpdate); - configuration = client.updateMetricAnomalyDetectionConfiguration(configuration); + configuration = client.updateMetricAnomalyDetectionConfig(configuration); super.assertUpdateDetectionConfigurationOutput(configuration, costMetricId); id.set(configuration.getId()); } finally { if (!CoreUtils.isNullOrEmpty(id.get())) { - client.deleteMetricAnomalyDetectionConfiguration(id.get()); + client.deleteMetricAnomalyDetectionConfig(id.get()); } if (dataFeed != null) { super.deleteDateFeed(dataFeed, httpClient, serviceVersion); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationTestBase.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationTestBase.java index 0abfa559ca23..99c02102f775 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationTestBase.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DetectionConfigurationTestBase.java @@ -8,15 +8,15 @@ import com.azure.ai.metricsadvisor.models.AnomalyDetectorDirection; import com.azure.ai.metricsadvisor.models.ChangeThresholdCondition; import com.azure.ai.metricsadvisor.models.DataFeed; +import com.azure.ai.metricsadvisor.models.DataFeedDimension; import com.azure.ai.metricsadvisor.models.DataFeedGranularity; import com.azure.ai.metricsadvisor.models.DataFeedGranularityType; import com.azure.ai.metricsadvisor.models.DataFeedIngestionSettings; import com.azure.ai.metricsadvisor.models.DataFeedSchema; import com.azure.ai.metricsadvisor.models.DetectionConditionsOperator; -import com.azure.ai.metricsadvisor.models.Dimension; import com.azure.ai.metricsadvisor.models.DimensionKey; import com.azure.ai.metricsadvisor.models.HardThresholdCondition; -import com.azure.ai.metricsadvisor.models.Metric; +import com.azure.ai.metricsadvisor.models.DataFeedMetric; import com.azure.ai.metricsadvisor.models.MetricSeriesGroupDetectionCondition; import com.azure.ai.metricsadvisor.models.MetricWholeSeriesDetectionCondition; import com.azure.ai.metricsadvisor.models.MetricSingleSeriesDetectionCondition; @@ -792,11 +792,11 @@ protected DataFeed createDataFeed(HttpClient httpClient, DataFeed dataFeed = new DataFeed().setSource(new SQLServerDataFeedSource(SQL_SERVER_CONNECTION_STRING, TEMPLATE_QUERY)); dataFeed.setSchema(new DataFeedSchema(Arrays.asList( - new Metric().setName("cost").setDisplayName("cost"), - new Metric().setName("revenue").setDisplayName("revenue"))) + new DataFeedMetric().setName("cost").setDisplayName("cost"), + new DataFeedMetric().setName("revenue").setDisplayName("revenue"))) .setDimensions(Arrays.asList( - new Dimension().setName("city").setDisplayName("city"), - new Dimension().setName("category").setDisplayName("category")))) + new DataFeedDimension().setName("city").setDisplayName("city"), + new DataFeedDimension().setName("category").setDisplayName("category")))) .setName("java_data_feed_for_detection" + UUID.randomUUID()) .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) .setIngestionSettings(new DataFeedIngestionSettings(INGESTION_START_TIME)); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentDetectedTestBase.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentDetectedTestBase.java index 6dd370b6f05e..94473ae2d16f 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentDetectedTestBase.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentDetectedTestBase.java @@ -3,7 +3,7 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.Incident; +import com.azure.ai.metricsadvisor.models.AnomalyIncident; import com.azure.ai.metricsadvisor.models.ListIncidentsDetectedOptions; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; @@ -33,17 +33,17 @@ protected static class ListIncidentsDetectedOutput { final int expectedIncidents = 27; } - protected void assertListIncidentsDetectedOutput(Incident incident) { - Assertions.assertNotNull(incident); - Assertions.assertNotNull(incident.getId()); + protected void assertListIncidentsDetectedOutput(AnomalyIncident anomalyIncident) { + Assertions.assertNotNull(anomalyIncident); + Assertions.assertNotNull(anomalyIncident.getId()); // Note: Service will not return metricId & detectionId when listing incidents by detection // config but only for alert. - Assertions.assertNotNull(incident.getSeverity()); - Assertions.assertNotNull(incident.getStatus()); - Assertions.assertNotNull(incident.getLastTime()); - Assertions.assertNotNull(incident.getRootDimensionKey()); - Assertions.assertFalse(incident.getRootDimensionKey().asMap().isEmpty()); - OffsetDateTime startTime = incident.getStartTime(); + Assertions.assertNotNull(anomalyIncident.getSeverity()); + Assertions.assertNotNull(anomalyIncident.getStatus()); + Assertions.assertNotNull(anomalyIncident.getLastTime()); + Assertions.assertNotNull(anomalyIncident.getRootDimensionKey()); + Assertions.assertFalse(anomalyIncident.getRootDimensionKey().asMap().isEmpty()); + OffsetDateTime startTime = anomalyIncident.getStartTime(); Assertions.assertNotNull(startTime); boolean isInRange = (startTime.isEqual(ListIncidentsDetectedInput.INSTANCE.startTime) || startTime.isAfter(ListIncidentsDetectedInput.INSTANCE.startTime)) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentForAlertTestBase.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentForAlertTestBase.java index f986a21ed857..277abe0ac947 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentForAlertTestBase.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentForAlertTestBase.java @@ -3,7 +3,7 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.Incident; +import com.azure.ai.metricsadvisor.models.AnomalyIncident; import com.azure.ai.metricsadvisor.models.ListIncidentsAlertedOptions; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; @@ -28,7 +28,7 @@ protected static class ListIncidentsForAlertOutput { final int expectedIncidents = 2; } - protected void assertListIncidentsForAlertOutput(Incident incident) { + protected void assertListIncidentsForAlertOutput(AnomalyIncident incident) { Assertions.assertNotNull(incident); Assertions.assertNotNull(incident.getId()); Assertions.assertNotNull(incident.getMetricId()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentRootCauseTestBase.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentRootCauseTestBase.java index 8b3fe7c5a30e..2e175cff663c 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentRootCauseTestBase.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentRootCauseTestBase.java @@ -71,7 +71,7 @@ void validateIncidentRootCauses(IncidentRootCause expectedIncidentRootCause, assertEquals(expectedIncidentRootCause.getSeriesKey(), actualIncidentRootCause.getSeriesKey()); assertEquals(expectedIncidentRootCause.getDescription(), actualIncidentRootCause.getDescription()); assertEquals(expectedIncidentRootCause.getPaths(), actualIncidentRootCause.getPaths()); - assertNotNull(actualIncidentRootCause.getConfidenceScore()); + assertNotNull(actualIncidentRootCause.getContributionScore()); } String getEndpoint() { diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesAsyncTest.java index c1a180d9f12a..195c01b5313b 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesAsyncTest.java @@ -6,7 +6,6 @@ import com.azure.ai.metricsadvisor.models.DimensionKey; import com.azure.ai.metricsadvisor.models.EnrichmentStatus; import com.azure.ai.metricsadvisor.models.ListMetricDimensionValuesOptions; -import com.azure.ai.metricsadvisor.models.ListMetricSeriesDataOptions; import com.azure.ai.metricsadvisor.models.ListMetricSeriesDefinitionOptions; import com.azure.ai.metricsadvisor.models.MetricSeriesDefinition; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; @@ -82,8 +81,7 @@ public void listMetricSeriesData(HttpClient httpClient, MetricsAdvisorServiceVer client = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildAsyncClient(); StepVerifier.create(client.listMetricSeriesData(METRIC_ID, Collections.singletonList(new DimensionKey(SERIES_KEY_FILTER)), - new ListMetricSeriesDataOptions(TIME_SERIES_START_TIME, - TIME_SERIES_END_TIME))) + TIME_SERIES_START_TIME, TIME_SERIES_END_TIME)) .assertNext(metricSeriesData -> { assertEquals(METRIC_ID, metricSeriesData.getMetricId()); assertNotNull(metricSeriesData.getSeriesKey()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesTest.java index 169cc47d8818..84923e307f0e 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesTest.java @@ -6,7 +6,6 @@ import com.azure.ai.metricsadvisor.models.DimensionKey; import com.azure.ai.metricsadvisor.models.EnrichmentStatus; import com.azure.ai.metricsadvisor.models.ListMetricDimensionValuesOptions; -import com.azure.ai.metricsadvisor.models.ListMetricSeriesDataOptions; import com.azure.ai.metricsadvisor.models.ListMetricSeriesDefinitionOptions; import com.azure.ai.metricsadvisor.models.MetricSeriesDefinition; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; @@ -76,9 +75,8 @@ public void listMetricDimensionValues(HttpClient httpClient, MetricsAdvisorServi @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") public void listMetricSeriesData(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { client = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildClient(); - client.listMetricSeriesData(METRIC_ID, Collections.singletonList(new DimensionKey(SERIES_KEY_FILTER)), - new ListMetricSeriesDataOptions(TIME_SERIES_START_TIME, - TIME_SERIES_END_TIME)) + client.listMetricSeriesData(METRIC_ID, Collections.singletonList(new DimensionKey(SERIES_KEY_FILTER)), + TIME_SERIES_START_TIME, TIME_SERIES_END_TIME) .forEach(metricSeriesData -> { assertEquals(METRIC_ID, metricSeriesData.getMetricId()); assertEquals(SERIES_KEY_FILTER, metricSeriesData.getSeriesKey().asMap()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/HookAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/NotificationHookAsyncTest.java similarity index 87% rename from sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/HookAsyncTest.java rename to sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/NotificationHookAsyncTest.java index b88ca05019b3..a6ce5f068b65 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/HookAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/NotificationHookAsyncTest.java @@ -4,7 +4,7 @@ package com.azure.ai.metricsadvisor; import com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient; -import com.azure.ai.metricsadvisor.models.Hook; +import com.azure.ai.metricsadvisor.models.NotificationHook; import com.azure.ai.metricsadvisor.models.ListHookOptions; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; @@ -24,7 +24,7 @@ import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; -public final class HookAsyncTest extends HookTestBase { +public final class NotificationHookAsyncTest extends NotificationHookTestBase { @BeforeAll static void beforeAll() { TestBase.setupClass(); @@ -43,7 +43,7 @@ void createEmailHook(HttpClient httpClient, MetricsAdvisorServiceVersion service MetricsAdvisorAdministrationAsyncClient client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); - Mono createHookMono = client.createHook(CreateEmailHookInput.INSTANCE.hook); + Mono createHookMono = client.createHook(CreateEmailHookInput.INSTANCE.hook); String[] hookId = new String[1]; Assertions.assertNotNull(createHookMono); StepVerifier.create(createHookMono) @@ -66,7 +66,7 @@ void createWebHook(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVe MetricsAdvisorAdministrationAsyncClient client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); - Mono createHookMono = client.createHook(CreateWebHookInput.INSTANCE.hook); + Mono createHookMono = client.createHook(CreateWebHookInput.INSTANCE.hook); String[] hookId = new String[1]; Assertions.assertNotNull(createHookMono); StepVerifier.create(createHookMono) @@ -105,14 +105,14 @@ void testListHook(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVer Assertions.assertNotNull(hookId[0]); Assertions.assertNotNull(hookId[1]); - List hookList = new ArrayList<>(); + List notificationHookList = new ArrayList<>(); StepVerifier.create(client.listHooks()) - .thenConsumeWhile(hookList::add) + .thenConsumeWhile(notificationHookList::add) .verifyComplete(); - assertListHookOutput(hookList); + assertListHookOutput(notificationHookList); - List> hookPageList = new ArrayList<>(); + List> hookPageList = new ArrayList<>(); StepVerifier.create(client.listHooks(new ListHookOptions().setTop(ListHookInput.INSTANCE.pageSize)).byPage()) .thenConsumeWhile(hookPageList::add) .verifyComplete(); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/HookTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/NotificationHookTest.java similarity index 68% rename from sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/HookTest.java rename to sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/NotificationHookTest.java index cd3d23f0d259..7eb4f65dd7b0 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/HookTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/NotificationHookTest.java @@ -4,7 +4,7 @@ package com.azure.ai.metricsadvisor; import com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient; -import com.azure.ai.metricsadvisor.models.Hook; +import com.azure.ai.metricsadvisor.models.NotificationHook; import com.azure.ai.metricsadvisor.models.ListHookOptions; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; @@ -18,7 +18,7 @@ import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; -public final class HookTest extends HookTestBase { +public final class NotificationHookTest extends NotificationHookTestBase { @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") @Override @@ -26,10 +26,10 @@ void createEmailHook(HttpClient httpClient, MetricsAdvisorServiceVersion service MetricsAdvisorAdministrationClient client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); - Hook createdHook = client.createHook(CreateEmailHookInput.INSTANCE.hook); - Assertions.assertNotNull(createdHook); - assertCreateEmailHookOutput(createdHook); - client.deleteHook(createdHook.getId()); + NotificationHook createdNotificationHook = client.createHook(CreateEmailHookInput.INSTANCE.hook); + Assertions.assertNotNull(createdNotificationHook); + assertCreateEmailHookOutput(createdNotificationHook); + client.deleteHook(createdNotificationHook.getId()); } @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) @@ -39,10 +39,10 @@ void createWebHook(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVe MetricsAdvisorAdministrationClient client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); - Hook createdHook = client.createHook(CreateWebHookInput.INSTANCE.hook); - Assertions.assertNotNull(createdHook); - assertCreateWebHookOutput(createdHook); - client.deleteHook(createdHook.getId()); + NotificationHook createdNotificationHook = client.createHook(CreateWebHookInput.INSTANCE.hook); + Assertions.assertNotNull(createdNotificationHook); + assertCreateWebHookOutput(createdNotificationHook); + client.deleteHook(createdNotificationHook.getId()); } // Track this with https://github.com/Azure/azure-sdk-for-java/issues/16932 @@ -54,22 +54,22 @@ void testListHook(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVer = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); String[] hookId = new String[2]; - Hook hook1 = client.createHook(ListHookInput.INSTANCE.emailHook); - hookId[0] = hook1.getId(); + NotificationHook notificationHook1 = client.createHook(ListHookInput.INSTANCE.emailHook); + hookId[0] = notificationHook1.getId(); - Hook hook2 = client.createHook(ListHookInput.INSTANCE.webHook); - hookId[1] = hook2.getId(); + NotificationHook notificationHook2 = client.createHook(ListHookInput.INSTANCE.webHook); + hookId[1] = notificationHook2.getId(); Assertions.assertNotNull(hookId[0]); Assertions.assertNotNull(hookId[1]); - List hookList = client.listHooks() + List notificationHookList = client.listHooks() .stream() .collect(Collectors.toList()); - assertListHookOutput(hookList); + assertListHookOutput(notificationHookList); - List> hookPageList + List> hookPageList = client.listHooks(new ListHookOptions().setTop(ListHookInput.INSTANCE.pageSize), Context.NONE) .streamByPage() .collect(Collectors.toList()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/HookTestBase.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/NotificationHookTestBase.java similarity index 69% rename from sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/HookTestBase.java rename to sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/NotificationHookTestBase.java index 697940100d79..9cee5878a64e 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/HookTestBase.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/NotificationHookTestBase.java @@ -3,10 +3,10 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.models.EmailHook; -import com.azure.ai.metricsadvisor.models.Hook; +import com.azure.ai.metricsadvisor.models.EmailNotificationHook; +import com.azure.ai.metricsadvisor.models.NotificationHook; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; -import com.azure.ai.metricsadvisor.models.WebHook; +import com.azure.ai.metricsadvisor.models.WebNotificationHook; import com.azure.core.http.HttpClient; import com.azure.core.http.HttpHeaders; import com.azure.core.http.rest.PagedResponse; @@ -18,7 +18,7 @@ import java.util.List; import java.util.UUID; -public abstract class HookTestBase extends MetricsAdvisorAdministrationClientTestBase { +public abstract class NotificationHookTestBase extends MetricsAdvisorAdministrationClientTestBase { @Test abstract void createEmailHook(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion); @@ -29,17 +29,17 @@ protected static class CreateEmailHookInput { String email2 = "simpleuser1@hotmail.com"; String description = "alert_us!"; String externalLink = "https://github.com/Azure/azure-sdk-for-java/wiki"; - EmailHook hook = new EmailHook(name) + EmailNotificationHook hook = new EmailNotificationHook(name) .addEmailToAlert(email1) .addEmailToAlert(email2) .setDescription(description) .setExternalLink(externalLink); } - protected void assertCreateEmailHookOutput(Hook hook) { - Assertions.assertNotNull(hook); - Assertions.assertTrue(hook instanceof EmailHook); - EmailHook emailHook = (EmailHook) hook; + protected void assertCreateEmailHookOutput(NotificationHook notificationHook) { + Assertions.assertNotNull(notificationHook); + Assertions.assertTrue(notificationHook instanceof EmailNotificationHook); + EmailNotificationHook emailHook = (EmailNotificationHook) notificationHook; Assertions.assertNotNull(emailHook.getId()); Assertions.assertNotNull(emailHook.getAdminEmails()); Assertions.assertNotNull(emailHook.getName()); @@ -68,17 +68,17 @@ protected static class CreateWebHookInput { HttpHeaders httpHeaders = new HttpHeaders() .put("x-contoso-id", "123") .put("x-contoso-name", "contoso"); - WebHook hook = new WebHook(name, endpoint) + WebNotificationHook hook = new WebNotificationHook(name, endpoint) .setDescription(description) .setExternalLink(externalLink) .setUserCredentials(userName, password) .setHttpHeaders(httpHeaders); } - protected void assertCreateWebHookOutput(Hook hook) { - Assertions.assertNotNull(hook); - Assertions.assertTrue(hook instanceof WebHook); - WebHook webHook = (WebHook) hook; + protected void assertCreateWebHookOutput(NotificationHook notificationHook) { + Assertions.assertNotNull(notificationHook); + Assertions.assertTrue(notificationHook instanceof WebNotificationHook); + WebNotificationHook webHook = (WebNotificationHook) notificationHook; Assertions.assertNotNull(webHook.getId()); Assertions.assertNotNull(webHook.getAdminEmails()); Assertions.assertNotNull(webHook.getName()); @@ -102,42 +102,42 @@ protected void assertCreateWebHookOutput(Hook hook) { protected static class ListHookInput { static final ListHookInput INSTANCE = new ListHookInput(); - EmailHook emailHook = new EmailHook(UUID.randomUUID().toString()) + EmailNotificationHook emailHook = new EmailNotificationHook(UUID.randomUUID().toString()) .addEmailToAlert("simpleuser0@hotmail.com"); - WebHook webHook = new WebHook(UUID.randomUUID().toString(), + WebNotificationHook webHook = new WebNotificationHook(UUID.randomUUID().toString(), "https://httpbin.org/post"); int pageSize = 1; } - protected void assertListHookOutput(List hooksList) { + protected void assertListHookOutput(List hooksList) { Assertions.assertTrue(hooksList.size() >= 2); if (getTestMode() == TestMode.PLAYBACK) { // assert random generated hook names only when hitting real service. return; } - Hook hook1 = null; - Hook hook2 = null; - for (Hook hook : hooksList) { - if (hook1 != null && hook2 != null) { + NotificationHook notificationHook1 = null; + NotificationHook notificationHook2 = null; + for (NotificationHook notificationHook : hooksList) { + if (notificationHook1 != null && notificationHook2 != null) { break; } - Assertions.assertNotNull(hook.getName()); - if (hook.getName().equals(ListHookInput.INSTANCE.emailHook.getName())) { - hook1 = hook; - } else if (hook.getName().equals(ListHookInput.INSTANCE.webHook.getName())) { - hook2 = hook; + Assertions.assertNotNull(notificationHook.getName()); + if (notificationHook.getName().equals(ListHookInput.INSTANCE.emailHook.getName())) { + notificationHook1 = notificationHook; + } else if (notificationHook.getName().equals(ListHookInput.INSTANCE.webHook.getName())) { + notificationHook2 = notificationHook; } } - Assertions.assertNotNull(hook1); - Assertions.assertNotNull(hook2); - Assertions.assertTrue(hook1 instanceof EmailHook); - Assertions.assertTrue(hook2 instanceof WebHook); + Assertions.assertNotNull(notificationHook1); + Assertions.assertNotNull(notificationHook2); + Assertions.assertTrue(notificationHook1 instanceof EmailNotificationHook); + Assertions.assertTrue(notificationHook2 instanceof WebNotificationHook); } - protected void assertPagedListHookOutput(List> hookPageList) { + protected void assertPagedListHookOutput(List> hookPageList) { Assertions.assertTrue(hookPageList.size() >= 2); int cnt = 0; - for (PagedResponse hookPage : hookPageList) { + for (PagedResponse hookPage : hookPageList) { Assertions.assertNotNull(hookPage.getValue()); cnt++; boolean isLastPage = (cnt == hookPageList.size()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/TestUtils.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/TestUtils.java index 252614603177..ee26805df2da 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/TestUtils.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/TestUtils.java @@ -8,9 +8,9 @@ import com.azure.ai.metricsadvisor.models.DataFeedGranularity; import com.azure.ai.metricsadvisor.models.DataFeedGranularityType; import com.azure.ai.metricsadvisor.models.DataFeedIngestionSettings; +import com.azure.ai.metricsadvisor.models.DataFeedMetric; import com.azure.ai.metricsadvisor.models.DataFeedSchema; -import com.azure.ai.metricsadvisor.models.Dimension; -import com.azure.ai.metricsadvisor.models.Metric; +import com.azure.ai.metricsadvisor.models.DataFeedDimension; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.ai.metricsadvisor.models.SQLServerDataFeedSource; import com.azure.core.http.HttpClient; @@ -129,11 +129,11 @@ private TestUtils() { static DataFeed getSQLDataFeedSample() { return new DataFeed().setSource(new SQLServerDataFeedSource(SQL_SERVER_CONNECTION_STRING, TEMPLATE_QUERY)).setSchema(new DataFeedSchema(Arrays.asList( - new Metric().setName("cost"), - new Metric().setName("revenue"))) + new DataFeedMetric().setName("cost"), + new DataFeedMetric().setName("revenue"))) .setDimensions(Arrays.asList( - new Dimension().setName("city"), - new Dimension().setName("category")))) + new DataFeedDimension().setName("city"), + new DataFeedDimension().setName("category")))) .setName("java_SQL_create_data_feed_test_sample" + UUID.randomUUID()) .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) .setIngestionSettings(new DataFeedIngestionSettings(INGESTION_START_TIME)); @@ -142,11 +142,11 @@ static DataFeed getSQLDataFeedSample() { static DataFeed getAzureBlobDataFeedSample() { return new DataFeed().setSource(new AzureBlobDataFeedSource(BLOB_CONNECTION_STRING, "BLOB_CONTAINER", "BLOB_TEMPLATE_NAME")).setSchema(new DataFeedSchema(Arrays.asList( - new Metric().setName("cost"), - new Metric().setName("revenue"))) + new DataFeedMetric().setName("cost"), + new DataFeedMetric().setName("revenue"))) .setDimensions(Arrays.asList( - new Dimension().setName("city"), - new Dimension().setName("category")))) + new DataFeedDimension().setName("city"), + new DataFeedDimension().setName("category")))) .setName("java_BLOB_create_data_feed_test_sample" + UUID.randomUUID()) .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) .setIngestionSettings(new DataFeedIngestionSettings(INGESTION_START_TIME)); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/swagger/README.md b/sdk/metricsadvisor/azure-ai-metricsadvisor/swagger/README.md index 79fbb34b1a7c..0d8f8e008619 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/swagger/README.md +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/swagger/README.md @@ -195,7 +195,7 @@ directive: ``` yaml directive: - from: swagger-document - where: $["paths"]["/alert/anomaly/configurations/{configurationId}/alerts/query"] + where: $["paths"]["/anomalyAlert/anomaly/configurations/{configurationId}/alerts/query"] transform: > let pageExt = $.post["x-ms-pageable"]; if (!pageExt) { @@ -555,7 +555,7 @@ directive: ``` yaml directive: - from: swagger-document - where: $["paths"]["/metrics/{metricId}/series/query"] + where: $["paths"]["/dataFeedMetrics/{metricId}/series/query"] transform: > let pageExt = $.post["x-ms-pageable"]; if (!pageExt) { @@ -627,7 +627,7 @@ directive: ``` yaml directive: - from: swagger-document - where: $["paths"]["/metrics/{metricId}/dimension/query"] + where: $["paths"]["/dataFeedMetrics/{metricId}/dimension/query"] transform: > let pageExt = $.post["x-ms-pageable"]; if (!pageExt) { @@ -699,7 +699,7 @@ directive: ``` yaml directive: - from: swagger-document - where: $["paths"]["/metrics/{metricId}/status/enrichment/anomalyDetection/query"] + where: $["paths"]["/dataFeedMetrics/{metricId}/status/enrichment/anomalyDetection/query"] transform: > let pageExt = $.post["x-ms-pageable"]; if (!pageExt) { From 8b94f9a97362363af14c5931d2de9bbc45b3e7f3 Mon Sep 17 00:00:00 2001 From: Sameeksha Vaity Date: Sun, 1 Nov 2020 20:38:17 -0800 Subject: [PATCH 5/9] swagger rename updates, readme update --- .../azure-ai-metricsadvisor/README.md | 53 +++++++++--------- .../implementation/models/AnomalyScope.java | 4 +- .../implementation/models/DataFeedDetail.java | 16 +++--- .../implementation/models/SeriesResult.java | 6 +-- .../metricsadvisor/models/DataFeedSchema.java | 2 +- .../metricsadvisor/models/DimensionKey.java | 3 +- .../ai/metricsadvisor/models/SnoozeScope.java | 4 +- .../src/samples/README.md | 6 +-- .../metricsadvisor/ListAlertsAsyncSample.java | 2 +- .../ai/metricsadvisor/ListAlertsSample.java | 2 +- ...tEnrichmentStatusForMetricAsyncSample.java | 6 +-- .../ListEnrichmentStatusForMetricSample.java | 6 +-- .../ListIncidentsAlertedAsyncSample.java | 4 +- .../ListIncidentsAlertedSample.java | 4 +- .../ListIncidentsDetectedAsyncSample.java | 6 +-- .../ListIncidentsDetectedSample.java | 6 +-- ...SeriesDefinitionsForMetricAsyncSample.java | 2 +- .../ListSeriesDefinitionsForMetricSample.java | 2 +- .../ListsAnomaliesForAlertsAsyncSample.java | 4 +- .../ListsAnomaliesForAlertsSample.java | 4 +- ...nomaliesForDetectionConfigAsyncSample.java | 2 +- ...istsAnomaliesForDetectionConfigSample.java | 2 +- .../MetricFeedbackAsyncSample.java | 52 +++++++++--------- .../metricsadvisor/MetricFeedbackSample.java | 50 ++++++++--------- ...tricsAdvisorClientJavaDocCodeSnippets.java | 4 +- .../ai/metricsadvisor/ReadmeSamples.java | 13 +++-- ...trationAsyncClientJavaDocCodeSnippets.java | 13 +++-- ...ministrationClientJavaDocCodeSnippets.java | 25 ++++++--- ...omalyAlertConfigOperationsAsyncSample.java | 8 +-- ...icsAnomalyAlertConfigOperationsSample.java | 8 +-- .../azure-ai-metricsadvisor/swagger/README.md | 54 ++++++++++++++++--- 31 files changed, 218 insertions(+), 155 deletions(-) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md b/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md index e4b4f0251ff6..bdbf2c24d296 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md @@ -44,7 +44,7 @@ az cognitiveservices account show --name "resource-name" --resource-group "resou ``` #### Create a Metrics Advisor client using MetricsAdvisorKeyCredential - + ```java MetricsAdvisorKeyCredential credential = new MetricsAdvisorKeyCredential("subscription_key", "api_key"); MetricsAdvisorClient metricsAdvisorClient = new MetricsAdvisorClientBuilder() @@ -54,7 +54,7 @@ MetricsAdvisorClient metricsAdvisorClient = new MetricsAdvisorClientBuilder() ``` #### Create a Metrics Administration client using MetricsAdvisorKeyCredential - + ```java MetricsAdvisorKeyCredential credential = new MetricsAdvisorKeyCredential("subscription_key", "api_key"); MetricsAdvisorAdministrationClient metricsAdvisorAdminClient = @@ -121,7 +121,7 @@ A notification hook is the entry point that allows the users to subscribe to rea #### Add a data feed from a sample or data source This example ingests the user specified `SQLServerDataFeedSource` data feed source data to the service. - + ```java DataFeed dataFeed = new DataFeed() .setName("dataFeedName") @@ -129,10 +129,14 @@ DataFeed dataFeed = new DataFeed() .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) .setSchema(new DataFeedSchema( Arrays.asList( - new DataFeedMetric().setName("metric1"), - new DataFeedMetric().setName("metric2") - ) - )) + new DataFeedMetric().setName("cost"), + new DataFeedMetric().setName("revenue") + )).setDimensions( + Arrays.asList( + new DataFeedDimension().setName("city"), + new DataFeedDimension().setName("category") + )) + ) .setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse("2020-01-01T00:00:00Z"))) .setOptions(new DataFeedOptions() .setDescription("data feed description") @@ -160,7 +164,7 @@ if (SQL_SERVER_DB == createdSqlDataFeed.getSourceType()) { #### Check ingestion status This example checks the ingestion status of a previously provided data feed source. - + ```java String dataFeedId = "3d48er30-6e6e-4391-b78f-b00dfee1e6f5"; @@ -179,7 +183,7 @@ metricsAdvisorAdminClient.listDataFeedIngestionStatus( #### Configure anomaly detection configuration This example demonstrates how a user can configure an anomaly detection configuration for their data. - + ```java String metricId = "3d48er30-6e6e-4391-b78f-b00dfee1e6f5"; @@ -216,7 +220,7 @@ final AnomalyDetectionConfiguration anomalyDetectionConfiguration = ### Add hooks for receiving anomaly alerts This example creates an email hook that receives anomaly incident alerts. - + ```java NotificationHook emailNotificationHook = new EmailNotificationHook("email Hook") .setDescription("my email Hook") @@ -230,14 +234,14 @@ System.out.printf("Email Hook name: %s%n", createdEmailHook.getName()); System.out.printf("Email Hook description: %s%n", createdEmailHook.getDescription()); System.out.printf("Email Hook external Link: %s%n", createdEmailHook.getExternalLink()); System.out.printf("Email Hook emails to alert: %s%n", + String.join(",", createdEmailHook.getEmailsToAlert())); ``` #### Configure an anomaly alert configuration This example demonstrates how a user can configure an alerting configuration for detected anomalies in their data. - + ```java -ic void configureAlert() { String detectionConfigurationId1 = "9ol48er30-6e6e-4391-b78f-b00dfee1e6f5"; String detectionConfigurationId2 = "3e58er30-6e6e-4391-b78f-b00dfee1e6f5"; String hookId1 = "5f48er30-6e6e-4391-b78f-b00dfee1e6f5"; @@ -258,6 +262,7 @@ final AnomalyAlertConfiguration anomalyAlertConfiguration .setMaxAlertSeverity(AnomalySeverity.HIGH))) )) .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.AND) + .setIdOfHooksToAlert(Arrays.asList(hookId1, hookId2))); ``` #### Query anomaly detection results @@ -293,13 +298,13 @@ Metrics Advisor clients raises `HttpResponseException` [exceptions][http_respons to provide a non existing feedback Id an `HttpResponseException` would be raised with an error indicating the failure cause. In the following code snippet, the error is handled gracefully by catching the exception and display the additional information about the error. - + ```java -public void handlingException() { - try { - metricsAdvisorClient.getMetricFeedback("non_existing_feedback_id"); - } catch (HttpResponseException e) { - System.out.println(e.getMessage()); +try { + metricsAdvisorClient.getMetricFeedback("non_existing_feedback_id"); +} catch (HttpResponseException e) { + System.out.println(e.getMessage()); +} ``` ### Enable client logging @@ -318,13 +323,13 @@ For more details see the [samples README][samples_readme]. #### Async APIs All the examples shown so far have been using synchronous APIs, but we provide full support for async APIs as well. You'll need to use `MetricsAdvisorAsyncClient` - + ```java -public void useMetricsAdvisorKeyCredentialAsyncClient() { - MetricsAdvisorKeyCredential credential = new MetricsAdvisorKeyCredential("subscription_key", "api_key"); - MetricsAdvisorAsyncClient metricsAdvisorAsyncClient = new MetricsAdvisorClientBuilder() - .credential(credential) - .endpoint("{endpoint}") +MetricsAdvisorKeyCredential credential = new MetricsAdvisorKeyCredential("subscription_key", "api_key"); +MetricsAdvisorAsyncClient metricsAdvisorAsyncClient = new MetricsAdvisorClientBuilder() + .credential(credential) + .endpoint("{endpoint}") + .buildAsyncClient(); ``` ### Additional documentation diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/AnomalyScope.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/AnomalyScope.java index 7dbb191c8f8b..ad490aee9f8f 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/AnomalyScope.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/AnomalyScope.java @@ -13,8 +13,8 @@ public final class AnomalyScope extends ExpandableStringEnum { /** Static value All for AnomalyScope. */ public static final AnomalyScope ALL = fromString("All"); - /** Static value DataFeedDimension for AnomalyScope. */ - public static final AnomalyScope DIMENSION = fromString("DataFeedDimension"); + /** Static value Dimension for AnomalyScope. */ + public static final AnomalyScope DIMENSION = fromString("Dimension"); /** Static value TopN for AnomalyScope. */ public static final AnomalyScope TOPN = fromString("TopN"); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/DataFeedDetail.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/DataFeedDetail.java index 9d4b41111aa4..84a8d77410a0 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/DataFeedDetail.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/DataFeedDetail.java @@ -17,10 +17,10 @@ /** The DataFeedDetail model. */ @JsonTypeInfo( - use = JsonTypeInfo.Id.NAME, - include = JsonTypeInfo.As.PROPERTY, - property = "dataSourceType", - defaultImpl = DataFeedDetail.class) + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.PROPERTY, + property = "dataSourceType", + defaultImpl = DataFeedDetail.class) @JsonTypeName("DataFeedDetail") @JsonSubTypes({ @JsonSubTypes.Type(name = "AzureApplicationInsights", value = AzureApplicationInsightsDataFeed.class), @@ -304,13 +304,13 @@ public List getMetrics() { } /** - * Set the dataFeedMetrics property: measure list. + * Set the metrics property: measure list. * - * @param dataFeedMetrics the dataFeedMetrics value to set. + * @param metrics the metrics value to set. * @return the DataFeedDetail object itself. */ - public DataFeedDetail setMetrics(List dataFeedMetrics) { - this.metrics = dataFeedMetrics; + public DataFeedDetail setMetrics(List metrics) { + this.metrics = metrics; return this; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/SeriesResult.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/SeriesResult.java index 3df57a809e01..e4d3037be7e5 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/SeriesResult.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/models/SeriesResult.java @@ -175,7 +175,7 @@ public List getExpectedValueList() { * @param expectedValueList the expectedValueList value to set. * @return the SeriesResult object itself. */ - public SeriesResult setExpectedMetricValues(List expectedValueList) { + public SeriesResult setExpectedValueList(List expectedValueList) { this.expectedValueList = expectedValueList; return this; } @@ -195,7 +195,7 @@ public List getLowerBoundaryList() { * @param lowerBoundaryList the lowerBoundaryList value to set. * @return the SeriesResult object itself. */ - public SeriesResult setLowerBoundaryValues(List lowerBoundaryList) { + public SeriesResult setLowerBoundaryList(List lowerBoundaryList) { this.lowerBoundaryList = lowerBoundaryList; return this; } @@ -215,7 +215,7 @@ public List getUpperBoundaryList() { * @param upperBoundaryList the upperBoundaryList value to set. * @return the SeriesResult object itself. */ - public SeriesResult setUpperBoundaryValues(List upperBoundaryList) { + public SeriesResult setUpperBoundaryList(List upperBoundaryList) { this.upperBoundaryList = upperBoundaryList; return this; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedSchema.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedSchema.java index 71b6c289528d..107b4b132a82 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedSchema.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DataFeedSchema.java @@ -54,7 +54,7 @@ public String getTimestampColumn() { /** * Sets the dimension columns value. * - * @param dimensions the dataFeedDimensions column value to set. + * @param dimensions the dimensions column value to set. * * @return the DataFeedSchema object itself. */ diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DimensionKey.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DimensionKey.java index b26710dd3af0..2d3626e17365 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DimensionKey.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/DimensionKey.java @@ -9,8 +9,7 @@ import java.util.TreeMap; /** - * Describes a DataFeedMetric dimension name-value pairs. - * + * Describes a Data Feed Metric dimension name-value pairs. *

* A metric advisor data feed schema {@link DataFeedSchema} defines dimension * names and metric for a data source, For example, a SQL data source for a diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/SnoozeScope.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/SnoozeScope.java index 3d9dcd757d88..62a30fd96b4f 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/SnoozeScope.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/SnoozeScope.java @@ -10,8 +10,8 @@ /** Defines values for SnoozeScope. */ public final class SnoozeScope extends ExpandableStringEnum { - /** Static value DataFeedMetric for SnoozeScope. */ - public static final SnoozeScope METRIC = fromString("DataFeedMetric"); + /** Static value Metric for SnoozeScope. */ + public static final SnoozeScope METRIC = fromString("Metric"); /** Static value Series for SnoozeScope. */ public static final SnoozeScope SERIES = fromString("Series"); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/README.md b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/README.md index cb7c84aa29aa..cbd08820c9f2 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/README.md +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/README.md @@ -5,7 +5,7 @@ languages: products: - azure - azure-cognitive-services - - azure-dataFeedMetrics-advisor + - azure-metrics-advisor urlFragment: metricsadvisor-java-samples --- @@ -52,11 +52,11 @@ Querying API's |[ListIncidentRootCausesSample][list_incident_root_causes_sample] & [ListIncidentRootCausesAsyncSample][list_incident_root_causes_async_sample] | List root causes for an incident| |[ListIncidentsAlertedSample][list_incidents_alerted_sample] -& [ListIncidentsAlertedAsyncSample][list_incidents_alerted_async_sample] | List incidents in an anomalyAlert| +& [ListIncidentsAlertedAsyncSample][list_incidents_alerted_async_sample] | List incidents in an anomaly alert| |[ListIncidentsDetectedSample][list_incidents_sample] & [ListIncidentsDetectedAsyncSample][list_incidents_async_sample] | List incidents detected by a detection configuration| |[ListsAnomaliesForAlertsSample][list_anomaly_alert_sample] -& [ListsAnomaliesForAlertsAsyncSample][list_anomaly_alert_async_sample] | List anomalies triggered for an anomalyAlert| +& [ListsAnomaliesForAlertsAsyncSample][list_anomaly_alert_async_sample] | List anomalies triggered for an anomaly alert| |[ListsAnomaliesForDetectionConfigSample][list_anomalies_detection_config_sample] & [ListsAnomaliesForDetectionConfigAsyncSample][list_anomalies_detection_config_async_sample] | List anomalies identified by a detection configuration| |[ListSeriesDataForMetricAsyncSample][list_series_data_sample] diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsAsyncSample.java index 8557a8333323..91361f85ab74 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsAsyncSample.java @@ -37,7 +37,7 @@ public static void main(String[] args) { advisorAsyncClient.listAlerts(alertConfigurationId, options) .subscribe(alert -> { - System.out.printf("AnomalyAlert Id: %s%n", alert.getId()); + System.out.printf("Anomaly Alert Id: %s%n", alert.getId()); System.out.printf("Created Time: %s%n", alert.getCreatedTime()); System.out.printf("Modified Time: %s%n", alert.getModifiedTime()); }); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsSample.java index 3aeeeff09378..1f712957c547 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsSample.java @@ -39,7 +39,7 @@ public static void main(String[] args) { PagedIterable alertsIterable = advisorClient.listAlerts(alertConfigurationId, options); for (AnomalyAlert anomalyAlert : alertsIterable) { - System.out.printf("AnomalyAlert Id: %s%n", anomalyAlert.getId()); + System.out.printf("Anomaly Alert Id: %s%n", anomalyAlert.getId()); System.out.printf("Created Time: %s%n", anomalyAlert.getCreatedTime()); System.out.printf("Modified Time: %s%n", anomalyAlert.getModifiedTime()); } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricAsyncSample.java index 2c4833e25536..12b3862856d0 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricAsyncSample.java @@ -26,9 +26,9 @@ public static void main(String[] args) { advisorAsyncClient.listMetricEnrichmentStatus(metricId, options) .doOnNext(enrichmentStatus -> { - System.out.printf("DataFeedMetric enrichment status : %s%n", enrichmentStatus.getStatus()); - System.out.printf("DataFeedMetric enrichment status message: %s%n", enrichmentStatus.getMessage()); - System.out.printf("DataFeedMetric enrichment status data slice timestamp : %s%n", + System.out.printf("Data Feed Metric enrichment status : %s%n", enrichmentStatus.getStatus()); + System.out.printf("Data Feed Metric enrichment status message: %s%n", enrichmentStatus.getMessage()); + System.out.printf("Data Feed Metric enrichment status data slice timestamp : %s%n", enrichmentStatus.getTimestamp()); }) .blockLast(); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricSample.java index 3a94a3d777c6..940f3e5af0ad 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricSample.java @@ -26,9 +26,9 @@ public static void main(String[] args) { advisorClient.listMetricEnrichmentStatus(metricId, options) .forEach(enrichmentStatus -> { - System.out.printf("DataFeedMetric enrichment status : %s%n", enrichmentStatus.getStatus()); - System.out.printf("DataFeedMetric enrichment status message: %s%n", enrichmentStatus.getMessage()); - System.out.printf("DataFeedMetric enrichment status data slice timestamp : %s%n", + System.out.printf("Data Feed Metric enrichment status : %s%n", enrichmentStatus.getStatus()); + System.out.printf("Data Feed Metric enrichment status message: %s%n", enrichmentStatus.getMessage()); + System.out.printf("Data Feed Metric enrichment status data slice timestamp : %s%n", enrichmentStatus.getTimestamp()); }); } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsAlertedAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsAlertedAsyncSample.java index 9336d43e3143..923fa09dd954 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsAlertedAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsAlertedAsyncSample.java @@ -34,9 +34,9 @@ public static void main(String[] args) { System.out.printf("Detection Configuration Id: %s%n", incident.getDetectionConfigurationId()); System.out.printf("Anomaly Incident Id: %s%n", incident.getId()); System.out.printf("Anomaly Incident Start Time: %s%n", incident.getStartTime()); - System.out.printf("Anomaly Incident AnomalySeverity: %s%n", incident.getSeverity()); + System.out.printf("Anomaly Incident Severity: %s%n", incident.getSeverity()); System.out.printf("Anomaly Incident Status: %s%n", incident.getStatus()); - System.out.printf("Root DataFeedDimension Key: %s%n", incident.getRootDimensionKey().asMap()); + System.out.printf("Root Dimension Key: %s%n", incident.getRootDimensionKey().asMap()); }).blockLast(); /* 'blockLast()' will block until the above operation s completed. diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsAlertedSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsAlertedSample.java index 89e8256e78bb..0e170272a371 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsAlertedSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsAlertedSample.java @@ -34,9 +34,9 @@ public static void main(String[] args) { System.out.printf("Detection Configuration Id: %s%n", anomalyIncident.getDetectionConfigurationId()); System.out.printf("Anomaly Incident Id: %s%n", anomalyIncident.getId()); System.out.printf("Anomaly Incident Start Time: %s%n", anomalyIncident.getStartTime()); - System.out.printf("Anomaly Incident AnomalySeverity: %s%n", anomalyIncident.getSeverity()); + System.out.printf("Anomaly Incident Severity: %s%n", anomalyIncident.getSeverity()); System.out.printf("Anomaly Incident Status: %s%n", anomalyIncident.getStatus()); - System.out.printf("Root DataFeedDimension Key: %s%n", anomalyIncident.getRootDimensionKey().asMap()); + System.out.printf("Root Dimension Key: %s%n", anomalyIncident.getRootDimensionKey().asMap()); } } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsDetectedAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsDetectedAsyncSample.java index ce5089f31dc3..102198333e00 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsDetectedAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsDetectedAsyncSample.java @@ -31,13 +31,13 @@ public static void main(String[] args) { = advisorAsyncClient.listIncidentsForDetectionConfig(detectionConfigurationId, options); incidentsFlux.doOnNext(incident -> { - System.out.printf("DataFeedMetric Id: %s%n", incident.getMetricId()); + System.out.printf("Data Feed Metric Id: %s%n", incident.getMetricId()); System.out.printf("Detection Configuration Id: %s%n", incident.getDetectionConfigurationId()); System.out.printf("Anomaly Incident Id: %s%n", incident.getId()); System.out.printf("Anomaly Incident Start Time: %s%n", incident.getStartTime()); - System.out.printf("Anomaly Incident AnomalySeverity: %s%n", incident.getSeverity()); + System.out.printf("Anomaly Incident Severity: %s%n", incident.getSeverity()); System.out.printf("Anomaly Incident Status: %s%n", incident.getStatus()); - System.out.printf("Root DataFeedDimension Key: %s%n", incident.getRootDimensionKey().asMap()); + System.out.printf("Root Dimension Key: %s%n", incident.getRootDimensionKey().asMap()); }).blockLast(); /* 'blockLast()' will block until the above operation s completed. diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsDetectedSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsDetectedSample.java index 8aa52349ce62..d79eba72ee26 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsDetectedSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsDetectedSample.java @@ -31,13 +31,13 @@ public static void main(String[] args) { = advisorClient.listIncidentsForDetectionConfig(detectionConfigurationId, options); for (AnomalyIncident anomalyIncident : incidentsIterable) { - System.out.printf("DataFeedMetric Id: %s%n", anomalyIncident.getMetricId()); + System.out.printf("Data Feed Metric Id: %s%n", anomalyIncident.getMetricId()); System.out.printf("Detection Configuration Id: %s%n", anomalyIncident.getDetectionConfigurationId()); System.out.printf("Anomaly Incident Id: %s%n", anomalyIncident.getId()); System.out.printf("Anomaly Incident Start Time: %s%n", anomalyIncident.getStartTime()); - System.out.printf("Anomaly Incident AnomalySeverity: %s%n", anomalyIncident.getSeverity()); + System.out.printf("Anomaly Incident Severity: %s%n", anomalyIncident.getSeverity()); System.out.printf("Anomaly Incident Status: %s%n", anomalyIncident.getStatus()); - System.out.printf("Root DataFeedDimension Key: %s%n", anomalyIncident.getRootDimensionKey().asMap()); + System.out.printf("Root Dimension Key: %s%n", anomalyIncident.getRootDimensionKey().asMap()); } } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDefinitionsForMetricAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDefinitionsForMetricAsyncSample.java index 21d091a0f01c..588b55c4d892 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDefinitionsForMetricAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDefinitionsForMetricAsyncSample.java @@ -32,7 +32,7 @@ public static void main(String[] args) { advisorAsyncClient.listMetricSeriesDefinitions(metricId, options) .doOnNext(metricSeriesDefinition -> { - System.out.printf("DataFeedMetric Id : %s%n", metricSeriesDefinition.getMetricId()); + System.out.printf("Data Feed Metric Id : %s%n", metricSeriesDefinition.getMetricId()); System.out.printf("Series Key: %s%n", metricSeriesDefinition.getSeriesKey().asMap()); }).blockLast(); /* diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDefinitionsForMetricSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDefinitionsForMetricSample.java index f2f371a90a99..db937e6aeb3e 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDefinitionsForMetricSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDefinitionsForMetricSample.java @@ -33,7 +33,7 @@ public static void main(String[] args) { advisorClient.listMetricSeriesDefinitions(metricId, options) .forEach(metricSeriesDefinition -> { - System.out.printf("DataFeedMetric Id : %s%n", metricSeriesDefinition.getMetricId()); + System.out.printf("Data Feed Metric Id : %s%n", metricSeriesDefinition.getMetricId()); System.out.printf("Series Key: %s%n", metricSeriesDefinition.getSeriesKey().asMap()); }); } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForAlertsAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForAlertsAsyncSample.java index 57b2ebbff24f..e3aabf3612d6 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForAlertsAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForAlertsAsyncSample.java @@ -26,11 +26,11 @@ public static void main(String[] args) { alertId, options) .doOnNext(anomaly -> { - System.out.printf("DataFeedMetric Id: %s%n", anomaly.getMetricId()); + System.out.printf("Data Feed Metric Id: %s%n", anomaly.getMetricId()); System.out.printf("Detection Configuration Id: %s%n", anomaly.getDetectionConfigurationId()); System.out.printf("DataPoint Anomaly Created Time: %s%n", anomaly.getCreatedTime()); System.out.printf("DataPoint Anomaly Modified Time: %s%n", anomaly.getModifiedTime()); - System.out.printf("DataPoint Anomaly AnomalySeverity: %s%n", anomaly.getSeverity()); + System.out.printf("DataPoint Anomaly Severity: %s%n", anomaly.getSeverity()); System.out.printf("DataPoint Anomaly Status: %s%n", anomaly.getStatus()); System.out.printf("Series Key: %s%n", anomaly.getSeriesKey().asMap()); }).blockLast(); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForAlertsSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForAlertsSample.java index cba6c86bffcd..a9e0ad668cf3 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForAlertsSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForAlertsSample.java @@ -29,11 +29,11 @@ public static void main(String[] args) { alertId); for (DataPointAnomaly dataPointAnomaly : anomaliesIterable) { - System.out.printf("DataFeedMetric Id: %s%n", dataPointAnomaly.getMetricId()); + System.out.printf("Data Feed Metric Id: %s%n", dataPointAnomaly.getMetricId()); System.out.printf("Detection Configuration Id: %s%n", dataPointAnomaly.getDetectionConfigurationId()); System.out.printf("DataPoint Anomaly Created Time: %s%n", dataPointAnomaly.getCreatedTime()); System.out.printf("DataPoint Anomaly Modified Time: %s%n", dataPointAnomaly.getModifiedTime()); - System.out.printf("DataPoint Anomaly AnomalySeverity: %s%n", dataPointAnomaly.getSeverity()); + System.out.printf("DataPoint Anomaly Severity: %s%n", dataPointAnomaly.getSeverity()); System.out.printf("DataPoint Anomaly Status: %s%n", dataPointAnomaly.getStatus()); System.out.printf("Series Key: %s%n", dataPointAnomaly.getSeriesKey().asMap()); } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigAsyncSample.java index e213a9af6af5..6b3a04265997 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigAsyncSample.java @@ -32,7 +32,7 @@ public static void main(String[] args) { advisorAsyncClient.listAnomaliesForDetectionConfig(detectionConfigurationId, options) .doOnNext(anomaly -> { - System.out.printf("DataPoint Anomaly AnomalySeverity: %s%n", anomaly.getSeverity()); + System.out.printf("DataPoint Anomaly Severity: %s%n", anomaly.getSeverity()); System.out.printf("Series Key: %s%n", anomaly.getSeriesKey().asMap().entrySet()); }).blockLast(); /* diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigSample.java index 9a6e616884b6..039080f9f222 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigSample.java @@ -36,7 +36,7 @@ public static void main(String[] args) { options); for (DataPointAnomaly dataPointAnomaly : anomaliesIterable) { - System.out.printf("DataPoint Anomaly AnomalySeverity: %s%n", dataPointAnomaly.getSeverity()); + System.out.printf("DataPoint Anomaly Severity: %s%n", dataPointAnomaly.getSeverity()); System.out.printf("Series Key: %s%n", dataPointAnomaly.getSeriesKey().asMap().entrySet()); } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricFeedbackAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricFeedbackAsyncSample.java index 98b7f60094fc..d26216110608 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricFeedbackAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricFeedbackAsyncSample.java @@ -30,47 +30,47 @@ public static void main(String[] args) { .credential(new MetricsAdvisorKeyCredential("subscription_key", "api_key")) .buildAsyncClient(); - // Create DataFeedMetric Feedback + // Create Metric Feedback final String metricId = "d3gh4i4-b804-4ab9-a70f-0da0c89cft3l"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final MetricChangePointFeedback metricChangePointFeedback = new MetricChangePointFeedback(startTime, endTime, ChangePointValue.AUTO_DETECT); - System.out.printf("Creating DataFeedMetric Feedback%n"); + System.out.printf("Creating Metric Feedback%n"); final Mono createdFeedbackMono = advisorAsyncClient.createMetricFeedback(metricId, metricChangePointFeedback); createdFeedbackMono .doOnSubscribe(__ -> - System.out.printf("Creating DataFeedMetric Feedback%n")) + System.out.printf("Creating Metric Feedback%n")) .doOnSuccess(feedback -> - System.out.printf("Created DataFeedMetric Feedback: %s%n", feedback.getId())); + System.out.printf("Created Metric Feedback: %s%n", feedback.getId())); // Retrieve the metric feedback that just created. Mono fetchFeedbackMono = createdFeedbackMono.flatMap(createdFeedback -> { return advisorAsyncClient.getMetricFeedback(createdFeedback.getId()) .doOnSubscribe(__ -> - System.out.printf("Fetching DataFeedMetric Feedback: %s%n", createdFeedback.getId())) + System.out.printf("Fetching Metric Feedback: %s%n", createdFeedback.getId())) .doOnSuccess(config -> - System.out.printf("Fetched DataFeedMetric Feedback%n")) + System.out.printf("Fetched Metric Feedback%n")) .doOnNext(feedback -> { - System.out.printf("DataFeedMetric Feedback Id : %s%n", feedback.getId()); - System.out.printf("DataFeedMetric Feedback created time : %s%n", feedback.getCreatedTime()); - System.out.printf("DataFeedMetric Feedback user principal : %s%n", feedback.getUserPrincipal()); - System.out.printf("DataFeedMetric feedback associated dimension filter: %s%n", + System.out.printf("Metric Feedback Id : %s%n", feedback.getId()); + System.out.printf("Metric Feedback created time : %s%n", feedback.getCreatedTime()); + System.out.printf("Metric Feedback user principal : %s%n", feedback.getUserPrincipal()); + System.out.printf("Metric feedback associated dimension filter: %s%n", feedback.getDimensionFilter().asMap()); if (CHANGE_POINT.equals(createdFeedback.getFeedbackType())) { MetricChangePointFeedback createdMetricChangePointFeedback = (MetricChangePointFeedback) createdFeedback; - System.out.printf("DataFeedMetric feedback Id: %s%n", createdMetricChangePointFeedback.getId()); - System.out.printf("DataFeedMetric feedback change point value: %s%n", + System.out.printf("Metric feedback Id: %s%n", createdMetricChangePointFeedback.getId()); + System.out.printf("Metric feedback change point value: %s%n", createdMetricChangePointFeedback.getChangePointValue().toString()); - System.out.printf("DataFeedMetric feedback start time: %s%n", + System.out.printf("Metric feedback start time: %s%n", createdMetricChangePointFeedback.getStartTime()); - System.out.printf("DataFeedMetric feedback end time: %s%n", + System.out.printf("Metric feedback end time: %s%n", createdMetricChangePointFeedback.getEndTime()); } }); @@ -87,39 +87,39 @@ public static void main(String[] args) { System.out.printf("Listing metric feedbacks%n"); advisorAsyncClient.listMetricFeedbacks(metricId) .doOnNext(feedbackItem -> { - System.out.printf("DataFeedMetric Feedback Id : %s%n", feedbackItem.getId()); - System.out.printf("DataFeedMetric Feedback created time : %s%n", feedbackItem.getCreatedTime()); - System.out.printf("DataFeedMetric Feedback user principal : %s%n", feedbackItem.getUserPrincipal()); - System.out.printf("DataFeedMetric feedback associated dimension filter: %s%n", + System.out.printf("Metric Feedback Id : %s%n", feedbackItem.getId()); + System.out.printf("Metric Feedback created time : %s%n", feedbackItem.getCreatedTime()); + System.out.printf("Metric Feedback user principal : %s%n", feedbackItem.getUserPrincipal()); + System.out.printf("Metric feedback associated dimension filter: %s%n", feedbackItem.getDimensionFilter().asMap()); if (CHANGE_POINT.equals(feedbackItem.getFeedbackType())) { MetricChangePointFeedback changePointFeedback = (MetricChangePointFeedback) feedbackItem; - System.out.printf("DataFeedMetric feedback change point value: %s%n", + System.out.printf("Metric feedback change point value: %s%n", changePointFeedback.getChangePointValue().toString()); - System.out.printf("DataFeedMetric feedback start time: %s%n", + System.out.printf("Metric feedback start time: %s%n", changePointFeedback.getStartTime()); - System.out.printf("DataFeedMetric feedback end time: %s%n", + System.out.printf("Metric feedback end time: %s%n", changePointFeedback.getEndTime()); } else if (PERIOD.equals(feedbackItem.getFeedbackType())) { MetricPeriodFeedback periodFeedback = (MetricPeriodFeedback) feedbackItem; - System.out.printf("DataFeedMetric feedback type: %s%n", + System.out.printf("Metric feedback type: %s%n", periodFeedback.getPeriodType().toString()); - System.out.printf("DataFeedMetric feedback period value: %f%n", + System.out.printf("Metric feedback period value: %f%n", periodFeedback.getPeriodValue()); } else if (ANOMALY.equals(feedbackItem.getFeedbackType())) { MetricAnomalyFeedback metricAnomalyFeedback = (MetricAnomalyFeedback) feedbackItem; - System.out.printf("DataFeedMetric feedback anomaly value: %s%n", + System.out.printf("Metric feedback anomaly value: %s%n", metricAnomalyFeedback.getAnomalyValue().toString()); - System.out.printf("DataFeedMetric feedback associated detection configuration Id: %s%n", + System.out.printf("Metric feedback associated detection configuration Id: %s%n", metricAnomalyFeedback.getDetectionConfigurationId()); } else if (COMMENT.equals(feedbackItem.getFeedbackType())) { MetricCommentFeedback metricCommentFeedback = (MetricCommentFeedback) feedbackItem; - System.out.printf("DataFeedMetric feedback comment value: %s%n", + System.out.printf("Metric feedback comment value: %s%n", metricCommentFeedback.getComment()); } }); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricFeedbackSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricFeedbackSample.java index 9e3a3df4a8e3..670e13f4ac45 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricFeedbackSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricFeedbackSample.java @@ -29,40 +29,40 @@ public static void main(String[] args) { .credential(new MetricsAdvisorKeyCredential("subscription_key", "api_key")) .buildClient(); - // Create DataFeedMetric Feedback + // Create Metric Feedback final String metricId = "d3gh4i4-b804-4ab9-a70f-0da0c89cft3l"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final MetricChangePointFeedback metricChangePointFeedback = new MetricChangePointFeedback(startTime, endTime, ChangePointValue.AUTO_DETECT); - System.out.printf("Creating DataFeedMetric Feedback%n"); + System.out.printf("Creating Metric Feedback%n"); final MetricFeedback createdFeedback = advisorClient.createMetricFeedback(metricId, metricChangePointFeedback); - System.out.printf("Created DataFeedMetric Feedback: %s%n", createdFeedback.getId()); + System.out.printf("Created Metric Feedback: %s%n", createdFeedback.getId()); - System.out.printf("Fetching DataFeedMetric Feedback: %s%n", createdFeedback.getId()); + System.out.printf("Fetching Metric Feedback: %s%n", createdFeedback.getId()); // Retrieve the metric feedback that just created. MetricFeedback fetchFeedback = advisorClient.getMetricFeedback(createdFeedback.getId()); - System.out.printf("Fetched DataFeedMetric Feedback%n"); + System.out.printf("Fetched Metric Feedback%n"); - System.out.printf("DataFeedMetric Feedback Id : %s%n", fetchFeedback.getId()); - System.out.printf("DataFeedMetric Feedback created time : %s%n", fetchFeedback.getCreatedTime()); - System.out.printf("DataFeedMetric Feedback user principal : %s%n", fetchFeedback.getUserPrincipal()); - System.out.printf("DataFeedMetric feedback associated dimension filter: %s%n", + System.out.printf("Metric Feedback Id : %s%n", fetchFeedback.getId()); + System.out.printf("Metric Feedback created time : %s%n", fetchFeedback.getCreatedTime()); + System.out.printf("Metric Feedback user principal : %s%n", fetchFeedback.getUserPrincipal()); + System.out.printf("Metric feedback associated dimension filter: %s%n", fetchFeedback.getDimensionFilter().asMap()); if (CHANGE_POINT.equals(createdFeedback.getFeedbackType())) { MetricChangePointFeedback createdMetricChangePointFeedback = (MetricChangePointFeedback) createdFeedback; - System.out.printf("DataFeedMetric feedback Id: %s%n", createdMetricChangePointFeedback.getId()); - System.out.printf("DataFeedMetric feedback change point value: %s%n", + System.out.printf("Metric feedback Id: %s%n", createdMetricChangePointFeedback.getId()); + System.out.printf("Metric feedback change point value: %s%n", createdMetricChangePointFeedback.getChangePointValue().toString()); - System.out.printf("DataFeedMetric feedback start time: %s%n", + System.out.printf("Metric feedback start time: %s%n", createdMetricChangePointFeedback.getStartTime()); - System.out.printf("DataFeedMetric feedback end time: %s%n", + System.out.printf("Metric feedback end time: %s%n", createdMetricChangePointFeedback.getEndTime()); } @@ -70,39 +70,39 @@ public static void main(String[] args) { System.out.printf("Listing metric feedbacks%n"); advisorClient.listMetricFeedbacks(metricId) .forEach(feedbackItem -> { - System.out.printf("DataFeedMetric Feedback Id : %s%n", feedbackItem.getId()); - System.out.printf("DataFeedMetric Feedback created time : %s%n", feedbackItem.getCreatedTime()); - System.out.printf("DataFeedMetric Feedback user principal : %s%n", feedbackItem.getUserPrincipal()); - System.out.printf("DataFeedMetric feedback associated dimension filter: %s%n", + System.out.printf("Metric Feedback Id : %s%n", feedbackItem.getId()); + System.out.printf("Metric Feedback created time : %s%n", feedbackItem.getCreatedTime()); + System.out.printf("Metric Feedback user principal : %s%n", feedbackItem.getUserPrincipal()); + System.out.printf("Metric feedback associated dimension filter: %s%n", feedbackItem.getDimensionFilter().asMap()); if (CHANGE_POINT.equals(feedbackItem.getFeedbackType())) { MetricChangePointFeedback changePointFeedback = (MetricChangePointFeedback) feedbackItem; - System.out.printf("DataFeedMetric feedback change point value: %s%n", + System.out.printf("Metric feedback change point value: %s%n", changePointFeedback.getChangePointValue().toString()); - System.out.printf("DataFeedMetric feedback start time: %s%n", + System.out.printf("Metric feedback start time: %s%n", changePointFeedback.getStartTime()); - System.out.printf("DataFeedMetric feedback end time: %s%n", + System.out.printf("Metric feedback end time: %s%n", changePointFeedback.getEndTime()); } else if (PERIOD.equals(feedbackItem.getFeedbackType())) { MetricPeriodFeedback periodFeedback = (MetricPeriodFeedback) feedbackItem; - System.out.printf("DataFeedMetric feedback type: %s%n", + System.out.printf("Metric feedback type: %s%n", periodFeedback.getPeriodType().toString()); - System.out.printf("DataFeedMetric feedback period value: %f%n", + System.out.printf("Metric feedback period value: %f%n", periodFeedback.getPeriodValue()); } else if (ANOMALY.equals(feedbackItem.getFeedbackType())) { MetricAnomalyFeedback metricAnomalyFeedback = (MetricAnomalyFeedback) feedbackItem; - System.out.printf("DataFeedMetric feedback anomaly value: %s%n", + System.out.printf("Metric feedback anomaly value: %s%n", metricAnomalyFeedback.getAnomalyValue().toString()); - System.out.printf("DataFeedMetric feedback associated detection configuration Id: %s%n", + System.out.printf("Metric feedback associated detection configuration Id: %s%n", metricAnomalyFeedback.getDetectionConfigurationId()); } else if (COMMENT.equals(feedbackItem.getFeedbackType())) { MetricCommentFeedback metricCommentFeedback = (MetricCommentFeedback) feedbackItem; - System.out.printf("DataFeedMetric feedback comment value: %s%n", + System.out.printf("Metric feedback comment value: %s%n", metricCommentFeedback.getComment()); } }); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java index 200bef60a705..18248dbf2619 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java @@ -140,7 +140,7 @@ public void listMetricSeriesDefinitionsWithContext() { * {@link MetricsAdvisorClient#listMetricSeriesData(String, List, OffsetDateTime, OffsetDateTime)} */ public void listMetricSeriesData() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesData#String-List-ListMetricSeriesDataOptions + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesData#String-List-OffsetDateTime-OffsetDateTime final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); @@ -156,7 +156,7 @@ public void listMetricSeriesData() { System.out.printf("Series Key:"); System.out.println(metricSeriesData.getSeriesKey().asMap()); }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesData#String-List-ListMetricSeriesDataOptions + // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesData#String-List-OffsetDateTime-OffsetDateTime } /** diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java index 53fec9b463d1..6b9ff2987a2c 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java @@ -11,6 +11,7 @@ import com.azure.ai.metricsadvisor.models.AnomalySeverity; import com.azure.ai.metricsadvisor.models.ChangeThresholdCondition; import com.azure.ai.metricsadvisor.models.DataFeed; +import com.azure.ai.metricsadvisor.models.DataFeedDimension; import com.azure.ai.metricsadvisor.models.DataFeedGranularity; import com.azure.ai.metricsadvisor.models.DataFeedGranularityType; import com.azure.ai.metricsadvisor.models.DataFeedIngestionSettings; @@ -89,10 +90,14 @@ public void createDataFeed() { .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) .setSchema(new DataFeedSchema( Arrays.asList( - new DataFeedMetric().setName("metric1"), - new DataFeedMetric().setName("metric2") - ) - )) + new DataFeedMetric().setName("cost"), + new DataFeedMetric().setName("revenue") + )).setDimensions( + Arrays.asList( + new DataFeedDimension().setName("city"), + new DataFeedDimension().setName("category") + )) + ) .setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse("2020-01-01T00:00:00Z"))) .setOptions(new DataFeedOptions() .setDescription("data feed description") diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets.java index dcd7660bd915..b2478a3efcfb 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationAsyncClientJavaDocCodeSnippets.java @@ -8,6 +8,7 @@ import com.azure.ai.metricsadvisor.models.AnomalyDetectorDirection; import com.azure.ai.metricsadvisor.models.ChangeThresholdCondition; import com.azure.ai.metricsadvisor.models.DataFeed; +import com.azure.ai.metricsadvisor.models.DataFeedDimension; import com.azure.ai.metricsadvisor.models.DataFeedGranularity; import com.azure.ai.metricsadvisor.models.DataFeedGranularityType; import com.azure.ai.metricsadvisor.models.DataFeedIngestionProgress; @@ -100,10 +101,14 @@ public void createDataFeed() { .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) .setSchema(new DataFeedSchema( Arrays.asList( - new DataFeedMetric().setName("metric1"), - new DataFeedMetric().setName("metric2") - ) - )) + new DataFeedMetric().setName("cost"), + new DataFeedMetric().setName("revenue") + )).setDimensions( + Arrays.asList( + new DataFeedDimension().setName("city"), + new DataFeedDimension().setName("category") + )) + ) .setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse("2020-01-01T00:00:00Z"))) .setOptions(new DataFeedOptions() .setDescription("data feed description") diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClientJavaDocCodeSnippets.java index 89d91f727af7..aa6248f1385f 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClientJavaDocCodeSnippets.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAdvisorAdministrationClientJavaDocCodeSnippets.java @@ -9,6 +9,7 @@ import com.azure.ai.metricsadvisor.models.ChangeThresholdCondition; import com.azure.ai.metricsadvisor.models.AnomalyAlertConfiguration; import com.azure.ai.metricsadvisor.models.DataFeed; +import com.azure.ai.metricsadvisor.models.DataFeedDimension; import com.azure.ai.metricsadvisor.models.DataFeedGranularity; import com.azure.ai.metricsadvisor.models.DataFeedGranularityType; import com.azure.ai.metricsadvisor.models.DataFeedIngestionProgress; @@ -106,10 +107,14 @@ public void createDataFeed() { .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) .setSchema(new DataFeedSchema( Arrays.asList( - new DataFeedMetric().setName("metric1"), - new DataFeedMetric().setName("metric2") - ) - )) + new DataFeedMetric().setName("cost"), + new DataFeedMetric().setName("revenue") + )).setDimensions( + Arrays.asList( + new DataFeedDimension().setName("city"), + new DataFeedDimension().setName("category") + )) + ) .setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse("2020-01-01T00:00:00Z"))) .setOptions(new DataFeedOptions() .setDescription("data feed description") @@ -136,10 +141,14 @@ public void createDataFeedWithResponse() { .setGranularity(new DataFeedGranularity().setGranularityType(DataFeedGranularityType.DAILY)) .setSchema(new DataFeedSchema( Arrays.asList( - new DataFeedMetric().setName("metric1"), - new DataFeedMetric().setName("metric2") - ) - )) + new DataFeedMetric().setName("cost"), + new DataFeedMetric().setName("revenue") + )).setDimensions( + Arrays.asList( + new DataFeedDimension().setName("city"), + new DataFeedDimension().setName("category") + )) + ) .setIngestionSettings(new DataFeedIngestionSettings(OffsetDateTime.parse("2020-01-01T00:00:00Z"))) .setOptions(new DataFeedOptions() .setDescription("data feed description") diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAnomalyAlertConfigOperationsAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAnomalyAlertConfigOperationsAsyncSample.java index 86e1dc6f410f..0c04bcd8e20e 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAnomalyAlertConfigOperationsAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAnomalyAlertConfigOperationsAsyncSample.java @@ -35,7 +35,7 @@ public static void main(String[] args) { final Mono createdAnomalyAlertConfigMono = advisorAdministrationAsyncClient.createAnomalyAlertConfig( - new AnomalyAlertConfiguration("My AnomalyAlert config name") + new AnomalyAlertConfiguration("My Anomaly Alert config name") .setDescription("alert config description") .setMetricAlertConfigurations(Arrays.asList( new MetricAnomalyAlertConfiguration(detectionConfigurationId1, @@ -72,11 +72,11 @@ public static void main(String[] args) { System.out.println("DataFeedMetric level alert configurations for this anomaly alert config:"); anomalyAlertConfig.getMetricAlertConfigurations(). forEach(metricAnomalyAlertConfiguration -> { - System.out.printf("AnomalyAlert detection configuration Id: %s%n", + System.out.printf("Anomaly Alert detection configuration Id: %s%n", metricAnomalyAlertConfiguration.getDetectionConfigurationId()); - System.out.printf("AnomalyAlert configuration negation value", + System.out.printf("Anomaly Alert configuration negation value", metricAnomalyAlertConfiguration.isNegationOperationEnabled()); - System.out.printf("AnomalyAlert configuration scope type", + System.out.printf("Anomaly Alert configuration scope type", metricAnomalyAlertConfiguration.getAlertScope().getScopeType().toString()); }); }); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAnomalyAlertConfigOperationsSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAnomalyAlertConfigOperationsSample.java index 74cae7747bde..169b2a183b52 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAnomalyAlertConfigOperationsSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/administration/MetricsAnomalyAlertConfigOperationsSample.java @@ -35,7 +35,7 @@ public static void main(String[] args) { System.out.println("Creating DataPoint Anomaly alert config%n"); final AnomalyAlertConfiguration createdAnomalyAlertConfig = advisorAdministrationClient.createAnomalyAlertConfig( - new AnomalyAlertConfiguration("My AnomalyAlert config name") + new AnomalyAlertConfiguration("My Anomaly Alert config name") .setDescription("alert config description") .setMetricAlertConfigurations(Arrays.asList( new MetricAnomalyAlertConfiguration(detectionConfigurationId1, @@ -64,11 +64,11 @@ public static void main(String[] args) { System.out.println("DataFeedMetric level alert configurations for this anomaly alert config:"); fetchAnomalyAlertConfig.getMetricAlertConfigurations(). forEach(metricAnomalyAlertConfiguration -> { - System.out.printf("AnomalyAlert detection configuration Id: %s%n", + System.out.printf("Anomaly Alert detection configuration Id: %s%n", metricAnomalyAlertConfiguration.getDetectionConfigurationId()); - System.out.printf("AnomalyAlert configuration negation value", + System.out.printf("Anomaly Alert configuration negation value", metricAnomalyAlertConfiguration.isNegationOperationEnabled()); - System.out.printf("AnomalyAlert configuration scope type", + System.out.printf("Anomaly Alert configuration scope type", metricAnomalyAlertConfiguration.getAlertScope().getScopeType().toString()); }); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/swagger/README.md b/sdk/metricsadvisor/azure-ai-metricsadvisor/swagger/README.md index 0d8f8e008619..09e7d3c59f3d 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/swagger/README.md +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/swagger/README.md @@ -32,17 +32,41 @@ add-context-parameter: true models-subpackage: implementation.models context-client-method-parameter: true custom-types-subpackage: models -custom-types: AnomalyDetectorDirection,AnomalyStatus,AnomalyValue,ChangePointValue,ChangeThresholdCondition,DataFeedIngestionProgress,Dimension,EnrichmentStatus,HardThresholdCondition,IncidentStatus,IngestionStatusType,Metric,PeriodType,Severity,SeverityCondition,SmartDetectionCondition,SnoozeScope,SuppressCondition,TimeMode,TopNGroupScope,DataFeedIngestionStatus,MetricAnomalyAlertSnoozeCondition,MetricSeriesDefinition,FeedbackQueryTimeMode,Alert,DataFeedGranularityType,DataFeedRollupType,DataFeedAutoRollUpMethod,DataFeedStatus,ErrorCodeException,ErrorCode +custom-types: AnomalyDetectorDirection,AnomalyStatus,AnomalyValue,ChangePointValue,ChangeThresholdCondition,DataFeedIngestionProgress,DataFeedDimension,EnrichmentStatus,HardThresholdCondition,AnomalyIncidentStatus,IngestionStatusType,DataFeedMetric,PeriodType,AnomalySeverity,SeverityCondition,SmartDetectionCondition,SnoozeScope,SuppressCondition,AlertQueryTimeMode,TopNGroupScope,DataFeedIngestionStatus,MetricAnomalyAlertSnoozeCondition,MetricSeriesDefinition,FeedbackQueryTimeMode,AnomalyAlert,DataFeedGranularityType,DataFeedRollupType,DataFeedAutoRollUpMethod,DataFeedStatus,ErrorCodeException,ErrorCode ``` ### Generated types renamed and moved to model -#### AlertResult -> Alert +#### TimeMode -> AlertQueryTimeMode +```yaml +directive: + - rename-model: + from: TimeMode + to: AlertQueryTimeModel +``` + +#### Severity -> AnomalySeverity +```yaml +directive: + - rename-model: + from: Severity + to: AnomalySeverity +``` + +#### IncidentStatus -> AnomalyIncidentStatus +```yaml +directive: + - rename-model: + from: IncidentStatus + to: AnomalyIncidentStatus +``` + +#### AlertResult -> AnomalyAlert ```yaml directive: - rename-model: from: AlertResult - to: Alert + to: AnomalyAlert ``` #### IngestionStatus -> DataFeedIngestionStatus @@ -178,6 +202,22 @@ directive: delete $.properties.metricId["format"]; ``` +### Rename Metric to DataFeedMetric +```yaml +directive: + - rename-model: + from: Metric + to: DataFeedMetric +``` + +### Rename Dimension to DataFeedDimension +```yaml +directive: + - rename-model: + from: Dimension + to: DataFeedDimension +``` + ### Add x-ms-paths section if not exists ``` yaml @@ -195,7 +235,7 @@ directive: ``` yaml directive: - from: swagger-document - where: $["paths"]["/anomalyAlert/anomaly/configurations/{configurationId}/alerts/query"] + where: $["paths"]["/alert/anomaly/configurations/{configurationId}/alerts/query"] transform: > let pageExt = $.post["x-ms-pageable"]; if (!pageExt) { @@ -555,7 +595,7 @@ directive: ``` yaml directive: - from: swagger-document - where: $["paths"]["/dataFeedMetrics/{metricId}/series/query"] + where: $["paths"]["/metrics/{metricId}/series/query"] transform: > let pageExt = $.post["x-ms-pageable"]; if (!pageExt) { @@ -627,7 +667,7 @@ directive: ``` yaml directive: - from: swagger-document - where: $["paths"]["/dataFeedMetrics/{metricId}/dimension/query"] + where: $["paths"]["/metrics/{metricId}/dimension/query"] transform: > let pageExt = $.post["x-ms-pageable"]; if (!pageExt) { @@ -699,7 +739,7 @@ directive: ``` yaml directive: - from: swagger-document - where: $["paths"]["/dataFeedMetrics/{metricId}/status/enrichment/anomalyDetection/query"] + where: $["paths"]["/metrics/{metricId}/status/enrichment/anomalyDetection/query"] transform: > let pageExt = $.post["x-ms-pageable"]; if (!pageExt) { From 712b0394138c21be8a37753d51149dd46173a273 Mon Sep 17 00:00:00 2001 From: Sameeksha Vaity Date: Mon, 2 Nov 2020 15:44:02 -0800 Subject: [PATCH 6/9] rebase changes --- .../azure-ai-metricsadvisor/README.md | 2 +- .../metricsadvisor/AnomalyAlertAsyncTest.java | 5 +- .../ai/metricsadvisor/AnomalyAlertTest.java | 30 +- .../ai/metricsadvisor/DataFeedClientTest.java | 2 +- .../DataPointAnomalyAlertAsyncTest.java | 315 ------------------ .../DataPointAnomalyAlertTest.java | 304 ----------------- .../DataPointAnomalyForAlertAsyncTest.java | 53 --- .../DataPointAnomalyForAlertTest.java | 41 --- ...intAnomalyForDetectionConfigAsyncTest.java | 45 --- ...ataPointAnomalyForDetectionConfigTest.java | 32 -- ...aluesOfDimensionWithAnomaliesTestBase.java | 7 +- 11 files changed, 33 insertions(+), 803 deletions(-) delete mode 100644 sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyAlertAsyncTest.java delete mode 100644 sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyAlertTest.java delete mode 100644 sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForAlertAsyncTest.java delete mode 100644 sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForAlertTest.java delete mode 100644 sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForDetectionConfigAsyncTest.java delete mode 100644 sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForDetectionConfigTest.java diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md b/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md index bdbf2c24d296..178e013fc4c7 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md @@ -362,7 +362,7 @@ This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For m [http_clients_wiki]: https://github.com/Azure/azure-sdk-for-java/wiki/HTTP-clients [jdk_link]: https://docs.microsoft.com/java/azure/jdk/?view=azure-java-stable [metrics_advisor_account]: https://ms.portal.azure.com/#create/Microsoft.CognitiveServicesMetricsAdvisor -[metrics_advisor_doc]: https://docs.microsoft.com/azure/cognitive-services/dataFeedMetrics-advisor/glossary +[metrics_advisor_doc]: https://docs.microsoft.com/azure/cognitive-services/Metrics-advisor/glossary [mvn_package]: https://search.maven.org/artifact/com.azure/azure-ai-metricsadvisor/1.0.0-beta.1/jar [product_documentation]: https://docs.microsoft.com/azure/cognitive-services/metrics-advisor/overview [source_code]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/metricsadvisor/azure-ai-metricsadvisor/src diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyAlertAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyAlertAsyncTest.java index a965e2312ad4..e0598a8c07aa 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyAlertAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyAlertAsyncTest.java @@ -4,7 +4,6 @@ package com.azure.ai.metricsadvisor; import com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient; -import com.azure.ai.metricsadvisor.models.AnomalyAlert; import com.azure.ai.metricsadvisor.models.AnomalyAlertConfiguration; import com.azure.ai.metricsadvisor.models.ErrorCodeException; import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConfiguration; @@ -12,12 +11,10 @@ import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertScope; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; -import com.azure.core.http.rest.PagedFlux; import com.azure.core.test.TestBase; import com.azure.core.util.CoreUtils; import io.netty.handler.codec.http.HttpResponseStatus; import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -173,7 +170,7 @@ public void getAnomalyAlertValidId(HttpClient httpClient, MetricsAdvisorServiceV */ @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - public void createAnomalyAlertConfig(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { + public void createAnomalyAlertConfiguration(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { final AtomicReference alertConfigurationId = new AtomicReference<>(); try { // Arrange diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyAlertTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyAlertTest.java index 6a0c7affabc0..0dc1b41ed352 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyAlertTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyAlertTest.java @@ -3,9 +3,7 @@ package com.azure.ai.metricsadvisor; -import com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient; import com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient; -import com.azure.ai.metricsadvisor.models.AnomalyAlert; import com.azure.ai.metricsadvisor.models.AnomalyAlertConfiguration; import com.azure.ai.metricsadvisor.models.ErrorCodeException; import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConfiguration; @@ -13,13 +11,11 @@ import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertScope; import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; -import com.azure.core.http.rest.PagedIterable; import com.azure.core.http.rest.Response; import com.azure.core.test.TestBase; import com.azure.core.util.Context; import io.netty.handler.codec.http.HttpResponseStatus; import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -161,7 +157,7 @@ public void getAnomalyAlertValidId(HttpClient httpClient, MetricsAdvisorServiceV */ @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - public void createAnomalyAlertConfig(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { + public void createAnomalyAlertConfiguration(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { // Arrange client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); final AtomicReference alertConfigurationId = new AtomicReference<>(); @@ -281,4 +277,28 @@ public void updateAnomalyAlertHappyPath(HttpClient httpClient, MetricsAdvisorSer // }); // client.deleteAnomalyAlertConfigWithResponse(inputAnomalyAlertConfigId.get()).block(); // } + + /** + * Verifies update for a removing hooks from a previously created anomaly alert configuration's. + */ + @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) + @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") + public void updateAnomalyAlertRemoveHooks(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { + // Arrange + client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); + final AtomicReference inputAnomalyAlertConfigId = new AtomicReference<>(); + creatAnomalyAlertRunner(inputAnomalyAlert -> { + // Arrange + final AnomalyAlertConfiguration createdAnomalyAlert = + client.createAnomalyAlertConfig(inputAnomalyAlert); + + inputAnomalyAlertConfigId.set(createdAnomalyAlert.getId()); + + // Act & Assert + final AnomalyAlertConfiguration updatedAnomalyAlertConfiguration = client.updateAnomalyAlertConfig( + createdAnomalyAlert.removeHookToAlert(ALERT_HOOK_ID)); + assertEquals(0, updatedAnomalyAlertConfiguration.getIdOfHooksToAlert().size()); + }); + client.deleteAnomalyAlertConfig(inputAnomalyAlertConfigId.get()); + } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedClientTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedClientTest.java index f7426a393024..dbbddee6ba19 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedClientTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataFeedClientTest.java @@ -713,7 +713,7 @@ void createDataFeedRequiredParams(HttpClient httpClient, MetricsAdvisorServiceVe .setSource(new PostgreSqlDataFeedSource("conn-string", "query")) .setSchema(new DataFeedSchema(Collections.singletonList(new DataFeedMetric().setName("name")))) .setGranularity(new DataFeedGranularity().setGranularityType(DAILY)))); - assertEquals("'dataFeedIngestionSettings.ingestionStartTime' cannot be null or empty.", + assertEquals("'dataFeedIngestionSettings.ingestionStartTime' is required and cannot be null.", ex.getMessage()); }, SQL_SERVER_DB); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyAlertAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyAlertAsyncTest.java deleted file mode 100644 index 8541bb9c2c22..000000000000 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyAlertAsyncTest.java +++ /dev/null @@ -1,315 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.ai.metricsadvisor; - -import com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationAsyncClient; -import com.azure.ai.metricsadvisor.models.AnomalyAlertConfiguration; -import com.azure.ai.metricsadvisor.models.ErrorCodeException; -import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConfiguration; -import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConfigurationsOperator; -import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertScope; -import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; -import com.azure.core.http.HttpClient; -import com.azure.core.test.TestBase; -import io.netty.handler.codec.http.HttpResponseStatus; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.MethodSource; -import reactor.test.StepVerifier; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicReference; -import java.util.stream.Collectors; - -import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; -import static com.azure.ai.metricsadvisor.TestUtils.INCORRECT_UUID; -import static com.azure.ai.metricsadvisor.TestUtils.INCORRECT_UUID_ERROR; -import static org.junit.jupiter.api.Assertions.assertEquals; - -public class DataPointAnomalyAlertAsyncTest extends AnomalyAlertTestBase { - private MetricsAdvisorAdministrationAsyncClient client; - - @BeforeAll - static void beforeAll() { - TestBase.setupClass(); - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); - } - - @AfterAll - static void afterAll() { - StepVerifier.resetDefaultTimeout(); - } - - /** - * Verifies the result of the list anomaly alert configuration method when no options specified. - */ - @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) - @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - void testListAnomalyAlert(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { - // Arrange - client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); - - listAnomalyAlertRunner(inputAnomalyAlertList -> { - List actualAnomalyAlertList = new ArrayList<>(); - List expectedAnomalyAlertList = - inputAnomalyAlertList.stream().map(inputAnomalyAlert -> - client.createAnomalyAlertConfig(inputAnomalyAlert).block()) - .collect(Collectors.toList()); - - // Act - final AtomicInteger i = new AtomicInteger(-1); - StepVerifier.create(client.listAnomalyAlertConfigs(inputAnomalyAlertList.get(i.incrementAndGet()) - .getMetricAlertConfigurations().get(i.get()).getDetectionConfigurationId())) - .thenConsumeWhile(actualAnomalyAlertList::add) - .verifyComplete(); - - final List expectedAnomalyAlertIdList = expectedAnomalyAlertList.stream() - .map(AnomalyAlertConfiguration::getId) - .collect(Collectors.toList()); - - final List actualList = - actualAnomalyAlertList.stream().filter(actualConfiguration -> expectedAnomalyAlertIdList - .contains(actualConfiguration.getId())) - .collect(Collectors.toList()); - - // Assert - assertEquals(inputAnomalyAlertList.size(), actualList.size()); - expectedAnomalyAlertList.sort(Comparator.comparing(AnomalyAlertConfiguration::getName)); - actualList.sort(Comparator.comparing(AnomalyAlertConfiguration::getName)); - expectedAnomalyAlertList.forEach(expectedAnomalyAlert -> validateAnomalyAlertResult(expectedAnomalyAlert, - actualList.get(i.get()))); - - expectedAnomalyAlertIdList.forEach(inputAnomalyAlertConfigId -> - client.deleteAnomalyAlertConfig(inputAnomalyAlertList.get(i.get()) - .getMetricAlertConfigurations().get(i.get()).getDetectionConfigurationId()).block()); - }); - } - - - // Get DataPointAnomaly AnomalyAlert Configuration - - /** - * Verifies that an exception is thrown for null detection configuration Id parameter. - */ - @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) - @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - public void getAnomalyAlertNullId(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { - // Arrange - client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); - - // Act & Assert - StepVerifier.create(client.getAnomalyAlertConfig(null)) - .expectErrorMatches(throwable -> throwable instanceof NullPointerException - && throwable.getMessage().equals("'alertConfigurationId' is required.")) - .verify(); - } - - /** - * Verifies that an exception is thrown for invalid detection configuration Id. - */ - @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) - @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - public void getAnomalyAlertInvalidId(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { - // Arrange - client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); - - // Act & Assert - StepVerifier.create(client.getAnomalyAlertConfig(INCORRECT_UUID)) - .expectErrorMatches(throwable -> throwable instanceof IllegalArgumentException - && throwable.getMessage().equals(INCORRECT_UUID_ERROR)) - .verify(); - } - - /** - * Verifies a valid alert configuration info is returned with response for a valid alert configuration Id. - */ - @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) - @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - public void getAnomalyAlertValidId(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { - // Arrange - client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); - final AtomicReference alertConfigurationId = new AtomicReference<>(); - - creatAnomalyAlertRunner(inputAnomalyAlertConfiguration -> { - final AnomalyAlertConfiguration createdAnomalyAlert = - client.createAnomalyAlertConfig(inputAnomalyAlertConfiguration).block(); - alertConfigurationId.set(createdAnomalyAlert.getId()); - - // Act & Assert - StepVerifier.create(client.getAnomalyAlertConfigWithResponse(alertConfigurationId.get())) - .assertNext(anomalyAlertConfigurationResponse -> { - assertEquals(anomalyAlertConfigurationResponse.getStatusCode(), HttpResponseStatus.OK.code()); - validateAnomalyAlertResult(createdAnomalyAlert, anomalyAlertConfigurationResponse.getValue()); - }); - }); - client.deleteAnomalyAlertConfig(alertConfigurationId.get()).block(); - } - - // Create DataPointAnomaly alert configuration - - /** - * Verifies valid anomaly alert configuration created for required anomaly alert configuration details. - */ - @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) - @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - public void createAnomalyAlertConfiguration(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { - // Arrange - client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); - final AtomicReference alertConfigurationId = new AtomicReference<>(); - creatAnomalyAlertRunner(inputAnomalyAlert -> - - // Act & Assert - StepVerifier.create(client.createAnomalyAlertConfig(inputAnomalyAlert)) - .assertNext(createdAnomalyAlert -> { - alertConfigurationId.set(createdAnomalyAlert.getId()); - validateAnomalyAlertResult(inputAnomalyAlert, createdAnomalyAlert); - }) - .verifyComplete()); - - client.deleteAnomalyAlertConfig(alertConfigurationId.get()).block(); - } - - /** - * Verifies happy path for delete anomaly alert configuration. - */ - @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) - @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - public void deleteAnomalyAlertWithResponse(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { - // Arrange - client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); - creatAnomalyAlertRunner(inputAnomalyAlertConfig -> { - final AnomalyAlertConfiguration createdAnomalyAlert = - client.createAnomalyAlertConfig(inputAnomalyAlertConfig).block(); - - StepVerifier.create(client.deleteAnomalyAlertConfigWithResponse(createdAnomalyAlert.getId())) - .assertNext(response -> assertEquals(HttpResponseStatus.NO_CONTENT.code(), response.getStatusCode())) - .verifyComplete(); - - // Act & Assert - StepVerifier.create(client.getAnomalyAlertConfigWithResponse(createdAnomalyAlert.getId())) - .verifyErrorSatisfies(throwable -> { - assertEquals(ErrorCodeException.class, throwable.getClass()); - final ErrorCodeException errorCodeException = (ErrorCodeException) throwable; - assertEquals(HttpResponseStatus.NOT_FOUND.code(), errorCodeException.getResponse().getStatusCode()); - }); - }); - } - - // Update anomaly alert configuration - - /** - * Verifies previously created anomaly alert configuration can be updated successfully to update the metrics - * operator. - */ - @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) - @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - public void updateAnomalyAlertHappyPath(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { - // Arrange - client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); - final AtomicReference inputAnomalyAlertConfigId = new AtomicReference<>(); - creatAnomalyAlertRunner(inputAnomalyAlert -> { - // Arrange - final AnomalyAlertConfiguration createdAnomalyAlert = - client.createAnomalyAlertConfig(inputAnomalyAlert).block(); - - inputAnomalyAlertConfigId.set(createdAnomalyAlert.getId()); - - final MetricAnomalyAlertConfiguration metricAnomalyAlertConfiguration - = new MetricAnomalyAlertConfiguration(DETECTION_CONFIGURATION_ID, - MetricAnomalyAlertScope.forWholeSeries()); - final MetricAnomalyAlertConfiguration metricAnomalyAlertConfiguration2 - = new MetricAnomalyAlertConfiguration("bd309211-64b5-4a7a-bb81-a2789599c526", - MetricAnomalyAlertScope.forWholeSeries()); - - // Act & Assert - // add metricAnomalyAlertConfiguration and operator - StepVerifier.create(client.updateAnomalyAlertConfig( - createdAnomalyAlert.setMetricAlertConfigurations( - Arrays.asList(metricAnomalyAlertConfiguration, metricAnomalyAlertConfiguration2)) - .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.XOR))) - .assertNext(updatedAnomalyAlert -> { - validateAnomalyAlertResult(inputAnomalyAlert - .addMetricAlertConfiguration(metricAnomalyAlertConfiguration2), updatedAnomalyAlert); - assertEquals(MetricAnomalyAlertConfigurationsOperator.XOR.toString(), - updatedAnomalyAlert.getCrossMetricsOperator().toString()); - }).verifyComplete(); - - // clear the set configurations, not allowed - StepVerifier.create(client.updateAnomalyAlertConfig( - createdAnomalyAlert.setMetricAlertConfigurations(null))) - .verifyErrorSatisfies(throwable -> assertEquals( - "'alertConfiguration.metricAnomalyAlertConfigurations' is required and cannot be empty", - throwable.getMessage())); - }); - client.deleteAnomalyAlertConfigWithResponse(inputAnomalyAlertConfigId.get()).block(); - } - - // TODO (savaity) update cannot be used to clear a set description? - // anything set to null as a value not sent over the wire? - // /** - // * Verifies update for a previously created anomaly alert configuration's description and clear off description. - // */ - // @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) - // @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - // public void updateAnomalyAlertConfigDescription(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { - // // Arrange - // client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); - // final AtomicReference inputAnomalyAlertConfigId = new AtomicReference<>(); - // creatAnomalyAlertRunner(inputAnomalyAlert -> { - // // Arrange - // final AnomalyAlertConfiguration createdAnomalyAlert = - // client.createAnomalyAlertConfig(inputAnomalyAlert).block(); - // - // inputAnomalyAlertConfigId.set(createdAnomalyAlert.getId()); - // - // // Act & Assert - // StepVerifier.create(client.updateAnomalyAlertConfig( - // createdAnomalyAlert.setDescription("updated_description") - // .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.XOR))) - // .assertNext(updatedAnomalyAlert -> - // assertEquals("updated_description", updatedAnomalyAlert.getDescription())).verifyComplete(); - // - // // clear the set description, not allowed - // StepVerifier.create(client.updateAnomalyAlertConfig( - // createdAnomalyAlert.setDescription(null))) - // .assertNext(anomalyAlertConfiguration -> assertNull(anomalyAlertConfiguration.getDescription())) - // .verifyComplete(); - // - // }); - // client.deleteAnomalyAlertConfigWithResponse(inputAnomalyAlertConfigId.get()).block(); - // } - - /** - * Verifies update for a removing hooks from a previously created anomaly alert configuration's. - */ - @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) - @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - public void updateAnomalyAlertRemoveHooks(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { - // Arrange - client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildAsyncClient(); - final AtomicReference inputAnomalyAlertConfigId = new AtomicReference<>(); - creatAnomalyAlertRunner(inputAnomalyAlert -> { - // Arrange - final AnomalyAlertConfiguration createdAnomalyAlert = - client.createAnomalyAlertConfig(inputAnomalyAlert).block(); - - inputAnomalyAlertConfigId.set(createdAnomalyAlert.getId()); - - // Act & Assert - StepVerifier.create(client.updateAnomalyAlertConfig( - createdAnomalyAlert.removeHookToAlert(ALERT_HOOK_ID))) - .assertNext(updatedAnomalyAlert -> - assertEquals(0, updatedAnomalyAlert.getIdOfHooksToAlert().size())) - .verifyComplete(); - - }); - client.deleteAnomalyAlertConfigWithResponse(inputAnomalyAlertConfigId.get()).block(); - } -} diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyAlertTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyAlertTest.java deleted file mode 100644 index 3a6aa650b1d8..000000000000 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyAlertTest.java +++ /dev/null @@ -1,304 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.ai.metricsadvisor; - -import com.azure.ai.metricsadvisor.administration.MetricsAdvisorAdministrationClient; -import com.azure.ai.metricsadvisor.models.AnomalyAlertConfiguration; -import com.azure.ai.metricsadvisor.models.ErrorCodeException; -import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConfiguration; -import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConfigurationsOperator; -import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertScope; -import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; -import com.azure.core.http.HttpClient; -import com.azure.core.http.rest.Response; -import com.azure.core.util.Context; -import io.netty.handler.codec.http.HttpResponseStatus; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.MethodSource; -import reactor.test.StepVerifier; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicReference; -import java.util.stream.Collectors; - -import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; -import static com.azure.ai.metricsadvisor.TestUtils.INCORRECT_UUID; -import static com.azure.ai.metricsadvisor.TestUtils.INCORRECT_UUID_ERROR; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; - -public class DataPointAnomalyAlertTest extends AnomalyAlertTestBase { - private MetricsAdvisorAdministrationClient client; - - @BeforeAll - static void beforeAll() { - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); - } - - @AfterAll - static void afterAll() { - StepVerifier.resetDefaultTimeout(); - } - - /** - * Verifies the result of the list anomaly alert configuration method when no options specified. - */ - @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) - @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - void testListAnomalyAlert(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { - // Arrange - client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); - - listAnomalyAlertRunner(inputAnomalyAlertList -> { - List actualAnomalyAlertList = new ArrayList<>(); - List expectedAnomalyAlertList = - inputAnomalyAlertList.stream().map(inputAnomalyAlert -> - client.createAnomalyAlertConfig(inputAnomalyAlert)) - .collect(Collectors.toList()); - - // Act - final AtomicInteger i = new AtomicInteger(-1); - client.listAnomalyAlertConfigs(inputAnomalyAlertList.get(i.incrementAndGet()) - .getMetricAlertConfigurations().get(i.get()).getDetectionConfigurationId()) - .forEach(actualAnomalyAlertList::add); - - final List expectedAnomalyAlertIdList = expectedAnomalyAlertList - .stream() - .map(AnomalyAlertConfiguration::getId) - .collect(Collectors.toList()); - - final List actualList = - actualAnomalyAlertList.stream().filter(actualConfiguration -> expectedAnomalyAlertIdList - .contains(actualConfiguration.getId())) - .collect(Collectors.toList()); - - // Assert - assertEquals(inputAnomalyAlertList.size(), actualList.size()); - expectedAnomalyAlertList.sort(Comparator.comparing(AnomalyAlertConfiguration::getName)); - actualList.sort(Comparator.comparing(AnomalyAlertConfiguration::getName)); - expectedAnomalyAlertList.forEach(expectedAnomalyAlert -> validateAnomalyAlertResult(expectedAnomalyAlert, - actualList.get(i.get()))); - - expectedAnomalyAlertIdList.forEach(inputAnomalyAlertConfigId -> - client.deleteAnomalyAlertConfig(inputAnomalyAlertList.get(i.get()) - .getMetricAlertConfigurations().get(i.get()).getDetectionConfigurationId())); - }); - } - - - // Get DataPointAnomaly AnomalyAlert Configuration - - /** - * Verifies that an exception is thrown for null detection configuration Id parameter. - */ - @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) - @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - public void getAnomalyAlertNullId(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { - // Arrange - client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); - // Act & Assert - Exception exception = assertThrows(NullPointerException.class, () -> - client.getAnomalyAlertConfig(null)); - assertEquals(exception.getMessage(), "'alertConfigurationId' is required."); - } - - /** - * Verifies that an exception is thrown for invalid alert configuration Id. - */ - @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) - @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - public void getAnomalyAlertInvalidId(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { - // Arrange - client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); - - // Act & Assert - Exception exception = assertThrows(IllegalArgumentException.class, () -> - client.getAnomalyAlertConfig(INCORRECT_UUID)); - assertEquals(exception.getMessage(), INCORRECT_UUID_ERROR); - } - - /** - * Verifies a valid alert configuration info is returned with response for a valid alert configuration Id. - */ - @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) - @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - public void getAnomalyAlertValidId(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { - // Arrange - client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); - final AtomicReference alertConfigurationId = new AtomicReference<>(); - - listAnomalyAlertRunner(anomalyAlertConfigurationList -> { - final AnomalyAlertConfiguration inputAnomalyAlertConfiguration = anomalyAlertConfigurationList.get(0); - final AnomalyAlertConfiguration createdAnomalyAlert = - client.createAnomalyAlertConfig(inputAnomalyAlertConfiguration); - alertConfigurationId.set(createdAnomalyAlert.getId()); - - // Act & Assert - Response anomalyAlertConfigurationResponse = - client.getAnomalyAlertConfigWithResponse(alertConfigurationId.get(), Context.NONE); - assertEquals(anomalyAlertConfigurationResponse.getStatusCode(), HttpResponseStatus.OK.code()); - validateAnomalyAlertResult(createdAnomalyAlert, anomalyAlertConfigurationResponse.getValue()); - }); - client.deleteAnomalyAlertConfig(alertConfigurationId.get()); - } - - // Create DataPointAnomaly alert configuration - - /** - * Verifies valid anomaly alert configuration created for required anomaly alert configuration details. - */ - @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) - @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - public void createAnomalyAlertConfiguration(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { - // Arrange - client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); - final AtomicReference alertConfigurationId = new AtomicReference<>(); - creatAnomalyAlertRunner(inputAnomalyAlertConfig -> { - // Act & Assert - AnomalyAlertConfiguration createdAnomalyAlertConfig = - client.createAnomalyAlertConfig(inputAnomalyAlertConfig); - alertConfigurationId.set(createdAnomalyAlertConfig.getId()); - validateAnomalyAlertResult(inputAnomalyAlertConfig, createdAnomalyAlertConfig); - }); - client.deleteAnomalyAlertConfig(alertConfigurationId.get()); - } - - /** - * Verifies happy path for delete anomaly alert configuration. - */ - @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) - @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - public void deleteAnomalyAlertWithResponse(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { - // Arrange - client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); - creatAnomalyAlertRunner(inputAnomalyAlertConfig -> { - final AnomalyAlertConfiguration createdAnomalyAlert = - client.createAnomalyAlertConfig(inputAnomalyAlertConfig); - - Response response = client.deleteAnomalyAlertConfigWithResponse(createdAnomalyAlert.getId(), - Context.NONE); - assertEquals(response.getStatusCode(), HttpResponseStatus.NO_CONTENT.code()); - - // Act & Assert - Exception exception = assertThrows(ErrorCodeException.class, () -> - client.getAnomalyAlertConfig(createdAnomalyAlert.getId())); - assertEquals(ErrorCodeException.class, exception.getClass()); - final ErrorCodeException errorCodeException = ((ErrorCodeException) exception); - assertEquals(HttpResponseStatus.NOT_FOUND.code(), errorCodeException.getResponse().getStatusCode()); - }); - } - - // Update anomaly alert configuration - - /** - * Verifies previously created anomaly alert configuration can be updated successfully to update the metrics - * operator. - */ - @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) - @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - public void updateAnomalyAlertHappyPath(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { - // Arrange - client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); - final AtomicReference inputAnomalyAlertConfigId = new AtomicReference<>(); - creatAnomalyAlertRunner(inputAnomalyAlert -> { - // Arrange - final AnomalyAlertConfiguration createdAnomalyAlert = - client.createAnomalyAlertConfig(inputAnomalyAlert); - - inputAnomalyAlertConfigId.set(createdAnomalyAlert.getId()); - - final MetricAnomalyAlertConfiguration metricAnomalyAlertConfiguration - = new MetricAnomalyAlertConfiguration(DETECTION_CONFIGURATION_ID, - MetricAnomalyAlertScope.forWholeSeries()); - final MetricAnomalyAlertConfiguration metricAnomalyAlertConfiguration2 - = new MetricAnomalyAlertConfiguration("bd309211-64b5-4a7a-bb81-a2789599c526", - MetricAnomalyAlertScope.forWholeSeries()); - - // Act & Assert - // add metricAnomalyAlertConfiguration and operator - final AnomalyAlertConfiguration updatedAnomalyAlertConfiguration = client.updateAnomalyAlertConfig( - createdAnomalyAlert.setMetricAlertConfigurations( - Arrays.asList(metricAnomalyAlertConfiguration, metricAnomalyAlertConfiguration2)) - .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.XOR)); - validateAnomalyAlertResult(inputAnomalyAlert - .addMetricAlertConfiguration(metricAnomalyAlertConfiguration2), updatedAnomalyAlertConfiguration); - assertEquals(MetricAnomalyAlertConfigurationsOperator.XOR.toString(), - updatedAnomalyAlertConfiguration.getCrossMetricsOperator().toString()); - - - // clear the set configurations, not allowed - Exception exception = assertThrows(NullPointerException.class, () -> - client.updateAnomalyAlertConfig(createdAnomalyAlert.setMetricAlertConfigurations(null))); - assertEquals("'alertConfiguration.metricAnomalyAlertConfigurations' is " - + "required and cannot be empty", exception.getMessage()); - }); - - client.deleteAnomalyAlertConfig(inputAnomalyAlertConfigId.get()); - } - - // TODO (savaity) update cannot be used to clear a set description? - // /** - // * Verifies update for a previously created anomaly alert configuration's description and clear off description. - // */ - // @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) - // @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - // public void updateAnomalyAlertConfigDescription(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { - // // Arrange - // client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); - // final AtomicReference inputAnomalyAlertConfigId = new AtomicReference<>(); - // creatAnomalyAlertRunner(inputAnomalyAlert -> { - // // Arrange - // final AnomalyAlertConfiguration createdAnomalyAlert = - // client.createAnomalyAlertConfig(inputAnomalyAlert).block(); - // - // inputAnomalyAlertConfigId.set(createdAnomalyAlert.getId()); - // - // // Act & Assert - // StepVerifier.create(client.updateAnomalyAlertConfig( - // createdAnomalyAlert.setDescription("updated_description") - // .setCrossMetricsOperator(MetricAnomalyAlertConfigurationsOperator.XOR))) - // .assertNext(updatedAnomalyAlert -> - // assertEquals("updated_description", updatedAnomalyAlert.getDescription())).verifyComplete(); - // - // // clear the set description, not allowed - // StepVerifier.create(client.updateAnomalyAlertConfig( - // createdAnomalyAlert.setDescription(null))) - // .assertNext(anomalyAlertConfiguration -> assertNull(anomalyAlertConfiguration.getDescription())) - // .verifyComplete(); - // - // }); - // client.deleteAnomalyAlertConfigWithResponse(inputAnomalyAlertConfigId.get()).block(); - // } - - /** - * Verifies update for a removing hooks from a previously created anomaly alert configuration's. - */ - @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) - @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - public void updateAnomalyAlertRemoveHooks(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { - // Arrange - client = getMetricsAdvisorAdministrationBuilder(httpClient, serviceVersion).buildClient(); - final AtomicReference inputAnomalyAlertConfigId = new AtomicReference<>(); - creatAnomalyAlertRunner(inputAnomalyAlert -> { - // Arrange - final AnomalyAlertConfiguration createdAnomalyAlert = - client.createAnomalyAlertConfig(inputAnomalyAlert); - - inputAnomalyAlertConfigId.set(createdAnomalyAlert.getId()); - - // Act & Assert - final AnomalyAlertConfiguration updatedAnomalyAlertConfiguration = client.updateAnomalyAlertConfig( - createdAnomalyAlert.removeHookToAlert(ALERT_HOOK_ID)); - assertEquals(0, updatedAnomalyAlertConfiguration.getIdOfHooksToAlert().size()); - }); - client.deleteAnomalyAlertConfig(inputAnomalyAlertConfigId.get()); - } -} diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForAlertAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForAlertAsyncTest.java deleted file mode 100644 index 6a81378f162d..000000000000 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForAlertAsyncTest.java +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.ai.metricsadvisor; - -import com.azure.ai.metricsadvisor.models.DataPointAnomaly; -import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; -import com.azure.core.http.HttpClient; -import com.azure.core.http.rest.PagedFlux; -import com.azure.core.test.TestBase; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.MethodSource; -import reactor.test.StepVerifier; - -import java.time.Duration; - -import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; - -public class DataPointAnomalyForAlertAsyncTest extends AnomalyForAlertTestBase { - @BeforeAll - static void beforeAll() { - TestBase.setupClass(); - StepVerifier.setDefaultTimeout(Duration.ofSeconds(30)); - } - - @AfterAll - static void afterAll() { - StepVerifier.resetDefaultTimeout(); - } - - @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) - @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - @Override - public void listAnomaliesForAlert(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { - MetricsAdvisorAsyncClient client = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildAsyncClient(); - - PagedFlux anomaliesFlux - = client.listAnomaliesForAlert( - ListAnomaliesForAlertInput.INSTANCE.alertConfigurationId, - ListAnomaliesForAlertInput.INSTANCE.alertId, - ListAnomaliesForAlertInput.INSTANCE.options); - - Assertions.assertNotNull(anomaliesFlux); - - StepVerifier.create(anomaliesFlux) - .assertNext(anomaly -> assertListAnomaliesForAlertOutput(anomaly)) - .expectNextCount(ListAnomaliesForAlertOutput.INSTANCE.expectedAnomalies - 1) - .verifyComplete(); - } -} diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForAlertTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForAlertTest.java deleted file mode 100644 index 32d59aae80ed..000000000000 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForAlertTest.java +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.ai.metricsadvisor; - -import com.azure.ai.metricsadvisor.models.DataPointAnomaly; -import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; -import com.azure.core.http.HttpClient; -import com.azure.core.http.rest.PagedIterable; -import com.azure.core.util.Context; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.MethodSource; - -import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; - -public class DataPointAnomalyForAlertTest extends AnomalyForAlertTestBase { - @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) - @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - @Override - public void listAnomaliesForAlert(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { - MetricsAdvisorClient client = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildClient(); - - PagedIterable anomaliesIterable - = client.listAnomaliesForAlert( - ListAnomaliesForAlertInput.INSTANCE.alertConfigurationId, - ListAnomaliesForAlertInput.INSTANCE.alertId, - ListAnomaliesForAlertInput.INSTANCE.options, - Context.NONE - ); - - int[] cnt = new int[1]; - for (DataPointAnomaly dataPointAnomaly : anomaliesIterable) { - cnt[0]++; - assertListAnomaliesForAlertOutput(dataPointAnomaly); - } - Assertions.assertEquals(ListAnomaliesForAlertOutput.INSTANCE.expectedAnomalies, cnt[0]); - } -} diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForDetectionConfigAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForDetectionConfigAsyncTest.java deleted file mode 100644 index beee30fc4366..000000000000 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForDetectionConfigAsyncTest.java +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.ai.metricsadvisor; - -import com.azure.ai.metricsadvisor.models.DataPointAnomaly; -import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; -import com.azure.core.http.HttpClient; -import com.azure.core.http.rest.PagedFlux; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.MethodSource; -import reactor.test.StepVerifier; - -import java.util.ArrayList; -import java.util.List; - -import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; - -public class DataPointAnomalyForDetectionConfigAsyncTest extends AnomalyForDetectionConfigTestBase { - @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) - @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - @Override - public void listAnomaliesForDetectionConfig(HttpClient httpClient, - MetricsAdvisorServiceVersion serviceVersion) { - MetricsAdvisorAsyncClient client - = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildAsyncClient(); - - PagedFlux anomaliesFlux - = client.listAnomaliesForDetectionConfig( - ListAnomaliesForDetectionConfigInput.INSTANCE.detectionConfigurationId, - ListAnomaliesForDetectionConfigInput.INSTANCE.options); - - Assertions.assertNotNull(anomaliesFlux); - - List anomaliesList = new ArrayList<>(); - StepVerifier.create(anomaliesFlux) - .thenConsumeWhile(anomaliesList::add) - .verifyComplete(); - - for (DataPointAnomaly dataPointAnomaly : anomaliesList) { - assertListAnomaliesDetectionConfigOutput(dataPointAnomaly); - } - } -} diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForDetectionConfigTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForDetectionConfigTest.java deleted file mode 100644 index ed35f2e9eef8..000000000000 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/DataPointAnomalyForDetectionConfigTest.java +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.ai.metricsadvisor; - -import com.azure.ai.metricsadvisor.models.DataPointAnomaly; -import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; -import com.azure.core.http.HttpClient; -import com.azure.core.http.rest.PagedIterable; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.MethodSource; - -import static com.azure.ai.metricsadvisor.TestUtils.DISPLAY_NAME_WITH_ARGUMENTS; - -public class DataPointAnomalyForDetectionConfigTest extends AnomalyForDetectionConfigTestBase { - @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS) - @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") - @Override - public void listAnomaliesForDetectionConfig(HttpClient httpClient, - MetricsAdvisorServiceVersion serviceVersion) { - MetricsAdvisorClient client = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildClient(); - - PagedIterable anomaliesIterable - = client.listAnomaliesForDetectionConfig( - ListAnomaliesForDetectionConfigInput.INSTANCE.detectionConfigurationId, - ListAnomaliesForDetectionConfigInput.INSTANCE.options); - - for (DataPointAnomaly dataPointAnomaly : anomaliesIterable) { - assertListAnomaliesDetectionConfigOutput(dataPointAnomaly); - } - } -} diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesTestBase.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesTestBase.java index f7c7d3cbdf0c..a172d8f846fd 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesTestBase.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesTestBase.java @@ -7,6 +7,7 @@ import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.time.OffsetDateTime; @@ -16,6 +17,8 @@ import static com.azure.ai.metricsadvisor.MetricsSeriesTestBase.TIME_SERIES_START_TIME; public abstract class ValuesOfDimensionWithAnomaliesTestBase extends MetricsAdvisorClientTestBase { + + @Test public abstract void listValuesOfDimensionWithAnomalies(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion); @@ -24,8 +27,8 @@ protected static class ListValuesOfDimensionWithAnomaliesInput { static final ListValuesOfDimensionWithAnomaliesInput INSTANCE = new ListValuesOfDimensionWithAnomaliesInput(); final OffsetDateTime startTime = TIME_SERIES_START_TIME; final OffsetDateTime endTime = TIME_SERIES_END_TIME; - final ListValuesOfDimensionWithAnomaliesOptions options - = new ListValuesOfDimensionWithAnomaliesOptions(startTime, endTime) + final ListDimensionValuesWithAnomaliesOptions options + = new ListDimensionValuesWithAnomaliesOptions(startTime, endTime) .setTop(10); final String detectionConfigurationId = DETECTION_CONFIGURATION_ID; final String dimensionName = DIMENSION_NAME; From 8b3a29cb339cf6821b7d48bb1bed917db04d2cf1 Mon Sep 17 00:00:00 2001 From: Sameeksha Vaity Date: Tue, 3 Nov 2020 10:59:34 -0800 Subject: [PATCH 7/9] remove tests coverage pom --- sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml b/sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml index f514db2e78a7..937c7360cd5f 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml @@ -32,13 +32,6 @@ HEAD - - UTF-8 - - 0.49 - 0.68 - - com.azure @@ -107,13 +100,6 @@ --add-exports com.azure.core/com.azure.core.implementation.http=ALL-UNNAMED --add-opens com.azure.ai.metricsadvisor/com.azure.ai.metricsadvisor=ALL-UNNAMED - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M3 - From 022c137c2b34c06ba829b3e7619e34da6150340e Mon Sep 17 00:00:00 2001 From: Sameeksha Vaity Date: Tue, 3 Nov 2020 14:44:04 -0800 Subject: [PATCH 8/9] options update --- .../azure-ai-metricsadvisor/CHANGELOG.md | 2 +- .../azure-ai-metricsadvisor/README.md | 24 +- .../MetricsAdvisorAsyncClient.java | 208 ++++++++++-------- .../metricsadvisor/MetricsAdvisorClient.java | 130 ++++++----- .../models/ListAlertOptions.java | 42 +--- .../models/ListAnomaliesDetectedOptions.java | 34 --- ...stDimensionValuesWithAnomaliesOptions.java | 34 --- .../models/ListIncidentsDetectedOptions.java | 33 --- .../ListMetricEnrichmentStatusOptions.java | 33 --- .../metricsadvisor/ListAlertsAsyncSample.java | 5 +- .../ai/metricsadvisor/ListAlertsSample.java | 5 +- ...tEnrichmentStatusForMetricAsyncSample.java | 4 +- .../ListEnrichmentStatusForMetricSample.java | 4 +- .../ListIncidentsDetectedAsyncSample.java | 4 +- .../ListIncidentsDetectedSample.java | 6 +- ...nomaliesForDetectionConfigAsyncSample.java | 4 +- ...istsAnomaliesForDetectionConfigSample.java | 4 +- ...AdvisorAsyncClientJavaDocCodeSnippets.java | 57 ++--- ...tricsAdvisorClientJavaDocCodeSnippets.java | 110 +++++---- .../ai/metricsadvisor/ReadmeSamples.java | 8 +- .../ai/metricsadvisor/AlertAsyncTest.java | 4 +- .../azure/ai/metricsadvisor/AlertTest.java | 4 +- .../ai/metricsadvisor/AlertTestBase.java | 3 +- .../AnomalyForDetectionConfigTestBase.java | 2 +- .../AnomalyIncidentDetectedAsyncTest.java | 1 + .../AnomalyIncidentDetectedTest.java | 4 +- .../IncidentDetectedTestBase.java | 2 +- .../MetricsSeriesAsyncTest.java | 2 +- .../ai/metricsadvisor/MetricsSeriesTest.java | 2 +- .../metricsadvisor/MetricsSeriesTestBase.java | 2 +- ...luesOfDimensionWithAnomaliesAsyncTest.java | 2 + .../ValuesOfDimensionWithAnomaliesTest.java | 5 +- ...aluesOfDimensionWithAnomaliesTestBase.java | 2 +- 33 files changed, 339 insertions(+), 447 deletions(-) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md b/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md index 74835a4ee025..4d1c57aadabe 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md @@ -13,7 +13,7 @@ - Renamed method `setSeverity` to `setSeverityRangeCondition` on `MetricAnomalyAlertConditions` model. - Renamed property `confidenceScore` to `contributionScore` and its accessors on `IncidentRootCause` model. - Removed model `ListMetricSeriesData` as top and skip parameters are not valid for this API. -Also, moved `startTime` and `endTime` to positional arguments on `listMetricSeriesData` method as they are required. +- Moved `startTime` and `endTime` to positional arguments on several methods as they are required. ## 1.0.0-beta.1 (2020-10-07) Version 1.0.0-beta.1 is a preview of our efforts in creating a Azure Metrics Advisor client library that is developer-friendly diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md b/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md index 178e013fc4c7..6ff0dcd03ce7 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md @@ -44,7 +44,7 @@ az cognitiveservices account show --name "resource-name" --resource-group "resou ``` #### Create a Metrics Advisor client using MetricsAdvisorKeyCredential - + ```java MetricsAdvisorKeyCredential credential = new MetricsAdvisorKeyCredential("subscription_key", "api_key"); MetricsAdvisorClient metricsAdvisorClient = new MetricsAdvisorClientBuilder() @@ -54,7 +54,7 @@ MetricsAdvisorClient metricsAdvisorClient = new MetricsAdvisorClientBuilder() ``` #### Create a Metrics Administration client using MetricsAdvisorKeyCredential - + ```java MetricsAdvisorKeyCredential credential = new MetricsAdvisorKeyCredential("subscription_key", "api_key"); MetricsAdvisorAdministrationClient metricsAdvisorAdminClient = @@ -121,7 +121,7 @@ A notification hook is the entry point that allows the users to subscribe to rea #### Add a data feed from a sample or data source This example ingests the user specified `SQLServerDataFeedSource` data feed source data to the service. - + ```java DataFeed dataFeed = new DataFeed() .setName("dataFeedName") @@ -164,7 +164,7 @@ if (SQL_SERVER_DB == createdSqlDataFeed.getSourceType()) { #### Check ingestion status This example checks the ingestion status of a previously provided data feed source. - + ```java String dataFeedId = "3d48er30-6e6e-4391-b78f-b00dfee1e6f5"; @@ -183,7 +183,7 @@ metricsAdvisorAdminClient.listDataFeedIngestionStatus( #### Configure anomaly detection configuration This example demonstrates how a user can configure an anomaly detection configuration for their data. - + ```java String metricId = "3d48er30-6e6e-4391-b78f-b00dfee1e6f5"; @@ -220,7 +220,7 @@ final AnomalyDetectionConfiguration anomalyDetectionConfiguration = ### Add hooks for receiving anomaly alerts This example creates an email hook that receives anomaly incident alerts. - + ```java NotificationHook emailNotificationHook = new EmailNotificationHook("email Hook") .setDescription("my email Hook") @@ -240,7 +240,7 @@ System.out.printf("Email Hook emails to alert: %s%n", #### Configure an anomaly alert configuration This example demonstrates how a user can configure an alerting configuration for detected anomalies in their data. - + ```java String detectionConfigurationId1 = "9ol48er30-6e6e-4391-b78f-b00dfee1e6f5"; String detectionConfigurationId2 = "3e58er30-6e6e-4391-b78f-b00dfee1e6f5"; @@ -270,11 +270,11 @@ This example demonstrates how a user can query alerts triggered for an anomaly d ```java String alertConfigurationId = "9ol48er30-6e6e-4391-b78f-b00dfee1e6f5"; +final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); +final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); metricsAdvisorClient.listAlerts( alertConfigurationId, - new ListAlertOptions(OffsetDateTime.parse("2020-01-01T00:00:00Z"), - OffsetDateTime.now(), - AlertQueryTimeMode.ANOMALY_TIME)) + startTime, endTime) .forEach(alert -> { System.out.printf("AnomalyAlert Id: %s%n", alert.getId()); System.out.printf("AnomalyAlert created on: %s%n", alert.getCreatedTime()); @@ -298,7 +298,7 @@ Metrics Advisor clients raises `HttpResponseException` [exceptions][http_respons to provide a non existing feedback Id an `HttpResponseException` would be raised with an error indicating the failure cause. In the following code snippet, the error is handled gracefully by catching the exception and display the additional information about the error. - + ```java try { metricsAdvisorClient.getMetricFeedback("non_existing_feedback_id"); @@ -323,7 +323,7 @@ For more details see the [samples README][samples_readme]. #### Async APIs All the examples shown so far have been using synchronous APIs, but we provide full support for async APIs as well. You'll need to use `MetricsAdvisorAsyncClient` - + ```java MetricsAdvisorKeyCredential credential = new MetricsAdvisorKeyCredential("subscription_key", "api_key"); MetricsAdvisorAsyncClient metricsAdvisorAsyncClient = new MetricsAdvisorClientBuilder() diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClient.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClient.java index 130cb0f4a17f..12b31503620d 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClient.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClient.java @@ -211,7 +211,7 @@ private Mono> listMetricSeriesDefinitionNe * @return A {@link PagedFlux} of the {@link MetricSeriesData metric series data points}. * @throws IllegalArgumentException thrown if {@code metricId} fail the UUID format validation. * @throws ErrorCodeException thrown if the request is rejected by server. - * @throws NullPointerException thrown if the {@code metricId}, {@code options.startTime} or {@code options.endTime} + * @throws NullPointerException thrown if the {@code metricId}, {@code startTime} or {@code endTime} * is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) @@ -370,28 +370,30 @@ private Mono> listMetricDimensionValuesNextPageAsync(Strin * List the enrichment status for a metric. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricEnrichmentStatus#String-ListMetricEnrichmentStatusOptions} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricEnrichmentStatus#String-OffsetDateTime-OffsetDateTime-ListMetricEnrichmentStatusOptions} * * @param metricId metric unique id. + * @param startTime The start time for querying the time series data. + * @param endTime The end time for querying the time series data. * @param options th e additional configurable options to specify when querying the result.. * * @return the list of enrichment status's for the specified metric. * @throws IllegalArgumentException thrown if {@code metricId} fail the UUID format validation. * @throws ErrorCodeException thrown if the request is rejected by server. - * @throws NullPointerException thrown if {@code metricId}, {@code options.startTime} and {@code options.endTime} + * @throws NullPointerException thrown if {@code metricId}, {@code startTime} and {@code endTime} * is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) public PagedFlux listMetricEnrichmentStatus( String metricId, - ListMetricEnrichmentStatusOptions options) { + OffsetDateTime startTime, OffsetDateTime endTime, ListMetricEnrichmentStatusOptions options) { try { return new PagedFlux<>(() -> withContext(context -> - listMetricEnrichmentStatusSinglePageAsync(metricId, options, context)), + listMetricEnrichmentStatusSinglePageAsync(metricId, startTime, endTime, options, context)), continuationToken -> withContext(context -> listMetricEnrichmentStatusNextPageAsync(continuationToken, - options, context))); + startTime, endTime, options, context))); } catch (RuntimeException ex) { return new PagedFlux<>(() -> monoError(logger, ex)); } @@ -399,20 +401,23 @@ public PagedFlux listMetricEnrichmentStatus( PagedFlux listMetricEnrichmentStatus( String metricId, - ListMetricEnrichmentStatusOptions options, Context context) { - return new PagedFlux<>(() -> listMetricEnrichmentStatusSinglePageAsync(metricId, options, context), - continuationToken -> listMetricEnrichmentStatusNextPageAsync(continuationToken, options, context)); + OffsetDateTime startTime, OffsetDateTime endTime, ListMetricEnrichmentStatusOptions options, Context context) { + return new PagedFlux<>(() -> listMetricEnrichmentStatusSinglePageAsync(metricId, startTime, endTime, + options, context), + continuationToken -> listMetricEnrichmentStatusNextPageAsync(continuationToken, startTime, endTime, + options, context)); } private Mono> listMetricEnrichmentStatusSinglePageAsync(String metricId, - ListMetricEnrichmentStatusOptions options, Context context) { + OffsetDateTime startTime, OffsetDateTime endTime, ListMetricEnrichmentStatusOptions options, Context context) { Objects.requireNonNull(metricId, "'metricId' is required."); - Objects.requireNonNull(options, "'options' is required."); - Objects.requireNonNull(options.getStartTime(), "'options.startTime' is required."); - Objects.requireNonNull(options.getEndTime(), "'options.endTime' is required."); - + Objects.requireNonNull(startTime, "'startTime' is required."); + Objects.requireNonNull(endTime, "'endTime' is required."); + if (options == null) { + options = new ListMetricEnrichmentStatusOptions(); + } final EnrichmentStatusQueryOption enrichmentStatusQueryOption = - new EnrichmentStatusQueryOption().setStartTime(options.getStartTime()).setEndTime(options.getEndTime()); + new EnrichmentStatusQueryOption().setStartTime(startTime).setEndTime(endTime); final Context withTracing = context.addData(AZ_TRACING_NAMESPACE_KEY, METRICS_ADVISOR_TRACING_NAMESPACE_VALUE); return service.getEnrichmentStatusByMetricSinglePageAsync( @@ -434,16 +439,15 @@ private Mono> listMetricEnrichmentStatusSinglePa } private Mono> listMetricEnrichmentStatusNextPageAsync(String nextPageLink, - ListMetricEnrichmentStatusOptions options, Context context) { + OffsetDateTime startTime, OffsetDateTime endTime, ListMetricEnrichmentStatusOptions options, Context context) { if (CoreUtils.isNullOrEmpty(nextPageLink)) { return Mono.empty(); } - Objects.requireNonNull(options, "'options' is required."); - Objects.requireNonNull(options.getStartTime(), "'options.startTime' is required."); - Objects.requireNonNull(options.getEndTime(), "'options.endTime' is required."); + Objects.requireNonNull(startTime, "'startTime' is required."); + Objects.requireNonNull(endTime, "'endTime' is required."); final EnrichmentStatusQueryOption enrichmentStatusQueryOption = - new EnrichmentStatusQueryOption().setStartTime(options.getStartTime()).setEndTime(options.getEndTime()); + new EnrichmentStatusQueryOption().setStartTime(startTime).setEndTime(endTime); final Context withTracing = context.addData(AZ_TRACING_NAMESPACE_KEY, METRICS_ADVISOR_TRACING_NAMESPACE_VALUE); return service.getEnrichmentStatusByMetricNextSinglePageAsync(nextPageLink, enrichmentStatusQueryOption, @@ -471,8 +475,8 @@ private Mono> listMetricEnrichmentStatusNextPage * @param seriesKeys The time series key list, each key identifies a specific time series. * @param detectionConfigurationId The id of the configuration used to enrich the time series * identified by the keys in {@code seriesKeys}. - * @param startTime The start time. - * @param endTime The end time. + * @param startTime The start time of the time range within which the enriched data is returned. + * @param endTime The end time of the time range within which the enriched data is returned. * @return The enriched time series. * @throws IllegalArgumentException thrown if {@code detectionConfigurationId} fail the UUID format validation * or if {@code seriesKeys} is empty. @@ -549,29 +553,32 @@ PagedFlux listMetricEnrichedSeriesData(ListCode sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAnomaliesForDetectionConfig#String-ListAnomaliesDetectedOptions} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAnomaliesForDetectionConfig#String-OffsetDateTime-OffsetDateTime-ListAnomaliesDetectedOptions} * * @param detectionConfigurationId The anomaly detection configuration id. + * @param startTime The start time of the time range within which the anomalies were detected. + * @param endTime The end time of the time range within which the anomalies were detected. * @param options The additional parameters. + * * @return The anomalies. * @throws IllegalArgumentException thrown if {@code detectionConfigurationId} does not conform * to the UUID format specification * or {@code options.filter} is used to set severity but either min or max severity is missing. * @throws NullPointerException thrown if the {@code detectionConfigurationId} or {@code options} - * or {@code options.startTime} or {@code options.endTime} is null. + * or {@code startTime} or {@code endTime} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) public PagedFlux listAnomaliesForDetectionConfig( String detectionConfigurationId, - ListAnomaliesDetectedOptions options) { + OffsetDateTime startTime, OffsetDateTime endTime, ListAnomaliesDetectedOptions options) { try { return new PagedFlux<>(() -> withContext(context -> listAnomaliesForDetectionConfigSinglePageAsync(detectionConfigurationId, - options, context)), + startTime, endTime, options, context)), continuationToken -> withContext(context -> listAnomaliesForDetectionConfigNextPageAsync(continuationToken, - options, context))); + startTime, endTime, options, context))); } catch (RuntimeException ex) { return new PagedFlux<>(() -> FluxUtil.monoError(logger, ex)); } @@ -579,25 +586,25 @@ public PagedFlux listAnomaliesForDetectionConfig( PagedFlux listAnomaliesForDetectionConfig( String detectionConfigurationId, - ListAnomaliesDetectedOptions options, Context context) { + OffsetDateTime startTime, OffsetDateTime endTime, ListAnomaliesDetectedOptions options, Context context) { return new PagedFlux<>(() -> - listAnomaliesForDetectionConfigSinglePageAsync(detectionConfigurationId, options, context), + listAnomaliesForDetectionConfigSinglePageAsync(detectionConfigurationId, startTime, endTime, options, + context), continuationToken -> - listAnomaliesForDetectionConfigNextPageAsync(continuationToken, options, context)); + listAnomaliesForDetectionConfigNextPageAsync(continuationToken, startTime, endTime, options, context)); } private Mono> listAnomaliesForDetectionConfigSinglePageAsync( String detectionConfigurationId, - ListAnomaliesDetectedOptions options, + OffsetDateTime startTime, OffsetDateTime endTime, ListAnomaliesDetectedOptions options, Context context) { Objects.requireNonNull(detectionConfigurationId, "'detectionConfigurationId' is required."); - Objects.requireNonNull(options, "'options' is required."); - Objects.requireNonNull(options.getStartTime(), "'options.startTime' is required."); - Objects.requireNonNull(options.getEndTime(), "'options.endTime' is required."); + Objects.requireNonNull(startTime, "'startTime' is required."); + Objects.requireNonNull(endTime, "'endTime' is required."); DetectionAnomalyResultQuery query = new DetectionAnomalyResultQuery() - .setStartTime(options.getStartTime()) - .setEndTime(options.getEndTime()); + .setStartTime(startTime) + .setEndTime(endTime); if (options.getFilter() != null) { DetectionAnomalyFilterCondition innerFilter = AnomalyTransforms.toInnerFilter(options.getFilter(), @@ -622,15 +629,15 @@ private Mono> listAnomaliesForDetectionConfigSin private Mono> listAnomaliesForDetectionConfigNextPageAsync( String nextPageLink, - ListAnomaliesDetectedOptions options, + OffsetDateTime startTime, OffsetDateTime endTime, ListAnomaliesDetectedOptions options, Context context) { if (CoreUtils.isNullOrEmpty(nextPageLink)) { return Mono.empty(); } DetectionAnomalyResultQuery query = new DetectionAnomalyResultQuery() - .setStartTime(options.getStartTime()) - .setEndTime(options.getEndTime()); + .setStartTime(startTime) + .setEndTime(endTime); if (options.getFilter() != null) { DetectionAnomalyFilterCondition innerFilter = AnomalyTransforms.toInnerFilter(options.getFilter(), @@ -657,28 +664,31 @@ private Mono> listAnomaliesForDetectionConfigNex * Fetch the incidents identified by an anomaly detection configuration. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidentsForDetectionConfig#String-ListIncidentsDetectedOptions} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidentsForDetectionConfig#String-OffsetDateTime-OffsetDateTime-ListIncidentsDetectedOptions} * * @param detectionConfigurationId The anomaly detection configuration id. + * @param startTime The start time of the time range within which the incidents were detected. + * @param endTime The end time of the time range within which the incidents were detected. * @param options The additional parameters. * @return The incidents. * @throws IllegalArgumentException thrown if {@code detectionConfigurationId} does not conform * to the UUID format specification. * @throws NullPointerException thrown if the {@code detectionConfigurationId} or {@code options} - * or {@code options.startTime} or {@code options.endTime} is null. + * or {@code startTime} or {@code endTime} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) public PagedFlux listIncidentsForDetectionConfig( String detectionConfigurationId, - ListIncidentsDetectedOptions options) { + OffsetDateTime startTime, OffsetDateTime endTime, ListIncidentsDetectedOptions options) { try { return new PagedFlux<>(() -> withContext(context -> - listIncidentsForDetectionConfigSinglePageAsync(detectionConfigurationId, + listIncidentsForDetectionConfigSinglePageAsync(detectionConfigurationId, startTime, endTime, options, context)), continuationToken -> - withContext(context -> listIncidentsForDetectionConfigNextPageAsync(continuationToken, + withContext(context -> listIncidentsForDetectionConfigNextPageAsync(continuationToken, startTime, + endTime, context))); } catch (RuntimeException ex) { return new PagedFlux<>(() -> FluxUtil.monoError(logger, ex)); @@ -687,25 +697,28 @@ public PagedFlux listIncidentsForDetectionConfig( PagedFlux listIncidentsForDetectionConfig( String detectionConfigurationId, - ListIncidentsDetectedOptions options, Context context) { + OffsetDateTime startTime, OffsetDateTime endTime, ListIncidentsDetectedOptions options, Context context) { return new PagedFlux<>(() -> - listIncidentsForDetectionConfigSinglePageAsync(detectionConfigurationId, options, context), + listIncidentsForDetectionConfigSinglePageAsync(detectionConfigurationId, startTime, endTime, options, + context), continuationToken -> - listIncidentsForDetectionConfigNextPageAsync(continuationToken, context)); + listIncidentsForDetectionConfigNextPageAsync(continuationToken, startTime, endTime, context)); } private Mono> listIncidentsForDetectionConfigSinglePageAsync( String detectionConfigurationId, - ListIncidentsDetectedOptions options, + OffsetDateTime startTime, OffsetDateTime endTime, ListIncidentsDetectedOptions options, Context context) { Objects.requireNonNull(detectionConfigurationId, "'detectionConfigurationId' is required."); - Objects.requireNonNull(options, "'options' is required."); - Objects.requireNonNull(options.getStartTime(), "'options.startTime' is required."); - Objects.requireNonNull(options.getEndTime(), "'options.endTime' is required."); + Objects.requireNonNull(startTime, "'startTime' is required."); + Objects.requireNonNull(endTime, "'endTime' is required."); DetectionIncidentResultQuery query = new DetectionIncidentResultQuery() - .setStartTime(options.getStartTime()) - .setEndTime(options.getEndTime()); + .setStartTime(startTime) + .setEndTime(endTime); + if (options == null) { + options = new ListIncidentsDetectedOptions(); + } if (options.getDimensionsToFilter() != null) { List innerDimensionsToFilter = new ArrayList<>(); for (DimensionKey dimensionToFilter : options.getDimensionsToFilter()) { @@ -732,7 +745,7 @@ private Mono> listIncidentsForDetectionConfigSing private Mono> listIncidentsForDetectionConfigNextPageAsync( String nextPageLink, - Context context) { + OffsetDateTime startTime, OffsetDateTime endTime, Context context) { if (CoreUtils.isNullOrEmpty(nextPageLink)) { return Mono.empty(); } @@ -779,10 +792,12 @@ public PagedFlux listIncidentRootCauses( PagedFlux listIncidentRootCauses( String detectionConfigurationId, String incidentId, Context context) { - AnomalyIncident anomalyIncident = new AnomalyIncident(); - IncidentHelper.setId(anomalyIncident, incidentId); - IncidentHelper.setDetectionConfigurationId(anomalyIncident, detectionConfigurationId); try { + Objects.requireNonNull(detectionConfigurationId, "'detectionConfigurationId' is required."); + Objects.requireNonNull(incidentId, "'incidentId' is required."); + AnomalyIncident anomalyIncident = new AnomalyIncident(); + IncidentHelper.setId(anomalyIncident, incidentId); + IncidentHelper.setDetectionConfigurationId(anomalyIncident, detectionConfigurationId); return new PagedFlux<>(() -> listIncidentRootCausesInternal(anomalyIncident, context), null); } catch (RuntimeException ex) { return new PagedFlux<>(() -> monoError(logger, ex)); @@ -841,32 +856,38 @@ private Mono> listIncidentRootCausesInternal(An * Fetch the values of a dimension that have anomalies. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listDimensionValuesWithAnomalies#String-String-ListDimensionValuesWithAnomaliesOptions} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listDimensionValuesWithAnomalies#String-String-OffsetDateTime-OffsetDateTime-ListDimensionValuesWithAnomaliesOptions} * * @param detectionConfigurationId Identifies the configuration used to detect the anomalies. * @param dimensionName The dimension name to retrieve the values for. + * @param startTime The start time of the time range within which the anomalies were identified. + * @param endTime The end time of the time range within which the anomalies were identified. * @param options The additional parameters. * @return The dimension values with anomalies. * @throws IllegalArgumentException thrown if {@code detectionConfigurationId} does not conform * to the UUID format specification. * @throws NullPointerException thrown if the {@code detectionConfigurationId} or {@code dimensionName} - * or {@code options} or {@code options.startTime} or {@code options.endTime} is null. + * or {@code options} or {@code startTime} or {@code endTime} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) public PagedFlux listDimensionValuesWithAnomalies( String detectionConfigurationId, String dimensionName, - ListDimensionValuesWithAnomaliesOptions options) { + OffsetDateTime startTime, OffsetDateTime endTime, ListDimensionValuesWithAnomaliesOptions options) { try { return new PagedFlux<>(() -> withContext(context -> listDimensionValuesWithAnomaliesSinglePageAsync(detectionConfigurationId, dimensionName, + startTime, + endTime, options, context)), continuationToken -> withContext(context -> listDimensionValuesWithAnomaliesNextPageAsync(continuationToken, dimensionName, + startTime, + endTime, options, context))); } catch (RuntimeException ex) { @@ -877,16 +898,20 @@ public PagedFlux listDimensionValuesWithAnomalies( PagedFlux listDimensionValuesWithAnomalies( String detectionConfigurationId, String dimensionName, - ListDimensionValuesWithAnomaliesOptions options, + OffsetDateTime startTime, OffsetDateTime endTime, ListDimensionValuesWithAnomaliesOptions options, Context context) { return new PagedFlux<>(() -> listDimensionValuesWithAnomaliesSinglePageAsync(detectionConfigurationId, dimensionName, + startTime, + endTime, options, context), continuationToken -> listDimensionValuesWithAnomaliesNextPageAsync(continuationToken, dimensionName, + startTime, + endTime, options, context)); } @@ -894,18 +919,20 @@ PagedFlux listDimensionValuesWithAnomalies( private Mono> listDimensionValuesWithAnomaliesSinglePageAsync( String detectionConfigurationId, String dimensionName, - ListDimensionValuesWithAnomaliesOptions options, + OffsetDateTime startTime, OffsetDateTime endTime, ListDimensionValuesWithAnomaliesOptions options, Context context) { Objects.requireNonNull(detectionConfigurationId, "'detectionConfigurationId' is required."); Objects.requireNonNull(dimensionName, "'dimensionName' is required."); - Objects.requireNonNull(options, "'options' is required."); - Objects.requireNonNull(options.getStartTime(), "'options.startTime' is required."); - Objects.requireNonNull(options.getEndTime(), "'options.endTime' is required."); + Objects.requireNonNull(startTime, "'startTime' is required."); + Objects.requireNonNull(endTime, "'endTime' is required."); AnomalyDimensionQuery query = new AnomalyDimensionQuery(); query.setDimensionName(dimensionName); - query.setStartTime(options.getStartTime()); - query.setEndTime(options.getEndTime()); + query.setStartTime(startTime); + query.setEndTime(endTime); + if (options == null) { + options = new ListDimensionValuesWithAnomaliesOptions(); + } if (options.getDimensionToFilter() != null) { query.setDimensionFilter(new DimensionGroupIdentity() .setDimension(options.getDimensionToFilter().asMap())); @@ -926,7 +953,7 @@ private Mono> listDimensionValuesWithAnomaliesSinglePageAs private Mono> listDimensionValuesWithAnomaliesNextPageAsync( String nextPageLink, String dimensionName, - ListDimensionValuesWithAnomaliesOptions options, + OffsetDateTime startTime, OffsetDateTime endTime, ListDimensionValuesWithAnomaliesOptions options, Context context) { if (CoreUtils.isNullOrEmpty(nextPageLink)) { return Mono.empty(); @@ -934,8 +961,8 @@ private Mono> listDimensionValuesWithAnomaliesNextPageAsyn AnomalyDimensionQuery query = new AnomalyDimensionQuery(); query.setDimensionName(dimensionName); - query.setStartTime(options.getStartTime()); - query.setEndTime(options.getEndTime()); + query.setStartTime(startTime); + query.setEndTime(endTime); if (options.getDimensionToFilter() != null) { query.setDimensionFilter(new DimensionGroupIdentity() .setDimension(options.getDimensionToFilter().asMap())); @@ -955,26 +982,29 @@ private Mono> listDimensionValuesWithAnomaliesNextPageAsyn * Fetch the alerts triggered by an anomaly alert configuration. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAlerts#String-ListAlertOptions} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAlerts#String-OffsetDateTime-OffsetDateTime-ListAlertOptions} * * @param alertConfigurationId The anomaly alert configuration id. + * @param startTime The start time of the time range within which the alerts were triggered. + * @param endTime The end time of the time range within which the alerts were triggered. * @param options The additional parameters. * @return The alerts. * @throws IllegalArgumentException thrown if {@code alertConfigurationId} does not conform * to the UUID format specification. - * @throws NullPointerException thrown if the {@code alertConfigurationId} or {@code options} - * or {@code options.startTime} or {@code options.endTime} is null. + * @throws NullPointerException thrown if the {@code alertConfigurationId} + * or {@code startTime} or {@code endTime} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) public PagedFlux listAlerts( - String alertConfigurationId, - ListAlertOptions options) { + String alertConfigurationId, OffsetDateTime startTime, OffsetDateTime endTime, ListAlertOptions options) { try { return new PagedFlux<>(() -> withContext(context -> - listAlertsSinglePageAsync(alertConfigurationId, options, context)), + listAlertsSinglePageAsync(alertConfigurationId, startTime, endTime, + options, context)), continuationToken -> withContext(context -> listAlertsNextPageAsync(continuationToken, + startTime, endTime, options, context))); } catch (RuntimeException ex) { @@ -984,27 +1014,29 @@ public PagedFlux listAlerts( PagedFlux listAlerts( String alertConfigurationId, - ListAlertOptions options, Context context) { + OffsetDateTime startTime, OffsetDateTime endTime, ListAlertOptions options, Context context) { return new PagedFlux<>(() -> - listAlertsSinglePageAsync(alertConfigurationId, options, context), + listAlertsSinglePageAsync(alertConfigurationId, startTime, endTime, options, context), continuationToken -> listAlertsNextPageAsync(continuationToken, - options, + startTime, endTime, options, context)); } private Mono> listAlertsSinglePageAsync( String alertConfigurationId, - ListAlertOptions options, + OffsetDateTime startTime, OffsetDateTime endTime, ListAlertOptions options, Context context) { Objects.requireNonNull(alertConfigurationId, "'alertConfigurationId' is required."); - Objects.requireNonNull(options, "'options' is required."); - Objects.requireNonNull(options.getStartTime(), "'options.startTime' is required."); - Objects.requireNonNull(options.getEndTime(), "'options.endTime' is required."); + Objects.requireNonNull(startTime, "'startTime' is required."); + Objects.requireNonNull(endTime, "'endTime' is required."); + if (options == null) { + options = new ListAlertOptions(); + } AlertingResultQuery query = new AlertingResultQuery(); - query.setStartTime(options.getStartTime()); - query.setEndTime(options.getEndTime()); + query.setStartTime(startTime); + query.setEndTime(endTime); query.setTimeMode(options.getTimeMode()); final Context withTracing = context.addData(AZ_TRACING_NAMESPACE_KEY, METRICS_ADVISOR_TRACING_NAMESPACE_VALUE); @@ -1021,15 +1053,15 @@ private Mono> listAlertsSinglePageAsync( private Mono> listAlertsNextPageAsync( String nextPageLink, - ListAlertOptions options, + OffsetDateTime startTime, OffsetDateTime endTime, ListAlertOptions options, Context context) { if (CoreUtils.isNullOrEmpty(nextPageLink)) { return Mono.empty(); } AlertingResultQuery query = new AlertingResultQuery(); - query.setStartTime(options.getStartTime()); - query.setEndTime(options.getEndTime()); + query.setStartTime(startTime); + query.setEndTime(endTime); query.setTimeMode(options.getTimeMode()); final Context withTracing = context.addData(AZ_TRACING_NAMESPACE_KEY, METRICS_ADVISOR_TRACING_NAMESPACE_VALUE); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorClient.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorClient.java index 06531dd3406d..9ad46af5b6da 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorClient.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorClient.java @@ -123,7 +123,7 @@ public PagedIterable listMetricSeriesDefinitions( * * @return A {@link PagedIterable} of the {@link MetricSeriesData metric series data points}. * @throws IllegalArgumentException thrown if {@code metricId} fail the UUID format validation. - * @throws NullPointerException thrown if the {@code metricId}, {@code options.startTime} or {@code options.endTime} + * @throws NullPointerException thrown if the {@code metricId}, {@code startTime} or {@code endTime} * is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) @@ -164,45 +164,46 @@ public PagedIterable listMetricSeriesData(String metricId, Lis * List the enrichment status for a metric. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricEnrichmentStatus#String-ListMetricEnrichmentStatusOptions} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricEnrichmentStatus#String-OffsetDateTime-OffsetDateTime} * * @param metricId metric unique id. - * @param options th e additional configurable options to specify when querying the result.. - * + * @param startTime The start time for querying the time series data. + * @param endTime The end time for querying the time series data. * @return the list of enrichment status's for the specified metric. * @throws IllegalArgumentException thrown if {@code metricId} fail the UUID format validation. * @throws ErrorCodeException thrown if the request is rejected by server. - * @throws NullPointerException thrown if {@code metricId}, {@code options.startTime} and {@code options.endTime} + * @throws NullPointerException thrown if {@code metricId}, {@code startTime} and {@code endTime} * is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) public PagedIterable listMetricEnrichmentStatus( - String metricId, - ListMetricEnrichmentStatusOptions options) { - return listMetricEnrichmentStatus(metricId, options, Context.NONE); + String metricId, OffsetDateTime startTime, OffsetDateTime endTime) { + return listMetricEnrichmentStatus(metricId, startTime, endTime, null, Context.NONE); } /** * List the enrichment status for a metric. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricEnrichmentStatus#String-ListMetricEnrichmentStatusOptions-Context} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricEnrichmentStatus#String-OffsetDateTime-OffsetDateTime-ListMetricEnrichmentStatusOptions-Context} * * @param metricId metric unique id. + * @param startTime The start time for querying the time series data. + * @param endTime The end time for querying the time series data. * @param options th e additional configurable options to specify when querying the result.. * @param context Additional context that is passed through the Http pipeline during the service call. * * @return the list of enrichment status's for the specified metric. * @throws IllegalArgumentException thrown if {@code metricId} fail the UUID format validation. * @throws ErrorCodeException thrown if the request is rejected by server. - * @throws NullPointerException thrown if {@code metricId}, {@code options.startTime} and {@code options.endTime} + * @throws NullPointerException thrown if {@code metricId}, {@code startTime} and {@code endTime} * is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) public PagedIterable listMetricEnrichmentStatus( String metricId, - ListMetricEnrichmentStatusOptions options, Context context) { - return new PagedIterable<>(client.listMetricEnrichmentStatus(metricId, options, + OffsetDateTime startTime, OffsetDateTime endTime, ListMetricEnrichmentStatusOptions options, Context context) { + return new PagedIterable<>(client.listMetricEnrichmentStatus(metricId, startTime, endTime, options, context == null ? Context.NONE : context)); } @@ -246,8 +247,8 @@ public PagedIterable listMetricEnrichedSeriesData(List * @param seriesKeys The time series key list, each key identifies a specific time series. * @param detectionConfigurationId The id of the configuration used to enrich the time series * identified by the keys in {@code seriesKeys}. - * @param startTime The start time. - * @param endTime The end time. + * @param startTime The start time of the time range within which the enriched data is returned. + * @param endTime The end time of the time range within which the enriched data is returned. * @param context Additional context that is passed through the Http pipeline during the service call. * @return The enriched time series. * @throws IllegalArgumentException thrown if {@code detectionConfigurationId} fail the UUID format validation @@ -273,45 +274,49 @@ public PagedIterable listMetricEnrichedSeriesData( * Fetch the anomalies identified by an anomaly detection configuration. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForDetectionConfig#String-ListAnomaliesDetectedOptions} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForDetectionConfig#String-OffsetDateTime-OffsetDateTime} * * @param detectionConfigurationId The anomaly detection configuration id. - * @param options The additional parameters. + * @param startTime The start time of the time range within which the anomalies were detected. + * @param endTime The end time of the time range within which the anomalies were detected. * @return The anomalies. * @throws IllegalArgumentException thrown if {@code detectionConfigurationId} does not conform * to the UUID format specification * or {@code options.filter} is used to set severity but either min or max severity is missing. - * @throws NullPointerException thrown if the {@code detectionConfigurationId} or {@code options} - * or {@code options.startTime} or {@code options.endTime} is null. + * @throws NullPointerException thrown if the {@code detectionConfigurationId} or + * {@code startTime} or {@code endTime} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) public PagedIterable listAnomaliesForDetectionConfig( - String detectionConfigurationId, - ListAnomaliesDetectedOptions options) { - return listAnomaliesForDetectionConfig(detectionConfigurationId, options, Context.NONE); + String detectionConfigurationId, OffsetDateTime startTime, OffsetDateTime endTime) { + return listAnomaliesForDetectionConfig(detectionConfigurationId, startTime, endTime, null, Context.NONE); } /** * Fetch the anomalies identified by an anomaly detection configuration. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForDetectionConfig#String-ListAnomaliesDetectedOptions-Context} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForDetectionConfig#String-OffsetDateTime-OffsetDateTime-ListAnomaliesDetectedOptions-Context} * * @param detectionConfigurationId The anomaly detection configuration id. + * @param startTime The start time of the time range within which the anomalies were detected. + * @param endTime The end time of the time range within which the anomalies were detected. * @param options The additional parameters. * @param context Additional context that is passed through the Http pipeline during the service call. * @return The anomalies. * @throws IllegalArgumentException thrown if {@code detectionConfigurationId} does not conform * to the UUID format specification * or {@code options.filter} is used to set severity but either min or max severity is missing. - * @throws NullPointerException thrown if the {@code detectionConfigurationId} or {@code options} - * or {@code options.startTime} or {@code options.endTime} is null. + * @throws NullPointerException thrown if the {@code detectionConfigurationId} or {@code startTime} or + * {@code endTime} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) public PagedIterable listAnomaliesForDetectionConfig( String detectionConfigurationId, - ListAnomaliesDetectedOptions options, Context context) { + OffsetDateTime startTime, OffsetDateTime endTime, ListAnomaliesDetectedOptions options, Context context) { return new PagedIterable<>(client.listAnomaliesForDetectionConfig(detectionConfigurationId, + startTime, + endTime, options, context == null ? Context.NONE : context)); } @@ -320,44 +325,46 @@ public PagedIterable listAnomaliesForDetectionConfig( * Fetch the incidents identified by an anomaly detection configuration. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentsForDetectionConfig#String-ListIncidentsDetectedOptions} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentsForDetectionConfig#String-OffsetDateTime-OffsetDateTime} * * @param detectionConfigurationId The anomaly detection configuration id. - * @param options The additional parameters. + * @param startTime The start time of the time range within which the incidents were detected. + * @param endTime The end time of the time range within which the incidents were detected. * @return The incidents. * @throws IllegalArgumentException thrown if {@code detectionConfigurationId} does not conform * to the UUID format specification. * @throws NullPointerException thrown if the {@code detectionConfigurationId} or {@code options} - * or {@code options.startTime} or {@code options.endTime} is null. + * or {@code startTime} or {@code endTime} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) public PagedIterable listIncidentsForDetectionConfig( - String detectionConfigurationId, - ListIncidentsDetectedOptions options) { - return listIncidentsForDetectionConfig(detectionConfigurationId, options, Context.NONE); + String detectionConfigurationId, OffsetDateTime startTime, OffsetDateTime endTime) { + return listIncidentsForDetectionConfig(detectionConfigurationId, startTime, endTime, null, Context.NONE); } /** * Fetch the incidents identified by an anomaly detection configuration. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentsForDetectionConfig#String-ListIncidentsDetectedOptions-Context} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentsForDetectionConfig#String-OffsetDateTime-OffsetDateTime-ListIncidentsDetectedOptions-Context} * * @param detectionConfigurationId The anomaly detection configuration id. + * @param startTime The start time of the time range within which the incidents were detected. + * @param endTime The end time of the time range within which the incidents were detected. * @param options The additional parameters. * @param context Additional context that is passed through the Http pipeline during the service call. * @return The incidents. * @throws IllegalArgumentException thrown if {@code detectionConfigurationId} does not conform * to the UUID format specification. - * @throws NullPointerException thrown if the {@code detectionConfigurationId} or {@code options} - * or {@code options.startTime} or {@code options.endTime} is null. + * @throws NullPointerException thrown if the {@code detectionConfigurationId} or {@code startTime} or + * {@code endTime} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) public PagedIterable listIncidentsForDetectionConfig( String detectionConfigurationId, - ListIncidentsDetectedOptions options, Context context) { + OffsetDateTime startTime, OffsetDateTime endTime, ListIncidentsDetectedOptions options, Context context) { return new PagedIterable<>(client.listIncidentsForDetectionConfig(detectionConfigurationId, - options, + startTime, endTime, options, context == null ? Context.NONE : context)); } @@ -426,35 +433,36 @@ public PagedIterable listIncidentRootCauses(AnomalyIncident a * Fetch the values of a dimension that have anomalies. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listDimensionValuesWithAnomalies#String-String-ListDimensionValuesWithAnomaliesOptions} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listDimensionValuesWithAnomalies#String-String-OffsetDateTime-OffsetDateTime} * * @param detectionConfigurationId Identifies the configuration used to detect the anomalies. * @param dimensionName The dimension name to retrieve the values for. - * @param options The additional parameters. - * + * @param startTime The start time of the time range within which the anomalies were identified. + * @param endTime The end time of the time range within which the anomalies were identified. * @return The dimension values with anomalies. * @throws IllegalArgumentException thrown if {@code detectionConfigurationId} does not conform * to the UUID format specification. * @throws NullPointerException thrown if the {@code detectionConfigurationId} or {@code dimensionName} - * or {@code options} or {@code options.startTime} or {@code options.endTime} is null. + * or {@code startTime} or {@code endTime} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) public PagedIterable listDimensionValuesWithAnomalies( String detectionConfigurationId, - String dimensionName, - ListDimensionValuesWithAnomaliesOptions options) { + String dimensionName, OffsetDateTime startTime, OffsetDateTime endTime) { return listDimensionValuesWithAnomalies(detectionConfigurationId, - dimensionName, options, Context.NONE); + dimensionName, startTime, endTime, null, Context.NONE); } /** * Fetch the values of a dimension that have anomalies. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listDimensionValuesWithAnomalies#String-String-ListDimensionValuesWithAnomaliesOptions-Context} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listDimensionValuesWithAnomalies#String-String-OffsetDateTime-OffsetDateTime-ListDimensionValuesWithAnomaliesOptions-Context} * * @param detectionConfigurationId Identifies the configuration used to detect the anomalies. * @param dimensionName The dimension name to retrieve the values for. + * @param startTime The start time of the time range within which the anomalies were identified. + * @param endTime The end time of the time range within which the anomalies were identified. * @param options The additional parameters. * @param context Additional context that is passed through the Http pipeline during the service call. * @@ -462,60 +470,62 @@ public PagedIterable listDimensionValuesWithAnomalies( * @throws IllegalArgumentException thrown if {@code detectionConfigurationId} does not conform * to the UUID format specification. * @throws NullPointerException thrown if the {@code detectionConfigurationId} or {@code dimensionName} - * or {@code options} or {@code options.startTime} or {@code options.endTime} is null. + * or {@code startTime} or {@code endTime} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) public PagedIterable listDimensionValuesWithAnomalies( String detectionConfigurationId, String dimensionName, + OffsetDateTime startTime, OffsetDateTime endTime, ListDimensionValuesWithAnomaliesOptions options, Context context) { return new PagedIterable<>(client.listDimensionValuesWithAnomalies(detectionConfigurationId, - dimensionName, options, context == null ? Context.NONE : context)); + dimensionName, startTime, endTime, options, context == null ? Context.NONE : context)); } /** * Fetch the alerts triggered by an anomaly alert configuration. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAlerts#String-ListAlertOptions} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAlerts#String-OffsetDateTime-OffsetDateTime} * * @param alertConfigurationId The anomaly alert configuration id. - * @param options The additional parameters. - * + * @param startTime The start time of the time range within which the alerts were triggered. + * @param endTime The end time of the time range within which the alerts were triggered. * @return The alerts. * @throws IllegalArgumentException thrown if {@code alertConfigurationId} does not conform * to the UUID format specification. - * @throws NullPointerException thrown if the {@code alertConfigurationId} or {@code options} - * or {@code options.startTime} or {@code options.endTime} is null. + * @throws NullPointerException thrown if the {@code alertConfigurationId} + * or {@code startTime} or {@code endTime} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) public PagedIterable listAlerts( - String alertConfigurationId, - ListAlertOptions options) { - return listAlerts(alertConfigurationId, options, Context.NONE); + String alertConfigurationId, OffsetDateTime startTime, OffsetDateTime endTime) { + return listAlerts(alertConfigurationId, startTime, endTime, null, Context.NONE); } /** * Fetch the alerts triggered by an anomaly alert configuration. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAlerts#String-ListAlertOptions-Context} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAlerts#String-OffsetDateTime-OffsetDateTime-ListAlertOptions-Context} * * @param alertConfigurationId The anomaly alert configuration id. + * @param startTime The start time of the time range within which the alerts were triggered. + * @param endTime The end time of the time range within which the alerts were triggered. * @param options The additional parameters. * @param context Additional context that is passed through the Http pipeline during the service call. * * @return The alerts. * @throws IllegalArgumentException thrown if {@code alertConfigurationId} does not conform * to the UUID format specification. - * @throws NullPointerException thrown if the {@code alertConfigurationId} or {@code options} - * or {@code options.startTime} or {@code options.endTime} is null. + * @throws NullPointerException thrown if the {@code alertConfigurationId} + * or {@code startTime} or {@code endTime} is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) public PagedIterable listAlerts( String alertConfigurationId, - ListAlertOptions options, Context context) { - return new PagedIterable<>(client.listAlerts(alertConfigurationId, options, + OffsetDateTime startTime, OffsetDateTime endTime, ListAlertOptions options, Context context) { + return new PagedIterable<>(client.listAlerts(alertConfigurationId, startTime, endTime, options, context == null ? Context.NONE : context)); } @@ -523,7 +533,7 @@ public PagedIterable listAlerts( * Fetch the anomalies in an alert. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForAlert#String-String-ListAnomaliesAlertedOptions} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForAlert#String-String} * * @param alertConfigurationId The anomaly alert configuration id. * @param alertId The alert id. diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListAlertOptions.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListAlertOptions.java index 17cea625bc1a..54aebb9ba2b3 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListAlertOptions.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListAlertOptions.java @@ -3,53 +3,27 @@ package com.azure.ai.metricsadvisor.models; -import java.time.OffsetDateTime; - /** * Describes the additional parameters for the API to list the alerts triggered. */ public final class ListAlertOptions { - private final OffsetDateTime startTime; - private final OffsetDateTime endTime; - private final AlertQueryTimeMode alertQueryTimeMode; private Integer top; private Integer skip; + private AlertQueryTimeMode alertQueryTimeMode; /** - * Creates a new instance of ListAlertOptions. - * - * @param startTime The start time of the time range within which the alerts were triggered. - * @param endTime The end time of the time range within which the alerts were triggered. - * @param timeMode The time mode. - */ - public ListAlertOptions(OffsetDateTime startTime, - OffsetDateTime endTime, - AlertQueryTimeMode timeMode) { - this.startTime = startTime; - this.endTime = endTime; - this.alertQueryTimeMode = timeMode; - } - - /** - * Gets the start time of the time range within which the alerts were triggered. + * Set the query time mode. * - * @return The start time. + * @param alertQueryTimeMode the alert Query Time Mode value to set. + * @return the ListAlertOptions object itself. */ - public OffsetDateTime getStartTime() { - return this.startTime; - } - - /** - * Gets the end time of the time range within which the alerts were triggered. - * - * @return The end time. - */ - public OffsetDateTime getEndTime() { - return this.endTime; + public ListAlertOptions setAlertQueryTimeMode(AlertQueryTimeMode alertQueryTimeMode) { + this.alertQueryTimeMode = alertQueryTimeMode; + return this; } /** - * Gets the time model. + * Gets the time mode. * * @return The time mode. */ diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListAnomaliesDetectedOptions.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListAnomaliesDetectedOptions.java index caa7d6098bcc..5c95d55d8edd 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListAnomaliesDetectedOptions.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListAnomaliesDetectedOptions.java @@ -3,48 +3,14 @@ package com.azure.ai.metricsadvisor.models; -import java.time.OffsetDateTime; - /** * Describes the additional parameters for the API to list anomalies detected. */ public final class ListAnomaliesDetectedOptions { - private final OffsetDateTime startTime; - private final OffsetDateTime endTime; private Integer top; private Integer skip; private ListAnomaliesDetectedFilter filter; - /** - * Creates a new instance of ListAnomaliesDetectedOptions. - * - * @param startTime The start time of the time range within which the anomalies were detected. - * @param endTime The end time of the time range within which the anomalies were detected. - */ - public ListAnomaliesDetectedOptions(OffsetDateTime startTime, - OffsetDateTime endTime) { - this.startTime = startTime; - this.endTime = endTime; - } - - /** - * Gets the start time of the time range within which the incidents were detected. - * - * @return The start time. - */ - public OffsetDateTime getStartTime() { - return this.startTime; - } - - /** - * Gets the end time of the time range within which the incidents were detected. - * - * @return The end time. - */ - public OffsetDateTime getEndTime() { - return this.endTime; - } - /** * Gets limit indicating the number of items to be included in a service returned page. * diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListDimensionValuesWithAnomaliesOptions.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListDimensionValuesWithAnomaliesOptions.java index 2db411214d0e..ac2d8b6048c8 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListDimensionValuesWithAnomaliesOptions.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListDimensionValuesWithAnomaliesOptions.java @@ -3,48 +3,14 @@ package com.azure.ai.metricsadvisor.models; -import java.time.OffsetDateTime; - /** * Describes the additional parameters for the API to list values of a dimension that have anomalies. */ public final class ListDimensionValuesWithAnomaliesOptions { - private final OffsetDateTime startTime; - private final OffsetDateTime endTime; private Integer top; private Integer skip; private DimensionKey dimensionToFilter; - /** - * Creates a new instance of ListDimensionValuesWithAnomaliesOptions. - * - * @param startTime The start time of the time range within which the anomalies were identified. - * @param endTime The end time of the time range within which the anomalies were identified. - */ - public ListDimensionValuesWithAnomaliesOptions(OffsetDateTime startTime, - OffsetDateTime endTime) { - this.startTime = startTime; - this.endTime = endTime; - } - - /** - * Gets the start time of the time range within which the anomalies were identified. - * - * @return The start time. - */ - public OffsetDateTime getStartTime() { - return this.startTime; - } - - /** - * Gets the end time of the time range within which the anomalies were identified. - * - * @return The end time. - */ - public OffsetDateTime getEndTime() { - return this.endTime; - } - /** * Gets limit indicating the number of items that will be included in a service returned page. * diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListIncidentsDetectedOptions.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListIncidentsDetectedOptions.java index eb2ef68105d4..e5ea1e0ef088 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListIncidentsDetectedOptions.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListIncidentsDetectedOptions.java @@ -3,48 +3,15 @@ package com.azure.ai.metricsadvisor.models; -import java.time.OffsetDateTime; import java.util.List; /** * Describes the additional parameters for the API to list incidents detected. */ public final class ListIncidentsDetectedOptions { - private final OffsetDateTime startTime; - private final OffsetDateTime endTime; private Integer top; private List dimensionsToFilter; - /** - * Creates a new instance of ListIncidentsDetectedOptions. - * - * @param startTime The start time of the time range within which the incidents were detected. - * @param endTime The end time of the time range within which the incidents were detected. - */ - public ListIncidentsDetectedOptions(OffsetDateTime startTime, - OffsetDateTime endTime) { - this.startTime = startTime; - this.endTime = endTime; - } - - /** - * Gets the start time of the time range within which the incidents were detected. - * - * @return The start time. - */ - public OffsetDateTime getStartTime() { - return this.startTime; - } - - /** - * Gets the end time of the time range within which the incidents were detected. - * - * @return The end time. - */ - public OffsetDateTime getEndTime() { - return this.endTime; - } - /** * Gets limit indicating the number of items to be included in a service returned page. * diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListMetricEnrichmentStatusOptions.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListMetricEnrichmentStatusOptions.java index e759a5ab3414..daa17e9f1c11 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListMetricEnrichmentStatusOptions.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListMetricEnrichmentStatusOptions.java @@ -5,30 +5,14 @@ import com.azure.core.annotation.Fluent; -import java.time.OffsetDateTime; - /** * Additional parameters to set when listing enrichment status for a metric. */ @Fluent public final class ListMetricEnrichmentStatusOptions { - private final OffsetDateTime startTime; - private final OffsetDateTime endTime; private Integer top; private Integer skip; - /** - * Creates a new instance of ListMetricEnrichmentStatusOptions. - * - * @param startTime The start time for querying the time series data. - * @param endTime The end time for querying the time series data. - */ - public ListMetricEnrichmentStatusOptions(OffsetDateTime startTime, - OffsetDateTime endTime) { - this.startTime = startTime; - this.endTime = endTime; - } - /** * Gets limit indicating the number of items that will be included in a service returned page. * @@ -72,21 +56,4 @@ public ListMetricEnrichmentStatusOptions setSkip(int skip) { return this; } - /** - * Gets the start time for which the time series data will be queried for. - * - * @return The start time. - */ - public OffsetDateTime getStartTime() { - return this.startTime; - } - - /** - * Gets the end time for which the time series data will be queried for. - * - * @return The end time. - */ - public OffsetDateTime getEndTime() { - return this.endTime; - } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsAsyncSample.java index 91361f85ab74..faaababfd929 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsAsyncSample.java @@ -32,10 +32,11 @@ public static void main(String[] args) { final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); // - final ListAlertOptions options = new ListAlertOptions(startTime, endTime, timeMode) + final ListAlertOptions options = new ListAlertOptions() + .setAlertQueryTimeMode(timeMode) .setTop(10); - advisorAsyncClient.listAlerts(alertConfigurationId, options) + advisorAsyncClient.listAlerts(alertConfigurationId, startTime, endTime, options) .subscribe(alert -> { System.out.printf("Anomaly Alert Id: %s%n", alert.getId()); System.out.printf("Created Time: %s%n", alert.getCreatedTime()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsSample.java index 1f712957c547..02d0625860de 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListAlertsSample.java @@ -34,10 +34,11 @@ public static void main(String[] args) { final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); // - final ListAlertOptions options = new ListAlertOptions(startTime, endTime, timeMode) + final ListAlertOptions options = new ListAlertOptions() + .setAlertQueryTimeMode(timeMode) .setTop(10); - PagedIterable alertsIterable = advisorClient.listAlerts(alertConfigurationId, options); + PagedIterable alertsIterable = advisorClient.listAlerts(alertConfigurationId, startTime, endTime); for (AnomalyAlert anomalyAlert : alertsIterable) { System.out.printf("Anomaly Alert Id: %s%n", anomalyAlert.getId()); System.out.printf("Created Time: %s%n", anomalyAlert.getCreatedTime()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricAsyncSample.java index 12b3862856d0..ef511f341c0d 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricAsyncSample.java @@ -21,10 +21,10 @@ public static void main(String[] args) { final String metricId = "24gdgfbbbb-41ec-a637-677e77b81455"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); - final ListMetricEnrichmentStatusOptions options = new ListMetricEnrichmentStatusOptions(startTime, endTime) + final ListMetricEnrichmentStatusOptions options = new ListMetricEnrichmentStatusOptions() .setTop(10); - advisorAsyncClient.listMetricEnrichmentStatus(metricId, options) + advisorAsyncClient.listMetricEnrichmentStatus(metricId, startTime, endTime, options) .doOnNext(enrichmentStatus -> { System.out.printf("Data Feed Metric enrichment status : %s%n", enrichmentStatus.getStatus()); System.out.printf("Data Feed Metric enrichment status message: %s%n", enrichmentStatus.getMessage()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricSample.java index 940f3e5af0ad..02f80cee4403 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListEnrichmentStatusForMetricSample.java @@ -21,10 +21,10 @@ public static void main(String[] args) { final String metricId = "24gdgfbbbb-41ec-a637-677e77b81455"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); - final ListMetricEnrichmentStatusOptions options = new ListMetricEnrichmentStatusOptions(startTime, endTime) + final ListMetricEnrichmentStatusOptions options = new ListMetricEnrichmentStatusOptions() .setTop(10); - advisorClient.listMetricEnrichmentStatus(metricId, options) + advisorClient.listMetricEnrichmentStatus(metricId, startTime, endTime) .forEach(enrichmentStatus -> { System.out.printf("Data Feed Metric enrichment status : %s%n", enrichmentStatus.getStatus()); System.out.printf("Data Feed Metric enrichment status message: %s%n", enrichmentStatus.getMessage()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsDetectedAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsDetectedAsyncSample.java index 102198333e00..fab9f3ce4e47 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsDetectedAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsDetectedAsyncSample.java @@ -24,11 +24,11 @@ public static void main(String[] args) { final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); - final ListIncidentsDetectedOptions options = new ListIncidentsDetectedOptions(startTime, endTime) + final ListIncidentsDetectedOptions options = new ListIncidentsDetectedOptions() .setTop(1000); PagedFlux incidentsFlux - = advisorAsyncClient.listIncidentsForDetectionConfig(detectionConfigurationId, options); + = advisorAsyncClient.listIncidentsForDetectionConfig(detectionConfigurationId, startTime, endTime, options); incidentsFlux.doOnNext(incident -> { System.out.printf("Data Feed Metric Id: %s%n", incident.getMetricId()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsDetectedSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsDetectedSample.java index d79eba72ee26..200b5ccbb4cc 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsDetectedSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListIncidentsDetectedSample.java @@ -7,6 +7,7 @@ import com.azure.ai.metricsadvisor.models.ListIncidentsDetectedOptions; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; import com.azure.core.http.rest.PagedIterable; +import com.azure.core.util.Context; import java.time.OffsetDateTime; @@ -24,11 +25,12 @@ public static void main(String[] args) { final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); - final ListIncidentsDetectedOptions options = new ListIncidentsDetectedOptions(startTime, endTime) + final ListIncidentsDetectedOptions options = new ListIncidentsDetectedOptions() .setTop(1000); PagedIterable incidentsIterable - = advisorClient.listIncidentsForDetectionConfig(detectionConfigurationId, options); + = advisorClient.listIncidentsForDetectionConfig(detectionConfigurationId, startTime, endTime, options, + Context.NONE); for (AnomalyIncident anomalyIncident : incidentsIterable) { System.out.printf("Data Feed Metric Id: %s%n", anomalyIncident.getMetricId()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigAsyncSample.java index 6b3a04265997..51c84161b8dc 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigAsyncSample.java @@ -26,11 +26,11 @@ public static void main(String[] args) { final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); final ListAnomaliesDetectedFilter filter = new ListAnomaliesDetectedFilter() .setSeverityRange(AnomalySeverity.LOW, AnomalySeverity.MEDIUM); - final ListAnomaliesDetectedOptions options = new ListAnomaliesDetectedOptions(startTime, endTime) + final ListAnomaliesDetectedOptions options = new ListAnomaliesDetectedOptions() .setTop(10) .setFilter(filter); advisorAsyncClient.listAnomaliesForDetectionConfig(detectionConfigurationId, - options) + startTime, endTime, options) .doOnNext(anomaly -> { System.out.printf("DataPoint Anomaly Severity: %s%n", anomaly.getSeverity()); System.out.printf("Series Key: %s%n", anomaly.getSeriesKey().asMap().entrySet()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigSample.java index 039080f9f222..f5af1e8e2225 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListsAnomaliesForDetectionConfigSample.java @@ -28,12 +28,12 @@ public static void main(String[] args) { final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); final ListAnomaliesDetectedFilter filter = new ListAnomaliesDetectedFilter() .setSeverityRange(AnomalySeverity.LOW, AnomalySeverity.MEDIUM); - final ListAnomaliesDetectedOptions options = new ListAnomaliesDetectedOptions(startTime, endTime) + final ListAnomaliesDetectedOptions options = new ListAnomaliesDetectedOptions() .setTop(10) .setFilter(filter); PagedIterable anomaliesIterable = advisorClient.listAnomaliesForDetectionConfig(detectionConfigurationId, - options); + startTime, endTime); for (DataPointAnomaly dataPointAnomaly : anomaliesIterable) { System.out.printf("DataPoint Anomaly Severity: %s%n", dataPointAnomaly.getSeverity()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClientJavaDocCodeSnippets.java index ce4a85ce3b22..486134fe079a 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClientJavaDocCodeSnippets.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClientJavaDocCodeSnippets.java @@ -239,61 +239,62 @@ public void listAnomaliesForAlertWithOptions() { } /** - * Code snippet for {@link MetricsAdvisorAsyncClient#listAlerts(String, ListAlertOptions)}. + * Code snippet for {@link MetricsAdvisorAsyncClient#listAlerts(String, OffsetDateTime, OffsetDateTime, ListAlertOptions)}. */ public void listAlertForAlertConfiguration() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAlerts#String-ListAlertOptions + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAlerts#String-OffsetDateTime-OffsetDateTime-ListAlertOptions final String alertConfigurationId = "ff3014a0-bbbb-41ec-a637-677e77b81299"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final AlertQueryTimeMode timeMode = AlertQueryTimeMode.ANOMALY_TIME; - final ListAlertOptions options = new ListAlertOptions(startTime, endTime, timeMode) + final ListAlertOptions options = new ListAlertOptions() + .setAlertQueryTimeMode(timeMode) .setTop(10); - metricsAdvisorAsyncClient.listAlerts(alertConfigurationId, options) + metricsAdvisorAsyncClient.listAlerts(alertConfigurationId, startTime, endTime, options) .subscribe(alert -> { System.out.printf("Anomaly Alert Id: %s%n", alert.getId()); System.out.printf("Created Time: %s%n", alert.getCreatedTime()); System.out.printf("Modified Time: %s%n", alert.getModifiedTime()); }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAlerts#String-ListAlertOptions + // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAlerts#String-OffsetDateTime-OffsetDateTime-ListAlertOptions } /** - * Code snippet for {@link MetricsAdvisorAsyncClient#listDimensionValuesWithAnomalies(String, String, ListDimensionValuesWithAnomaliesOptions)}. + * Code snippet for {@link MetricsAdvisorAsyncClient#listDimensionValuesWithAnomalies(String, String, OffsetDateTime, OffsetDateTime, ListDimensionValuesWithAnomaliesOptions)}. */ public void listValuesOfDimensionWithAnomalies() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listDimensionValuesWithAnomalies#String-String-ListDimensionValuesWithAnomaliesOptions + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listDimensionValuesWithAnomalies#String-String-OffsetDateTime-OffsetDateTime-ListDimensionValuesWithAnomaliesOptions final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8"; final String dimensionName = "Dim1"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final ListDimensionValuesWithAnomaliesOptions options - = new ListDimensionValuesWithAnomaliesOptions(startTime, endTime) + = new ListDimensionValuesWithAnomaliesOptions() .setTop(10); metricsAdvisorAsyncClient.listDimensionValuesWithAnomalies(detectionConfigurationId, dimensionName, - options) + startTime, endTime, options) .subscribe(dimensionValue -> { System.out.printf("DataFeedDimension Value: %s%n", dimensionValue); }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listDimensionValuesWithAnomalies#String-String-ListDimensionValuesWithAnomaliesOptions + // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listDimensionValuesWithAnomalies#String-String-OffsetDateTime-OffsetDateTime-ListDimensionValuesWithAnomaliesOptions } /** - * Code snippet for {@link MetricsAdvisorAsyncClient#listIncidentsForDetectionConfig(String, ListIncidentsDetectedOptions)}. + * Code snippet for {@link MetricsAdvisorAsyncClient#listIncidentsForDetectionConfig(String, OffsetDateTime, OffsetDateTime, ListIncidentsDetectedOptions)}. */ public void listIncidentsForDetectionConfig() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidentsForDetectionConfig#String-ListIncidentsDetectedOptions + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidentsForDetectionConfig#String-OffsetDateTime-OffsetDateTime-ListIncidentsDetectedOptions final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); - final ListIncidentsDetectedOptions options = new ListIncidentsDetectedOptions(startTime, endTime) + final ListIncidentsDetectedOptions options = new ListIncidentsDetectedOptions() .setTop(1000); PagedFlux incidentsFlux - = metricsAdvisorAsyncClient.listIncidentsForDetectionConfig(detectionConfigurationId, options); + = metricsAdvisorAsyncClient.listIncidentsForDetectionConfig(detectionConfigurationId, startTime, endTime, options); incidentsFlux.subscribe(incident -> { System.out.printf("Data Feed Metric Id: %s%n", incident.getMetricId()); @@ -304,24 +305,24 @@ public void listIncidentsForDetectionConfig() { System.out.printf("Anomaly Incident Status: %s%n", incident.getStatus()); System.out.printf("Root DataFeedDimension Key: %s%n", incident.getRootDimensionKey().asMap()); }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidentsForDetectionConfig#String-ListIncidentsDetectedOptions + // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidentsForDetectionConfig#String-OffsetDateTime-OffsetDateTime-ListIncidentsDetectedOptions } /** - * Code snippet for {@link MetricsAdvisorAsyncClient#listAnomaliesForDetectionConfig(String, ListAnomaliesDetectedOptions)}. + * Code snippet for {@link MetricsAdvisorAsyncClient#listAnomaliesForDetectionConfig(String, OffsetDateTime, OffsetDateTime, ListAnomaliesDetectedOptions)}. */ public void listAnomaliesForDetectionConfiguration() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAnomaliesForDetectionConfig#String-ListAnomaliesDetectedOptions + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAnomaliesForDetectionConfig#String-OffsetDateTime-OffsetDateTime-ListAnomaliesDetectedOptions final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); final ListAnomaliesDetectedFilter filter = new ListAnomaliesDetectedFilter() .setSeverityRange(AnomalySeverity.LOW, AnomalySeverity.MEDIUM); - final ListAnomaliesDetectedOptions options = new ListAnomaliesDetectedOptions(startTime, endTime) + final ListAnomaliesDetectedOptions options = new ListAnomaliesDetectedOptions() .setTop(10) .setFilter(filter); metricsAdvisorAsyncClient.listAnomaliesForDetectionConfig(detectionConfigurationId, - options) + startTime, endTime, options) .subscribe(anomaly -> { System.out.printf("DataPoint Anomaly AnomalySeverity: %s%n", anomaly.getSeverity()); System.out.printf("Series Key:"); @@ -331,7 +332,7 @@ public void listAnomaliesForDetectionConfiguration() { dimension.getKey(), dimension.getValue()); } }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAnomaliesForDetectionConfig#String-ListAnomaliesDetectedOptions + // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listAnomaliesForDetectionConfig#String-OffsetDateTime-OffsetDateTime-ListAnomaliesDetectedOptions } /* @@ -550,10 +551,10 @@ public void listIncidentRootCausesWithIncident() { final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final ListIncidentsDetectedOptions options - = new ListIncidentsDetectedOptions(startTime, endTime) + = new ListIncidentsDetectedOptions() .setTop(10); - metricsAdvisorAsyncClient.listIncidentsForDetectionConfig(detectionConfigurationId, options) + metricsAdvisorAsyncClient.listIncidentsForDetectionConfig(detectionConfigurationId, startTime, endTime, options) .flatMap(incident -> { return metricsAdvisorAsyncClient.listIncidentRootCauses(incident); }) @@ -566,24 +567,24 @@ public void listIncidentRootCausesWithIncident() { // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listIncidentRootCauses#AnomalyIncident } - /* - * Code snippet for {@link MetricsAdvisorAsyncClient#listMetricEnrichmentStatus(String, ListMetricEnrichmentStatusOptions)}. + /** + * Code snippet for {@link MetricsAdvisorAsyncClient#listMetricEnrichmentStatus(String, OffsetDateTime, OffsetDateTime, ListMetricEnrichmentStatusOptions)}. */ public void listMetricEnrichmentStatus() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricEnrichmentStatus#String-ListMetricEnrichmentStatusOptions + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricEnrichmentStatus#String-OffsetDateTime-OffsetDateTime-ListMetricEnrichmentStatusOptions final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final String metricId = "d3gh4i4-b804-4ab9-a70f-0da0c89cft3l"; - final ListMetricEnrichmentStatusOptions options = new ListMetricEnrichmentStatusOptions(startTime, endTime); + final ListMetricEnrichmentStatusOptions options = new ListMetricEnrichmentStatusOptions().setTop(10); - metricsAdvisorAsyncClient.listMetricEnrichmentStatus(metricId, options) + metricsAdvisorAsyncClient.listMetricEnrichmentStatus(metricId, startTime, endTime, options) .subscribe(enrichmentStatus -> { System.out.printf("Data Feed Metric enrichment status : %s%n", enrichmentStatus.getStatus()); System.out.printf("Data Feed Metric enrichment status message: %s%n", enrichmentStatus.getMessage()); System.out.printf("Data Feed Metric enrichment status data slice timestamp : %s%n", enrichmentStatus.getTimestamp()); }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricEnrichmentStatus#String-ListMetricEnrichmentStatusOptions + // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricEnrichmentStatus#String-OffsetDateTime-OffsetDateTime-ListMetricEnrichmentStatusOptions } /** diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java index 18248dbf2619..40a404627d7f 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java @@ -277,14 +277,12 @@ public void listIncidentsForAlertWithContext() { } /** - * Code snippet for {@link MetricsAdvisorClient#listAnomaliesForAlert(String, String)}. + * Code snippet for {@link MetricsAdvisorClient#listAnomaliesForAlert(String, String)} */ public void listAnomaliesForAlert() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForAlert#String-String-ListAnomaliesAlertedOptions + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForAlert#String-String final String alertConfigurationId = "ff3014a0-bbbb-41ec-a637-677e77b81299"; final String alertId = "1746b031c00"; - final ListAnomaliesAlertedOptions options = new ListAnomaliesAlertedOptions() - .setTop(10); PagedIterable anomaliesIterable = metricsAdvisorClient.listAnomaliesForAlert( alertConfigurationId, alertId @@ -300,7 +298,7 @@ public void listAnomaliesForAlert() { System.out.printf("Series Key:"); System.out.println(dataPointAnomaly.getSeriesKey().asMap()); } - // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForAlert#String-String-ListAnomaliesAlertedOptions + // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForAlert#String-String } /** @@ -338,42 +336,41 @@ public void listAnomaliesForAlertWithContext() { } /** - * Code snippet for {@link MetricsAdvisorClient#listAlerts(String, ListAlertOptions)}. + * Code snippet for {@link MetricsAdvisorClient#listAlerts(String, OffsetDateTime, OffsetDateTime)}. */ public void listAlertForAlertConfiguration() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAlerts#String-ListAlertOptions + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAlerts#String-OffsetDateTime-OffsetDateTime final String alertConfigurationId = "ff3014a0-bbbb-41ec-a637-677e77b81299"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final AlertQueryTimeMode timeMode = AlertQueryTimeMode.ANOMALY_TIME; - final ListAlertOptions options = new ListAlertOptions(startTime, endTime, timeMode) - .setTop(10); PagedIterable alertsIterable - = metricsAdvisorClient.listAlerts(alertConfigurationId, options); + = metricsAdvisorClient.listAlerts(alertConfigurationId, startTime, endTime); for (AnomalyAlert anomalyAlert : alertsIterable) { System.out.printf("Anomaly Alert Id: %s%n", anomalyAlert.getId()); System.out.printf("Created Time: %s%n", anomalyAlert.getCreatedTime()); System.out.printf("Modified Time: %s%n", anomalyAlert.getModifiedTime()); } - // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAlerts#String-ListAlertOptions + // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAlerts#String-OffsetDateTime-OffsetDateTime } /** - * Code snippet for {@link MetricsAdvisorClient#listAlerts(String, ListAlertOptions, Context)}. + * Code snippet for {@link MetricsAdvisorClient#listAlerts(String, OffsetDateTime, OffsetDateTime, ListAlertOptions, Context)}. */ public void listAlertForAlertConfigurationWithContext() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAlerts#String-ListAlertOptions-Context + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAlerts#String-OffsetDateTime-OffsetDateTime-ListAlertOptions-Context final String alertConfigurationId = "ff3014a0-bbbb-41ec-a637-677e77b81299"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final AlertQueryTimeMode timeMode = AlertQueryTimeMode.ANOMALY_TIME; - final ListAlertOptions options = new ListAlertOptions(startTime, endTime, timeMode) + final ListAlertOptions options = new ListAlertOptions() + .setAlertQueryTimeMode(timeMode) .setTop(10); PagedIterable alertsIterable - = metricsAdvisorClient.listAlerts(alertConfigurationId, options, Context.NONE); + = metricsAdvisorClient.listAlerts(alertConfigurationId, startTime, endTime, options, Context.NONE); Stream> alertsPageStream = alertsIterable.streamByPage(); int[] pageCount = new int[1]; @@ -386,50 +383,50 @@ public void listAlertForAlertConfigurationWithContext() { System.out.printf("Modified Time: %s%n", anomalyAlert.getModifiedTime()); } }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAlerts#String-ListAlertOptions-Context + // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAlerts#String-OffsetDateTime-OffsetDateTime-ListAlertOptions-Context } /** - * Code snippet for {@link MetricsAdvisorClient#listDimensionValuesWithAnomalies(String, String, ListDimensionValuesWithAnomaliesOptions)}. + * Code snippet for {@link MetricsAdvisorClient#listDimensionValuesWithAnomalies(String, String, OffsetDateTime, OffsetDateTime)}. */ public void listValuesOfDimensionWithAnomalies() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listDimensionValuesWithAnomalies#String-String-ListDimensionValuesWithAnomaliesOptions + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listDimensionValuesWithAnomalies#String-String-OffsetDateTime-OffsetDateTime final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8"; final String dimensionName = "Dim1"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final ListDimensionValuesWithAnomaliesOptions options - = new ListDimensionValuesWithAnomaliesOptions(startTime, endTime) + = new ListDimensionValuesWithAnomaliesOptions() .setTop(10); PagedIterable dimensionValueIterable = metricsAdvisorClient.listDimensionValuesWithAnomalies(detectionConfigurationId, dimensionName, - options); + startTime, endTime); for (String dimensionValue : dimensionValueIterable) { System.out.printf("DataFeedDimension Value: %s%n", dimensionValue); } - // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listDimensionValuesWithAnomalies#String-String-ListDimensionValuesWithAnomaliesOptions + // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listDimensionValuesWithAnomalies#String-String-OffsetDateTime-OffsetDateTime } /** - * Code snippet for {@link MetricsAdvisorClient#listDimensionValuesWithAnomalies(String, String, ListDimensionValuesWithAnomaliesOptions, Context)}. + * Code snippet for {@link MetricsAdvisorClient#listDimensionValuesWithAnomalies(String, String, OffsetDateTime, OffsetDateTime, ListDimensionValuesWithAnomaliesOptions, Context)}. */ public void listValuesOfDimensionWithAnomaliesWithContext() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listDimensionValuesWithAnomalies#String-String-ListDimensionValuesWithAnomaliesOptions-Context + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listDimensionValuesWithAnomalies#String-String-OffsetDateTime-OffsetDateTime-ListDimensionValuesWithAnomaliesOptions-Context final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8"; final String dimensionName = "Dim1"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final ListDimensionValuesWithAnomaliesOptions options - = new ListDimensionValuesWithAnomaliesOptions(startTime, endTime) + = new ListDimensionValuesWithAnomaliesOptions() .setTop(10); PagedIterable dimensionValueIterable = metricsAdvisorClient.listDimensionValuesWithAnomalies(detectionConfigurationId, dimensionName, - options, + startTime, endTime, options, Context.NONE); Stream> dimensionValuePageStream = dimensionValueIterable.streamByPage(); @@ -441,22 +438,22 @@ public void listValuesOfDimensionWithAnomaliesWithContext() { System.out.printf("DataFeedDimension Value: %s%n", dimensionValue); } }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listDimensionValuesWithAnomalies#String-String-ListDimensionValuesWithAnomaliesOptions-Context + // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listDimensionValuesWithAnomalies#String-String-OffsetDateTime-OffsetDateTime-ListDimensionValuesWithAnomaliesOptions-Context } /** - * Code snippet for {@link MetricsAdvisorClient#listIncidentsForDetectionConfig(String, ListIncidentsDetectedOptions)}. + * Code snippet for {@link MetricsAdvisorClient#listIncidentsForDetectionConfig(String, OffsetDateTime, OffsetDateTime)}. */ public void listIncidentsForDetectionConfig() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentsForDetectionConfig#String-ListIncidentsDetectedOptions + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentsForDetectionConfig#String-OffsetDateTime-OffsetDateTime final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); - final ListIncidentsDetectedOptions options = new ListIncidentsDetectedOptions(startTime, endTime) + final ListIncidentsDetectedOptions options = new ListIncidentsDetectedOptions() .setTop(1000); PagedIterable incidentsIterable - = metricsAdvisorClient.listIncidentsForDetectionConfig(detectionConfigurationId, options); + = metricsAdvisorClient.listIncidentsForDetectionConfig(detectionConfigurationId, startTime, endTime); for (AnomalyIncident anomalyIncident : incidentsIterable) { System.out.printf("Data Feed Metric Id: %s%n", anomalyIncident.getMetricId()); @@ -467,23 +464,23 @@ public void listIncidentsForDetectionConfig() { System.out.printf("Anomaly Incident Status: %s%n", anomalyIncident.getStatus()); System.out.printf("Root DataFeedDimension Key: %s%n", anomalyIncident.getRootDimensionKey().asMap()); } - // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentsForDetectionConfig#String-ListIncidentsDetectedOptions + // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentsForDetectionConfig#String-OffsetDateTime-OffsetDateTime } /** - * Code snippet for {@link MetricsAdvisorClient#listIncidentsForDetectionConfig(String, ListIncidentsDetectedOptions, Context)}. + * Code snippet for {@link MetricsAdvisorClient#listIncidentsForDetectionConfig(String, OffsetDateTime, OffsetDateTime, ListIncidentsDetectedOptions, Context)}. */ public void listIncidentsForDetectionConfigWithContext() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentsForDetectionConfig#String-ListIncidentsDetectedOptions-Context + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentsForDetectionConfig#String-OffsetDateTime-OffsetDateTime-ListIncidentsDetectedOptions-Context final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); - final ListIncidentsDetectedOptions options = new ListIncidentsDetectedOptions(startTime, endTime) + final ListIncidentsDetectedOptions options = new ListIncidentsDetectedOptions() .setTop(1000); PagedIterable incidentsIterable = metricsAdvisorClient.listIncidentsForDetectionConfig(detectionConfigurationId, - options, + startTime, endTime, options, Context.NONE); Stream> incidentsPageStream = incidentsIterable.streamByPage(); @@ -503,24 +500,24 @@ public void listIncidentsForDetectionConfigWithContext() { System.out.printf("Root DataFeedDimension Key: %s%n", anomalyIncident.getRootDimensionKey().asMap()); } }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentsForDetectionConfig#String-ListIncidentsDetectedOptions-Context + // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listIncidentsForDetectionConfig#String-OffsetDateTime-OffsetDateTime-ListIncidentsDetectedOptions-Context } /* * Code snippet for {@link MetricsAdvisorClient#listAnomaliesForDetectionConfig(String, ListAnomaliesDetectedOptions)}. */ public void listAnomaliesForDetectionConfiguration() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForDetectionConfig#String-ListAnomaliesDetectedOptions + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForDetectionConfig#String-OffsetDateTime-OffsetDateTime final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); final ListAnomaliesDetectedFilter filter = new ListAnomaliesDetectedFilter() .setSeverityRange(AnomalySeverity.LOW, AnomalySeverity.MEDIUM); - final ListAnomaliesDetectedOptions options = new ListAnomaliesDetectedOptions(startTime, endTime) + final ListAnomaliesDetectedOptions options = new ListAnomaliesDetectedOptions() .setTop(10) .setFilter(filter); PagedIterable anomaliesIterable - = metricsAdvisorClient.listAnomaliesForDetectionConfig(detectionConfigurationId, options); + = metricsAdvisorClient.listAnomaliesForDetectionConfig(detectionConfigurationId, startTime, endTime); for (DataPointAnomaly dataPointAnomaly : anomaliesIterable) { System.out.printf("DataPointAnomaly AnomalySeverity: %s%n", dataPointAnomaly.getSeverity()); @@ -531,25 +528,25 @@ public void listAnomaliesForDetectionConfiguration() { dimension.getKey(), dimension.getValue()); } } - // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForDetectionConfig#String-ListAnomaliesDetectedOptions + // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForDetectionConfig#String-OffsetDateTime-OffsetDateTime } /** - * Code snippet for {@link MetricsAdvisorClient#listAnomaliesForDetectionConfig(String, ListAnomaliesDetectedOptions, Context)}. + * Code snippet for {@link MetricsAdvisorClient#listAnomaliesForDetectionConfig(String, OffsetDateTime, OffsetDateTime, ListAnomaliesDetectedOptions, Context)}. */ public void listAnomaliesForDetectionConfigurationWithContext() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForDetectionConfig#String-ListAnomaliesDetectedOptions-Context + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForDetectionConfig#String-OffsetDateTime-OffsetDateTime-ListAnomaliesDetectedOptions-Context final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T12:00:00Z"); final ListAnomaliesDetectedFilter filter = new ListAnomaliesDetectedFilter() .setSeverityRange(AnomalySeverity.LOW, AnomalySeverity.MEDIUM); - final ListAnomaliesDetectedOptions options = new ListAnomaliesDetectedOptions(startTime, endTime) + final ListAnomaliesDetectedOptions options = new ListAnomaliesDetectedOptions() .setTop(10) .setFilter(filter); PagedIterable anomaliesIterable = metricsAdvisorClient.listAnomaliesForDetectionConfig(detectionConfigurationId, - options, + startTime, endTime, options, Context.NONE); Stream> anomaliesPageStream = anomaliesIterable.streamByPage(); @@ -567,7 +564,7 @@ public void listAnomaliesForDetectionConfigurationWithContext() { } } }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForDetectionConfig#String-ListAnomaliesDetectedOptions-Context + // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listAnomaliesForDetectionConfig#String-OffsetDateTime-OffsetDateTime-ListAnomaliesDetectedOptions-Context } /* @@ -807,11 +804,8 @@ public void listIncidentRootCausesWithIncident() { final String detectionConfigurationId = "c0f2539f-b804-4ab9-a70f-0da0c89c76d8"; final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); - final ListIncidentsDetectedOptions options - = new ListIncidentsDetectedOptions(startTime, endTime) - .setTop(10); - metricsAdvisorClient.listIncidentsForDetectionConfig(detectionConfigurationId, options) + metricsAdvisorClient.listIncidentsForDetectionConfig(detectionConfigurationId, startTime, endTime) .forEach(incident -> { metricsAdvisorClient.listIncidentRootCauses(incident) .forEach(incidentRootCause -> { @@ -829,39 +823,39 @@ public void listIncidentRootCausesWithIncident() { * Code snippet for {@link MetricsAdvisorClient#listMetricEnrichmentStatus(String, ListMetricEnrichmentStatusOptions)}. */ public void listMetricEnrichmentStatus() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricEnrichmentStatus#String-ListMetricEnrichmentStatusOptions + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricEnrichmentStatus#String-OffsetDateTime-OffsetDateTime final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final String metricId = "d3gh4i4-b804-4ab9-a70f-0da0c89cft3l"; - final ListMetricEnrichmentStatusOptions options = new ListMetricEnrichmentStatusOptions(startTime, endTime); - metricsAdvisorClient.listMetricEnrichmentStatus(metricId, options) + final ListMetricEnrichmentStatusOptions options = new ListMetricEnrichmentStatusOptions().setTop(10); + metricsAdvisorClient.listMetricEnrichmentStatus(metricId, startTime, endTime) .forEach(enrichmentStatus -> { System.out.printf("Data Feed Metric enrichment status : %s%n", enrichmentStatus.getStatus()); System.out.printf("Data Feed Metric enrichment status message: %s%n", enrichmentStatus.getMessage()); System.out.printf("Data Feed Metric enrichment status data slice timestamp : %s%n", enrichmentStatus.getTimestamp()); }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricEnrichmentStatus#String-ListMetricEnrichmentStatusOptions + // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricEnrichmentStatus#String-OffsetDateTime-OffsetDateTime } /** - * Code snippet for {@link MetricsAdvisorClient#listMetricEnrichmentStatus(String, ListMetricEnrichmentStatusOptions, Context)}. + * Code snippet for {@link MetricsAdvisorClient#listMetricEnrichmentStatus(String, OffsetDateTime, OffsetDateTime, ListMetricEnrichmentStatusOptions, Context)}. */ public void listMetricEnrichmentStatusWithContext() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricEnrichmentStatus#String-ListMetricEnrichmentStatusOptions-Context + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricEnrichmentStatus#String-OffsetDateTime-OffsetDateTime-ListMetricEnrichmentStatusOptions-Context final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); final String metricId = "d3gh4i4-b804-4ab9-a70f-0da0c89cft3l"; - final ListMetricEnrichmentStatusOptions options = new ListMetricEnrichmentStatusOptions(startTime, endTime); + final ListMetricEnrichmentStatusOptions options = new ListMetricEnrichmentStatusOptions().setTop(10); - metricsAdvisorClient.listMetricEnrichmentStatus(metricId, options, Context.NONE) + metricsAdvisorClient.listMetricEnrichmentStatus(metricId, startTime, endTime, options, Context.NONE) .forEach(enrichmentStatus -> { System.out.printf("Data Feed Metric enrichment status : %s%n", enrichmentStatus.getStatus()); System.out.printf("Data Feed Metric enrichment status message: %s%n", enrichmentStatus.getMessage()); System.out.printf("Data Feed Metric enrichment status data slice timestamp : %s%n", enrichmentStatus.getTimestamp()); }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricEnrichmentStatus#String-ListMetricEnrichmentStatusOptions-Context + // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricEnrichmentStatus#String-OffsetDateTime-OffsetDateTime-ListMetricEnrichmentStatusOptions-Context } /** diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java index 6b9ff2987a2c..f140a7c00616 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ReadmeSamples.java @@ -24,7 +24,6 @@ import com.azure.ai.metricsadvisor.models.EmailNotificationHook; import com.azure.ai.metricsadvisor.models.HardThresholdCondition; import com.azure.ai.metricsadvisor.models.NotificationHook; -import com.azure.ai.metricsadvisor.models.ListAlertOptions; import com.azure.ai.metricsadvisor.models.ListDataFeedIngestionOptions; import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConditions; import com.azure.ai.metricsadvisor.models.MetricAnomalyAlertConfiguration; @@ -37,7 +36,6 @@ import com.azure.ai.metricsadvisor.models.SeverityCondition; import com.azure.ai.metricsadvisor.models.SmartDetectionCondition; import com.azure.ai.metricsadvisor.models.SuppressCondition; -import com.azure.ai.metricsadvisor.models.AlertQueryTimeMode; import com.azure.core.exception.HttpResponseException; import java.time.OffsetDateTime; @@ -229,11 +227,11 @@ public void configureAlert() { */ public void queryAlertsForDetection() { String alertConfigurationId = "9ol48er30-6e6e-4391-b78f-b00dfee1e6f5"; + final OffsetDateTime startTime = OffsetDateTime.parse("2020-01-01T00:00:00Z"); + final OffsetDateTime endTime = OffsetDateTime.parse("2020-09-09T00:00:00Z"); metricsAdvisorClient.listAlerts( alertConfigurationId, - new ListAlertOptions(OffsetDateTime.parse("2020-01-01T00:00:00Z"), - OffsetDateTime.now(), - AlertQueryTimeMode.ANOMALY_TIME)) + startTime, endTime) .forEach(alert -> { System.out.printf("AnomalyAlert Id: %s%n", alert.getId()); System.out.printf("AnomalyAlert created on: %s%n", alert.getCreatedTime()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertAsyncTest.java index 1eb025776229..c7d0a8646382 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertAsyncTest.java @@ -22,7 +22,9 @@ public void listAlerts(HttpClient httpClient, MetricsAdvisorServiceVersion servi MetricsAdvisorAsyncClient client = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildAsyncClient(); PagedFlux alertsFlux - = client.listAlerts(ListAlertsInput.INSTANCE.alertConfigurationId, ListAlertsInput.INSTANCE.options); + = client.listAlerts(ListAlertsInput.INSTANCE.alertConfigurationId, ListAlertsInput.INSTANCE.startTime, + ListAlertsInput.INSTANCE.endTime, ListAlertsInput.INSTANCE.options + ); Assertions.assertNotNull(alertsFlux); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertTest.java index d6b9088956a5..b9eebbb49f54 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertTest.java @@ -8,6 +8,7 @@ import com.azure.core.http.HttpClient; import com.azure.core.http.rest.PagedIterable; import com.azure.core.test.TestBase; +import com.azure.core.util.Context; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -38,7 +39,8 @@ public void listAlerts(HttpClient httpClient, MetricsAdvisorServiceVersion servi MetricsAdvisorClient client = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildClient(); PagedIterable alertsIterable - = client.listAlerts(ListAlertsInput.INSTANCE.alertConfigurationId, ListAlertsInput.INSTANCE.options); + = client.listAlerts(ListAlertsInput.INSTANCE.alertConfigurationId, ListAlertsInput.INSTANCE.startTime, + ListAlertsInput.INSTANCE.endTime, ListAlertsInput.INSTANCE.options, Context.NONE); int[] cnt = new int[1]; for (AnomalyAlert alert : alertsIterable) { diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertTestBase.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertTestBase.java index 98c7b6ff675a..7624bf21821a 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertTestBase.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AlertTestBase.java @@ -25,7 +25,8 @@ protected static class ListAlertsInput { final OffsetDateTime startTime = OffsetDateTime.parse("2020-10-10T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-10-21T00:00:00Z"); final AlertQueryTimeMode timeMode = AlertQueryTimeMode.ANOMALY_TIME; - final ListAlertOptions options = new ListAlertOptions(startTime, endTime, timeMode) + final ListAlertOptions options = new ListAlertOptions() + .setAlertQueryTimeMode(timeMode) .setTop(10); final String alertConfigurationId = ALERT_CONFIG_ID; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForDetectionConfigTestBase.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForDetectionConfigTestBase.java index ea2fc16a2f0b..64dd12a3d96a 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForDetectionConfigTestBase.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyForDetectionConfigTestBase.java @@ -29,7 +29,7 @@ protected static class ListAnomaliesForDetectionConfigInput { final OffsetDateTime endTime = TIME_SERIES_END_TIME; final ListAnomaliesDetectedFilter filter = new ListAnomaliesDetectedFilter() .setSeverityRange(AnomalySeverity.LOW, AnomalySeverity.MEDIUM); - final ListAnomaliesDetectedOptions options = new ListAnomaliesDetectedOptions(startTime, endTime) + final ListAnomaliesDetectedOptions options = new ListAnomaliesDetectedOptions() .setTop(10) .setFilter(filter); } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentDetectedAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentDetectedAsyncTest.java index 2b7b1ddb5940..821a9edf982c 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentDetectedAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentDetectedAsyncTest.java @@ -42,6 +42,7 @@ public void listIncidentsDetected(HttpClient httpClient, MetricsAdvisorServiceVe PagedFlux incidentsFlux = client.listIncidentsForDetectionConfig( ListIncidentsDetectedInput.INSTANCE.detectionConfigurationId, + ListIncidentsDetectedInput.INSTANCE.startTime, ListIncidentsDetectedInput.INSTANCE.endTime, ListIncidentsDetectedInput.INSTANCE.options); Assertions.assertNotNull(incidentsFlux); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentDetectedTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentDetectedTest.java index aad9a739fa6e..5f379f258fdf 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentDetectedTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/AnomalyIncidentDetectedTest.java @@ -7,6 +7,7 @@ import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.PagedIterable; +import com.azure.core.util.Context; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -23,7 +24,8 @@ public void listIncidentsDetected(HttpClient httpClient, MetricsAdvisorServiceVe PagedIterable incidentsIterable = client.listIncidentsForDetectionConfig( ListIncidentsDetectedInput.INSTANCE.detectionConfigurationId, - ListIncidentsDetectedInput.INSTANCE.options); + ListIncidentsDetectedInput.INSTANCE.startTime, ListIncidentsDetectedInput.INSTANCE.endTime, + ListIncidentsDetectedInput.INSTANCE.options, Context.NONE); for (AnomalyIncident anomalyIncident : incidentsIterable) { assertListIncidentsDetectedOutput(anomalyIncident); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentDetectedTestBase.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentDetectedTestBase.java index 94473ae2d16f..61829ae88620 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentDetectedTestBase.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/IncidentDetectedTestBase.java @@ -23,7 +23,7 @@ protected static class ListIncidentsDetectedInput { static final ListIncidentsDetectedInput INSTANCE = new ListIncidentsDetectedInput(); final OffsetDateTime startTime = OffsetDateTime.parse("2020-10-20T00:00:00Z"); final OffsetDateTime endTime = OffsetDateTime.parse("2020-10-21T00:00:00Z"); - final ListIncidentsDetectedOptions options = new ListIncidentsDetectedOptions(startTime, endTime) + final ListIncidentsDetectedOptions options = new ListIncidentsDetectedOptions() .setTop(1000); final String detectionConfigurationId = DETECTION_CONFIGURATION_ID; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesAsyncTest.java index 195c01b5313b..65b441163e1d 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesAsyncTest.java @@ -139,7 +139,7 @@ public void listMetricEnrichmentStatus(HttpClient httpClient, MetricsAdvisorServ List enrichmentStatuses = new ArrayList<>(); StepVerifier.create( client.listMetricEnrichmentStatus(ListEnrichmentStatusInput.INSTANCE.metricId, - ListEnrichmentStatusInput.INSTANCE.options)) + TIME_SERIES_START_TIME, TIME_SERIES_END_TIME, ListEnrichmentStatusInput.INSTANCE.options)) .thenConsumeWhile(enrichmentStatuses::add) .verifyComplete(); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesTest.java index 84923e307f0e..01475999ff05 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesTest.java @@ -131,7 +131,7 @@ public void listMetricEnrichmentStatus(HttpClient httpClient, MetricsAdvisorServ client = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildClient(); List enrichmentStatuses = client.listMetricEnrichmentStatus(ListEnrichmentStatusInput.INSTANCE.metricId, - ListEnrichmentStatusInput.INSTANCE.options) + TIME_SERIES_START_TIME, TIME_SERIES_END_TIME) .stream() .collect(Collectors.toList()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesTestBase.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesTestBase.java index c703de846454..8849038ec0d7 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesTestBase.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesTestBase.java @@ -43,7 +43,7 @@ public abstract class MetricsSeriesTestBase extends MetricsAdvisorClientTestBase protected static class ListEnrichmentStatusInput { static final ListEnrichmentStatusInput INSTANCE = new ListEnrichmentStatusInput(); final ListMetricEnrichmentStatusOptions options = - new ListMetricEnrichmentStatusOptions(TIME_SERIES_START_TIME, TIME_SERIES_END_TIME); + new ListMetricEnrichmentStatusOptions(); final String metricId = METRIC_ID; } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesAsyncTest.java index 09f6c173fab8..cce41366eb33 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesAsyncTest.java @@ -40,6 +40,8 @@ public void listValuesOfDimensionWithAnomalies(HttpClient httpClient, PagedFlux dimensionValuesFlux = client.listDimensionValuesWithAnomalies( ListValuesOfDimensionWithAnomaliesInput.INSTANCE.detectionConfigurationId, ListValuesOfDimensionWithAnomaliesInput.INSTANCE.dimensionName, + ListValuesOfDimensionWithAnomaliesInput.INSTANCE.startTime, + ListValuesOfDimensionWithAnomaliesInput.INSTANCE.endTime, ListValuesOfDimensionWithAnomaliesInput.INSTANCE.options); Assertions.assertNotNull(dimensionValuesFlux); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesTest.java index 03613a87a796..4a44ded73cbe 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesTest.java @@ -6,6 +6,7 @@ import com.azure.ai.metricsadvisor.models.MetricsAdvisorServiceVersion; import com.azure.core.http.HttpClient; import com.azure.core.http.rest.PagedIterable; +import com.azure.core.util.Context; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -23,7 +24,9 @@ public void listValuesOfDimensionWithAnomalies(HttpClient httpClient, PagedIterable dimensionValuesIterable = client.listDimensionValuesWithAnomalies( ListValuesOfDimensionWithAnomaliesInput.INSTANCE.detectionConfigurationId, ListValuesOfDimensionWithAnomaliesInput.INSTANCE.dimensionName, - ListValuesOfDimensionWithAnomaliesInput.INSTANCE.options); + ListValuesOfDimensionWithAnomaliesInput.INSTANCE.startTime, + ListValuesOfDimensionWithAnomaliesInput.INSTANCE.endTime, + ListValuesOfDimensionWithAnomaliesInput.INSTANCE.options, Context.NONE); int[] cnt = new int[1]; dimensionValuesIterable.forEach(value -> { diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesTestBase.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesTestBase.java index a172d8f846fd..7d736e2caeb1 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesTestBase.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/ValuesOfDimensionWithAnomaliesTestBase.java @@ -28,7 +28,7 @@ protected static class ListValuesOfDimensionWithAnomaliesInput { final OffsetDateTime startTime = TIME_SERIES_START_TIME; final OffsetDateTime endTime = TIME_SERIES_END_TIME; final ListDimensionValuesWithAnomaliesOptions options - = new ListDimensionValuesWithAnomaliesOptions(startTime, endTime) + = new ListDimensionValuesWithAnomaliesOptions() .setTop(10); final String detectionConfigurationId = DETECTION_CONFIGURATION_ID; final String dimensionName = DIMENSION_NAME; From c642b3136afa4bd12dff323b6063660339d30b78 Mon Sep 17 00:00:00 2001 From: Sameeksha Vaity Date: Wed, 4 Nov 2020 20:23:52 -0800 Subject: [PATCH 9/9] update review comments --- .../azure-ai-metricsadvisor/README.md | 2 +- .../MetricsAdvisorAsyncClient.java | 81 +++++++++++-------- .../metricsadvisor/MetricsAdvisorClient.java | 24 +++--- .../ListMetricSeriesDefinitionOptions.java | 19 ----- ...SeriesDefinitionsForMetricAsyncSample.java | 10 ++- .../ListSeriesDefinitionsForMetricSample.java | 8 +- ...AdvisorAsyncClientJavaDocCodeSnippets.java | 11 +-- ...tricsAdvisorClientJavaDocCodeSnippets.java | 25 +++--- .../MetricsSeriesAsyncTest.java | 7 +- .../ai/metricsadvisor/MetricsSeriesTest.java | 9 ++- 10 files changed, 96 insertions(+), 100 deletions(-) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md b/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md index 6ff0dcd03ce7..07410cf507ef 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md @@ -84,7 +84,7 @@ MetricsAdvisorAdministrationClient metricsAdvisorAdminClient = ### Data feed A data feed is what Metrics Advisor ingests from the user-specified data source such as Cosmos structure stream, SQL query result, and so on. -It contains rows of timestamps, zero or more dimensions, one or more etrics. Therefore, multiple metrics could share the same data source and even the same data feed. +It contains rows of timestamps, zero or more dimensions, one or more Metrics. Therefore, multiple metrics could share the same data source and even the same data feed. ### Data Feed Metric A metric is a quantifiable measure that is used to track and assess the status of a specific business process. It can be a combination of multiple time series values divided by dimensions, for example user count for a web vertical and en-us market. diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClient.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClient.java index 12b31503620d..8a28cec4c5e3 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClient.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClient.java @@ -121,49 +121,55 @@ public class MetricsAdvisorAsyncClient { * List series definition for a metric. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricSeriesDefinitions#String-ListMetricSeriesDefinitionOptions} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricSeriesDefinitions#String-OffsetDateTime-ListMetricSeriesDefinitionOptions} * * @param metricId metric unique id. + * @param activeSince the start time for querying series ingested after this time. * @param options the additional filtering attributes that can be provided to query the series. * * @return A {@link PagedFlux} of the {@link MetricSeriesDefinition metric series definitions}. * @throws IllegalArgumentException thrown if {@code metricId} fail the UUID format validation. * @throws ErrorCodeException thrown if the request is rejected by server. - * @throws NullPointerException thrown if the {@code metricId} or {@code options.activeSince} + * @throws NullPointerException thrown if the {@code metricId} or {@code activeSince} * is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) public PagedFlux listMetricSeriesDefinitions( String metricId, - ListMetricSeriesDefinitionOptions options) { + OffsetDateTime activeSince, ListMetricSeriesDefinitionOptions options) { try { return new PagedFlux<>(() -> withContext(context -> - listMetricSeriesDefinitionSinglePageAsync(metricId, options, context)), + listMetricSeriesDefinitionSinglePageAsync(metricId, activeSince, options, context)), continuationToken -> - withContext(context -> listMetricSeriesDefinitionNextPageAsync(continuationToken, options, - context))); + withContext(context -> listMetricSeriesDefinitionNextPageAsync(continuationToken, activeSince, + options, context))); } catch (RuntimeException ex) { return new PagedFlux<>(() -> monoError(logger, ex)); } } PagedFlux listMetricSeriesDefinitions(String metricId, - ListMetricSeriesDefinitionOptions options, Context context) { - return new PagedFlux<>(() -> listMetricSeriesDefinitionSinglePageAsync(metricId, options, context), - continuationToken -> listMetricSeriesDefinitionNextPageAsync(continuationToken, options, context)); + OffsetDateTime activeSince, ListMetricSeriesDefinitionOptions options, Context context) { + return new PagedFlux<>(() -> listMetricSeriesDefinitionSinglePageAsync(metricId, activeSince, options, + context), + continuationToken -> listMetricSeriesDefinitionNextPageAsync(continuationToken, activeSince, options, + context)); } private Mono> listMetricSeriesDefinitionSinglePageAsync(String metricId, - ListMetricSeriesDefinitionOptions options, Context context) { - Objects.requireNonNull(options, "'options' cannot be null."); + OffsetDateTime activeSince, ListMetricSeriesDefinitionOptions options, Context context) { - if (options.getActiveSince() == null) { - Objects.requireNonNull(options, "'options.activeSince' is required and cannot be null."); + if (activeSince == null) { + Objects.requireNonNull(options, "'activeSince' is required and cannot be null."); + } + + if (options == null) { + options = new ListMetricSeriesDefinitionOptions(); } final MetricSeriesQueryOptions metricSeriesQueryOptions = new MetricSeriesQueryOptions() - .setActiveSince(options.getActiveSince()).setDimensionFilter(options.getDimensionCombinationsToFilter()); + .setActiveSince(activeSince).setDimensionFilter(options.getDimensionCombinationsToFilter()); return service.getMetricSeriesSinglePageAsync(UUID.fromString(metricId), metricSeriesQueryOptions, options.getSkip(), options.getTop(), context) @@ -174,16 +180,19 @@ private Mono> listMetricSeriesDefinitionSi } private Mono> listMetricSeriesDefinitionNextPageAsync(String nextPageLink, - ListMetricSeriesDefinitionOptions options, Context context) { + OffsetDateTime activeSince, ListMetricSeriesDefinitionOptions options, Context context) { if (CoreUtils.isNullOrEmpty(nextPageLink)) { return Mono.empty(); } - Objects.requireNonNull(options, "'options' cannot be null."); - if (options.getActiveSince() == null) { - Objects.requireNonNull(options, "'options.activeSince' is required and cannot be null."); + if (activeSince == null) { + Objects.requireNonNull(options, "'activeSince' is required and cannot be null."); + } + + if (options == null) { + options = new ListMetricSeriesDefinitionOptions(); } final MetricSeriesQueryOptions metricSeriesQueryOptions = new MetricSeriesQueryOptions() - .setActiveSince(options.getActiveSince()).setDimensionFilter(options.getDimensionCombinationsToFilter()); + .setActiveSince(activeSince).setDimensionFilter(options.getDimensionCombinationsToFilter()); return service.getMetricSeriesNextSinglePageAsync(nextPageLink, metricSeriesQueryOptions, context) .doOnSubscribe(ignoredValue -> logger.info("Retrieving the next listing page - Page {}", nextPageLink)) @@ -393,7 +402,7 @@ public PagedFlux listMetricEnrichmentStatus( listMetricEnrichmentStatusSinglePageAsync(metricId, startTime, endTime, options, context)), continuationToken -> withContext(context -> listMetricEnrichmentStatusNextPageAsync(continuationToken, - startTime, endTime, options, context))); + startTime, endTime, context))); } catch (RuntimeException ex) { return new PagedFlux<>(() -> monoError(logger, ex)); } @@ -405,7 +414,7 @@ PagedFlux listMetricEnrichmentStatus( return new PagedFlux<>(() -> listMetricEnrichmentStatusSinglePageAsync(metricId, startTime, endTime, options, context), continuationToken -> listMetricEnrichmentStatusNextPageAsync(continuationToken, startTime, endTime, - options, context)); + context)); } private Mono> listMetricEnrichmentStatusSinglePageAsync(String metricId, @@ -426,9 +435,11 @@ private Mono> listMetricEnrichmentStatusSinglePa options.getSkip(), options.getTop(), withTracing) - .doOnRequest(ignoredValue -> logger.info("Listing all dimension values for a metric")) - .doOnSuccess(response -> logger.info("Listed all dimension values for a metric - {}", response)) - .doOnError(error -> logger.warning("Failed to list all dimension values for a metric information", error)) + .doOnRequest(ignoredValue -> logger.info("Listing all metric enrichment status values for a metric")) + .doOnSuccess(response -> logger.info("Listed all metric enrichment status values for a metric - {}", + response)) + .doOnError(error -> logger.warning("Failed to list all metric enrichment values for a metric information", + error)) .map(res -> new PagedResponseBase<>( res.getRequest(), res.getStatusCode(), @@ -439,7 +450,7 @@ private Mono> listMetricEnrichmentStatusSinglePa } private Mono> listMetricEnrichmentStatusNextPageAsync(String nextPageLink, - OffsetDateTime startTime, OffsetDateTime endTime, ListMetricEnrichmentStatusOptions options, Context context) { + OffsetDateTime startTime, OffsetDateTime endTime, Context context) { if (CoreUtils.isNullOrEmpty(nextPageLink)) { return Mono.empty(); } @@ -606,6 +617,10 @@ private Mono> listAnomaliesForDetectionConfigSin .setStartTime(startTime) .setEndTime(endTime); + if (options == null) { + options = new ListAnomaliesDetectedOptions(); + } + if (options.getFilter() != null) { DetectionAnomalyFilterCondition innerFilter = AnomalyTransforms.toInnerFilter(options.getFilter(), logger); @@ -639,6 +654,10 @@ private Mono> listAnomaliesForDetectionConfigNex .setStartTime(startTime) .setEndTime(endTime); + if (options == null) { + options = new ListAnomaliesDetectedOptions(); + } + if (options.getFilter() != null) { DetectionAnomalyFilterCondition innerFilter = AnomalyTransforms.toInnerFilter(options.getFilter(), logger); @@ -687,8 +706,7 @@ public PagedFlux listIncidentsForDetectionConfig( options, context)), continuationToken -> - withContext(context -> listIncidentsForDetectionConfigNextPageAsync(continuationToken, startTime, - endTime, + withContext(context -> listIncidentsForDetectionConfigNextPageAsync(continuationToken, context))); } catch (RuntimeException ex) { return new PagedFlux<>(() -> FluxUtil.monoError(logger, ex)); @@ -702,7 +720,7 @@ PagedFlux listIncidentsForDetectionConfig( listIncidentsForDetectionConfigSinglePageAsync(detectionConfigurationId, startTime, endTime, options, context), continuationToken -> - listIncidentsForDetectionConfigNextPageAsync(continuationToken, startTime, endTime, context)); + listIncidentsForDetectionConfigNextPageAsync(continuationToken, context)); } private Mono> listIncidentsForDetectionConfigSinglePageAsync( @@ -744,8 +762,7 @@ private Mono> listIncidentsForDetectionConfigSing } private Mono> listIncidentsForDetectionConfigNextPageAsync( - String nextPageLink, - OffsetDateTime startTime, OffsetDateTime endTime, Context context) { + String nextPageLink, Context context) { if (CoreUtils.isNullOrEmpty(nextPageLink)) { return Mono.empty(); } @@ -1018,9 +1035,7 @@ PagedFlux listAlerts( return new PagedFlux<>(() -> listAlertsSinglePageAsync(alertConfigurationId, startTime, endTime, options, context), continuationToken -> - listAlertsNextPageAsync(continuationToken, - startTime, endTime, options, - context)); + listAlertsNextPageAsync(continuationToken, startTime, endTime, options, context)); } private Mono> listAlertsSinglePageAsync( diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorClient.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorClient.java index 9ad46af5b6da..781f85849548 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorClient.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/MetricsAdvisorClient.java @@ -64,45 +64,43 @@ public class MetricsAdvisorClient { * List series (dimension combinations) from metric. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesDefinitions#String-ListMetricSeriesDefinitionOptions} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesDefinitions#String-OffsetDateTime} * * @param metricId metric unique id. - * @param options the additional filtering attributes that can be provided to query the series. - * + * @param activeSince the start time for querying series ingested after this time. * @return A {@link PagedIterable} of the {@link MetricSeriesDefinition metric series definitions}. * @throws IllegalArgumentException thrown if {@code metricId} fail the UUID format validation. * @throws ErrorCodeException thrown if the request is rejected by server. - * @throws NullPointerException thrown if the {@code metricId} or {@code options.activeSince} + * @throws NullPointerException thrown if the {@code metricId} or {@code activeSince} * is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) public PagedIterable listMetricSeriesDefinitions( - String metricId, - ListMetricSeriesDefinitionOptions options) { - return listMetricSeriesDefinitions(metricId, options, Context.NONE); + String metricId, OffsetDateTime activeSince) { + return listMetricSeriesDefinitions(metricId, activeSince, null, Context.NONE); } /** * List series (dimension combinations) from metric. * *

Code sample

- * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesDefinitions#String-ListMetricSeriesDefinitionOptions-Context} + * {@codesnippet com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesDefinitions#String-OffsetDateTime-ListMetricSeriesDefinitionOptions-Context} * * @param metricId metric unique id. + * @param activeSince the start time for querying series ingested after this time. * @param options the additional filtering attributes that can be provided to query the series. * @param context Additional context that is passed through the HTTP pipeline during the service call. * * @return A {@link PagedIterable} of the {@link MetricSeriesDefinition metric series definitions}. * @throws IllegalArgumentException thrown if {@code metricId} fail the UUID format validation. * @throws ErrorCodeException thrown if the request is rejected by server. - * @throws NullPointerException thrown if the {@code metricId} or {@code options.activeSince} + * @throws NullPointerException thrown if the {@code metricId} or {@code activeSince} * is null. */ @ServiceMethod(returns = ReturnType.COLLECTION) - public PagedIterable listMetricSeriesDefinitions( - String metricId, - ListMetricSeriesDefinitionOptions options, Context context) { - return new PagedIterable<>(client.listMetricSeriesDefinitions(metricId, options, + public PagedIterable listMetricSeriesDefinitions(String metricId, + OffsetDateTime activeSince, ListMetricSeriesDefinitionOptions options, Context context) { + return new PagedIterable<>(client.listMetricSeriesDefinitions(metricId, activeSince, options, context == null ? Context.NONE : context)); } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListMetricSeriesDefinitionOptions.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListMetricSeriesDefinitionOptions.java index 1a3a42834226..b9dce1aa478e 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListMetricSeriesDefinitionOptions.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/models/ListMetricSeriesDefinitionOptions.java @@ -5,7 +5,6 @@ import com.azure.core.annotation.Fluent; -import java.time.OffsetDateTime; import java.util.List; import java.util.Map; @@ -14,20 +13,10 @@ */ @Fluent public final class ListMetricSeriesDefinitionOptions { - private final OffsetDateTime activeSince; private Map> dimensionCombinations; private Integer top; private Integer skip; - /** - * Create an instance of ListMetricSeriesDefinitionOptions object. - * - * @param activeSince the start time for querying series ingested after this time. - */ - public ListMetricSeriesDefinitionOptions(OffsetDateTime activeSince) { - this.activeSince = activeSince; - } - /** * Gets the dimension key and values. *

@@ -103,12 +92,4 @@ public ListMetricSeriesDefinitionOptions setSkip(int skip) { return this; } - /** - * Get the start time for querying series ingested after this time. - * - * @return the activeSince value. - */ - public OffsetDateTime getActiveSince() { - return this.activeSince; - } } diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDefinitionsForMetricAsyncSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDefinitionsForMetricAsyncSample.java index 588b55c4d892..5c03a6b184cb 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDefinitionsForMetricAsyncSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDefinitionsForMetricAsyncSample.java @@ -22,15 +22,17 @@ public static void main(String[] args) { .credential(new MetricsAdvisorKeyCredential("subscription_key", "api_key")) .buildAsyncClient(); - String metricId = "b460abfc-7a58-47d7-9d99-21ee21fdfc6e"; + final String metricId = "b460abfc-7a58-47d7-9d99-21ee21fdfc6e"; + final OffsetDateTime activeSince = OffsetDateTime.parse("2020-07-10T00:00:00Z"); + final ListMetricSeriesDefinitionOptions options - = new ListMetricSeriesDefinitionOptions(OffsetDateTime.parse("2020-07-10T00:00:00Z")) + = new ListMetricSeriesDefinitionOptions() .setTop(10) .setDimensionCombinationToFilter(new HashMap>() {{ - put("Dim2", Collections.singletonList("Angelfish")); + put("city", Collections.singletonList("Redmond")); }}); - advisorAsyncClient.listMetricSeriesDefinitions(metricId, options) + advisorAsyncClient.listMetricSeriesDefinitions(metricId, activeSince, options) .doOnNext(metricSeriesDefinition -> { System.out.printf("Data Feed Metric Id : %s%n", metricSeriesDefinition.getMetricId()); System.out.printf("Series Key: %s%n", metricSeriesDefinition.getSeriesKey().asMap()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDefinitionsForMetricSample.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDefinitionsForMetricSample.java index db937e6aeb3e..434f7163af8b 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDefinitionsForMetricSample.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/ListSeriesDefinitionsForMetricSample.java @@ -5,6 +5,7 @@ import com.azure.ai.metricsadvisor.models.ListMetricSeriesDefinitionOptions; import com.azure.ai.metricsadvisor.models.MetricsAdvisorKeyCredential; +import com.azure.core.util.Context; import java.time.OffsetDateTime; import java.util.Collections; @@ -24,14 +25,15 @@ public static void main(String[] args) { .buildClient(); String metricId = "b460abfc-7a58-47d7-9d99-21ee21fdfc6e"; + final OffsetDateTime activeSince = OffsetDateTime.parse("2020-07-10T00:00:00Z"); final ListMetricSeriesDefinitionOptions options - = new ListMetricSeriesDefinitionOptions(OffsetDateTime.parse("2020-07-10T00:00:00Z")) + = new ListMetricSeriesDefinitionOptions() .setTop(10) .setDimensionCombinationToFilter(new HashMap>() {{ - put("Dim2", Collections.singletonList("Angelfish")); + put("city", Collections.singletonList("Redmond")); }}); - advisorClient.listMetricSeriesDefinitions(metricId, options) + advisorClient.listMetricSeriesDefinitions(metricId, activeSince, options, Context.NONE) .forEach(metricSeriesDefinition -> { System.out.printf("Data Feed Metric Id : %s%n", metricSeriesDefinition.getMetricId()); System.out.printf("Series Key: %s%n", metricSeriesDefinition.getSeriesKey().asMap()); diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClientJavaDocCodeSnippets.java index 486134fe079a..accb3e8cf772 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClientJavaDocCodeSnippets.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorAsyncClientJavaDocCodeSnippets.java @@ -83,26 +83,27 @@ public void createMetricAdvisorAsyncClientWithPipeline() { /** * Code snippet for - * {@link MetricsAdvisorAsyncClient#listMetricSeriesDefinitions(String, ListMetricSeriesDefinitionOptions)} + * {@link MetricsAdvisorAsyncClient#listMetricSeriesDefinitions(String, OffsetDateTime, ListMetricSeriesDefinitionOptions)} */ public void listMetricSeriesDefinitions() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricSeriesDefinitions#String-ListMetricSeriesDefinitionOptions + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricSeriesDefinitions#String-OffsetDateTime-ListMetricSeriesDefinitionOptions String metricId = "b460abfc-7a58-47d7-9d99-21ee21fdfc6e"; + final OffsetDateTime activeSince = OffsetDateTime.parse("2020-07-10T00:00:00Z"); final ListMetricSeriesDefinitionOptions options - = new ListMetricSeriesDefinitionOptions(OffsetDateTime.parse("2020-07-10T00:00:00Z")) + = new ListMetricSeriesDefinitionOptions() .setTop(10) .setDimensionCombinationToFilter(new HashMap>() {{ put("Dim2", Collections.singletonList("Angelfish")); }}); - metricsAdvisorAsyncClient.listMetricSeriesDefinitions(metricId, options) + metricsAdvisorAsyncClient.listMetricSeriesDefinitions(metricId, activeSince, options) .subscribe(metricSeriesDefinition -> { System.out.printf("Data Feed Metric id for the retrieved series definition : %s%n", metricSeriesDefinition.getMetricId()); System.out.printf("Series Key:"); System.out.println(metricSeriesDefinition.getSeriesKey().asMap()); }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricSeriesDefinitions#String-ListMetricSeriesDefinitionOptions + // END: com.azure.ai.metricsadvisor.MetricsAdvisorAsyncClient.listMetricSeriesDefinitions#String-OffsetDateTime-ListMetricSeriesDefinitionOptions } /** diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java index 40a404627d7f..f4a25025f797 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/samples/java/com/azure/ai/metricsadvisor/MetricsAdvisorClientJavaDocCodeSnippets.java @@ -91,48 +91,45 @@ public void createMetricsAdvisorAsyncClientWithPipeline() { /** * Code snippet for - * {@link MetricsAdvisorClient#listMetricSeriesDefinitions(String, ListMetricSeriesDefinitionOptions)} + * {@link MetricsAdvisorClient#listMetricSeriesDefinitions(String, OffsetDateTime)} */ public void listMetricSeriesDefinitions() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesDefinitions#String-ListMetricSeriesDefinitionOptions - + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesDefinitions#String-OffsetDateTime + final OffsetDateTime activeSince = OffsetDateTime.parse("2020-07-10T00:00:00Z"); metricsAdvisorClient.listMetricSeriesDefinitions( "metricId", - new ListMetricSeriesDefinitionOptions(OffsetDateTime.now()) - .setDimensionCombinationToFilter(new HashMap>() {{ - put("Dimension1", Arrays.asList("value1", "value2")); - }}) - .setTop(3)) + activeSince) .forEach(metricSeriesDefinition -> { System.out.printf("Data Feed Metric id for the retrieved series definition : %s%n", metricSeriesDefinition.getMetricId()); System.out.printf("Data Feed Metric dimension: %s%n", metricSeriesDefinition.getSeriesKey().asMap()); }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesDefinitions#String-ListMetricSeriesDefinitionOptions + // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesDefinitions#String-OffsetDateTime } /** * Code snippet for - * {@link MetricsAdvisorClient#listMetricSeriesDefinitions(String, ListMetricSeriesDefinitionOptions, Context)} + * {@link MetricsAdvisorClient#listMetricSeriesDefinitions(String, OffsetDateTime, ListMetricSeriesDefinitionOptions, Context)} */ public void listMetricSeriesDefinitionsWithContext() { - // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesDefinitions#String-ListMetricSeriesDefinitionOptions-Context + // BEGIN: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesDefinitions#String-OffsetDateTime-ListMetricSeriesDefinitionOptions-Context String metricId = "b460abfc-7a58-47d7-9d99-21ee21fdfc6e"; + final OffsetDateTime activeSince = OffsetDateTime.parse("2020-07-10T00:00:00Z"); final ListMetricSeriesDefinitionOptions options - = new ListMetricSeriesDefinitionOptions(OffsetDateTime.parse("2020-07-10T00:00:00Z")) + = new ListMetricSeriesDefinitionOptions() .setTop(10) .setDimensionCombinationToFilter(new HashMap>() {{ put("Dim2", Collections.singletonList("Angelfish")); }}); - metricsAdvisorClient.listMetricSeriesDefinitions(metricId, options, Context.NONE) + metricsAdvisorClient.listMetricSeriesDefinitions(metricId, activeSince, options, Context.NONE) .forEach(metricSeriesDefinition -> { System.out.printf("Data Feed Metric id for the retrieved series definition : %s%n", metricSeriesDefinition.getMetricId()); System.out.printf("Series Key:"); System.out.println(metricSeriesDefinition.getSeriesKey().asMap()); }); - // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesDefinitions#String-ListMetricSeriesDefinitionOptions-Context + // END: com.azure.ai.metricsadvisor.MetricsAdvisorClient.listMetricSeriesDefinitions#String-OffsetDateTime-ListMetricSeriesDefinitionOptions-Context } /** diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesAsyncTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesAsyncTest.java index 65b441163e1d..cc540d2a7455 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesAsyncTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesAsyncTest.java @@ -99,8 +99,7 @@ public void listMetricSeriesData(HttpClient httpClient, MetricsAdvisorServiceVer @MethodSource("com.azure.ai.metricsadvisor.TestUtils#getTestParameters") public void listMetricSeriesDefinitions(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { client = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildAsyncClient(); - StepVerifier.create(client.listMetricSeriesDefinitions(METRIC_ID, - new ListMetricSeriesDefinitionOptions(TIME_SERIES_START_TIME))) + StepVerifier.create(client.listMetricSeriesDefinitions(METRIC_ID, TIME_SERIES_START_TIME, null)) .thenConsumeWhile(metricSeriesDefinition -> metricSeriesDefinition.getMetricId() != null && metricSeriesDefinition.getSeriesKey() != null) .verifyComplete(); @@ -114,8 +113,8 @@ public void listMetricSeriesDefinitions(HttpClient httpClient, MetricsAdvisorSer public void listMetricSeriesDefinitionsDimensionFilter(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { client = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildAsyncClient(); List actualMetricSeriesDefinitions = new ArrayList<>(); - StepVerifier.create(client.listMetricSeriesDefinitions(METRIC_ID, - new ListMetricSeriesDefinitionOptions(TIME_SERIES_START_TIME) + StepVerifier.create(client.listMetricSeriesDefinitions(METRIC_ID, TIME_SERIES_START_TIME, + new ListMetricSeriesDefinitionOptions() .setDimensionCombinationToFilter(new HashMap>() {{ put("city", Collections.singletonList("Miami")); }}))) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesTest.java b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesTest.java index 01475999ff05..efc10205b5ce 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesTest.java +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/src/test/java/com/azure/ai/metricsadvisor/MetricsSeriesTest.java @@ -93,7 +93,7 @@ public void listMetricSeriesData(HttpClient httpClient, MetricsAdvisorServiceVer public void listMetricSeriesDefinitions(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { client = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildClient(); client.listMetricSeriesDefinitions(METRIC_ID, - new ListMetricSeriesDefinitionOptions(TIME_SERIES_START_TIME)) + TIME_SERIES_START_TIME) .forEach(metricSeriesDefinition -> { assertNotNull(metricSeriesDefinition.getMetricId()); assertNotNull(metricSeriesDefinition.getSeriesKey()); @@ -108,11 +108,12 @@ public void listMetricSeriesDefinitions(HttpClient httpClient, MetricsAdvisorSer public void listMetricSeriesDefinitionsDimensionFilter(HttpClient httpClient, MetricsAdvisorServiceVersion serviceVersion) { client = getMetricsAdvisorBuilder(httpClient, serviceVersion).buildClient(); - List actualMetricSeriesDefinitions = client.listMetricSeriesDefinitions(METRIC_ID, - new ListMetricSeriesDefinitionOptions(TIME_SERIES_START_TIME) + List actualMetricSeriesDefinitions + = client.listMetricSeriesDefinitions(METRIC_ID, TIME_SERIES_START_TIME, + new ListMetricSeriesDefinitionOptions() .setDimensionCombinationToFilter(new HashMap>() {{ put("city", Collections.singletonList("Miami")); - }})) + }}), Context.NONE) .stream().collect(Collectors.toList()); actualMetricSeriesDefinitions.forEach(metricSeriesDefinition -> {