aws-sdk-cloudwatch 1.56.0 → 1.60.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90cac4a2fa80a39ea0f85297a2b2ba94cc08d4a4917a659018be41bd5fe85755
-  data.tar.gz: 6c328a1deb4de02a7e1fd966d313c0873ccff197d64b8ff20ad8466e99e0a7da
+  metadata.gz: b8c9fce0d442b510c219046fafb4cbf27ad89d7f241534a9465a8c9fcecfbe5e
+  data.tar.gz: a16114cfc5990edf866cc7f93b13872fb2367dbd94f14e69e072ea04e8376b52
 SHA512:
-  metadata.gz: 2f1b118432b0e3dd8551f54304a5b7ad9a3db0f3f403f82c555e6a8a86c57bfda9d7a8be81119d0ffd659b3434a9bd8914787162db231d6f0f9d86067298145c
-  data.tar.gz: 13e3d7180a676fd76ad5b29448845d2e3797ff32df75169288054d5871f77a0b62b8a064086b602915d1efe238522b0751c5d6604c189a76e9d0e41ec8a70fb0
+  metadata.gz: 2b6a2fa6f05ceb783a5c6c7cb9e9f06c9589a3e994f66ddef75910780f70d37baa93b7b1eccc9ec7dd4b69a7ad0ad55d3e7286fdc12f9d152eda29ad57c0c610
+  data.tar.gz: 139736a09826dc2b44e0c3ed1427bca6f2ac863a7ea67f1168930b98209e09144744f50440434d6860413b928b9ba331d3f39360d4bdfef147b0ff3c7779b49b

data/CHANGELOG.md

@@ -1,6 +1,26 @@
 Unreleased Changes
 ------------------
 
+1.60.0 (2021-12-21)
+------------------
+
+* Feature - Code Generated Changes, see `./build_tools` or `aws-sdk-core`'s CHANGELOG.md for details.
+
+1.59.0 (2021-11-30)
+------------------
+
+* Feature - Code Generated Changes, see `./build_tools` or `aws-sdk-core`'s CHANGELOG.md for details.
+
+1.58.0 (2021-11-18)
+------------------
+
+* Feature - CloudWatch Anomaly Detection now supports anomaly detectors that use metric math as input.
+
+1.57.0 (2021-11-04)
+------------------
+
+* Feature - Code Generated Changes, see `./build_tools` or `aws-sdk-core`'s CHANGELOG.md for details.
+
 1.56.0 (2021-10-18)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.56.0
+1.60.0

data/lib/aws-sdk-cloudwatch/client.rb

@@ -27,6 +27,7 @@ require 'aws-sdk-core/plugins/client_metrics_plugin.rb'
 require 'aws-sdk-core/plugins/client_metrics_send_plugin.rb'
 require 'aws-sdk-core/plugins/transfer_encoding.rb'
 require 'aws-sdk-core/plugins/http_checksum.rb'
+require 'aws-sdk-core/plugins/defaults_mode.rb'
 require 'aws-sdk-core/plugins/signature_v4.rb'
 require 'aws-sdk-core/plugins/protocols/query.rb'
 
@@ -73,6 +74,7 @@ module Aws::CloudWatch
     add_plugin(Aws::Plugins::ClientMetricsSendPlugin)
     add_plugin(Aws::Plugins::TransferEncoding)
     add_plugin(Aws::Plugins::HttpChecksum)
+    add_plugin(Aws::Plugins::DefaultsMode)
     add_plugin(Aws::Plugins::SignatureV4)
     add_plugin(Aws::Plugins::Protocols::Query)
 
@@ -119,7 +121,9 @@ module Aws::CloudWatch
     #     * EC2/ECS IMDS instance profile - When used by default, the timeouts
     #       are very aggressive. Construct and pass an instance of
     #       `Aws::InstanceProfileCredentails` or `Aws::ECSCredentials` to
-    #       enable retries and extended timeouts.
+    #       enable retries and extended timeouts. Instance profile credential
+    #       fetching can be disabled by setting ENV['AWS_EC2_METADATA_DISABLED']
+    #       to true.
     #
     #   @option options [required, String] :region
     #     The AWS region to connect to.  The configured `:region` is
@@ -173,6 +177,10 @@ module Aws::CloudWatch
     #     Used only in `standard` and adaptive retry modes. Specifies whether to apply
     #     a clock skew correction and retry requests with skewed client clocks.
     #
+    #   @option options [String] :defaults_mode ("legacy")
+    #     See {Aws::DefaultsModeConfiguration} for a list of the
+    #     accepted modes and the configuration defaults that are included.
+    #
     #   @option options [Boolean] :disable_host_prefix_injection (false)
     #     Set to true to disable SDK automatically adding host prefix
     #     to default service endpoint when available.
@@ -275,6 +283,15 @@ module Aws::CloudWatch
     #     ** Please note ** When response stubbing is enabled, no HTTP
     #     requests are made, and retries are disabled.
     #
+    #   @option options [Boolean] :use_dualstack_endpoint
+    #     When set to `true`, dualstack enabled endpoints (with `.aws` TLD)
+    #     will be used if available.
+    #
+    #   @option options [Boolean] :use_fips_endpoint
+    #     When set to `true`, fips compatible endpoints will be used if available.
+    #     When a `fips` region is used, the region is normalized and this config
+    #     is set to `true`.
+    #
     #   @option options [Boolean] :validate_params (true)
     #     When `true`, request parameters are validated before
     #     sending the request.
@@ -286,7 +303,7 @@ module Aws::CloudWatch
     #     seconds to wait when opening a HTTP session before raising a
     #     `Timeout::Error`.
     #
-    #   @option options [Integer] :http_read_timeout (60) The default
+    #   @option options [Float] :http_read_timeout (60) The default
     #     number of seconds to wait for response data.  This value can
     #     safely be set per-request on the session.
     #
@@ -302,6 +319,9 @@ module Aws::CloudWatch
     #     disables this behaviour.  This value can safely be set per
     #     request on the session.
     #
+    #   @option options [Float] :ssl_timeout (nil) Sets the SSL timeout
+    #     in seconds.
+    #
     #   @option options [Boolean] :http_wire_trace (false) When `true`,
     #     HTTP debug output will be sent to the `:logger`.
     #
@@ -375,33 +395,111 @@ module Aws::CloudWatch
 
     # Deletes the specified anomaly detection model from your account.
     #
-    # @option params [required, String] :namespace
+    # @option params [String] :namespace
     #   The namespace associated with the anomaly detection model to delete.
     #
-    # @option params [required, String] :metric_name
+    # @option params [String] :metric_name
     #   The metric name associated with the anomaly detection model to delete.
     #
     # @option params [Array<Types::Dimension>] :dimensions
     #   The metric dimensions associated with the anomaly detection model to
     #   delete.
     #
-    # @option params [required, String] :stat
+    # @option params [String] :stat
     #   The statistic associated with the anomaly detection model to delete.
     #
