aws-sdk-cloudwatch 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d9a1b2bacedec9c1466999fc287f19c181f2217
-  data.tar.gz: 45683b3aa5773674b1c248931bcb86fc016cb35b
+  metadata.gz: 5b4039d21497b3f62dd18d7b8b017ca4e28d687d
+  data.tar.gz: 7492d20e1a11e4b77f9518452c525dd6db723230
 SHA512:
-  metadata.gz: a8b21dd58a4bacec25be3f034273cfd944d7f2622023bb7e3fe5f491418ff930f3342ade49cfd600614d314284424017734a84fd6193f6ff0e48281972756cb6
-  data.tar.gz: de0e156bafa6ccc6ff1d3c7de1c3a18b27f6fd6045968c369243565e479ee978c93cbbb884c245264fb77fb596017c855888c10179c978dbde80e8f3ef65846b
+  metadata.gz: bffe0c4e282c66bc0ec10fb93ba7f3c564688d420662eb90b2451ad8a0d18042da912a7322566d043405a168979e11b160c62749ce63a8fb0933bf179ee41540
+  data.tar.gz: dbbdbb2ee3577d728c8d5131e479b7b7fa14d8ec0ceea2e399e02f406439014ba72e81006abf2a93a18181ea60759f8b1d9979329acb7403c41aa9ccce36a705

data/lib/aws-sdk-cloudwatch.rb

@@ -45,6 +45,6 @@ require_relative 'aws-sdk-cloudwatch/customizations'
 # @service
 module Aws::CloudWatch
 
-  GEM_VERSION = '1.12.0'
+  GEM_VERSION = '1.13.0'
 
 end

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

@@ -192,6 +192,12 @@ module Aws::CloudWatch
       data[:evaluate_low_sample_count_percentile]
     end
 
+    
+    # @return [Array<Types::MetricDataQuery>]
+    def metrics
+      data[:metrics]
+    end
+
     # @!endgroup
 
     # @return [Client]

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

@@ -15,6 +15,8 @@ require 'aws-sdk-core/plugins/helpful_socket_errors.rb'
 require 'aws-sdk-core/plugins/retry_errors.rb'
 require 'aws-sdk-core/plugins/global_configuration.rb'
 require 'aws-sdk-core/plugins/regional_endpoint.rb'
+require 'aws-sdk-core/plugins/endpoint_discovery.rb'
+require 'aws-sdk-core/plugins/endpoint_pattern.rb'
 require 'aws-sdk-core/plugins/response_paging.rb'
 require 'aws-sdk-core/plugins/stub_responses.rb'
 require 'aws-sdk-core/plugins/idempotency_token.rb'
@@ -45,6 +47,8 @@ module Aws::CloudWatch
     add_plugin(Aws::Plugins::RetryErrors)
     add_plugin(Aws::Plugins::GlobalConfiguration)
     add_plugin(Aws::Plugins::RegionalEndpoint)
+    add_plugin(Aws::Plugins::EndpointDiscovery)
+    add_plugin(Aws::Plugins::EndpointPattern)
     add_plugin(Aws::Plugins::ResponsePaging)
     add_plugin(Aws::Plugins::StubResponses)
     add_plugin(Aws::Plugins::IdempotencyToken)
@@ -98,6 +102,10 @@ module Aws::CloudWatch
     #
     #   @option options [String] :access_key_id
     #
+    #   @option options [Boolean] :active_endpoint_cache (false)
+    #     When set to `true`, a thread polling for endpoints will be running in
+    #     the background every 60 secs (default). Defaults to `false`.
+    #
     #   @option options [Boolean] :client_side_monitoring (false)
     #     When `true`, client-side metrics will be collected for all API requests from
     #     this client.
@@ -118,11 +126,30 @@ module Aws::CloudWatch
     #     When `true`, an attempt is made to coerce request parameters into
     #     the required types.
     #
+    #   @option options [Boolean] :disable_host_prefix_injection (false)
+    #     Set to true to disable SDK automatically adding host prefix
+    #     to default service endpoint when available.
+    #
     #   @option options [String] :endpoint
     #     The client endpoint is normally constructed from the `:region`
     #     option. You should only configure an `:endpoint` when connecting
     #     to test endpoints. This should be avalid HTTP(S) URI.
     #
+    #   @option options [Integer] :endpoint_cache_max_entries (1000)
+    #     Used for the maximum size limit of the LRU cache storing endpoints data
+    #     for endpoint discovery enabled operations. Defaults to 1000.
+    #
+    #   @option options [Integer] :endpoint_cache_max_threads (10)
+    #     Used for the maximum threads in use for polling endpoints to be cached, defaults to 10.
+    #
+    #   @option options [Integer] :endpoint_cache_poll_interval (60)
+    #     When :endpoint_discovery and :active_endpoint_cache is enabled,
+    #     Use this option to config the time interval in seconds for making
+    #     requests fetching endpoints information. Defaults to 60 sec.
+    #
+    #   @option options [Boolean] :endpoint_discovery (false)
+    #     When set to `true`, endpoint discovery will be enabled for operations when available. Defaults to `false`.
+    #
     #   @option options [Aws::Log::Formatter] :log_formatter (Aws::Log::Formatter.default)
     #     The log formatter.
     #
