aws-sdk-computeoptimizer 1.25.0 → 1.29.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +20 -0
- data/VERSION +1 -1
- data/lib/aws-sdk-computeoptimizer/client.rb +313 -12
- data/lib/aws-sdk-computeoptimizer/client_api.rb +166 -0
- data/lib/aws-sdk-computeoptimizer/types.rb +625 -23
- data/lib/aws-sdk-computeoptimizer.rb +2 -2
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: bc1e4eb27dba50b105bca61492a5b37993687f8775b54a3f253dfe7cab54bf4a
|
4
|
+
data.tar.gz: ef7bae409e19b2a348faf8a2523386c0a74aeba79d0919c0262bce4be5ade3cc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0e40fa663d8e7889830a50ac8abaff19ad2c9ab73359b4b03bd23645d42f178a0c06076ab0b8d5742fd4aeefd002ca14157156a2dcf304f07bc14f97f098c359
|
7
|
+
data.tar.gz: 11a89f02532bb2edce23cad5b1e2135b14d8bcfe14a7e1c5501faf0d4eb6ceb22e4c17ed4a8920c768489a5f15d91fa9339cb2565d38e72de78a75e33387017e
|
data/CHANGELOG.md
CHANGED
@@ -1,6 +1,26 @@
|
|
1
1
|
Unreleased Changes
|
2
2
|
------------------
|
3
3
|
|
4
|
+
1.29.0 (2021-12-21)
|
5
|
+
------------------
|
6
|
+
|
7
|
+
* Feature - Code Generated Changes, see `./build_tools` or `aws-sdk-core`'s CHANGELOG.md for details.
|
8
|
+
|
9
|
+
1.28.0 (2021-11-30)
|
10
|
+
------------------
|
11
|
+
|
12
|
+
* Feature - Code Generated Changes, see `./build_tools` or `aws-sdk-core`'s CHANGELOG.md for details.
|
13
|
+
|
14
|
+
1.27.0 (2021-11-29)
|
15
|
+
------------------
|
16
|
+
|
17
|
+
* Feature - Adds support for the enhanced infrastructure metrics paid feature. Also adds support for two new sets of resource efficiency metrics, including savings opportunity metrics and performance improvement opportunity metrics.
|
18
|
+
|
19
|
+
1.26.0 (2021-11-04)
|
20
|
+
------------------
|
21
|
+
|
22
|
+
* Feature - Code Generated Changes, see `./build_tools` or `aws-sdk-core`'s CHANGELOG.md for details.
|
23
|
+
|
4
24
|
1.25.0 (2021-10-18)
|
5
25
|
------------------
|
6
26
|
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.
|
1
|
+
1.29.0
|
@@ -27,6 +27,7 @@ require 'aws-sdk-core/plugins/client_metrics_plugin.rb'
|
|
27
27
|
require 'aws-sdk-core/plugins/client_metrics_send_plugin.rb'
|
28
28
|
require 'aws-sdk-core/plugins/transfer_encoding.rb'
|
29
29
|
require 'aws-sdk-core/plugins/http_checksum.rb'
|
30
|
+
require 'aws-sdk-core/plugins/defaults_mode.rb'
|
30
31
|
require 'aws-sdk-core/plugins/signature_v4.rb'
|
31
32
|
require 'aws-sdk-core/plugins/protocols/json_rpc.rb'
|
32
33
|
|
@@ -73,6 +74,7 @@ module Aws::ComputeOptimizer
|
|
73
74
|
add_plugin(Aws::Plugins::ClientMetricsSendPlugin)
|
74
75
|
add_plugin(Aws::Plugins::TransferEncoding)
|
75
76
|
add_plugin(Aws::Plugins::HttpChecksum)
|
77
|
+
add_plugin(Aws::Plugins::DefaultsMode)
|
76
78
|
add_plugin(Aws::Plugins::SignatureV4)
|
77
79
|
add_plugin(Aws::Plugins::Protocols::JsonRpc)
|
78
80
|
|
@@ -119,7 +121,9 @@ module Aws::ComputeOptimizer
|
|
119
121
|
# * EC2/ECS IMDS instance profile - When used by default, the timeouts
|
120
122
|
# are very aggressive. Construct and pass an instance of
|
121
123
|
# `Aws::InstanceProfileCredentails` or `Aws::ECSCredentials` to
|
122
|
-
# enable retries and extended timeouts.
|
124
|
+
# enable retries and extended timeouts. Instance profile credential
|
125
|
+
# fetching can be disabled by setting ENV['AWS_EC2_METADATA_DISABLED']
|
126
|
+
# to true.
|
123
127
|
#
|
124
128
|
# @option options [required, String] :region
|
125
129
|
# The AWS region to connect to. The configured `:region` is
|
@@ -173,6 +177,10 @@ module Aws::ComputeOptimizer
|
|
173
177
|
# Used only in `standard` and adaptive retry modes. Specifies whether to apply
|
174
178
|
# a clock skew correction and retry requests with skewed client clocks.
|
175
179
|
#
|
180
|
+
# @option options [String] :defaults_mode ("legacy")
|
181
|
+
# See {Aws::DefaultsModeConfiguration} for a list of the
|
182
|
+
# accepted modes and the configuration defaults that are included.
|
183
|
+
#
|
176
184
|
# @option options [Boolean] :disable_host_prefix_injection (false)
|
177
185
|
# Set to true to disable SDK automatically adding host prefix
|
178
186
|
# to default service endpoint when available.
|
@@ -285,6 +293,15 @@ module Aws::ComputeOptimizer
|
|
285
293
|
# ** Please note ** When response stubbing is enabled, no HTTP
|
286
294
|
# requests are made, and retries are disabled.
|
287
295
|
#
|
296
|
+
# @option options [Boolean] :use_dualstack_endpoint
|
297
|
+
# When set to `true`, dualstack enabled endpoints (with `.aws` TLD)
|
298
|
+
# will be used if available.
|
299
|
+
#
|
300
|
+
# @option options [Boolean] :use_fips_endpoint
|
301
|
+
# When set to `true`, fips compatible endpoints will be used if available.
|
302
|
+
# When a `fips` region is used, the region is normalized and this config
|
303
|
+
# is set to `true`.
|
304
|
+
#
|
288
305
|
# @option options [Boolean] :validate_params (true)
|
289
306
|
# When `true`, request parameters are validated before
|
290
307
|
# sending the request.
|
@@ -296,7 +313,7 @@ module Aws::ComputeOptimizer
|
|
296
313
|
# seconds to wait when opening a HTTP session before raising a
|
297
314
|
# `Timeout::Error`.
|
298
315
|
#
|
299
|
-
# @option options [
|
316
|
+
# @option options [Float] :http_read_timeout (60) The default
|
300
317
|
# number of seconds to wait for response data. This value can
|
301
318
|
# safely be set per-request on the session.
|
302
319
|
#
|
@@ -312,6 +329,9 @@ module Aws::ComputeOptimizer
|
|
312
329
|
# disables this behaviour. This value can safely be set per
|
313
330
|
# request on the session.
|
314
331
|
#
|
332
|
+
# @option options [Float] :ssl_timeout (nil) Sets the SSL timeout
|
333
|
+
# in seconds.
|
334
|
+
#
|
315
335
|
# @option options [Boolean] :http_wire_trace (false) When `true`,
|
316
336
|
# HTTP debug output will be sent to the `:logger`.
|
317
337
|
#
|
@@ -337,6 +357,67 @@ module Aws::ComputeOptimizer
|
|
337
357
|
|
338
358
|
# @!group API Operations
|
339
359
|
|
360
|
+
# Deletes a recommendation preference, such as enhanced infrastructure
|
361
|
+
# metrics.
|
362
|
+
#
|
363
|
+
# For more information, see [Activating enhanced infrastructure
|
364
|
+
# metrics][1] in the *Compute Optimizer User Guide*.
|
365
|
+
#
|
366
|
+
#
|
367
|
+
#
|
368
|
+
# [1]: https://docs.aws.amazon.com/compute-optimizer/latest/ug/enhanced-infrastructure-metrics.html
|
369
|
+
#
|
370
|
+
# @option params [required, String] :resource_type
|
371
|
+
# The target resource type of the recommendation preference to delete.
|
372
|
+
#
|
373
|
+
# The `Ec2Instance` option encompasses standalone instances and
|
374
|
+
# instances that are part of Auto Scaling groups. The `AutoScalingGroup`
|
375
|
+
# option encompasses only instances that are part of an Auto Scaling
|
376
|
+
# group.
|
377
|
+
#
|
378
|
+
# @option params [Types::Scope] :scope
|
379
|
+
# An object that describes the scope of the recommendation preference to
|
380
|
+
# delete.
|
381
|
+
#
|
382
|
+
# You can delete recommendation preferences that are created at the
|
383
|
+
# organization level (for management accounts of an organization only),
|
384
|
+
# account level, and resource level. For more information, see
|
385
|
+
# [Activating enhanced infrastructure metrics][1] in the *Compute
|
386
|
+
# Optimizer User Guide*.
|
387
|
+
#
|
388
|
+
#
|
389
|
+
#
|
390
|
+
# [1]: https://docs.aws.amazon.com/compute-optimizer/latest/ug/enhanced-infrastructure-metrics.html
|
391
|
+
#
|
392
|
+
# @option params [required, Array<String>] :recommendation_preference_names
|
393
|
+
# The name of the recommendation preference to delete.
|
394
|
+
#
|
395
|
+
# Enhanced infrastructure metrics (`EnhancedInfrastructureMetrics`) is
|
396
|
+
# the only feature that can be activated through preferences. Therefore,
|
397
|
+
# it is also the only recommendation preference that can be deleted.
|
398
|
+
#
|
399
|
+
# @return [Struct] Returns an empty {Seahorse::Client::Response response}.
|
400
|
+
#
|
401
|
+
# @example Request syntax with placeholder values
|
402
|
+
#
|
403
|
+
# resp = client.delete_recommendation_preferences({
|
404
|
+
# resource_type: "Ec2Instance", # required, accepts Ec2Instance, AutoScalingGroup, EbsVolume, LambdaFunction
|
405
|
+
# scope: {
|
406
|
+
# name: "Organization", # accepts Organization, AccountId, ResourceArn
|
407
|
+
# value: "ScopeValue",
|
408
|
+
# },
|
409
|
+
# recommendation_preference_names: ["EnhancedInfrastructureMetrics"], # required, accepts EnhancedInfrastructureMetrics
|
410
|
+
# })
|
411
|
+
#
|
412
|
+
# @see http://docs.aws.amazon.com/goto/WebAPI/compute-optimizer-2019-11-01/DeleteRecommendationPreferences AWS API Documentation
|
413
|
+
#
|
414
|
+
# @overload delete_recommendation_preferences(params = {})
|
415
|
+
# @param [Hash] params ({})
|
416
|
+
def delete_recommendation_preferences(params = {}, options = {})
|
417
|
+
req = build_request(:delete_recommendation_preferences, params)
|
418
|
+
req.send_request(options)
|
419
|
+
end
|
420
|
+
|
340
421
|
# Describes recommendation export jobs created in the last seven days.
|
341
422
|
#
|
342
423
|
# Use the ExportAutoScalingGroupRecommendations or
|
@@ -519,7 +600,7 @@ module Aws::ComputeOptimizer
|
|
519
600
|
# values: ["FilterValue"],
|
520
601
|
# },
|
521
602
|
# ],
|
522
|
-
# fields_to_export: ["AccountId"], # accepts AccountId, AutoScalingGroupArn, AutoScalingGroupName, Finding, UtilizationMetricsCpuMaximum, UtilizationMetricsMemoryMaximum, UtilizationMetricsEbsReadOpsPerSecondMaximum, UtilizationMetricsEbsWriteOpsPerSecondMaximum, UtilizationMetricsEbsReadBytesPerSecondMaximum, UtilizationMetricsEbsWriteBytesPerSecondMaximum, UtilizationMetricsDiskReadOpsPerSecondMaximum, UtilizationMetricsDiskWriteOpsPerSecondMaximum, UtilizationMetricsDiskReadBytesPerSecondMaximum, UtilizationMetricsDiskWriteBytesPerSecondMaximum, UtilizationMetricsNetworkInBytesPerSecondMaximum, UtilizationMetricsNetworkOutBytesPerSecondMaximum, UtilizationMetricsNetworkPacketsInPerSecondMaximum, UtilizationMetricsNetworkPacketsOutPerSecondMaximum, LookbackPeriodInDays, CurrentConfigurationInstanceType, CurrentConfigurationDesiredCapacity, CurrentConfigurationMinSize, CurrentConfigurationMaxSize, CurrentOnDemandPrice, CurrentStandardOneYearNoUpfrontReservedPrice, CurrentStandardThreeYearNoUpfrontReservedPrice, CurrentVCpus, CurrentMemory, CurrentStorage, CurrentNetwork, RecommendationOptionsConfigurationInstanceType, RecommendationOptionsConfigurationDesiredCapacity, RecommendationOptionsConfigurationMinSize, RecommendationOptionsConfigurationMaxSize, RecommendationOptionsProjectedUtilizationMetricsCpuMaximum, RecommendationOptionsProjectedUtilizationMetricsMemoryMaximum, RecommendationOptionsPerformanceRisk, RecommendationOptionsOnDemandPrice, RecommendationOptionsStandardOneYearNoUpfrontReservedPrice, RecommendationOptionsStandardThreeYearNoUpfrontReservedPrice, RecommendationOptionsVcpus, RecommendationOptionsMemory, RecommendationOptionsStorage, RecommendationOptionsNetwork, LastRefreshTimestamp
|
603
|
+
# fields_to_export: ["AccountId"], # accepts AccountId, AutoScalingGroupArn, AutoScalingGroupName, Finding, UtilizationMetricsCpuMaximum, UtilizationMetricsMemoryMaximum, UtilizationMetricsEbsReadOpsPerSecondMaximum, UtilizationMetricsEbsWriteOpsPerSecondMaximum, UtilizationMetricsEbsReadBytesPerSecondMaximum, UtilizationMetricsEbsWriteBytesPerSecondMaximum, UtilizationMetricsDiskReadOpsPerSecondMaximum, UtilizationMetricsDiskWriteOpsPerSecondMaximum, UtilizationMetricsDiskReadBytesPerSecondMaximum, UtilizationMetricsDiskWriteBytesPerSecondMaximum, UtilizationMetricsNetworkInBytesPerSecondMaximum, UtilizationMetricsNetworkOutBytesPerSecondMaximum, UtilizationMetricsNetworkPacketsInPerSecondMaximum, UtilizationMetricsNetworkPacketsOutPerSecondMaximum, LookbackPeriodInDays, CurrentConfigurationInstanceType, CurrentConfigurationDesiredCapacity, CurrentConfigurationMinSize, CurrentConfigurationMaxSize, CurrentOnDemandPrice, CurrentStandardOneYearNoUpfrontReservedPrice, CurrentStandardThreeYearNoUpfrontReservedPrice, CurrentVCpus, CurrentMemory, CurrentStorage, CurrentNetwork, RecommendationOptionsConfigurationInstanceType, RecommendationOptionsConfigurationDesiredCapacity, RecommendationOptionsConfigurationMinSize, RecommendationOptionsConfigurationMaxSize, RecommendationOptionsProjectedUtilizationMetricsCpuMaximum, RecommendationOptionsProjectedUtilizationMetricsMemoryMaximum, RecommendationOptionsPerformanceRisk, RecommendationOptionsOnDemandPrice, RecommendationOptionsStandardOneYearNoUpfrontReservedPrice, RecommendationOptionsStandardThreeYearNoUpfrontReservedPrice, RecommendationOptionsVcpus, RecommendationOptionsMemory, RecommendationOptionsStorage, RecommendationOptionsNetwork, LastRefreshTimestamp, CurrentPerformanceRisk, RecommendationOptionsSavingsOpportunityPercentage, RecommendationOptionsEstimatedMonthlySavingsCurrency, RecommendationOptionsEstimatedMonthlySavingsValue, EffectiveRecommendationPreferencesCpuVendorArchitectures, EffectiveRecommendationPreferencesEnhancedInfrastructureMetrics
|
523
604
|
# s3_destination_config: { # required
|
524
605
|
# bucket: "DestinationBucket",
|
525
606
|
# key_prefix: "DestinationKeyPrefix",
|
@@ -653,7 +734,7 @@ module Aws::ComputeOptimizer
|
|
653
734
|
# values: ["FilterValue"],
|
654
735
|
# },
|
655
736
|
# ],
|
656
|
-
# fields_to_export: ["AccountId"], # accepts AccountId, VolumeArn, Finding, UtilizationMetricsVolumeReadOpsPerSecondMaximum, UtilizationMetricsVolumeWriteOpsPerSecondMaximum, UtilizationMetricsVolumeReadBytesPerSecondMaximum, UtilizationMetricsVolumeWriteBytesPerSecondMaximum, LookbackPeriodInDays, CurrentConfigurationVolumeType, CurrentConfigurationVolumeBaselineIOPS, CurrentConfigurationVolumeBaselineThroughput, CurrentConfigurationVolumeBurstIOPS, CurrentConfigurationVolumeBurstThroughput, CurrentConfigurationVolumeSize, CurrentMonthlyPrice, RecommendationOptionsConfigurationVolumeType, RecommendationOptionsConfigurationVolumeBaselineIOPS, RecommendationOptionsConfigurationVolumeBaselineThroughput, RecommendationOptionsConfigurationVolumeBurstIOPS, RecommendationOptionsConfigurationVolumeBurstThroughput, RecommendationOptionsConfigurationVolumeSize, RecommendationOptionsMonthlyPrice, RecommendationOptionsPerformanceRisk, LastRefreshTimestamp
|
737
|
+
# fields_to_export: ["AccountId"], # accepts AccountId, VolumeArn, Finding, UtilizationMetricsVolumeReadOpsPerSecondMaximum, UtilizationMetricsVolumeWriteOpsPerSecondMaximum, UtilizationMetricsVolumeReadBytesPerSecondMaximum, UtilizationMetricsVolumeWriteBytesPerSecondMaximum, LookbackPeriodInDays, CurrentConfigurationVolumeType, CurrentConfigurationVolumeBaselineIOPS, CurrentConfigurationVolumeBaselineThroughput, CurrentConfigurationVolumeBurstIOPS, CurrentConfigurationVolumeBurstThroughput, CurrentConfigurationVolumeSize, CurrentMonthlyPrice, RecommendationOptionsConfigurationVolumeType, RecommendationOptionsConfigurationVolumeBaselineIOPS, RecommendationOptionsConfigurationVolumeBaselineThroughput, RecommendationOptionsConfigurationVolumeBurstIOPS, RecommendationOptionsConfigurationVolumeBurstThroughput, RecommendationOptionsConfigurationVolumeSize, RecommendationOptionsMonthlyPrice, RecommendationOptionsPerformanceRisk, LastRefreshTimestamp, CurrentPerformanceRisk, RecommendationOptionsSavingsOpportunityPercentage, RecommendationOptionsEstimatedMonthlySavingsCurrency, RecommendationOptionsEstimatedMonthlySavingsValue
|
657
738
|
# s3_destination_config: { # required
|
658
739
|
# bucket: "DestinationBucket",
|
659
740
|
# key_prefix: "DestinationKeyPrefix",
|
@@ -729,11 +810,11 @@ module Aws::ComputeOptimizer
|
|
729
810
|
# You must create the destination Amazon S3 bucket for your
|
730
811
|
# recommendations export before you create the export job. Compute
|
731
812
|
# Optimizer does not create the S3 bucket for you. After you create the
|
732
|
-
# S3 bucket, ensure that it has the required permissions policy
|
733
|
-
#
|
734
|
-
#
|
735
|
-
# include the object prefix in the that you add to the S3 bucket.
|
736
|
-
# more information, see [Amazon S3 Bucket Policy for Compute
|
813
|
+
# S3 bucket, ensure that it has the required permissions policy to allow
|
814
|
+
# Compute Optimizer to write the export file to it. If you plan to
|
815
|
+
# specify an object prefix when you create the export job, you must
|
816
|
+
# include the object prefix in the policy that you add to the S3 bucket.
|
817
|
+
# For more information, see [Amazon S3 Bucket Policy for Compute
|
737
818
|
# Optimizer][1] in the *Compute Optimizer User Guide*.
|
738
819
|
#
|
739
820
|
#
|
@@ -785,7 +866,7 @@ module Aws::ComputeOptimizer
|
|
785
866
|
# values: ["FilterValue"],
|
786
867
|
# },
|
787
868
|
# ],
|
788
|
-
# fields_to_export: ["AccountId"], # accepts AccountId, InstanceArn, InstanceName, Finding, FindingReasonCodes, LookbackPeriodInDays, CurrentInstanceType, UtilizationMetricsCpuMaximum, UtilizationMetricsMemoryMaximum, UtilizationMetricsEbsReadOpsPerSecondMaximum, UtilizationMetricsEbsWriteOpsPerSecondMaximum, UtilizationMetricsEbsReadBytesPerSecondMaximum, UtilizationMetricsEbsWriteBytesPerSecondMaximum, UtilizationMetricsDiskReadOpsPerSecondMaximum, UtilizationMetricsDiskWriteOpsPerSecondMaximum, UtilizationMetricsDiskReadBytesPerSecondMaximum, UtilizationMetricsDiskWriteBytesPerSecondMaximum, UtilizationMetricsNetworkInBytesPerSecondMaximum, UtilizationMetricsNetworkOutBytesPerSecondMaximum, UtilizationMetricsNetworkPacketsInPerSecondMaximum, UtilizationMetricsNetworkPacketsOutPerSecondMaximum, CurrentOnDemandPrice, CurrentStandardOneYearNoUpfrontReservedPrice, CurrentStandardThreeYearNoUpfrontReservedPrice, CurrentVCpus, CurrentMemory, CurrentStorage, CurrentNetwork, RecommendationOptionsInstanceType, RecommendationOptionsProjectedUtilizationMetricsCpuMaximum, RecommendationOptionsProjectedUtilizationMetricsMemoryMaximum, RecommendationOptionsPlatformDifferences, RecommendationOptionsPerformanceRisk, RecommendationOptionsVcpus, RecommendationOptionsMemory, RecommendationOptionsStorage, RecommendationOptionsNetwork, RecommendationOptionsOnDemandPrice, RecommendationOptionsStandardOneYearNoUpfrontReservedPrice, RecommendationOptionsStandardThreeYearNoUpfrontReservedPrice, RecommendationsSourcesRecommendationSourceArn, RecommendationsSourcesRecommendationSourceType, LastRefreshTimestamp
|
869
|
+
# fields_to_export: ["AccountId"], # accepts AccountId, InstanceArn, InstanceName, Finding, FindingReasonCodes, LookbackPeriodInDays, CurrentInstanceType, UtilizationMetricsCpuMaximum, UtilizationMetricsMemoryMaximum, UtilizationMetricsEbsReadOpsPerSecondMaximum, UtilizationMetricsEbsWriteOpsPerSecondMaximum, UtilizationMetricsEbsReadBytesPerSecondMaximum, UtilizationMetricsEbsWriteBytesPerSecondMaximum, UtilizationMetricsDiskReadOpsPerSecondMaximum, UtilizationMetricsDiskWriteOpsPerSecondMaximum, UtilizationMetricsDiskReadBytesPerSecondMaximum, UtilizationMetricsDiskWriteBytesPerSecondMaximum, UtilizationMetricsNetworkInBytesPerSecondMaximum, UtilizationMetricsNetworkOutBytesPerSecondMaximum, UtilizationMetricsNetworkPacketsInPerSecondMaximum, UtilizationMetricsNetworkPacketsOutPerSecondMaximum, CurrentOnDemandPrice, CurrentStandardOneYearNoUpfrontReservedPrice, CurrentStandardThreeYearNoUpfrontReservedPrice, CurrentVCpus, CurrentMemory, CurrentStorage, CurrentNetwork, RecommendationOptionsInstanceType, RecommendationOptionsProjectedUtilizationMetricsCpuMaximum, RecommendationOptionsProjectedUtilizationMetricsMemoryMaximum, RecommendationOptionsPlatformDifferences, RecommendationOptionsPerformanceRisk, RecommendationOptionsVcpus, RecommendationOptionsMemory, RecommendationOptionsStorage, RecommendationOptionsNetwork, RecommendationOptionsOnDemandPrice, RecommendationOptionsStandardOneYearNoUpfrontReservedPrice, RecommendationOptionsStandardThreeYearNoUpfrontReservedPrice, RecommendationsSourcesRecommendationSourceArn, RecommendationsSourcesRecommendationSourceType, LastRefreshTimestamp, CurrentPerformanceRisk, RecommendationOptionsSavingsOpportunityPercentage, RecommendationOptionsEstimatedMonthlySavingsCurrency, RecommendationOptionsEstimatedMonthlySavingsValue, EffectiveRecommendationPreferencesCpuVendorArchitectures, EffectiveRecommendationPreferencesEnhancedInfrastructureMetrics
|
789
870
|
# s3_destination_config: { # required
|
790
871
|
# bucket: "DestinationBucket",
|
791
872
|
# key_prefix: "DestinationKeyPrefix",
|
@@ -919,7 +1000,7 @@ module Aws::ComputeOptimizer
|
|
919
1000
|
# values: ["FilterValue"],
|
920
1001
|
# },
|
921
1002
|
# ],
|
922
|
-
# fields_to_export: ["AccountId"], # accepts AccountId, FunctionArn, FunctionVersion, Finding, FindingReasonCodes, NumberOfInvocations, UtilizationMetricsDurationMaximum, UtilizationMetricsDurationAverage, UtilizationMetricsMemoryMaximum, UtilizationMetricsMemoryAverage, LookbackPeriodInDays, CurrentConfigurationMemorySize, CurrentConfigurationTimeout, CurrentCostTotal, CurrentCostAverage, RecommendationOptionsConfigurationMemorySize, RecommendationOptionsCostLow, RecommendationOptionsCostHigh, RecommendationOptionsProjectedUtilizationMetricsDurationLowerBound, RecommendationOptionsProjectedUtilizationMetricsDurationUpperBound, RecommendationOptionsProjectedUtilizationMetricsDurationExpected, LastRefreshTimestamp
|
1003
|
+
# fields_to_export: ["AccountId"], # accepts AccountId, FunctionArn, FunctionVersion, Finding, FindingReasonCodes, NumberOfInvocations, UtilizationMetricsDurationMaximum, UtilizationMetricsDurationAverage, UtilizationMetricsMemoryMaximum, UtilizationMetricsMemoryAverage, LookbackPeriodInDays, CurrentConfigurationMemorySize, CurrentConfigurationTimeout, CurrentCostTotal, CurrentCostAverage, RecommendationOptionsConfigurationMemorySize, RecommendationOptionsCostLow, RecommendationOptionsCostHigh, RecommendationOptionsProjectedUtilizationMetricsDurationLowerBound, RecommendationOptionsProjectedUtilizationMetricsDurationUpperBound, RecommendationOptionsProjectedUtilizationMetricsDurationExpected, LastRefreshTimestamp, CurrentPerformanceRisk, RecommendationOptionsSavingsOpportunityPercentage, RecommendationOptionsEstimatedMonthlySavingsCurrency, RecommendationOptionsEstimatedMonthlySavingsValue
|
923
1004
|
# s3_destination_config: { # required
|
924
1005
|
# bucket: "DestinationBucket",
|
925
1006
|
# key_prefix: "DestinationKeyPrefix",
|
@@ -1040,7 +1121,14 @@ module Aws::ComputeOptimizer
|
|
1040
1121
|
# resp.auto_scaling_group_recommendations[0].recommendation_options[0].projected_utilization_metrics[0].value #=> Float
|
1041
1122
|
# resp.auto_scaling_group_recommendations[0].recommendation_options[0].performance_risk #=> Float
|
1042
1123
|
# resp.auto_scaling_group_recommendations[0].recommendation_options[0].rank #=> Integer
|
1124
|
+
# resp.auto_scaling_group_recommendations[0].recommendation_options[0].savings_opportunity.savings_opportunity_percentage #=> Float
|
1125
|
+
# resp.auto_scaling_group_recommendations[0].recommendation_options[0].savings_opportunity.estimated_monthly_savings.currency #=> String, one of "USD", "CNY"
|
1126
|
+
# resp.auto_scaling_group_recommendations[0].recommendation_options[0].savings_opportunity.estimated_monthly_savings.value #=> Float
|
1043
1127
|
# resp.auto_scaling_group_recommendations[0].last_refresh_timestamp #=> Time
|
1128
|
+
# resp.auto_scaling_group_recommendations[0].current_performance_risk #=> String, one of "VeryLow", "Low", "Medium", "High"
|
1129
|
+
# resp.auto_scaling_group_recommendations[0].effective_recommendation_preferences.cpu_vendor_architectures #=> Array
|
1130
|
+
# resp.auto_scaling_group_recommendations[0].effective_recommendation_preferences.cpu_vendor_architectures[0] #=> String, one of "AWS_ARM64", "CURRENT"
|
1131
|
+
# resp.auto_scaling_group_recommendations[0].effective_recommendation_preferences.enhanced_infrastructure_metrics #=> String, one of "Active", "Inactive"
|
1044
1132
|
# resp.errors #=> Array
|
1045
1133
|
# resp.errors[0].identifier #=> String
|
1046
1134
|
# resp.errors[0].code #=> String
|
@@ -1143,7 +1231,11 @@ module Aws::ComputeOptimizer
|
|
1143
1231
|
# resp.volume_recommendations[0].volume_recommendation_options[0].configuration.volume_burst_throughput #=> Integer
|
1144
1232
|
# resp.volume_recommendations[0].volume_recommendation_options[0].performance_risk #=> Float
|
1145
1233
|
# resp.volume_recommendations[0].volume_recommendation_options[0].rank #=> Integer
|
1234
|
+
# resp.volume_recommendations[0].volume_recommendation_options[0].savings_opportunity.savings_opportunity_percentage #=> Float
|
1235
|
+
# resp.volume_recommendations[0].volume_recommendation_options[0].savings_opportunity.estimated_monthly_savings.currency #=> String, one of "USD", "CNY"
|
1236
|
+
# resp.volume_recommendations[0].volume_recommendation_options[0].savings_opportunity.estimated_monthly_savings.value #=> Float
|
1146
1237
|
# resp.volume_recommendations[0].last_refresh_timestamp #=> Time
|
1238
|
+
# resp.volume_recommendations[0].current_performance_risk #=> String, one of "VeryLow", "Low", "Medium", "High"
|
1147
1239
|
# resp.errors #=> Array
|
1148
1240
|
# resp.errors[0].identifier #=> String
|
1149
1241
|
# resp.errors[0].code #=> String
|
@@ -1251,10 +1343,17 @@ module Aws::ComputeOptimizer
|
|
1251
1343
|
# resp.instance_recommendations[0].recommendation_options[0].platform_differences[0] #=> String, one of "Hypervisor", "NetworkInterface", "StorageInterface", "InstanceStoreAvailability", "VirtualizationType", "Architecture"
|
1252
1344
|
# resp.instance_recommendations[0].recommendation_options[0].performance_risk #=> Float
|
1253
1345
|
# resp.instance_recommendations[0].recommendation_options[0].rank #=> Integer
|
1346
|
+
# resp.instance_recommendations[0].recommendation_options[0].savings_opportunity.savings_opportunity_percentage #=> Float
|
1347
|
+
# resp.instance_recommendations[0].recommendation_options[0].savings_opportunity.estimated_monthly_savings.currency #=> String, one of "USD", "CNY"
|
1348
|
+
# resp.instance_recommendations[0].recommendation_options[0].savings_opportunity.estimated_monthly_savings.value #=> Float
|
1254
1349
|
# resp.instance_recommendations[0].recommendation_sources #=> Array
|
1255
1350
|
# resp.instance_recommendations[0].recommendation_sources[0].recommendation_source_arn #=> String
|
1256
1351
|
# resp.instance_recommendations[0].recommendation_sources[0].recommendation_source_type #=> String, one of "Ec2Instance", "AutoScalingGroup", "EbsVolume", "LambdaFunction"
|
1257
1352
|
# resp.instance_recommendations[0].last_refresh_timestamp #=> Time
|
1353
|
+
# resp.instance_recommendations[0].current_performance_risk #=> String, one of "VeryLow", "Low", "Medium", "High"
|
1354
|
+
# resp.instance_recommendations[0].effective_recommendation_preferences.cpu_vendor_architectures #=> Array
|
1355
|
+
# resp.instance_recommendations[0].effective_recommendation_preferences.cpu_vendor_architectures[0] #=> String, one of "AWS_ARM64", "CURRENT"
|
1356
|
+
# resp.instance_recommendations[0].effective_recommendation_preferences.enhanced_infrastructure_metrics #=> String, one of "Active", "Inactive"
|
1258
1357
|
# resp.errors #=> Array
|
1259
1358
|
# resp.errors[0].identifier #=> String
|
1260
1359
|
# resp.errors[0].code #=> String
|
@@ -1342,6 +1441,43 @@ module Aws::ComputeOptimizer
|
|
1342
1441
|
req.send_request(options)
|
1343
1442
|
end
|
1344
1443
|
|
1444
|
+
# Returns the recommendation preferences that are in effect for a given
|
1445
|
+
# resource, such as enhanced infrastructure metrics. Considers all
|
1446
|
+
# applicable preferences that you might have set at the resource,
|
1447
|
+
# account, and organization level.
|
1448
|
+
#
|
1449
|
+
# When you create a recommendation preference, you can set its status to
|
1450
|
+
# `Active` or `Inactive`. Use this action to view the recommendation
|
1451
|
+
# preferences that are in effect, or `Active`.
|
1452
|
+
#
|
1453
|
+
# @option params [required, String] :resource_arn
|
1454
|
+
# The Amazon Resource Name (ARN) of the resource for which to confirm
|
1455
|
+
# effective recommendation preferences. Only EC2 instance and Auto
|
1456
|
+
# Scaling group ARNs are currently supported.
|
1457
|
+
#
|
1458
|
+
# @return [Types::GetEffectiveRecommendationPreferencesResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
|
1459
|
+
#
|
1460
|
+
# * {Types::GetEffectiveRecommendationPreferencesResponse#enhanced_infrastructure_metrics #enhanced_infrastructure_metrics} => String
|
1461
|
+
#
|
1462
|
+
# @example Request syntax with placeholder values
|
1463
|
+
#
|
1464
|
+
# resp = client.get_effective_recommendation_preferences({
|
1465
|
+
# resource_arn: "ResourceArn", # required
|
1466
|
+
# })
|
1467
|
+
#
|
1468
|
+
# @example Response structure
|
1469
|
+
#
|
1470
|
+
# resp.enhanced_infrastructure_metrics #=> String, one of "Active", "Inactive"
|
1471
|
+
#
|
1472
|
+
# @see http://docs.aws.amazon.com/goto/WebAPI/compute-optimizer-2019-11-01/GetEffectiveRecommendationPreferences AWS API Documentation
|
1473
|
+
#
|
1474
|
+
# @overload get_effective_recommendation_preferences(params = {})
|
1475
|
+
# @param [Hash] params ({})
|
1476
|
+
def get_effective_recommendation_preferences(params = {}, options = {})
|
1477
|
+
req = build_request(:get_effective_recommendation_preferences, params)
|
1478
|
+
req.send_request(options)
|
1479
|
+
end
|
1480
|
+
|
1345
1481
|
# Returns the enrollment (opt in) status of an account to the Compute
|
1346
1482
|
# Optimizer service.
|
1347
1483
|
#
|
@@ -1529,6 +1665,10 @@ module Aws::ComputeOptimizer
|
|
1529
1665
|
# resp.lambda_function_recommendations[0].memory_size_recommendation_options[0].projected_utilization_metrics[0].name #=> String, one of "Duration"
|
1530
1666
|
# resp.lambda_function_recommendations[0].memory_size_recommendation_options[0].projected_utilization_metrics[0].statistic #=> String, one of "LowerBound", "UpperBound", "Expected"
|
1531
1667
|
# resp.lambda_function_recommendations[0].memory_size_recommendation_options[0].projected_utilization_metrics[0].value #=> Float
|
1668
|
+
# resp.lambda_function_recommendations[0].memory_size_recommendation_options[0].savings_opportunity.savings_opportunity_percentage #=> Float
|
1669
|
+
# resp.lambda_function_recommendations[0].memory_size_recommendation_options[0].savings_opportunity.estimated_monthly_savings.currency #=> String, one of "USD", "CNY"
|
1670
|
+
# resp.lambda_function_recommendations[0].memory_size_recommendation_options[0].savings_opportunity.estimated_monthly_savings.value #=> Float
|
1671
|
+
# resp.lambda_function_recommendations[0].current_performance_risk #=> String, one of "VeryLow", "Low", "Medium", "High"
|
1532
1672
|
#
|
1533
1673
|
# @see http://docs.aws.amazon.com/goto/WebAPI/compute-optimizer-2019-11-01/GetLambdaFunctionRecommendations AWS API Documentation
|
1534
1674
|
#
|
@@ -1539,6 +1679,89 @@ module Aws::ComputeOptimizer
|
|
1539
1679
|
req.send_request(options)
|
1540
1680
|
end
|
1541
1681
|
|
1682
|
+
# Returns existing recommendation preferences, such as enhanced
|
1683
|
+
# infrastructure metrics.
|
1684
|
+
#
|
1685
|
+
# Use the `scope` parameter to specify which preferences to return. You
|
1686
|
+
# can specify to return preferences for an organization, a specific
|
1687
|
+
# account ID, or a specific EC2 instance or Auto Scaling group Amazon
|
1688
|
+
# Resource Name (ARN).
|
1689
|
+
#
|
1690
|
+
# For more information, see [Activating enhanced infrastructure
|
1691
|
+
# metrics][1] in the *Compute Optimizer User Guide*.
|
1692
|
+
#
|
1693
|
+
#
|
1694
|
+
#
|
1695
|
+
# [1]: https://docs.aws.amazon.com/compute-optimizer/latest/ug/enhanced-infrastructure-metrics.html
|
1696
|
+
#
|
1697
|
+
# @option params [required, String] :resource_type
|
1698
|
+
# The target resource type of the recommendation preference for which to
|
1699
|
+
# return preferences.
|
1700
|
+
#
|
1701
|
+
# The `Ec2Instance` option encompasses standalone instances and
|
1702
|
+
# instances that are part of Auto Scaling groups. The `AutoScalingGroup`
|
1703
|
+
# option encompasses only instances that are part of an Auto Scaling
|
1704
|
+
# group.
|
1705
|
+
#
|
1706
|
+
# @option params [Types::Scope] :scope
|
1707
|
+
# An object that describes the scope of the recommendation preference to
|
1708
|
+
# return.
|
1709
|
+
#
|
1710
|
+
# You can return recommendation preferences that are created at the
|
1711
|
+
# organization level (for management accounts of an organization only),
|
1712
|
+
# account level, and resource level. For more information, see
|
1713
|
+
# [Activating enhanced infrastructure metrics][1] in the *Compute
|
1714
|
+
# Optimizer User Guide*.
|
1715
|
+
#
|
1716
|
+
#
|
1717
|
+
#
|
1718
|
+
# [1]: https://docs.aws.amazon.com/compute-optimizer/latest/ug/enhanced-infrastructure-metrics.html
|
1719
|
+
#
|
1720
|
+
# @option params [String] :next_token
|
1721
|
+
# The token to advance to the next page of recommendation preferences.
|
1722
|
+
#
|
1723
|
+
# @option params [Integer] :max_results
|
1724
|
+
# The maximum number of recommendation preferences to return with a
|
1725
|
+
# single request.
|
1726
|
+
#
|
1727
|
+
# To retrieve the remaining results, make another request with the
|
1728
|
+
# returned `nextToken` value.
|
1729
|
+
#
|
1730
|
+
# @return [Types::GetRecommendationPreferencesResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
|
1731
|
+
#
|
1732
|
+
# * {Types::GetRecommendationPreferencesResponse#next_token #next_token} => String
|
1733
|
+
# * {Types::GetRecommendationPreferencesResponse#recommendation_preferences_details #recommendation_preferences_details} => Array<Types::RecommendationPreferencesDetail>
|
1734
|
+
#
|
1735
|
+
# @example Request syntax with placeholder values
|
1736
|
+
#
|
1737
|
+
# resp = client.get_recommendation_preferences({
|
1738
|
+
# resource_type: "Ec2Instance", # required, accepts Ec2Instance, AutoScalingGroup, EbsVolume, LambdaFunction
|
1739
|
+
# scope: {
|
1740
|
+
# name: "Organization", # accepts Organization, AccountId, ResourceArn
|
1741
|
+
# value: "ScopeValue",
|
1742
|
+
# },
|
1743
|
+
# next_token: "NextToken",
|
1744
|
+
# max_results: 1,
|
1745
|
+
# })
|
1746
|
+
#
|
1747
|
+
# @example Response structure
|
1748
|
+
#
|
1749
|
+
# resp.next_token #=> String
|
1750
|
+
# resp.recommendation_preferences_details #=> Array
|
1751
|
+
# resp.recommendation_preferences_details[0].scope.name #=> String, one of "Organization", "AccountId", "ResourceArn"
|
1752
|
+
# resp.recommendation_preferences_details[0].scope.value #=> String
|
1753
|
+
# resp.recommendation_preferences_details[0].resource_type #=> String, one of "Ec2Instance", "AutoScalingGroup", "EbsVolume", "LambdaFunction"
|
1754
|
+
# resp.recommendation_preferences_details[0].enhanced_infrastructure_metrics #=> String, one of "Active", "Inactive"
|
1755
|
+
#
|
1756
|
+
# @see http://docs.aws.amazon.com/goto/WebAPI/compute-optimizer-2019-11-01/GetRecommendationPreferences AWS API Documentation
|
1757
|
+
#
|
1758
|
+
# @overload get_recommendation_preferences(params = {})
|
1759
|
+
# @param [Hash] params ({})
|
1760
|
+
def get_recommendation_preferences(params = {}, options = {})
|
1761
|
+
req = build_request(:get_recommendation_preferences, params)
|
1762
|
+
req.send_request(options)
|
1763
|
+
end
|
1764
|
+
|
1542
1765
|
# Returns the optimization findings for an account.
|
1543
1766
|
#
|
1544
1767
|
# It returns the number of:
|
@@ -1600,6 +1823,13 @@ module Aws::ComputeOptimizer
|
|
1600
1823
|
# resp.recommendation_summaries[0].summaries[0].reason_code_summaries[0].value #=> Float
|
1601
1824
|
# resp.recommendation_summaries[0].recommendation_resource_type #=> String, one of "Ec2Instance", "AutoScalingGroup", "EbsVolume", "LambdaFunction"
|
1602
1825
|
# resp.recommendation_summaries[0].account_id #=> String
|
1826
|
+
# resp.recommendation_summaries[0].savings_opportunity.savings_opportunity_percentage #=> Float
|
1827
|
+
# resp.recommendation_summaries[0].savings_opportunity.estimated_monthly_savings.currency #=> String, one of "USD", "CNY"
|
1828
|
+
# resp.recommendation_summaries[0].savings_opportunity.estimated_monthly_savings.value #=> Float
|
1829
|
+
# resp.recommendation_summaries[0].current_performance_risk_ratings.high #=> Integer
|
1830
|
+
# resp.recommendation_summaries[0].current_performance_risk_ratings.medium #=> Integer
|
1831
|
+
# resp.recommendation_summaries[0].current_performance_risk_ratings.low #=> Integer
|
1832
|
+
# resp.recommendation_summaries[0].current_performance_risk_ratings.very_low #=> Integer
|
1603
1833
|
#
|
1604
1834
|
# @see http://docs.aws.amazon.com/goto/WebAPI/compute-optimizer-2019-11-01/GetRecommendationSummaries AWS API Documentation
|
1605
1835
|
#
|
@@ -1610,6 +1840,77 @@ module Aws::ComputeOptimizer
|
|
1610
1840
|
req.send_request(options)
|
1611
1841
|
end
|
1612
1842
|
|
1843
|
+
# Creates a new recommendation preference or updates an existing
|
1844
|
+
# recommendation preference, such as enhanced infrastructure metrics.
|
1845
|
+
#
|
1846
|
+
# For more information, see [Activating enhanced infrastructure
|
1847
|
+
# metrics][1] in the *Compute Optimizer User Guide*.
|
1848
|
+
#
|
1849
|
+
#
|
1850
|
+
#
|
1851
|
+
# [1]: https://docs.aws.amazon.com/compute-optimizer/latest/ug/enhanced-infrastructure-metrics.html
|
1852
|
+
#
|
1853
|
+
# @option params [required, String] :resource_type
|
1854
|
+
# The target resource type of the recommendation preference to create.
|
1855
|
+
#
|
1856
|
+
# The `Ec2Instance` option encompasses standalone instances and
|
1857
|
+
# instances that are part of Auto Scaling groups. The `AutoScalingGroup`
|
1858
|
+
# option encompasses only instances that are part of an Auto Scaling
|
1859
|
+
# group.
|
1860
|
+
#
|
1861
|
+
# @option params [Types::Scope] :scope
|
1862
|
+
# An object that describes the scope of the recommendation preference to
|
1863
|
+
# create.
|
1864
|
+
#
|
1865
|
+
# You can create recommendation preferences at the organization level
|
1866
|
+
# (for management accounts of an organization only), account level, and
|
1867
|
+
# resource level. For more information, see [Activating enhanced
|
1868
|
+
# infrastructure metrics][1] in the *Compute Optimizer User Guide*.
|
1869
|
+
#
|
1870
|
+
# <note markdown="1"> You cannot create recommendation preferences for Auto Scaling groups
|
1871
|
+
# at the organization and account levels. You can create recommendation
|
1872
|
+
# preferences for Auto Scaling groups only at the resource level by
|
1873
|
+
# specifying a scope name of `ResourceArn` and a scope value of the Auto
|
1874
|
+
# Scaling group Amazon Resource Name (ARN). This will configure the
|
1875
|
+
# preference for all instances that are part of the specified the Auto
|
1876
|
+
# Scaling group.
|
1877
|
+
#
|
1878
|
+
# </note>
|
1879
|
+
#
|
1880
|
+
#
|
1881
|
+
#
|
1882
|
+
# [1]: https://docs.aws.amazon.com/compute-optimizer/latest/ug/enhanced-infrastructure-metrics.html
|
1883
|
+
#
|
1884
|
+
# @option params [String] :enhanced_infrastructure_metrics
|
1885
|
+
# The status of the enhanced infrastructure metrics recommendation
|
1886
|
+
# preference to create or update.
|
1887
|
+
#
|
1888
|
+
# A status of `Active` confirms that the preference is applied in the
|
1889
|
+
# latest recommendation refresh, and a status of `Inactive` confirms
|
1890
|
+
# that it's not yet applied.
|
1891
|
+
#
|
1892
|
+
# @return [Struct] Returns an empty {Seahorse::Client::Response response}.
|
1893
|
+
#
|
1894
|
+
# @example Request syntax with placeholder values
|
1895
|
+
#
|
1896
|
+
# resp = client.put_recommendation_preferences({
|
1897
|
+
# resource_type: "Ec2Instance", # required, accepts Ec2Instance, AutoScalingGroup, EbsVolume, LambdaFunction
|
1898
|
+
# scope: {
|
1899
|
+
# name: "Organization", # accepts Organization, AccountId, ResourceArn
|
1900
|
+
# value: "ScopeValue",
|
1901
|
+
# },
|
1902
|
+
# enhanced_infrastructure_metrics: "Active", # accepts Active, Inactive
|
1903
|
+
# })
|
1904
|
+
#
|
1905
|
+
# @see http://docs.aws.amazon.com/goto/WebAPI/compute-optimizer-2019-11-01/PutRecommendationPreferences AWS API Documentation
|
1906
|
+
#
|
1907
|
+
# @overload put_recommendation_preferences(params = {})
|
1908
|
+
# @param [Hash] params ({})
|
1909
|
+
def put_recommendation_preferences(params = {}, options = {})
|
1910
|
+
req = build_request(:put_recommendation_preferences, params)
|
1911
|
+
req.send_request(options)
|
1912
|
+
end
|
1913
|
+
|
1613
1914
|
# Updates the enrollment (opt in and opt out) status of an account to
|
1614
1915
|
# the Compute Optimizer service.
|
1615
1916
|
#
|
@@ -1699,7 +2000,7 @@ module Aws::ComputeOptimizer
|
|
1699
2000
|
params: params,
|
1700
2001
|
config: config)
|
1701
2002
|
context[:gem_name] = 'aws-sdk-computeoptimizer'
|
1702
|
-
context[:gem_version] = '1.
|
2003
|
+
context[:gem_version] = '1.29.0'
|
1703
2004
|
Seahorse::Client::Request.new(handlers, context)
|
1704
2005
|
end
|
1705
2006
|
|