+    # @option params [Types::SingleMetricAnomalyDetector] :single_metric_anomaly_detector
+    #   A single metric anomaly detector to be deleted.
+    #
+    #   When using `SingleMetricAnomalyDetector`, you cannot include the
+    #   following parameters in the same operation:
+    #
+    #   * `Dimensions`,
+    #
+    #   * `MetricName`
+    #
+    #   * `Namespace`
+    #
+    #   * `Stat`
+    #
+    #   * the `MetricMathAnomalyDetector` parameters of
+    #     `DeleteAnomalyDetectorInput`
+    #
+    #   Instead, specify the single metric anomaly detector attributes as part
+    #   of the `SingleMetricAnomalyDetector` property.
+    #
+    # @option params [Types::MetricMathAnomalyDetector] :metric_math_anomaly_detector
+    #   The metric math anomaly detector to be deleted.
+    #
+    #   When using `MetricMathAnomalyDetector`, you cannot include following
+    #   parameters in the same operation:
+    #
+    #   * `Dimensions`,
+    #
+    #   * `MetricName`
+    #
+    #   * `Namespace`
+    #
+    #   * `Stat`
+    #
+    #   * the `SingleMetricAnomalyDetector` parameters of
+    #     `DeleteAnomalyDetectorInput`
+    #
+    #   Instead, specify the metric math anomaly detector attributes as part
+    #   of the `MetricMathAnomalyDetector` property.
+    #
     # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
     #
     # @example Request syntax with placeholder values
     #
     #   resp = client.delete_anomaly_detector({
-    #     namespace: "Namespace", # required
-    #     metric_name: "MetricName", # required
+    #     namespace: "Namespace",
+    #     metric_name: "MetricName",
     #     dimensions: [
     #       {
     #         name: "DimensionName", # required
     #         value: "DimensionValue", # required
     #       },
     #     ],
-    #     stat: "AnomalyDetectorMetricStat", # required
+    #     stat: "AnomalyDetectorMetricStat",
+    #     single_metric_anomaly_detector: {
+    #       namespace: "Namespace",
+    #       metric_name: "MetricName",
+    #       dimensions: [
+    #         {
+    #           name: "DimensionName", # required
+    #           value: "DimensionValue", # required
+    #         },
+    #       ],
+    #       stat: "AnomalyDetectorMetricStat",
+    #     },
+    #     metric_math_anomaly_detector: {
+    #       metric_data_queries: [
+    #         {
+    #           id: "MetricId", # required
+    #           metric_stat: {
+    #             metric: { # required
+    #               namespace: "Namespace",
+    #               metric_name: "MetricName",
+    #               dimensions: [
+    #                 {
+    #                   name: "DimensionName", # required
+    #                   value: "DimensionValue", # required
+    #                 },
+    #               ],
+    #             },
+    #             period: 1, # required
+    #             stat: "Stat", # required
+    #             unit: "Seconds", # accepts Seconds, Microseconds, Milliseconds, Bytes, Kilobytes, Megabytes, Gigabytes, Terabytes, Bits, Kilobits, Megabits, Gigabits, Terabits, Percent, Count, Bytes/Second, Kilobytes/Second, Megabytes/Second, Gigabytes/Second, Terabytes/Second, Bits/Second, Kilobits/Second, Megabits/Second, Gigabits/Second, Terabits/Second, Count/Second, None
+    #           },
+    #           expression: "MetricExpression",
+    #           label: "MetricLabel",
+    #           return_data: false,
+    #           period: 1,
+    #           account_id: "AccountId",
+    #         },
+    #       ],
+    #     },
     #   })
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/monitoring-2010-08-01/DeleteAnomalyDetector AWS API Documentation
@@ -508,6 +606,12 @@ module Aws::CloudWatch
     # CloudWatch retains the history of an alarm even if you delete the
     # alarm.
     #
+    # To use this operation and return information about a composite alarm,
+    # you must be signed on with the `cloudwatch:DescribeAlarmHistory`
+    # permission that is scoped to `*`. You can't return information about
+    # composite alarms if your `cloudwatch:DescribeAlarmHistory` permission
+    # has a narrower scope.
+    #
     # @option params [String] :alarm_name
     #   The name of the alarm.
     #
@@ -582,6 +686,12 @@ module Aws::CloudWatch
     # specifying a prefix for the alarm name, the alarm state, or a prefix
     # for any action.
     #
+    # To use this operation and return information about composite alarms,
+    # you must be signed on with the `cloudwatch:DescribeAlarms` permission
+    # that is scoped to `*`. You can't return information about composite
+    # alarms if your `cloudwatch:DescribeAlarms` permission has a narrower
+    # scope.
+    #
     # @option params [Array<String>] :alarm_names
     #   The names of the alarms to retrieve information about.
     #
@@ -873,9 +983,12 @@ module Aws::CloudWatch
     end
 
     # Lists the anomaly detection models that you have created in your
-    # account. You can list all models in your account or filter the results
-    # to only the models that are related to a certain namespace, metric
-    # name, or metric dimension.
+    # account. For single metric anomaly detectors, you can list all of the
+    # models in your account or filter the results to only the models that
+    # are related to a certain namespace, metric name, or metric dimension.
+    # For metric math anomaly detectors, you can list them by adding
+    # `METRIC_MATH` to the `AnomalyDetectorTypes` array. This will return
+    # all metric math anomaly detectors in your account.
     #
     # @option params [String] :next_token
     #   Use the token returned by the previous operation to request the next
@@ -904,6 +1017,11 @@ module Aws::CloudWatch
     #   metrics that have these dimensions and have anomaly detection models
     #   associated, they're all returned.
     #
+    # @option params [Array<String>] :anomaly_detector_types
+    #   The anomaly detector types to request when using
+    #   `DescribeAnomalyDetectorsInput`. If empty, defaults to
+    #   `SINGLE_METRIC`.
+    #
     # @return [Types::DescribeAnomalyDetectorsOutput] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::DescribeAnomalyDetectorsOutput#anomaly_detectors #anomaly_detectors} => Array&lt;Types::AnomalyDetector&gt;
@@ -922,6 +1040,7 @@ module Aws::CloudWatch
     #         value: "DimensionValue", # required
     #       },
     #     ],
+    #     anomaly_detector_types: ["SINGLE_METRIC"], # accepts SINGLE_METRIC, METRIC_MATH
     #   })
     #
     # @example Response structure
@@ -938,6 +1057,27 @@ module Aws::CloudWatch
     #   resp.anomaly_detectors[0].configuration.excluded_time_ranges[0].end_time #=> Time
     #   resp.anomaly_detectors[0].configuration.metric_timezone #=> String
     #   resp.anomaly_detectors[0].state_value #=> String, one of "PENDING_TRAINING", "TRAINED_INSUFFICIENT_DATA", "TRAINED"