@@ -359,6 +386,19 @@ module Aws::CloudWatch
     #   resp.metric_alarms[0].comparison_operator #=> String, one of "GreaterThanOrEqualToThreshold", "GreaterThanThreshold", "LessThanThreshold", "LessThanOrEqualToThreshold"
     #   resp.metric_alarms[0].treat_missing_data #=> String
     #   resp.metric_alarms[0].evaluate_low_sample_count_percentile #=> String
+    #   resp.metric_alarms[0].metrics #=> Array
+    #   resp.metric_alarms[0].metrics[0].id #=> String
+    #   resp.metric_alarms[0].metrics[0].metric_stat.metric.namespace #=> String
+    #   resp.metric_alarms[0].metrics[0].metric_stat.metric.metric_name #=> String
+    #   resp.metric_alarms[0].metrics[0].metric_stat.metric.dimensions #=> Array
+    #   resp.metric_alarms[0].metrics[0].metric_stat.metric.dimensions[0].name #=> String
+    #   resp.metric_alarms[0].metrics[0].metric_stat.metric.dimensions[0].value #=> String
+    #   resp.metric_alarms[0].metrics[0].metric_stat.period #=> Integer
+    #   resp.metric_alarms[0].metrics[0].metric_stat.stat #=> String
+    #   resp.metric_alarms[0].metrics[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.metric_alarms[0].metrics[0].expression #=> String
+    #   resp.metric_alarms[0].metrics[0].label #=> String
+    #   resp.metric_alarms[0].metrics[0].return_data #=> Boolean
     #   resp.next_token #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/monitoring-2010-08-01/DescribeAlarms AWS API Documentation
@@ -452,6 +492,19 @@ module Aws::CloudWatch
     #   resp.metric_alarms[0].comparison_operator #=> String, one of "GreaterThanOrEqualToThreshold", "GreaterThanThreshold", "LessThanThreshold", "LessThanOrEqualToThreshold"
     #   resp.metric_alarms[0].treat_missing_data #=> String
     #   resp.metric_alarms[0].evaluate_low_sample_count_percentile #=> String
+    #   resp.metric_alarms[0].metrics #=> Array
+    #   resp.metric_alarms[0].metrics[0].id #=> String
+    #   resp.metric_alarms[0].metrics[0].metric_stat.metric.namespace #=> String
+    #   resp.metric_alarms[0].metrics[0].metric_stat.metric.metric_name #=> String
+    #   resp.metric_alarms[0].metrics[0].metric_stat.metric.dimensions #=> Array
+    #   resp.metric_alarms[0].metrics[0].metric_stat.metric.dimensions[0].name #=> String
+    #   resp.metric_alarms[0].metrics[0].metric_stat.metric.dimensions[0].value #=> String
+    #   resp.metric_alarms[0].metrics[0].metric_stat.period #=> Integer
+    #   resp.metric_alarms[0].metrics[0].metric_stat.stat #=> String
+    #   resp.metric_alarms[0].metrics[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.metric_alarms[0].metrics[0].expression #=> String
+    #   resp.metric_alarms[0].metrics[0].label #=> String
+    #   resp.metric_alarms[0].metrics[0].return_data #=> Boolean
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/monitoring-2010-08-01/DescribeAlarmsForMetric AWS API Documentation
     #
@@ -1163,20 +1216,19 @@ module Aws::CloudWatch
     end
 
     # Creates or updates an alarm and associates it with the specified
-    # metric. Optionally, this operation can associate one or more Amazon
-    # SNS resources with the alarm.
+    # metric or metric math expression.
     #
     # When this operation creates an alarm, the alarm state is immediately
-    # set to `INSUFFICIENT_DATA`. The alarm is evaluated and its state is
-    # set appropriately. Any actions associated with the state are then
-    # executed.
+    # set to `INSUFFICIENT_DATA`. The alarm is then evaluated and its state
+    # is set appropriately. Any actions associated with the new state are
+    # then executed.
     #
     # When you update an existing alarm, its state is left unchanged, but
     # the update completely overwrites the previous configuration of the
     # alarm.
     #
     # If you are an IAM user, you must have Amazon EC2 permissions for some
-    # operations:
+    # alarm operations:
     #
     # * `iam:CreateServiceLinkedRole` for all alarms with EC2 actions
     #
@@ -1207,15 +1259,15 @@ module Aws::CloudWatch
     # The first time you create an alarm in the AWS Management Console, the
     # CLI, or by using the PutMetricAlarm API, CloudWatch creates the
     # necessary service-linked role for you. The service-linked role is
-    # called `AWSServiceRoleForCloudWatchEvents`. For more information about
-    # service-linked roles, see [AWS service-linked role][1].
+    # called `AWSServiceRoleForCloudWatchEvents`. For more information, see
+    # [AWS service-linked role][1].
     #
     #
     #
     # [1]: http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_terms-and-concepts.html#iam-term-service-linked-role
     #
     # @option params [required, String] :alarm_name
-    #   The name for the alarm. This name must be unique within the AWS
+    #   The name for the alarm. This name must be unique within your AWS
     #   account.
     #
     # @option params [String] :alarm_description
@@ -1223,7 +1275,7 @@ module Aws::CloudWatch
     #
     # @option params [Boolean] :actions_enabled
     #   Indicates whether actions should be executed during any changes to the
-    #   alarm state.
+    #   alarm state. The default is TRUE.
     #
     # @option params [Array<String>] :ok_actions
     #   The actions to execute when this alarm transitions to an `OK` state
