minor fix on monitor dynamic criteria (#857)

* minor fix on monitor dynamic criteria

* try with trusty for travis

.travis.yml

@@ -1,5 +1,6 @@
 if: branch = master
 
+dist: trusty
 language: java
 sudo: required
 jdk:

azure-mgmt-monitor/src/main/java/com/microsoft/azure/management/monitor/MetricAlert.java

@@ -137,14 +137,13 @@ interface Definition extends
      */
     interface DefinitionMultipleResource extends
             DefinitionStages.Blank,
-            DefinitionStages.WithCreate,
+            DefinitionStages.WithCreateDynamicCondition,
             DefinitionStages.WithScopes,
             DefinitionStages.WithWindowSizeMultipleResource,
             DefinitionStages.WithEvaluationFrequencyMultipleResource,
             DefinitionStages.WithSeverityMultipleResource,
             DefinitionStages.WithActionGroupMultipleResource,
-            DefinitionStages.WithCriteriaDefinitionMultipleResource,
-            DefinitionStages.WithCreateDynamicCondition {
+            DefinitionStages.WithCriteriaDefinitionMultipleResource {
     }
 
     /**

azure-mgmt-monitor/src/main/java/com/microsoft/azure/management/monitor/MetricDynamicAlertCondition.java

@@ -322,6 +322,29 @@ interface UpdateStages {
          */
         UpdateStages withoutDimension(String dimensionName);
 
+        /**
+         * Sets the failing periods for triggering the alert.
+         *
+         * @param failingPeriods the failing periods for triggering the alert.
+         * @return the next stage of metric alert condition definition.
+         */
+        UpdateStages withFailingPeriods(DynamicThresholdFailingPeriods failingPeriods);
+
+        /**
+         * Sets the date from which to start learning the metric historical data and calculate the dynamic thresholds.
+         *
+         * @param date the date from which to start learning the metric historical data and calculate the dynamic thresholds.
+         * @return the next stage of metric alert condition definition.
+         */
+        UpdateStages withIgnoreDataBefore(DateTime date);
+
+        /**
+         * Removes the date from which to start learning the metric historical data and calculate the dynamic thresholds.
+         *
+         * @return the next stage of the metric alert condition update.
+         */
+        UpdateStages withoutIgnoreDataBefore();
+
         /**
          * Returns back to the metric alert update flow.
          *

azure-mgmt-monitor/src/main/java/com/microsoft/azure/management/monitor/implementation/MetricAlertImpl.java

@@ -295,15 +295,15 @@ public MetricAlertImpl withMultipleTargetResources(Collection<? extends Resource
 
         List<String> resourceIds = new ArrayList<>();
         String type = resources.iterator().next().type();
-        String region = resources.iterator().next().regionName();
+        String regionName = resources.iterator().next().regionName();
         for (Resource resource : resources) {
-            if (!type.equalsIgnoreCase(resource.type()) || !region.equalsIgnoreCase(resource.regionName())) {
-                throw new IllegalArgumentException("Target resource must be of same resource type and in same region");
+            if (!type.equalsIgnoreCase(resource.type()) || !regionName.equalsIgnoreCase(resource.regionName())) {
+                throw new IllegalArgumentException("Target resource must be of the same resource type and in the same region");
             }
 
             resourceIds.add(resource.id());
         }
-        return this.withMultipleTargetResources(resourceIds, type, region);
+        return this.withMultipleTargetResources(resourceIds, type, regionName);
     }
 
     @Override

azure-mgmt-monitor/src/main/java/com/microsoft/azure/management/monitor/implementation/MetricDynamicAlertConditionImpl.java

@@ -91,4 +91,10 @@ public MetricDynamicAlertConditionImpl withIgnoreDataBefore(DateTime date) {
         this.inner().withIgnoreDataBefore(date);
         return this;
     }
+
+    @Override
+    public MetricDynamicAlertConditionImpl withoutIgnoreDataBefore() {
+        this.inner().withIgnoreDataBefore(null);
+        return this;
+    }
 }