+    #   resp.anomaly_detectors[0].single_metric_anomaly_detector.namespace #=> String
+    #   resp.anomaly_detectors[0].single_metric_anomaly_detector.metric_name #=> String
+    #   resp.anomaly_detectors[0].single_metric_anomaly_detector.dimensions #=> Array
+    #   resp.anomaly_detectors[0].single_metric_anomaly_detector.dimensions[0].name #=> String
+    #   resp.anomaly_detectors[0].single_metric_anomaly_detector.dimensions[0].value #=> String
+    #   resp.anomaly_detectors[0].single_metric_anomaly_detector.stat #=> String
+    #   resp.anomaly_detectors[0].metric_math_anomaly_detector.metric_data_queries #=> Array
+    #   resp.anomaly_detectors[0].metric_math_anomaly_detector.metric_data_queries[0].id #=> String
+    #   resp.anomaly_detectors[0].metric_math_anomaly_detector.metric_data_queries[0].metric_stat.metric.namespace #=> String
+    #   resp.anomaly_detectors[0].metric_math_anomaly_detector.metric_data_queries[0].metric_stat.metric.metric_name #=> String
+    #   resp.anomaly_detectors[0].metric_math_anomaly_detector.metric_data_queries[0].metric_stat.metric.dimensions #=> Array
+    #   resp.anomaly_detectors[0].metric_math_anomaly_detector.metric_data_queries[0].metric_stat.metric.dimensions[0].name #=> String
+    #   resp.anomaly_detectors[0].metric_math_anomaly_detector.metric_data_queries[0].metric_stat.metric.dimensions[0].value #=> String
+    #   resp.anomaly_detectors[0].metric_math_anomaly_detector.metric_data_queries[0].metric_stat.period #=> Integer
+    #   resp.anomaly_detectors[0].metric_math_anomaly_detector.metric_data_queries[0].metric_stat.stat #=> String
+    #   resp.anomaly_detectors[0].metric_math_anomaly_detector.metric_data_queries[0].metric_stat.unit #=> String, one of "Seconds", "Microseconds", "Milliseconds", "Bytes", "Kilobytes", "Megabytes", "Gigabytes", "Terabytes", "Bits", "Kilobits", "Megabits", "Gigabits", "Terabits", "Percent", "Count", "Bytes/Second", "Kilobytes/Second", "Megabytes/Second", "Gigabytes/Second", "Terabytes/Second", "Bits/Second", "Kilobits/Second", "Megabits/Second", "Gigabits/Second", "Terabits/Second", "Count/Second", "None"
+    #   resp.anomaly_detectors[0].metric_math_anomaly_detector.metric_data_queries[0].expression #=> String
+    #   resp.anomaly_detectors[0].metric_math_anomaly_detector.metric_data_queries[0].label #=> String
+    #   resp.anomaly_detectors[0].metric_math_anomaly_detector.metric_data_queries[0].return_data #=> Boolean
+    #   resp.anomaly_detectors[0].metric_math_anomaly_detector.metric_data_queries[0].period #=> Integer
+    #   resp.anomaly_detectors[0].metric_math_anomaly_detector.metric_data_queries[0].account_id #=> String
     #   resp.next_token #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/monitoring-2010-08-01/DescribeAnomalyDetectors AWS API Documentation
@@ -2087,16 +2227,16 @@ module Aws::CloudWatch
     #
     # [1]: https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch_Anomaly_Detection.html
     #
-    # @option params [required, String] :namespace
+    # @option params [String] :namespace
     #   The namespace of the metric to create the anomaly detection model for.
     #
-    # @option params [required, String] :metric_name
+    # @option params [String] :metric_name
     #   The name of the metric to create the anomaly detection model for.
     #
     # @option params [Array<Types::Dimension>] :dimensions
     #   The metric dimensions to create the anomaly detection model for.
     #
-    # @option params [required, String] :stat
+    # @option params [String] :stat
     #   The statistic to use for the metric and the anomaly detection model.
     #
     # @option params [Types::AnomalyDetectorConfiguration] :configuration
@@ -2107,20 +2247,60 @@ module Aws::CloudWatch
     #   The configuration can also include the time zone to use for the
     #   metric.
     #
+    # @option params [Types::SingleMetricAnomalyDetector] :single_metric_anomaly_detector
+    #   A single metric anomaly detector to be created.
+    #
+    #   When using `SingleMetricAnomalyDetector`, you cannot include the
+    #   following parameters in the same operation:
+    #
+    #   * `Dimensions`
+    #
+    #   * `MetricName`
+    #
+    #   * `Namespace`
+    #
+    #   * `Stat`
+    #
+    #   * the `MetricMatchAnomalyDetector` parameters of
+    #     `PutAnomalyDetectorInput`
+    #
+    #   Instead, specify the single metric anomaly detector attributes as part
+    #   of the property `SingleMetricAnomalyDetector`.
+    #
+    # @option params [Types::MetricMathAnomalyDetector] :metric_math_anomaly_detector
+    #   The metric math anomaly detector to be created.
+    #
+    #   When using `MetricMathAnomalyDetector`, you cannot include the
+    #   following parameters in the same operation:
+    #
+    #   * `Dimensions`
+    #
+    #   * `MetricName`
+    #
+    #   * `Namespace`
+    #
+    #   * `Stat`
+    #
+    #   * the `SingleMetricAnomalyDetector` parameters of
+    #     `PutAnomalyDetectorInput`
+    #
+    #   Instead, specify the metric math anomaly detector attributes as part
+    #   of the property `MetricMathAnomalyDetector`.
+    #
     # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
     #
     # @example Request syntax with placeholder values
     #
     #   resp = client.put_anomaly_detector({
-    #     namespace: "Namespace", # required
-    #     metric_name: "MetricName", # required
+    #     namespace: "Namespace",
+    #     metric_name: "MetricName",
     #     dimensions: [
     #       {
     #         name: "DimensionName", # required
     #         value: "DimensionValue", # required
     #       },
     #     ],
-    #     stat: "AnomalyDetectorMetricStat", # required
+    #     stat: "AnomalyDetectorMetricStat",
     #     configuration: {
     #       excluded_time_ranges: [
     #         {
@@ -2130,6 +2310,44 @@ module Aws::CloudWatch
     #       ],
     #       metric_timezone: "AnomalyDetectorMetricTimezone",
     #     },
+    #     single_metric_anomaly_detector: {
+    #       namespace: "Namespace",
+    #       metric_name: "MetricName",
+    #       dimensions: [
+    #         {
+    #           name: "DimensionName", # required
+    #           value: "DimensionValue", # required
+    #         },
+    #       ],
+    #       stat: "AnomalyDetectorMetricStat",
+    #     },
+    #     metric_math_anomaly_detector: {
+    #       metric_data_queries: [
+    #         {
+    #           id: "MetricId", # required
+    #           metric_stat: {
+    #             metric: { # required
+    #               namespace: "Namespace",
+    #               metric_name: "MetricName",
+    #               dimensions: [
+    #                 {
+    #                   name: "DimensionName", # required
+    #                   value: "DimensionValue", # required
+    #                 },
+    #               ],
+    #             },
+    #             period: 1, # required
+    #             stat: "Stat", # required
+    #             unit: "Seconds", # accepts Seconds, Microseconds, Milliseconds, Bytes, Kilobytes, Megabytes, Gigabytes, Terabytes, Bits, Kilobits, Megabits, Gigabits, Terabits, Percent, Count, Bytes/Second, Kilobytes/Second, Megabytes/Second, Gigabytes/Second, Terabytes/Second, Bits/Second, Kilobits/Second, Megabits/Second, Gigabits/Second, Terabits/Second, Count/Second, None
+    #           },
+    #           expression: "MetricExpression",
+    #           label: "MetricLabel",
+    #           return_data: false,
+    #           period: 1,
+    #           account_id: "AccountId",
+    #         },
+    #       ],
+    #     },
     #   })
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/monitoring-2010-08-01/PutAnomalyDetector AWS API Documentation
@@ -2187,6 +2405,11 @@ module Aws::CloudWatch
     # the update completely overwrites the previous configuration of the
     # alarm.
     #