@@ -1233,6 +1285,7 @@ module Aws::CloudWatch
     #   Valid Values: `arn:aws:automate:region:ec2:stop` \|
     #   `arn:aws:automate:region:ec2:terminate` \|
     #   `arn:aws:automate:region:ec2:recover` \|
+    #   `arn:aws:automate:region:ec2:reboot` \|
     #   `arn:aws:sns:region:account-id:sns-topic-name ` \|
     #   `arn:aws:autoscaling:region:account-id:scalingPolicy:policy-idautoScalingGroupName/group-friendly-name:policyName/policy-friendly-name
     #   `
@@ -1282,30 +1335,36 @@ module Aws::CloudWatch
     #   \|
     #   `arn:aws:swf:region:account-id:action/actions/AWS_EC2.InstanceId.Reboot/1.0`
     #
-    # @option params [required, String] :metric_name
+    # @option params [String] :metric_name
     #   The name for the metric associated with the alarm.
     #
-    # @option params [required, String] :namespace
-    #   The namespace for the metric associated with the alarm.
+    #   If you are creating an alarm based on a math expression, you cannot
+    #   specify this parameter, or any of the `Dimensions`, `Period`,
+    #   `Namespace`, `Statistic`, or `ExtendedStatistic` parameters. Instead,
+    #   you specify all this information in the `Metrics` array.
+    #
+    # @option params [String] :namespace
+    #   The namespace for the metric associated specified in `MetricName`.
     #
     # @option params [String] :statistic
-    #   The statistic for the metric associated with the alarm, other than
+    #   The statistic for the metric specified in `MetricName`, other than
     #   percentile. For percentile statistics, use `ExtendedStatistic`. When
-    #   you call `PutMetricAlarm`, you must specify either `Statistic` or
-    #   `ExtendedStatistic,` but not both.
+    #   you call `PutMetricAlarm` and specify a `MetricName`, you must specify
+    #   either `Statistic` or `ExtendedStatistic,` but not both.
     #
     # @option params [String] :extended_statistic
-    #   The percentile statistic for the metric associated with the alarm.
-    #   Specify a value between p0.0 and p100. When you call `PutMetricAlarm`,
-    #   you must specify either `Statistic` or `ExtendedStatistic,` but not
-    #   both.
+    #   The percentile statistic for the metric specified in `MetricName`.
+    #   Specify a value between p0.0 and p100. When you call `PutMetricAlarm`
+    #   and specify a `MetricName`, you must specify either `Statistic` or
+    #   `ExtendedStatistic,` but not both.
     #
     # @option params [Array<Types::Dimension>] :dimensions
-    #   The dimensions for the metric associated with the alarm.
+    #   The dimensions for the metric specified in `MetricName`.
     #
-    # @option params [required, Integer] :period
-    #   The period, in seconds, over which the specified statistic is applied.
-    #   Valid values are 10, 30, and any multiple of 60.
+    # @option params [Integer] :period
+    #   The length, in seconds, used each time the metric specified in
+    #   `MetricName` is evaluated. Valid values are 10, 30, and any multiple
+    #   of 60.
     #
     #   Be sure to specify 10 or 30 only for metrics that are stored by a
     #   `PutMetricData` call with a `StorageResolution` of 1. If you specify a
@@ -1340,7 +1399,7 @@ module Aws::CloudWatch
     #
     # @option params [required, Integer] :evaluation_periods
     #   The number of periods over which data is compared to the specified
-    #   threshold. If you are setting an alarm which requires that a number of
+    #   threshold. If you are setting an alarm that requires that a number of
     #   consecutive data points be breaching to trigger the alarm, this value
     #   specifies that number. If you are setting an "M out of N" alarm,
     #   this value is the N.
@@ -1394,6 +1453,18 @@ module Aws::CloudWatch
     #
     #   [1]: http://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/AlarmThatSendsEmail.html#percentiles-with-low-samples
     #
+    # @option params [Array<Types::MetricDataQuery>] :metrics
+    #   An array of `MetricDataQuery` structures that enable you to create an
+    #   alarm based on the result of a metric math expression. Each item in
+    #   the `Metrics` array either retrieves a metric or performs a math
+    #   expression.
+    #
+    #   If you use the `Metrics` parameter, you cannot include the
+    #   `MetricName`, `Dimensions`, `Period`, `Namespace`, `Statistic`, or
+    #   `ExtendedStatistic` parameters of `PutMetricAlarm` in the same
+    #   operation. Instead, you retrieve the metrics you are using in your
+    #   math expression as part of the `Metrics` array.
+    #
     # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
     #
     # @example Request syntax with placeholder values
@@ -1405,8 +1476,8 @@ module Aws::CloudWatch
     #     ok_actions: ["ResourceName"],
     #     alarm_actions: ["ResourceName"],
     #     insufficient_data_actions: ["ResourceName"],
-    #     metric_name: "MetricName", # required
-    #     namespace: "Namespace", # required
+    #     metric_name: "MetricName",
+    #     namespace: "Namespace",
     #     statistic: "SampleCount", # accepts SampleCount, Average, Sum, Minimum, Maximum
     #     extended_statistic: "ExtendedStatistic",
     #     dimensions: [
@@ -1415,7 +1486,7 @@ module Aws::CloudWatch
     #         value: "DimensionValue", # required
     #       },
     #     ],