+    # To use this operation, you must be signed on with the
+    # `cloudwatch:PutCompositeAlarm` permission that is scoped to `*`. You
+    # can't create a composite alarms if your
+    # `cloudwatch:PutCompositeAlarm` permission has a narrower scope.
+    #
     # If you are an IAM user, you must have `iam:CreateServiceLinkedRole` to
     # create a composite alarm that has Systems Manager OpsItem actions.
     #
@@ -2479,12 +2702,12 @@ module Aws::CloudWatch
     # * The `iam:CreateServiceLinkedRole` to create an alarm with Systems
     #   Manager OpsItem actions.
     #
-    # The first time you create an alarm in the Management Console, the CLI,
-    # or by using the PutMetricAlarm API, CloudWatch creates the necessary
-    # service-linked role for you. The service-linked roles are called
-    # `AWSServiceRoleForCloudWatchEvents` and
-    # `AWSServiceRoleForCloudWatchAlarms_ActionSSM`. For more information,
-    # see [Amazon Web Services service-linked role][1].
+    # The first time you create an alarm in the Amazon Web Services
+    # Management Console, the CLI, or by using the PutMetricAlarm API,
+    # CloudWatch creates the necessary service-linked role for you. The
+    # service-linked roles are called `AWSServiceRoleForCloudWatchEvents`
+    # and `AWSServiceRoleForCloudWatchAlarms_ActionSSM`. For more
+    # information, see [Amazon Web Services service-linked role][1].
     #
     # **Cross-account alarms**
     #
@@ -2986,7 +3209,7 @@ module Aws::CloudWatch
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/Metric-Streams.html
+    # [1]: https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-Metric-Streams.html
     #
     # @option params [required, String] :name
     #   If you are creating a new metric stream, this is the name for the new
@@ -3327,7 +3550,7 @@ module Aws::CloudWatch
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-cloudwatch'
-      context[:gem_version] = '1.56.0'
+      context[:gem_version] = '1.60.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

data/lib/aws-sdk-cloudwatch/client_api.rb

@@ -33,6 +33,8 @@ module Aws::CloudWatch
     AnomalyDetectorMetricStat = Shapes::StringShape.new(name: 'AnomalyDetectorMetricStat')
     AnomalyDetectorMetricTimezone = Shapes::StringShape.new(name: 'AnomalyDetectorMetricTimezone')
     AnomalyDetectorStateValue = Shapes::StringShape.new(name: 'AnomalyDetectorStateValue')
+    AnomalyDetectorType = Shapes::StringShape.new(name: 'AnomalyDetectorType')
+    AnomalyDetectorTypes = Shapes::ListShape.new(name: 'AnomalyDetectorTypes')
     AnomalyDetectors = Shapes::ListShape.new(name: 'AnomalyDetectors')
     AwsQueryErrorMessage = Shapes::StringShape.new(name: 'AwsQueryErrorMessage')
     BatchFailures = Shapes::ListShape.new(name: 'BatchFailures')
@@ -180,6 +182,7 @@ module Aws::CloudWatch
     MetricExpression = Shapes::StringShape.new(name: 'MetricExpression')
     MetricId = Shapes::StringShape.new(name: 'MetricId')
     MetricLabel = Shapes::StringShape.new(name: 'MetricLabel')
+    MetricMathAnomalyDetector = Shapes::StructureShape.new(name: 'MetricMathAnomalyDetector')
     MetricName = Shapes::StringShape.new(name: 'MetricName')
     MetricStat = Shapes::StructureShape.new(name: 'MetricStat')
     MetricStreamEntries = Shapes::ListShape.new(name: 'MetricStreamEntries')
@@ -221,6 +224,7 @@ module Aws::CloudWatch
     ReturnData = Shapes::BooleanShape.new(name: 'ReturnData')
     ScanBy = Shapes::StringShape.new(name: 'ScanBy')
     SetAlarmStateInput = Shapes::StructureShape.new(name: 'SetAlarmStateInput')
+    SingleMetricAnomalyDetector = Shapes::StructureShape.new(name: 'SingleMetricAnomalyDetector')
     Size = Shapes::IntegerShape.new(name: 'Size')
     StandardUnit = Shapes::StringShape.new(name: 'StandardUnit')
     StartMetricStreamsInput = Shapes::StructureShape.new(name: 'StartMetricStreamsInput')
@@ -265,12 +269,14 @@ module Aws::CloudWatch
 
     AlarmTypes.member = Shapes::ShapeRef.new(shape: AlarmType)
 
-    AnomalyDetector.add_member(:namespace, Shapes::ShapeRef.new(shape: Namespace, location_name: "Namespace"))
-    AnomalyDetector.add_member(:metric_name, Shapes::ShapeRef.new(shape: MetricName, location_name: "MetricName"))
-    AnomalyDetector.add_member(:dimensions, Shapes::ShapeRef.new(shape: Dimensions, location_name: "Dimensions"))
-    AnomalyDetector.add_member(:stat, Shapes::ShapeRef.new(shape: AnomalyDetectorMetricStat, location_name: "Stat"))
+    AnomalyDetector.add_member(:namespace, Shapes::ShapeRef.new(shape: Namespace, deprecated: true, location_name: "Namespace", metadata: {"deprecatedMessage"=>"Use SingleMetricAnomalyDetector.Namespace property."}))
+    AnomalyDetector.add_member(:metric_name, Shapes::ShapeRef.new(shape: MetricName, deprecated: true, location_name: "MetricName", metadata: {"deprecatedMessage"=>"Use SingleMetricAnomalyDetector.MetricName property."}))
+    AnomalyDetector.add_member(:dimensions, Shapes::ShapeRef.new(shape: Dimensions, deprecated: true, location_name: "Dimensions", metadata: {"deprecatedMessage"=>"Use SingleMetricAnomalyDetector.Dimensions property."}))
+    AnomalyDetector.add_member(:stat, Shapes::ShapeRef.new(shape: AnomalyDetectorMetricStat, deprecated: true, location_name: "Stat", metadata: {"deprecatedMessage"=>"Use SingleMetricAnomalyDetector.Stat property."}))
     AnomalyDetector.add_member(:configuration, Shapes::ShapeRef.new(shape: AnomalyDetectorConfiguration, location_name: "Configuration"))
     AnomalyDetector.add_member(:state_value, Shapes::ShapeRef.new(shape: AnomalyDetectorStateValue, location_name: "StateValue"))
+    AnomalyDetector.add_member(:single_metric_anomaly_detector, Shapes::ShapeRef.new(shape: SingleMetricAnomalyDetector, location_name: "SingleMetricAnomalyDetector"))
+    AnomalyDetector.add_member(:metric_math_anomaly_detector, Shapes::ShapeRef.new(shape: MetricMathAnomalyDetector, location_name: "MetricMathAnomalyDetector"))
     AnomalyDetector.struct_class = Types::AnomalyDetector
 
     AnomalyDetectorConfiguration.add_member(:excluded_time_ranges, Shapes::ShapeRef.new(shape: AnomalyDetectorExcludedTimeRanges, location_name: "ExcludedTimeRanges"))
@@ -279,6 +285,8 @@ module Aws::CloudWatch
 
     AnomalyDetectorExcludedTimeRanges.member = Shapes::ShapeRef.new(shape: Range)
 
+    AnomalyDetectorTypes.member = Shapes::ShapeRef.new(shape: AnomalyDetectorType)
+
     AnomalyDetectors.member = Shapes::ShapeRef.new(shape: AnomalyDetector)
 
     BatchFailures.member = Shapes::ShapeRef.new(shape: PartialFailure)
@@ -347,10 +355,12 @@ module Aws::CloudWatch
     DeleteAlarmsInput.add_member(:alarm_names, Shapes::ShapeRef.new(shape: AlarmNames, required: true, location_name: "AlarmNames"))
     DeleteAlarmsInput.struct_class = Types::DeleteAlarmsInput
 
-    DeleteAnomalyDetectorInput.add_member(:namespace, Shapes::ShapeRef.new(shape: Namespace, required: true, location_name: "Namespace"))
-    DeleteAnomalyDetectorInput.add_member(:metric_name, Shapes::ShapeRef.new(shape: MetricName, required: true, location_name: "MetricName"))
-    DeleteAnomalyDetectorInput.add_member(:dimensions, Shapes::ShapeRef.new(shape: Dimensions, location_name: "Dimensions"))
-    DeleteAnomalyDetectorInput.add_member(:stat, Shapes::ShapeRef.new(shape: AnomalyDetectorMetricStat, required: true, location_name: "Stat"))
+    DeleteAnomalyDetectorInput.add_member(:namespace, Shapes::ShapeRef.new(shape: Namespace, deprecated: true, location_name: "Namespace", metadata: {"deprecatedMessage"=>"Use SingleMetricAnomalyDetector."}))
+    DeleteAnomalyDetectorInput.add_member(:metric_name, Shapes::ShapeRef.new(shape: MetricName, deprecated: true, location_name: "MetricName", metadata: {"deprecatedMessage"=>"Use SingleMetricAnomalyDetector."}))
+    DeleteAnomalyDetectorInput.add_member(:dimensions, Shapes::ShapeRef.new(shape: Dimensions, deprecated: true, location_name: "Dimensions", metadata: {"deprecatedMessage"=>"Use SingleMetricAnomalyDetector."}))
+    DeleteAnomalyDetectorInput.add_member(:stat, Shapes::ShapeRef.new(shape: AnomalyDetectorMetricStat, deprecated: true, location_name: "Stat", metadata: {"deprecatedMessage"=>"Use SingleMetricAnomalyDetector."}))
+    DeleteAnomalyDetectorInput.add_member(:single_metric_anomaly_detector, Shapes::ShapeRef.new(shape: SingleMetricAnomalyDetector, location_name: "SingleMetricAnomalyDetector"))
+    DeleteAnomalyDetectorInput.add_member(:metric_math_anomaly_detector, Shapes::ShapeRef.new(shape: MetricMathAnomalyDetector, location_name: "MetricMathAnomalyDetector"))
     DeleteAnomalyDetectorInput.struct_class = Types::DeleteAnomalyDetectorInput
 
     DeleteAnomalyDetectorOutput.struct_class = Types::DeleteAnomalyDetectorOutput
@@ -418,6 +428,7 @@ module Aws::CloudWatch
     DescribeAnomalyDetectorsInput.add_member(:namespace, Shapes::ShapeRef.new(shape: Namespace, location_name: "Namespace"))
     DescribeAnomalyDetectorsInput.add_member(:metric_name, Shapes::ShapeRef.new(shape: MetricName, location_name: "MetricName"))
     DescribeAnomalyDetectorsInput.add_member(:dimensions, Shapes::ShapeRef.new(shape: Dimensions, location_name: "Dimensions"))
+    DescribeAnomalyDetectorsInput.add_member(:anomaly_detector_types, Shapes::ShapeRef.new(shape: AnomalyDetectorTypes, location_name: "AnomalyDetectorTypes"))
     DescribeAnomalyDetectorsInput.struct_class = Types::DescribeAnomalyDetectorsInput
 
     DescribeAnomalyDetectorsOutput.add_member(:anomaly_detectors, Shapes::ShapeRef.new(shape: AnomalyDetectors, location_name: "AnomalyDetectors"))
@@ -713,6 +724,9 @@ module Aws::CloudWatch
     MetricDatum.add_member(:storage_resolution, Shapes::ShapeRef.new(shape: StorageResolution, location_name: "StorageResolution"))
     MetricDatum.struct_class = Types::MetricDatum
 
+    MetricMathAnomalyDetector.add_member(:metric_data_queries, Shapes::ShapeRef.new(shape: MetricDataQueries, location_name: "MetricDataQueries"))
+    MetricMathAnomalyDetector.struct_class = Types::MetricMathAnomalyDetector
+
     MetricStat.add_member(:metric, Shapes::ShapeRef.new(shape: Metric, required: true, location_name: "Metric"))
     MetricStat.add_member(:period, Shapes::ShapeRef.new(shape: Period, required: true, location_name: "Period"))
     MetricStat.add_member(:stat, Shapes::ShapeRef.new(shape: Stat, required: true, location_name: "Stat"))
@@ -748,11 +762,13 @@ module Aws::CloudWatch
     PartialFailure.add_member(:failure_description, Shapes::ShapeRef.new(shape: FailureDescription, location_name: "FailureDescription"))
     PartialFailure.struct_class = Types::PartialFailure
 