-    #     period: 1, # required
+    #     period: 1,
     #     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
     #     evaluation_periods: 1, # required
     #     datapoints_to_alarm: 1,
@@ -1423,6 +1494,29 @@ module Aws::CloudWatch
     #     comparison_operator: "GreaterThanOrEqualToThreshold", # required, accepts GreaterThanOrEqualToThreshold, GreaterThanThreshold, LessThanThreshold, LessThanOrEqualToThreshold
     #     treat_missing_data: "TreatMissingData",
     #     evaluate_low_sample_count_percentile: "EvaluateLowSampleCountPercentile",
+    #     metrics: [
+    #       {
+    #         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,
+    #       },
+    #     ],
     #   })
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/monitoring-2010-08-01/PutMetricAlarm AWS API Documentation
@@ -1434,11 +1528,11 @@ module Aws::CloudWatch
       req.send_request(options)
     end
 
-    # Publishes metric data to Amazon CloudWatch. CloudWatch associates the
-    # data with the specified metric. If the specified metric does not
-    # exist, CloudWatch creates the metric. When CloudWatch creates a
-    # metric, it can take up to fifteen minutes for the metric to appear in
-    # calls to ListMetrics.
+    # Publishes metric data points to Amazon CloudWatch. CloudWatch
+    # associates the data points with the specified metric. If the specified
+    # metric does not exist, CloudWatch creates the metric. When CloudWatch
+    # creates a metric, it can take up to fifteen minutes for the metric to
+    # appear in calls to ListMetrics.
     #
     # You can publish either individual data points in the `Value` field, or
     # arrays of values and the number of times each value occurred during
@@ -1468,11 +1562,9 @@ module Aws::CloudWatch
     # GetMetricStatistics from the time they are submitted.
     #
     # CloudWatch needs raw data points to calculate percentile statistics.
-    # These raw data points could be published individually or as part of
-    # `Values` and `Counts` arrays. If you publish data using statistic sets
-    # in the `StatisticValues` field instead, you can only retrieve
-    # percentile statistics for this data if one of the following conditions
-    # is true:
+    # If you publish data using a statistic set instead, you can only
+    # retrieve percentile statistics for this data if one of the following
+    # conditions is true:
     #
     # * The `SampleCount` value of the statistic set is 1 and `Min`, `Max`,
     #   and `Sum` are all equal.
@@ -1593,7 +1685,7 @@ module Aws::CloudWatch
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-cloudwatch'
-      context[:gem_version] = '1.12.0'
+      context[:gem_version] = '1.13.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -347,6 +347,7 @@ module Aws::CloudWatch
     MetricAlarm.add_member(:comparison_operator, Shapes::ShapeRef.new(shape: ComparisonOperator, location_name: "ComparisonOperator"))
     MetricAlarm.add_member(:treat_missing_data, Shapes::ShapeRef.new(shape: TreatMissingData, location_name: "TreatMissingData"))
     MetricAlarm.add_member(:evaluate_low_sample_count_percentile, Shapes::ShapeRef.new(shape: EvaluateLowSampleCountPercentile, location_name: "EvaluateLowSampleCountPercentile"))
+    MetricAlarm.add_member(:metrics, Shapes::ShapeRef.new(shape: MetricDataQueries, location_name: "Metrics"))
     MetricAlarm.struct_class = Types::MetricAlarm
 
     MetricAlarms.member = Shapes::ShapeRef.new(shape: MetricAlarm)
@@ -406,12 +407,12 @@ module Aws::CloudWatch
     PutMetricAlarmInput.add_member(:ok_actions, Shapes::ShapeRef.new(shape: ResourceList, location_name: "OKActions"))
     PutMetricAlarmInput.add_member(:alarm_actions, Shapes::ShapeRef.new(shape: ResourceList, location_name: "AlarmActions"))
     PutMetricAlarmInput.add_member(:insufficient_data_actions, Shapes::ShapeRef.new(shape: ResourceList, location_name: "InsufficientDataActions"))
-    PutMetricAlarmInput.add_member(:metric_name, Shapes::ShapeRef.new(shape: MetricName, required: true, location_name: "MetricName"))
-    PutMetricAlarmInput.add_member(:namespace, Shapes::ShapeRef.new(shape: Namespace, required: true, location_name: "Namespace"))
+    PutMetricAlarmInput.add_member(:metric_name, Shapes::ShapeRef.new(shape: MetricName, location_name: "MetricName"))
+    PutMetricAlarmInput.add_member(:namespace, Shapes::ShapeRef.new(shape: Namespace, location_name: "Namespace"))
     PutMetricAlarmInput.add_member(:statistic, Shapes::ShapeRef.new(shape: Statistic, location_name: "Statistic"))
     PutMetricAlarmInput.add_member(:extended_statistic, Shapes::ShapeRef.new(shape: ExtendedStatistic, location_name: "ExtendedStatistic"))
     PutMetricAlarmInput.add_member(:dimensions, Shapes::ShapeRef.new(shape: Dimensions, location_name: "Dimensions"))
-    PutMetricAlarmInput.add_member(:period, Shapes::ShapeRef.new(shape: Period, required: true, location_name: "Period"))
+    PutMetricAlarmInput.add_member(:period, Shapes::ShapeRef.new(shape: Period, location_name: "Period"))
     PutMetricAlarmInput.add_member(:unit, Shapes::ShapeRef.new(shape: StandardUnit, location_name: "Unit"))
     PutMetricAlarmInput.add_member(:evaluation_periods, Shapes::ShapeRef.new(shape: EvaluationPeriods, required: true, location_name: "EvaluationPeriods"))
     PutMetricAlarmInput.add_member(:datapoints_to_alarm, Shapes::ShapeRef.new(shape: DatapointsToAlarm, location_name: "DatapointsToAlarm"))