-    PutAnomalyDetectorInput.add_member(:namespace, Shapes::ShapeRef.new(shape: Namespace, required: true, location_name: "Namespace"))
-    PutAnomalyDetectorInput.add_member(:metric_name, Shapes::ShapeRef.new(shape: MetricName, required: true, location_name: "MetricName"))
-    PutAnomalyDetectorInput.add_member(:dimensions, Shapes::ShapeRef.new(shape: Dimensions, location_name: "Dimensions"))
-    PutAnomalyDetectorInput.add_member(:stat, Shapes::ShapeRef.new(shape: AnomalyDetectorMetricStat, required: true, location_name: "Stat"))
+    PutAnomalyDetectorInput.add_member(:namespace, Shapes::ShapeRef.new(shape: Namespace, deprecated: true, location_name: "Namespace", metadata: {"deprecatedMessage"=>"Use SingleMetricAnomalyDetector."}))
+    PutAnomalyDetectorInput.add_member(:metric_name, Shapes::ShapeRef.new(shape: MetricName, deprecated: true, location_name: "MetricName", metadata: {"deprecatedMessage"=>"Use SingleMetricAnomalyDetector."}))
+    PutAnomalyDetectorInput.add_member(:dimensions, Shapes::ShapeRef.new(shape: Dimensions, deprecated: true, location_name: "Dimensions", metadata: {"deprecatedMessage"=>"Use SingleMetricAnomalyDetector."}))
+    PutAnomalyDetectorInput.add_member(:stat, Shapes::ShapeRef.new(shape: AnomalyDetectorMetricStat, deprecated: true, location_name: "Stat", metadata: {"deprecatedMessage"=>"Use SingleMetricAnomalyDetector."}))
     PutAnomalyDetectorInput.add_member(:configuration, Shapes::ShapeRef.new(shape: AnomalyDetectorConfiguration, location_name: "Configuration"))
+    PutAnomalyDetectorInput.add_member(:single_metric_anomaly_detector, Shapes::ShapeRef.new(shape: SingleMetricAnomalyDetector, location_name: "SingleMetricAnomalyDetector"))
+    PutAnomalyDetectorInput.add_member(:metric_math_anomaly_detector, Shapes::ShapeRef.new(shape: MetricMathAnomalyDetector, location_name: "MetricMathAnomalyDetector"))
     PutAnomalyDetectorInput.struct_class = Types::PutAnomalyDetectorInput
 
     PutAnomalyDetectorOutput.struct_class = Types::PutAnomalyDetectorOutput
@@ -841,6 +857,12 @@ module Aws::CloudWatch
     SetAlarmStateInput.add_member(:state_reason_data, Shapes::ShapeRef.new(shape: StateReasonData, location_name: "StateReasonData"))
     SetAlarmStateInput.struct_class = Types::SetAlarmStateInput
 
+    SingleMetricAnomalyDetector.add_member(:namespace, Shapes::ShapeRef.new(shape: Namespace, location_name: "Namespace"))
+    SingleMetricAnomalyDetector.add_member(:metric_name, Shapes::ShapeRef.new(shape: MetricName, location_name: "MetricName"))
+    SingleMetricAnomalyDetector.add_member(:dimensions, Shapes::ShapeRef.new(shape: Dimensions, location_name: "Dimensions"))
+    SingleMetricAnomalyDetector.add_member(:stat, Shapes::ShapeRef.new(shape: AnomalyDetectorMetricStat, location_name: "Stat"))
+    SingleMetricAnomalyDetector.struct_class = Types::SingleMetricAnomalyDetector
+
     StartMetricStreamsInput.add_member(:names, Shapes::ShapeRef.new(shape: MetricStreamNames, required: true, location_name: "Names"))
     StartMetricStreamsInput.struct_class = Types::StartMetricStreamsInput
 
@@ -920,6 +942,7 @@ module Aws::CloudWatch
         o.errors << Shapes::ShapeRef.new(shape: InternalServiceFault)
         o.errors << Shapes::ShapeRef.new(shape: InvalidParameterValueException)
         o.errors << Shapes::ShapeRef.new(shape: MissingRequiredParameterException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidParameterCombinationException)
       end)
 
       api.add_operation(:delete_dashboards, Seahorse::Model::Operation.new.tap do |o|
@@ -1001,6 +1024,7 @@ module Aws::CloudWatch
         o.errors << Shapes::ShapeRef.new(shape: InvalidNextToken)
         o.errors << Shapes::ShapeRef.new(shape: InternalServiceFault)
         o.errors << Shapes::ShapeRef.new(shape: InvalidParameterValueException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidParameterCombinationException)
       end)
 
       api.add_operation(:describe_insight_rules, Seahorse::Model::Operation.new.tap do |o|
@@ -1194,6 +1218,7 @@ module Aws::CloudWatch
         o.errors << Shapes::ShapeRef.new(shape: InternalServiceFault)
         o.errors << Shapes::ShapeRef.new(shape: InvalidParameterValueException)
         o.errors << Shapes::ShapeRef.new(shape: MissingRequiredParameterException)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidParameterCombinationException)
       end)
 
       api.add_operation(:put_composite_alarm, Seahorse::Model::Operation.new.tap do |o|

data/lib/aws-sdk-cloudwatch/types.rb

@@ -50,8 +50,8 @@ module Aws::CloudWatch
     end
 
     # An anomaly detection model associated with a particular CloudWatch
-    # metric and statistic. You can use the model to display a band of
-    # expected normal values when the metric is graphed.
+    # metric, statistic, or metric math expression. You can use the model to
+    # display a band of expected, normal values when the metric is graphed.
     #
     # @!attribute [rw] namespace
     #   The namespace of the metric associated with the anomaly detection
@@ -81,6 +81,14 @@ module Aws::CloudWatch
     #   values are `TRAINED | PENDING_TRAINING | TRAINED_INSUFFICIENT_DATA`
     #   @return [String]
     #
+    # @!attribute [rw] single_metric_anomaly_detector
+    #   The CloudWatch metric and statistic for this anomaly detector.
+    #   @return [Types::SingleMetricAnomalyDetector]
+    #
+    # @!attribute [rw] metric_math_anomaly_detector
+    #   The CloudWatch metric math expression for this anomaly detector.
+    #   @return [Types::MetricMathAnomalyDetector]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/monitoring-2010-08-01/AnomalyDetector AWS API Documentation
     #
     class AnomalyDetector < Struct.new(
@@ -89,7 +97,9 @@ module Aws::CloudWatch
       :dimensions,
       :stat,
       :configuration,
-      :state_value)
+      :state_value,
+      :single_metric_anomaly_detector,
+      :metric_math_anomaly_detector)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -382,15 +392,53 @@ module Aws::CloudWatch
     #   data as a hash:
     #
     #       {
-    #         namespace: "Namespace", # required
-    #         metric_name: "MetricName", # required
+    #         namespace: "Namespace",
+    #         metric_name: "MetricName",
     #         dimensions: [
     #           {
     #             name: "DimensionName", # required
     #             value: "DimensionValue", # required
     #           },
     #         ],