@@ -419,6 +420,7 @@ module Aws::CloudWatch
     PutMetricAlarmInput.add_member(:comparison_operator, Shapes::ShapeRef.new(shape: ComparisonOperator, required: true, location_name: "ComparisonOperator"))
     PutMetricAlarmInput.add_member(:treat_missing_data, Shapes::ShapeRef.new(shape: TreatMissingData, location_name: "TreatMissingData"))
     PutMetricAlarmInput.add_member(:evaluate_low_sample_count_percentile, Shapes::ShapeRef.new(shape: EvaluateLowSampleCountPercentile, location_name: "EvaluateLowSampleCountPercentile"))
+    PutMetricAlarmInput.add_member(:metrics, Shapes::ShapeRef.new(shape: MetricDataQueries, location_name: "Metrics"))
     PutMetricAlarmInput.struct_class = Types::PutMetricAlarmInput
 
     PutMetricDataInput.add_member(:namespace, Shapes::ShapeRef.new(shape: Namespace, required: true, location_name: "Namespace"))

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

@@ -312,7 +312,7 @@ module Aws::CloudWatch
     #         value: "DimensionValue", # required
     #       },
     #     ],
-    #     period: 1, # required
+    #     period: 1,
     #     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
     #     evaluation_periods: 1, # required
     #     datapoints_to_alarm: 1,
@@ -320,16 +320,39 @@ module Aws::CloudWatch
     #     comparison_operator: "GreaterThanOrEqualToThreshold", # required, accepts GreaterThanOrEqualToThreshold, GreaterThanThreshold, LessThanThreshold, LessThanOrEqualToThreshold
     #     treat_missing_data: "TreatMissingData",
     #     evaluate_low_sample_count_percentile: "EvaluateLowSampleCountPercentile",
+    #     metrics: [
+    #       {
+    #         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,
+    #       },
+    #     ],
     #   })
     # @param [Hash] options ({})
     # @option options [required, String] :alarm_name
-    #   The name for the alarm. This name must be unique within the AWS
+    #   The name for the alarm. This name must be unique within your AWS
     #   account.
     # @option options [String] :alarm_description
     #   The description for the alarm.
     # @option options [Boolean] :actions_enabled
     #   Indicates whether actions should be executed during any changes to the
-    #   alarm state.
+    #   alarm state. The default is TRUE.
     # @option options [Array<String>] :ok_actions
     #   The actions to execute when this alarm transitions to an `OK` state
     #   from any other state. Each action is specified as an Amazon Resource
@@ -338,6 +361,7 @@ module Aws::CloudWatch
     #   Valid Values: `arn:aws:automate:region:ec2:stop` \|
     #   `arn:aws:automate:region:ec2:terminate` \|
     #   `arn:aws:automate:region:ec2:recover` \|
+    #   `arn:aws:automate:region:ec2:reboot` \|
     #   `arn:aws:sns:region:account-id:sns-topic-name ` \|
     #   `arn:aws:autoscaling:region:account-id:scalingPolicy:policy-idautoScalingGroupName/group-friendly-name:policyName/policy-friendly-name
     #   `
@@ -385,20 +409,21 @@ module Aws::CloudWatch
     #   \|
     #   `arn:aws:swf:region:account-id:action/actions/AWS_EC2.InstanceId.Reboot/1.0`
     # @option options [String] :statistic
-    #   The statistic for the metric associated with the alarm, other than
+    #   The statistic for the metric specified in `MetricName`, other than
     #   percentile. For percentile statistics, use `ExtendedStatistic`. When
-    #   you call `PutMetricAlarm`, you must specify either `Statistic` or
-    #   `ExtendedStatistic,` but not both.
+    #   you call `PutMetricAlarm` and specify a `MetricName`, you must specify
+    #   either `Statistic` or `ExtendedStatistic,` but not both.
     # @option options [String] :extended_statistic
-    #   The percentile statistic for the metric associated with the alarm.
-    #   Specify a value between p0.0 and p100. When you call `PutMetricAlarm`,
-    #   you must specify either `Statistic` or `ExtendedStatistic,` but not
-    #   both.
+    #   The percentile statistic for the metric specified in `MetricName`.
+    #   Specify a value between p0.0 and p100. When you call `PutMetricAlarm`
+    #   and specify a `MetricName`, you must specify either `Statistic` or
+    #   `ExtendedStatistic,` but not both.
     # @option options [Array<Types::Dimension>] :dimensions
-    #   The dimensions for the metric associated with the alarm.
-    # @option options [required, Integer] :period
-    #   The period, in seconds, over which the specified statistic is applied.
-    #   Valid values are 10, 30, and any multiple of 60.
+    #   The dimensions for the metric specified in `MetricName`.
+    # @option options [Integer] :period
+    #   The length, in seconds, used each time the metric specified in
+    #   `MetricName` is evaluated. Valid values are 10, 30, and any multiple
+    #   of 60.
     #
     #   Be sure to specify 10 or 30 only for metrics that are stored by a
     #   `PutMetricData` call with a `StorageResolution` of 1. If you specify a
@@ -431,7 +456,7 @@ module Aws::CloudWatch
     #   `INSUFFICIENT DATA` state.
     # @option options [required, Integer] :evaluation_periods
     #   The number of periods over which data is compared to the specified
-    #   threshold. If you are setting an alarm which requires that a number of
+    #   threshold. If you are setting an alarm that requires that a number of
     #   consecutive data points be breaching to trigger the alarm, this value
     #   specifies that number. If you are setting an "M out of N" alarm,
     #   this value is the N.
@@ -479,6 +504,17 @@ module Aws::CloudWatch
     #
     #
     #   [1]: http://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/AlarmThatSendsEmail.html#percentiles-with-low-samples
+    # @option options [Array<Types::MetricDataQuery>] :metrics
+    #   An array of `MetricDataQuery` structures that enable you to create an
+    #   alarm based on the result of a metric math expression. Each item in
+    #   the `Metrics` array either retrieves a metric or performs a math
+    #   expression.
+    #
+    #   If you use the `Metrics` parameter, you cannot include the
+    #   `MetricName`, `Dimensions`, `Period`, `Namespace`, `Statistic`, or
+    #   `ExtendedStatistic` parameters of `PutMetricAlarm` in the same
+    #   operation. Instead, you retrieve the metrics you are using in your
+    #   math expression as part of the `Metrics` array.
     # @return [Alarm]
     def put_alarm(options = {})
       options = options.merge(

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

@@ -1008,7 +1008,7 @@ module Aws::CloudWatch
     #   @return [String]
     #
     # @!attribute [rw] metric_name
-    #   The name of the metric.
+    #   The name of the metric. This is a required field.
     #   @return [String]
     #
     # @!attribute [rw] dimensions
@@ -1144,6 +1144,9 @@ module Aws::CloudWatch
     #   matter how many data points are available.
     #   @return [String]
     #
+    # @!attribute [rw] metrics
+    #   @return [Array<Types::MetricDataQuery>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/monitoring-2010-08-01/MetricAlarm AWS API Documentation
     #
     class MetricAlarm < Struct.new(
@@ -1171,14 +1174,41 @@ module Aws::CloudWatch
       :threshold,
       :comparison_operator,
       :treat_missing_data,
-      :evaluate_low_sample_count_percentile)
+      :evaluate_low_sample_count_percentile,
+      :metrics)
       include Aws::Structure
     end
 
-    # This structure indicates the metric data to return, and whether this
-    # call is just retrieving a batch set of data for one metric, or is
-    # performing a math expression on metric data. A single `GetMetricData`
-    # call can include up to 100 `MetricDataQuery` structures.
+    # This structure is used in both `GetMetricData` and `PutMetricAlarm`.
+    # The supported use of this structure is different for those two
+    # operations.
+    #
+    # When used in `GetMetricData`, it indicates the metric data to return,
+    # and whether this call is just retrieving a batch set of data for one
+    # metric, or is performing a math expression on metric data. A single
+    # `GetMetricData` call can include up to 100 `MetricDataQuery`
+    # structures.
+    #
+    # When used in `PutMetricAlarm`, it enables you to create an alarm based
+    # on a metric math expression. Each `MetricDataQuery` in the array
+    # specifies either a metric to retrieve, or a math expression to be
+    # performed on retrieved metrics. A single `PutMetricAlarm` call can
+    # include up to 20 `MetricDataQuery` structures in the array. The 20
+    # structures can include as many as 10 structures that contain a
+    # `MetricStat` parameter to retrieve a metric, and as many as 10
+    # structures that contain the `Expression` parameter to perform a math
+    # expression. Any expression used in a `PutMetricAlarm` operation must
+    # return a single time series. For more information, see [Metric Math
+    # Syntax and Functions][1] in the *Amazon CloudWatch User Guide*.
+    #
+    # Some of the parameters of this structure also have different uses
+    # whether you are using this structure in a `GetMetricData` operation or
+    # a `PutMetricAlarm` operation. These differences are explained in the
+    # following parameter list.
+    #
+    #
+    #
+    # [1]: http://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/using-metric-math.html#metric-math-syntax
     #
     # @note When making an API call, you may pass MetricDataQuery
     #   data as a hash:
@@ -1206,31 +1236,33 @@ module Aws::CloudWatch
     #       }
     #
     # @!attribute [rw] id
-    #   A short name used to tie this structure to the results in the
-    #   response. This name must be unique within a single call to
-    #   `GetMetricData`. If you are performing math expressions on this set
-    #   of data, this name represents that data and can serve as a variable
-    #   in the mathematical expression. The valid characters are letters,
-    #   numbers, and underscore. The first character must be a lowercase
-    #   letter.
+    #   A short name used to tie this object to the results in the response.
+    #   This name must be unique within a single call to `GetMetricData`. If
+    #   you are performing math expressions on this set of data, this name
+    #   represents that data and can serve as a variable in the mathematical
+    #   expression. The valid characters are letters, numbers, and
+    #   underscore. The first character must be a lowercase letter.
     #   @return [String]
     #
     # @!attribute [rw] metric_stat
     #   The metric to be returned, along with statistics, period, and units.
-    #   Use this parameter only if this structure is performing a data
-    #   retrieval and not performing a math expression on the returned data.
+    #   Use this parameter only if this object is retrieving a metric and
+    #   not performing a math expression on returned data.
     #