-    #         stat: "AnomalyDetectorMetricStat", # required
+    #         stat: "AnomalyDetectorMetricStat",
+    #         single_metric_anomaly_detector: {
+    #           namespace: "Namespace",
+    #           metric_name: "MetricName",
+    #           dimensions: [
+    #             {
+    #               name: "DimensionName", # required
+    #               value: "DimensionValue", # required
+    #             },
+    #           ],
+    #           stat: "AnomalyDetectorMetricStat",
+    #         },
+    #         metric_math_anomaly_detector: {
+    #           metric_data_queries: [
+    #             {
+    #               id: "MetricId", # required
+    #               metric_stat: {
+    #                 metric: { # required
+    #                   namespace: "Namespace",
+    #                   metric_name: "MetricName",
+    #                   dimensions: [
+    #                     {
+    #                       name: "DimensionName", # required
+    #                       value: "DimensionValue", # required
+    #                     },
+    #                   ],
+    #                 },
+    #                 period: 1, # required
+    #                 stat: "Stat", # required
+    #                 unit: "Seconds", # accepts Seconds, Microseconds, Milliseconds, Bytes, Kilobytes, Megabytes, Gigabytes, Terabytes, Bits, Kilobits, Megabits, Gigabits, Terabits, Percent, Count, Bytes/Second, Kilobytes/Second, Megabytes/Second, Gigabytes/Second, Terabytes/Second, Bits/Second, Kilobits/Second, Megabits/Second, Gigabits/Second, Terabits/Second, Count/Second, None
+    #               },
+    #               expression: "MetricExpression",
+    #               label: "MetricLabel",
+    #               return_data: false,
+    #               period: 1,
+    #               account_id: "AccountId",
+    #             },
+    #           ],
+    #         },
     #       }
     #
     # @!attribute [rw] namespace
@@ -411,13 +459,57 @@ module Aws::CloudWatch
     #   The statistic associated with the anomaly detection model to delete.
     #   @return [String]
     #
+    # @!attribute [rw] single_metric_anomaly_detector
+    #   A single metric anomaly detector to be deleted.
+    #
+    #   When using `SingleMetricAnomalyDetector`, you cannot include the
+    #   following parameters in the same operation:
+    #
+    #   * `Dimensions`,
+    #
+    #   * `MetricName`
+    #
+    #   * `Namespace`
+    #
+    #   * `Stat`
+    #
+    #   * the `MetricMathAnomalyDetector` parameters of
+    #     `DeleteAnomalyDetectorInput`
+    #
+    #   Instead, specify the single metric anomaly detector attributes as
+    #   part of the `SingleMetricAnomalyDetector` property.
+    #   @return [Types::SingleMetricAnomalyDetector]
+    #
+    # @!attribute [rw] metric_math_anomaly_detector
+    #   The metric math anomaly detector to be deleted.
+    #
+    #   When using `MetricMathAnomalyDetector`, you cannot include following
+    #   parameters in the same operation:
+    #
+    #   * `Dimensions`,
+    #
+    #   * `MetricName`
+    #
+    #   * `Namespace`
+    #
+    #   * `Stat`
+    #
+    #   * the `SingleMetricAnomalyDetector` parameters of
+    #     `DeleteAnomalyDetectorInput`
+    #
+    #   Instead, specify the metric math anomaly detector attributes as part
+    #   of the `MetricMathAnomalyDetector` property.
+    #   @return [Types::MetricMathAnomalyDetector]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/monitoring-2010-08-01/DeleteAnomalyDetectorInput AWS API Documentation
     #
     class DeleteAnomalyDetectorInput < Struct.new(
       :namespace,
       :metric_name,
       :dimensions,
-      :stat)
+      :stat,
+      :single_metric_anomaly_detector,
+      :metric_math_anomaly_detector)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -821,6 +913,7 @@ module Aws::CloudWatch
     #             value: "DimensionValue", # required
     #           },
     #         ],
+    #         anomaly_detector_types: ["SINGLE_METRIC"], # accepts SINGLE_METRIC, METRIC_MATH
     #       }
     #
     # @!attribute [rw] next_token
@@ -855,6 +948,12 @@ module Aws::CloudWatch
     #   detection models associated, they're all returned.
     #   @return [Array<Types::Dimension>]
     #
+    # @!attribute [rw] anomaly_detector_types
+    #   The anomaly detector types to request when using
+    #   `DescribeAnomalyDetectorsInput`. If empty, defaults to
+    #   `SINGLE_METRIC`.
+    #   @return [Array<String>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/monitoring-2010-08-01/DescribeAnomalyDetectorsInput AWS API Documentation
     #
     class DescribeAnomalyDetectorsInput < Struct.new(
@@ -862,7 +961,8 @@ module Aws::CloudWatch
       :max_results,
       :namespace,
       :metric_name,
-      :dimensions)
+      :dimensions,
+      :anomaly_detector_types)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -1786,7 +1886,13 @@ module Aws::CloudWatch
     end
 
     # This structure contains the definition for a Contributor Insights
-    # rule.
+    # rule. For more information about this rule, see[ Using Constributor
+    # Insights to analyze high-cardinality data][1] in the *Amazon
+    # CloudWatch User Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/ContributorInsights.html
     #
     # @!attribute [rw] name
     #   The name of the rule.
@@ -1798,7 +1904,7 @@ module Aws::CloudWatch
     #
     # @!attribute [rw] schema
     #   For rules that you create, this is always `\{"Name":
-    #   "CloudWatchLogRule", "Version": 1\}`. For built-in rules, this is
+    #   "CloudWatchLogRule", "Version": 1\}`. For managed rules, this is
     #   `\{"Name": "ServiceLogRule", "Version": 1\}`
     #   @return [String]
     #
@@ -2876,6 +2982,61 @@ module Aws::CloudWatch
       include Aws::Structure
     end
 
+    # Indicates the CloudWatch math expression that provides the time series
+    # the anomaly detector uses as input. The designated math expression
+    # must return a single time series.
+    #
+    # @note When making an API call, you may pass MetricMathAnomalyDetector
+    #   data as a hash:
+    #
+    #       {
+    #         metric_data_queries: [
+    #           {
+    #             id: "MetricId", # required
+    #             metric_stat: {
+    #               metric: { # required
+    #                 namespace: "Namespace",
+    #                 metric_name: "MetricName",
+    #                 dimensions: [
+    #                   {
+    #                     name: "DimensionName", # required
+    #                     value: "DimensionValue", # required
+    #                   },
+    #                 ],
+    #               },
+    #               period: 1, # required
+    #               stat: "Stat", # required
+    #               unit: "Seconds", # accepts Seconds, Microseconds, Milliseconds, Bytes, Kilobytes, Megabytes, Gigabytes, Terabytes, Bits, Kilobits, Megabits, Gigabits, Terabits, Percent, Count, Bytes/Second, Kilobytes/Second, Megabytes/Second, Gigabytes/Second, Terabytes/Second, Bits/Second, Kilobits/Second, Megabits/Second, Gigabits/Second, Terabits/Second, Count/Second, None
+    #             },
+    #             expression: "MetricExpression",
+    #             label: "MetricLabel",
+    #             return_data: false,
+    #             period: 1,
+    #             account_id: "AccountId",
+    #           },
+    #         ],
+    #       }
+    #
+    # @!attribute [rw] metric_data_queries
+    #   An array of metric data query structures that enables you to create
+    #   an anomaly detector based on the result of a metric math expression.
+    #   Each item in `MetricDataQueries` gets a metric or performs a math
+    #   expression. One item in `MetricDataQueries` is the expression that
+    #   provides the time series that the anomaly detector uses as input.
+    #   Designate the expression by setting `ReturnData` to `True` for this
+    #   object in the array. For all other expressions and metrics, set
+    #   `ReturnData` to `False`. The designated expression must return a
+    #   single time series.
+    #   @return [Array<Types::MetricDataQuery>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/monitoring-2010-08-01/MetricMathAnomalyDetector AWS API Documentation
+    #
+    class MetricMathAnomalyDetector < Struct.new(
+      :metric_data_queries)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # This structure defines the metric to be returned, along with the
     # statistics, period, and units.
     #