-    #   Within one MetricDataQuery structure, you must specify either
+    #   Within one MetricDataQuery object, you must specify either
     #   `Expression` or `MetricStat` but not both.
     #   @return [Types::MetricStat]
     #
     # @!attribute [rw] expression
     #   The math expression to be performed on the returned data, if this
-    #   structure is performing a math expression. For more information
-    #   about metric math expressions, see [Metric Math Syntax and
-    #   Functions][1] in the *Amazon CloudWatch User Guide*.
-    #
-    #   Within one MetricDataQuery structure, you must specify either
+    #   object is performing a math expression. This expression can use the
+    #   `Id` of the other metrics to refer to those metrics, and can also
+    #   use the `Id` of other expressions to use the result of those
+    #   expressions. For more information about metric math expressions, see
+    #   [Metric Math Syntax and Functions][1] in the *Amazon CloudWatch User
+    #   Guide*.
+    #
+    #   Within each MetricDataQuery object, you must specify either
     #   `Expression` or `MetricStat` but not both.
     #
     #
@@ -1247,10 +1279,15 @@ module Aws::CloudWatch
     #   @return [String]
     #
     # @!attribute [rw] return_data
-    #   Indicates whether to return the time stamps and raw data values of
-    #   this metric. If you are performing this call just to do math
-    #   expressions and do not also need the raw data returned, you can
-    #   specify `False`. If you omit this, the default of `True` is used.
+    #   When used in `GetMetricData`, this option indicates whether to
+    #   return the timestamps and raw data values of this metric. If you are
+    #   performing this call just to do math expressions and do not also
+    #   need the raw data returned, you can specify `False`. If you omit
+    #   this, the default of `True` is used.
+    #
+    #   When used in `PutMetricAlarm`, specify `True` for the one expression
+    #   result to use as the alarm. For all other metrics and expressions in
+    #   the same `PutMetricAlarm` operation, specify `ReturnData` as False.
     #   @return [Boolean]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/monitoring-2010-08-01/MetricDataQuery AWS API Documentation
@@ -1266,7 +1303,7 @@ module Aws::CloudWatch
 
     # A `GetMetricData` call returns an array of `MetricDataResult`
     # structures. Each of these structures includes the data points for that
-    # metric, along with the time stamps of those data points and other
+    # metric, along with the timestamps of those data points and other
     # identifying information.
     #
     # @!attribute [rw] id
@@ -1278,15 +1315,15 @@ module Aws::CloudWatch
     #   @return [String]
     #
     # @!attribute [rw] timestamps
-    #   The time stamps for the data points, formatted in Unix timestamp
-    #   format. The number of time stamps always matches the number of
-    #   values and the value for Timestamps\[x\] is Values\[x\].
+    #   The timestamps for the data points, formatted in Unix timestamp
+    #   format. The number of timestamps always matches the number of values
+    #   and the value for Timestamps\[x\] is Values\[x\].
     #   @return [Array<Time>]
     #
     # @!attribute [rw] values
     #   The data points for the metric corresponding to `Timestamps`. The
-    #   number of values always matches the number of time stamps and the
-    #   time stamp for Values\[x\] is Timestamps\[x\].
+    #   number of values always matches the number of timestamps and the
+    #   timestamp for Values\[x\] is Timestamps\[x\].
     #   @return [Array<Float>]
     #
     # @!attribute [rw] status_code
@@ -1461,7 +1498,7 @@ module Aws::CloudWatch
     #   @return [Types::Metric]
     #
     # @!attribute [rw] period
-    #   The period to use when retrieving the metric.
+    #   The period, in seconds, to use when retrieving the metric.
     #   @return [Integer]
     #
     # @!attribute [rw] stat
@@ -1545,8 +1582,8 @@ module Aws::CloudWatch
     #         ok_actions: ["ResourceName"],
     #         alarm_actions: ["ResourceName"],
     #         insufficient_data_actions: ["ResourceName"],
-    #         metric_name: "MetricName", # required
-    #         namespace: "Namespace", # required
+    #         metric_name: "MetricName",
+    #         namespace: "Namespace",
     #         statistic: "SampleCount", # accepts SampleCount, Average, Sum, Minimum, Maximum
     #         extended_statistic: "ExtendedStatistic",
     #         dimensions: [
@@ -1555,7 +1592,7 @@ module Aws::CloudWatch
     #             value: "DimensionValue", # required
     #           },
     #         ],
-    #         period: 1, # required
+    #         period: 1,
     #         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
     #         evaluation_periods: 1, # required
     #         datapoints_to_alarm: 1,
@@ -1563,10 +1600,33 @@ module Aws::CloudWatch
     #         comparison_operator: "GreaterThanOrEqualToThreshold", # required, accepts GreaterThanOrEqualToThreshold, GreaterThanThreshold, LessThanThreshold, LessThanOrEqualToThreshold
     #         treat_missing_data: "TreatMissingData",
     #         evaluate_low_sample_count_percentile: "EvaluateLowSampleCountPercentile",
+    #         metrics: [
+    #           {
+    #             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,
+    #           },
+    #         ],
     #       }
     #
     # @!attribute [rw] alarm_name
-    #   The name for the alarm. This name must be unique within the AWS
+    #   The name for the alarm. This name must be unique within your AWS
     #   account.
     #   @return [String]
     #
@@ -1576,7 +1636,7 @@ module Aws::CloudWatch
     #
     # @!attribute [rw] actions_enabled
     #   Indicates whether actions should be executed during any changes to
-    #   the alarm state.
+    #   the alarm state. The default is TRUE.
     #   @return [Boolean]
     #
     # @!attribute [rw] ok_actions
@@ -1587,6 +1647,7 @@ module Aws::CloudWatch
     #   Valid Values: `arn:aws:automate:region:ec2:stop` \|
     #   `arn:aws:automate:region:ec2:terminate` \|
     #   `arn:aws:automate:region:ec2:recover` \|
+    #   `arn:aws:automate:region:ec2:reboot` \|
     #   `arn:aws:sns:region:account-id:sns-topic-name ` \|
     #   `arn:aws:autoscaling:region:account-id:scalingPolicy:policy-idautoScalingGroupName/group-friendly-name:policyName/policy-friendly-name
     #   `
@@ -1641,33 +1702,39 @@ module Aws::CloudWatch
     #
     # @!attribute [rw] metric_name
     #   The name for the metric associated with the alarm.
+    #
+    #   If you are creating an alarm based on a math expression, you cannot
+    #   specify this parameter, or any of the `Dimensions`, `Period`,
+    #   `Namespace`, `Statistic`, or `ExtendedStatistic` parameters.
+    #   Instead, you specify all this information in the `Metrics` array.
     #   @return [String]
     #
     # @!attribute [rw] namespace
-    #   The namespace for the metric associated with the alarm.
+    #   The namespace for the metric associated specified in `MetricName`.
     #   @return [String]
     #
     # @!attribute [rw] statistic
-    #   The statistic for the metric associated with the alarm, other than
+    #   The statistic for the metric specified in `MetricName`, other than
     #   percentile. For percentile statistics, use `ExtendedStatistic`. When
-    #   you call `PutMetricAlarm`, you must specify either `Statistic` or
-    #   `ExtendedStatistic,` but not both.
+    #   you call `PutMetricAlarm` and specify a `MetricName`, you must
+    #   specify either `Statistic` or `ExtendedStatistic,` but not both.
     #   @return [String]
     #
     # @!attribute [rw] extended_statistic
-    #   The percentile statistic for the metric associated with the alarm.
+    #   The percentile statistic for the metric specified in `MetricName`.
     #   Specify a value between p0.0 and p100. When you call
-    #   `PutMetricAlarm`, you must specify either `Statistic` or
-    #   `ExtendedStatistic,` but not both.
+    #   `PutMetricAlarm` and specify a `MetricName`, you must specify either
+    #   `Statistic` or `ExtendedStatistic,` but not both.
     #   @return [String]
     #
     # @!attribute [rw] dimensions
-    #   The dimensions for the metric associated with the alarm.
+    #   The dimensions for the metric specified in `MetricName`.
     #   @return [Array<Types::Dimension>]
     #
     # @!attribute [rw] period
-    #   The period, in seconds, over which the specified statistic is
-    #   applied. Valid values are 10, 30, and any multiple of 60.
+    #   The length, in seconds, used each time the metric specified in
+    #   `MetricName` is evaluated. Valid values are 10, 30, and any multiple
+    #   of 60.
     #
     #   Be sure to specify 10 or 30 only for metrics that are stored by a
     #   `PutMetricData` call with a `StorageResolution` of 1. If you specify
@@ -1705,7 +1772,7 @@ module Aws::CloudWatch
     #
     # @!attribute [rw] evaluation_periods
     #   The number of periods over which data is compared to the specified
-    #   threshold. If you are setting an alarm which requires that a number
+    #   threshold. If you are setting an alarm that requires that a number
     #   of consecutive data points be breaching to trigger the alarm, this
     #   value specifies that number. If you are setting an "M out of N"
     #   alarm, this value is the N.
@@ -1765,6 +1832,19 @@ module Aws::CloudWatch
     #   [1]: http://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/AlarmThatSendsEmail.html#percentiles-with-low-samples
     #   @return [String]
     #
+    # @!attribute [rw] metrics
+    #   An array of `MetricDataQuery` structures that enable you to create
+    #   an alarm based on the result of a metric math expression. Each item
+    #   in the `Metrics` array either retrieves a metric or performs a math
+    #   expression.
+    #
+    #   If you use the `Metrics` parameter, you cannot include the
+    #   `MetricName`, `Dimensions`, `Period`, `Namespace`, `Statistic`, or
+    #   `ExtendedStatistic` parameters of `PutMetricAlarm` in the same
+    #   operation. Instead, you retrieve the metrics you are using in your
+    #   math expression as part of the `Metrics` array.
+    #   @return [Array<Types::MetricDataQuery>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/monitoring-2010-08-01/PutMetricAlarmInput AWS API Documentation
     #
     class PutMetricAlarmInput < Struct.new(
@@ -1786,7 +1866,8 @@ module Aws::CloudWatch
       :threshold,
       :comparison_operator,
       :treat_missing_data,
-      :evaluate_low_sample_count_percentile)
+      :evaluate_low_sample_count_percentile,
+      :metrics)
       include Aws::Structure
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-cloudwatch
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2018-11-20 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.26.0
+        version: 3.39.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.26.0
+        version: 3.39.0
 - !ruby/object:Gem::Dependency
   name: aws-sigv4
   requirement: !ruby/object:Gem::Requirement