@@ -3075,15 +3236,15 @@ module Aws::CloudWatch
     #   data as a hash:
     #
     #       {
-    #         namespace: "Namespace", # required
-    #         metric_name: "MetricName", # required
+    #         namespace: "Namespace",
+    #         metric_name: "MetricName",
     #         dimensions: [
     #           {
     #             name: "DimensionName", # required
     #             value: "DimensionValue", # required
     #           },
     #         ],
-    #         stat: "AnomalyDetectorMetricStat", # required
+    #         stat: "AnomalyDetectorMetricStat",
     #         configuration: {
     #           excluded_time_ranges: [
     #             {
@@ -3093,6 +3254,44 @@ module Aws::CloudWatch
     #           ],
     #           metric_timezone: "AnomalyDetectorMetricTimezone",
     #         },
+    #         single_metric_anomaly_detector: {
+    #           namespace: "Namespace",
+    #           metric_name: "MetricName",
+    #           dimensions: [
+    #             {
+    #               name: "DimensionName", # required
+    #               value: "DimensionValue", # required
+    #             },
+    #           ],
+    #           stat: "AnomalyDetectorMetricStat",
+    #         },
+    #         metric_math_anomaly_detector: {
+    #           metric_data_queries: [
+    #             {
+    #               id: "MetricId", # required
+    #               metric_stat: {
+    #                 metric: { # required
+    #                   namespace: "Namespace",
+    #                   metric_name: "MetricName",
+    #                   dimensions: [
+    #                     {
+    #                       name: "DimensionName", # required
+    #                       value: "DimensionValue", # required
+    #                     },
+    #                   ],
+    #                 },
+    #                 period: 1, # required
+    #                 stat: "Stat", # required
+    #                 unit: "Seconds", # accepts Seconds, Microseconds, Milliseconds, Bytes, Kilobytes, Megabytes, Gigabytes, Terabytes, Bits, Kilobits, Megabits, Gigabits, Terabits, Percent, Count, Bytes/Second, Kilobytes/Second, Megabytes/Second, Gigabytes/Second, Terabytes/Second, Bits/Second, Kilobits/Second, Megabits/Second, Gigabits/Second, Terabits/Second, Count/Second, None
+    #               },
+    #               expression: "MetricExpression",
+    #               label: "MetricLabel",
+    #               return_data: false,
+    #               period: 1,
+    #               account_id: "AccountId",
+    #             },
+    #           ],
+    #         },
     #       }
     #
     # @!attribute [rw] namespace
@@ -3122,6 +3321,48 @@ module Aws::CloudWatch
     #   metric.
     #   @return [Types::AnomalyDetectorConfiguration]
     #
+    # @!attribute [rw] single_metric_anomaly_detector
+    #   A single metric anomaly detector to be created.
+    #
+    #   When using `SingleMetricAnomalyDetector`, you cannot include the
+    #   following parameters in the same operation:
+    #
+    #   * `Dimensions`
+    #
+    #   * `MetricName`
+    #
+    #   * `Namespace`
+    #
+    #   * `Stat`
+    #
+    #   * the `MetricMatchAnomalyDetector` parameters of
+    #     `PutAnomalyDetectorInput`
+    #
+    #   Instead, specify the single metric anomaly detector attributes as
+    #   part of the property `SingleMetricAnomalyDetector`.
+    #   @return [Types::SingleMetricAnomalyDetector]
+    #
+    # @!attribute [rw] metric_math_anomaly_detector
+    #   The metric math anomaly detector to be created.
+    #
+    #   When using `MetricMathAnomalyDetector`, you cannot include the
+    #   following parameters in the same operation:
+    #
+    #   * `Dimensions`
+    #
+    #   * `MetricName`
+    #
+    #   * `Namespace`
+    #
+    #   * `Stat`
+    #
+    #   * the `SingleMetricAnomalyDetector` parameters of
+    #     `PutAnomalyDetectorInput`
+    #
+    #   Instead, specify the metric math anomaly detector attributes as part
+    #   of the property `MetricMathAnomalyDetector`.
+    #   @return [Types::MetricMathAnomalyDetector]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/monitoring-2010-08-01/PutAnomalyDetectorInput AWS API Documentation
     #
     class PutAnomalyDetectorInput < Struct.new(
@@ -3129,7 +3370,9 @@ module Aws::CloudWatch
       :metric_name,
       :dimensions,
       :stat,
-      :configuration)
+      :configuration,
+      :single_metric_anomaly_detector,
+      :metric_math_anomaly_detector)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -4074,6 +4317,52 @@ module Aws::CloudWatch
       include Aws::Structure
     end
 
+    # Designates the CloudWatch metric and statistic that provides the time
+    # series the anomaly detector uses as input.
+    #
+    # @note When making an API call, you may pass SingleMetricAnomalyDetector
+    #   data as a hash:
+    #
+    #       {
+    #         namespace: "Namespace",
+    #         metric_name: "MetricName",
+    #         dimensions: [
+    #           {
+    #             name: "DimensionName", # required
+    #             value: "DimensionValue", # required
+    #           },
+    #         ],
+    #         stat: "AnomalyDetectorMetricStat",
+    #       }
+    #
+    # @!attribute [rw] namespace
+    #   The namespace of the metric to create the anomaly detection model
+    #   for.
+    #   @return [String]
+    #
+    # @!attribute [rw] metric_name
+    #   The name of the metric to create the anomaly detection model for.
+    #   @return [String]
+    #
+    # @!attribute [rw] dimensions
+    #   The metric dimensions to create the anomaly detection model for.
+    #   @return [Array<Types::Dimension>]
+    #
+    # @!attribute [rw] stat
+    #   The statistic to use for the metric and anomaly detection model.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/monitoring-2010-08-01/SingleMetricAnomalyDetector AWS API Documentation
+    #
+    class SingleMetricAnomalyDetector < Struct.new(
+      :namespace,
+      :metric_name,
+      :dimensions,
+      :stat)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass StartMetricStreamsInput
     #   data as a hash:
     #

data/lib/aws-sdk-cloudwatch.rb

@@ -52,6 +52,6 @@ require_relative 'aws-sdk-cloudwatch/customizations'
 # @!group service
 module Aws::CloudWatch
 
-  GEM_VERSION = '1.56.0'
+  GEM_VERSION = '1.60.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-cloudwatch
 version: !ruby/object:Gem::Version
-  version: 1.56.0
+  version: 1.60.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-18 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -19,7 +19,7 @@ dependencies:
         version: '3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.121.2
+        version: 3.125.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.121.2
+        version: 3.125.0
 - !ruby/object:Gem::Dependency
   name: aws-sigv4
   requirement: !ruby/object:Gem::Requirement