Skip to content

Commit 4f5a452

Browse files
author
awstools
committed
feat(client-ec2): EC2 Capacity Manager adds new dimensions for grouping and filtering capacity metrics, including tag-based dimensions and Account Name.
1 parent b982b67 commit 4f5a452

29 files changed

Lines changed: 1812 additions & 267 deletions

‎clients/client-ec2/README.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3900,6 +3900,13 @@ GetCapacityManagerMetricDimensions
39003900
</details>
39013901
<details>
39023902
<summary>
3903+
GetCapacityManagerMonitoredTagKeys
3904+
</summary>
3905+
3906+
[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/ec2/command/GetCapacityManagerMonitoredTagKeysCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-ec2/Interface/GetCapacityManagerMonitoredTagKeysCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-ec2/Interface/GetCapacityManagerMonitoredTagKeysCommandOutput/)
3907+
</details>
3908+
<details>
3909+
<summary>
39033910
GetCapacityReservationUsage
39043911
</summary>
39053912

@@ -5440,6 +5447,13 @@ UnmonitorInstances
54405447
</details>
54415448
<details>
54425449
<summary>
5450+
UpdateCapacityManagerMonitoredTagKeys
5451+
</summary>
5452+
5453+
[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/ec2/command/UpdateCapacityManagerMonitoredTagKeysCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-ec2/Interface/UpdateCapacityManagerMonitoredTagKeysCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-ec2/Interface/UpdateCapacityManagerMonitoredTagKeysCommandOutput/)
5454+
</details>
5455+
<details>
5456+
<summary>
54435457
UpdateCapacityManagerOrganizationsAccess
54445458
</summary>
54455459

‎clients/client-ec2/src/EC2.ts‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2651,6 +2651,11 @@ import {
26512651
type GetCapacityManagerMetricDimensionsCommandOutput,
26522652
GetCapacityManagerMetricDimensionsCommand,
26532653
} from "./commands/GetCapacityManagerMetricDimensionsCommand";
2654+
import {
2655+
type GetCapacityManagerMonitoredTagKeysCommandInput,
2656+
type GetCapacityManagerMonitoredTagKeysCommandOutput,
2657+
GetCapacityManagerMonitoredTagKeysCommand,
2658+
} from "./commands/GetCapacityManagerMonitoredTagKeysCommand";
26542659
import {
26552660
type GetCapacityReservationUsageCommandInput,
26562661
type GetCapacityReservationUsageCommandOutput,
@@ -3751,6 +3756,11 @@ import {
37513756
type UnmonitorInstancesCommandOutput,
37523757
UnmonitorInstancesCommand,
37533758
} from "./commands/UnmonitorInstancesCommand";
3759+
import {
3760+
type UpdateCapacityManagerMonitoredTagKeysCommandInput,
3761+
type UpdateCapacityManagerMonitoredTagKeysCommandOutput,
3762+
UpdateCapacityManagerMonitoredTagKeysCommand,
3763+
} from "./commands/UpdateCapacityManagerMonitoredTagKeysCommand";
37543764
import {
37553765
type UpdateCapacityManagerOrganizationsAccessCommandInput,
37563766
type UpdateCapacityManagerOrganizationsAccessCommandOutput,
@@ -3966,6 +3976,7 @@ import { paginateGetAssociatedIpv6PoolCidrs } from "./pagination/GetAssociatedIp
39663976
import { paginateGetAwsNetworkPerformanceData } from "./pagination/GetAwsNetworkPerformanceDataPaginator";
39673977
import { paginateGetCapacityManagerMetricData } from "./pagination/GetCapacityManagerMetricDataPaginator";
39683978
import { paginateGetCapacityManagerMetricDimensions } from "./pagination/GetCapacityManagerMetricDimensionsPaginator";
3979+
import { paginateGetCapacityManagerMonitoredTagKeys } from "./pagination/GetCapacityManagerMonitoredTagKeysPaginator";
39693980
import { paginateGetGroupsForCapacityReservation } from "./pagination/GetGroupsForCapacityReservationPaginator";
39703981
import {
39713982
paginateGetInstanceTypesFromInstanceRequirements,
@@ -4590,6 +4601,7 @@ const commands = {
45904601
GetCapacityManagerAttributesCommand,
45914602
GetCapacityManagerMetricDataCommand,
45924603
GetCapacityManagerMetricDimensionsCommand,
4604+
GetCapacityManagerMonitoredTagKeysCommand,
45934605
GetCapacityReservationUsageCommand,
45944606
GetCoipPoolUsageCommand,
45954607
GetConsoleOutputCommand,
@@ -4810,6 +4822,7 @@ const commands = {
48104822
UnassignPrivateNatGatewayAddressCommand,
48114823
UnlockSnapshotCommand,
48124824
UnmonitorInstancesCommand,
4825+
UpdateCapacityManagerMonitoredTagKeysCommand,
48134826
UpdateCapacityManagerOrganizationsAccessCommand,
48144827
UpdateInterruptibleCapacityReservationAllocationCommand,
48154828
UpdateSecurityGroupRuleDescriptionsEgressCommand,
@@ -4956,6 +4969,7 @@ const paginators = {
49564969
paginateGetAwsNetworkPerformanceData,
49574970
paginateGetCapacityManagerMetricData,
49584971
paginateGetCapacityManagerMetricDimensions,
4972+
paginateGetCapacityManagerMonitoredTagKeys,
49594973
paginateGetGroupsForCapacityReservation,
49604974
paginateGetInstanceTypesFromInstanceRequirements,
49614975
paginateGetIpamAddressHistory,
@@ -14265,6 +14279,24 @@ export interface EC2 {
1426514279
cb: (err: any, data?: GetCapacityManagerMetricDimensionsCommandOutput) => void
1426614280
): void;
1426714281

14282+
/**
14283+
* @see {@link GetCapacityManagerMonitoredTagKeysCommand}
14284+
*/
14285+
getCapacityManagerMonitoredTagKeys(): Promise<GetCapacityManagerMonitoredTagKeysCommandOutput>;
14286+
getCapacityManagerMonitoredTagKeys(
14287+
args: GetCapacityManagerMonitoredTagKeysCommandInput,
14288+
options?: __HttpHandlerOptions
14289+
): Promise<GetCapacityManagerMonitoredTagKeysCommandOutput>;
14290+
getCapacityManagerMonitoredTagKeys(
14291+
args: GetCapacityManagerMonitoredTagKeysCommandInput,
14292+
cb: (err: any, data?: GetCapacityManagerMonitoredTagKeysCommandOutput) => void
14293+
): void;
14294+
getCapacityManagerMonitoredTagKeys(
14295+
args: GetCapacityManagerMonitoredTagKeysCommandInput,
14296+
options: __HttpHandlerOptions,
14297+
cb: (err: any, data?: GetCapacityManagerMonitoredTagKeysCommandOutput) => void
14298+
): void;
14299+
1426814300
/**
1426914301
* @see {@link GetCapacityReservationUsageCommand}
1427014302
*/
@@ -18026,6 +18058,24 @@ export interface EC2 {
1802618058
cb: (err: any, data?: UnmonitorInstancesCommandOutput) => void
1802718059
): void;
1802818060

18061+
/**
18062+
* @see {@link UpdateCapacityManagerMonitoredTagKeysCommand}
18063+
*/
18064+
updateCapacityManagerMonitoredTagKeys(): Promise<UpdateCapacityManagerMonitoredTagKeysCommandOutput>;
18065+
updateCapacityManagerMonitoredTagKeys(
18066+
args: UpdateCapacityManagerMonitoredTagKeysCommandInput,
18067+
options?: __HttpHandlerOptions
18068+
): Promise<UpdateCapacityManagerMonitoredTagKeysCommandOutput>;
18069+
updateCapacityManagerMonitoredTagKeys(
18070+
args: UpdateCapacityManagerMonitoredTagKeysCommandInput,
18071+
cb: (err: any, data?: UpdateCapacityManagerMonitoredTagKeysCommandOutput) => void
18072+
): void;
18073+
updateCapacityManagerMonitoredTagKeys(
18074+
args: UpdateCapacityManagerMonitoredTagKeysCommandInput,
18075+
options: __HttpHandlerOptions,
18076+
cb: (err: any, data?: UpdateCapacityManagerMonitoredTagKeysCommandOutput) => void
18077+
): void;
18078+
1802918079
/**
1803018080
* @see {@link UpdateCapacityManagerOrganizationsAccessCommand}
1803118081
*/
@@ -19642,6 +19692,17 @@ export interface EC2 {
1964219692
paginationConfig?: Omit<PaginationConfiguration, "client">
1964319693
): Paginator<GetCapacityManagerMetricDimensionsCommandOutput>;
1964419694

19695+
/**
19696+
* @see {@link GetCapacityManagerMonitoredTagKeysCommand}
19697+
* @param args - command input.
19698+
* @param paginationConfig - optional pagination config.
19699+
* @returns AsyncIterable of {@link GetCapacityManagerMonitoredTagKeysCommandOutput}.
19700+
*/
19701+
paginateGetCapacityManagerMonitoredTagKeys(
19702+
args?: GetCapacityManagerMonitoredTagKeysCommandInput,
19703+
paginationConfig?: Omit<PaginationConfiguration, "client">
19704+
): Paginator<GetCapacityManagerMonitoredTagKeysCommandOutput>;
19705+
1964519706
/**
1964619707
* @see {@link GetGroupsForCapacityReservationCommand}
1964719708
* @param args - command input.

‎clients/client-ec2/src/EC2Client.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1951,6 +1951,10 @@ import type {
19511951
GetCapacityManagerMetricDimensionsCommandInput,
19521952
GetCapacityManagerMetricDimensionsCommandOutput,
19531953
} from "./commands/GetCapacityManagerMetricDimensionsCommand";
1954+
import type {
1955+
GetCapacityManagerMonitoredTagKeysCommandInput,
1956+
GetCapacityManagerMonitoredTagKeysCommandOutput,
1957+
} from "./commands/GetCapacityManagerMonitoredTagKeysCommand";
19541958
import type {
19551959
GetCapacityReservationUsageCommandInput,
19561960
GetCapacityReservationUsageCommandOutput,
@@ -2735,6 +2739,10 @@ import type {
27352739
UnmonitorInstancesCommandInput,
27362740
UnmonitorInstancesCommandOutput,
27372741
} from "./commands/UnmonitorInstancesCommand";
2742+
import type {
2743+
UpdateCapacityManagerMonitoredTagKeysCommandInput,
2744+
UpdateCapacityManagerMonitoredTagKeysCommandOutput,
2745+
} from "./commands/UpdateCapacityManagerMonitoredTagKeysCommand";
27382746
import type {
27392747
UpdateCapacityManagerOrganizationsAccessCommandInput,
27402748
UpdateCapacityManagerOrganizationsAccessCommandOutput,
@@ -3301,6 +3309,7 @@ export type ServiceInputTypes =
33013309
| GetCapacityManagerAttributesCommandInput
33023310
| GetCapacityManagerMetricDataCommandInput
33033311
| GetCapacityManagerMetricDimensionsCommandInput
3312+
| GetCapacityManagerMonitoredTagKeysCommandInput
33043313
| GetCapacityReservationUsageCommandInput
33053314
| GetCoipPoolUsageCommandInput
33063315
| GetConsoleOutputCommandInput
@@ -3521,6 +3530,7 @@ export type ServiceInputTypes =
35213530
| UnassignPrivateNatGatewayAddressCommandInput
35223531
| UnlockSnapshotCommandInput
35233532
| UnmonitorInstancesCommandInput
3533+
| UpdateCapacityManagerMonitoredTagKeysCommandInput
35243534
| UpdateCapacityManagerOrganizationsAccessCommandInput
35253535
| UpdateInterruptibleCapacityReservationAllocationCommandInput
35263536
| UpdateSecurityGroupRuleDescriptionsEgressCommandInput
@@ -4062,6 +4072,7 @@ export type ServiceOutputTypes =
40624072
| GetCapacityManagerAttributesCommandOutput
40634073
| GetCapacityManagerMetricDataCommandOutput
40644074
| GetCapacityManagerMetricDimensionsCommandOutput
4075+
| GetCapacityManagerMonitoredTagKeysCommandOutput
40654076
| GetCapacityReservationUsageCommandOutput
40664077
| GetCoipPoolUsageCommandOutput
40674078
| GetConsoleOutputCommandOutput
@@ -4282,6 +4293,7 @@ export type ServiceOutputTypes =
42824293
| UnassignPrivateNatGatewayAddressCommandOutput
42834294
| UnlockSnapshotCommandOutput
42844295
| UnmonitorInstancesCommandOutput
4296+
| UpdateCapacityManagerMonitoredTagKeysCommandOutput
42854297
| UpdateCapacityManagerOrganizationsAccessCommandOutput
42864298
| UpdateInterruptibleCapacityReservationAllocationCommandOutput
42874299
| UpdateSecurityGroupRuleDescriptionsEgressCommandOutput

‎clients/client-ec2/src/commands/GetCapacityManagerMetricDataCommand.ts‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ export interface GetCapacityManagerMetricDataCommandOutput extends GetCapacityMa
4747
* EndTime: new Date("TIMESTAMP"), // required
4848
* Period: Number("int"), // required
4949
* GroupBy: [ // GroupBySet
50-
* "resource-region" || "availability-zone-id" || "account-id" || "instance-family" || "instance-type" || "instance-platform" || "reservation-arn" || "reservation-id" || "reservation-type" || "reservation-create-timestamp" || "reservation-start-timestamp" || "reservation-end-timestamp" || "reservation-end-date-type" || "tenancy" || "reservation-state" || "reservation-instance-match-criteria" || "reservation-unused-financial-owner",
50+
* "resource-region" || "availability-zone-id" || "account-id" || "account-name" || "instance-family" || "instance-type" || "instance-platform" || "reservation-arn" || "reservation-id" || "reservation-type" || "reservation-create-timestamp" || "reservation-start-timestamp" || "reservation-end-timestamp" || "reservation-end-date-type" || "tenancy" || "reservation-state" || "reservation-instance-match-criteria" || "reservation-unused-financial-owner",
5151
* ],
5252
* FilterBy: [ // CapacityManagerConditionSet
5353
* { // CapacityManagerCondition
5454
* DimensionCondition: { // DimensionCondition
55-
* Dimension: "resource-region" || "availability-zone-id" || "account-id" || "instance-family" || "instance-type" || "instance-platform" || "reservation-arn" || "reservation-id" || "reservation-type" || "reservation-create-timestamp" || "reservation-start-timestamp" || "reservation-end-timestamp" || "reservation-end-date-type" || "tenancy" || "reservation-state" || "reservation-instance-match-criteria" || "reservation-unused-financial-owner",
55+
* Dimension: "resource-region" || "availability-zone-id" || "account-id" || "account-name" || "instance-family" || "instance-type" || "instance-platform" || "reservation-arn" || "reservation-id" || "reservation-type" || "reservation-create-timestamp" || "reservation-start-timestamp" || "reservation-end-timestamp" || "reservation-end-date-type" || "tenancy" || "reservation-state" || "reservation-instance-match-criteria" || "reservation-unused-financial-owner",
5656
* Comparison: "equals" || "in",
5757
* Values: [ // ConditionValueList
5858
* "STRING_VALUE",
@@ -73,6 +73,7 @@ export interface GetCapacityManagerMetricDataCommandOutput extends GetCapacityMa
7373
* // ResourceRegion: "STRING_VALUE",
7474
* // AvailabilityZoneId: "STRING_VALUE",
7575
* // AccountId: "STRING_VALUE",
76+
* // AccountName: "STRING_VALUE",
7677
* // InstanceFamily: "STRING_VALUE",
7778
* // InstanceType: "STRING_VALUE",
7879
* // InstancePlatform: "STRING_VALUE",
@@ -87,6 +88,12 @@ export interface GetCapacityManagerMetricDataCommandOutput extends GetCapacityMa
8788
* // ReservationState: "active" || "expired" || "cancelled" || "scheduled" || "pending" || "failed" || "delayed" || "unsupported" || "payment-pending" || "payment-failed" || "retired",
8889
* // ReservationInstanceMatchCriteria: "STRING_VALUE",
8990
* // ReservationUnusedFinancialOwner: "STRING_VALUE",
91+
* // Tags: [ // CapacityManagerTagDimensionSet
92+
* // { // CapacityManagerTagDimension
93+
* // Key: "STRING_VALUE",
94+
* // Value: "STRING_VALUE",
95+
* // },
96+
* // ],
9097
* // },
9198
* // Timestamp: new Date("TIMESTAMP"),
9299
* // MetricValues: [ // MetricValueSet

‎clients/client-ec2/src/commands/GetCapacityManagerMetricDimensionsCommand.ts‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ export interface GetCapacityManagerMetricDimensionsCommandOutput extends GetCapa
4444
* const client = new EC2Client(config);
4545
* const input = { // GetCapacityManagerMetricDimensionsRequest
4646
* GroupBy: [ // GroupBySet // required
47-
* "resource-region" || "availability-zone-id" || "account-id" || "instance-family" || "instance-type" || "instance-platform" || "reservation-arn" || "reservation-id" || "reservation-type" || "reservation-create-timestamp" || "reservation-start-timestamp" || "reservation-end-timestamp" || "reservation-end-date-type" || "tenancy" || "reservation-state" || "reservation-instance-match-criteria" || "reservation-unused-financial-owner",
47+
* "resource-region" || "availability-zone-id" || "account-id" || "account-name" || "instance-family" || "instance-type" || "instance-platform" || "reservation-arn" || "reservation-id" || "reservation-type" || "reservation-create-timestamp" || "reservation-start-timestamp" || "reservation-end-timestamp" || "reservation-end-date-type" || "tenancy" || "reservation-state" || "reservation-instance-match-criteria" || "reservation-unused-financial-owner",
4848
* ],
4949
* FilterBy: [ // CapacityManagerConditionSet
5050
* { // CapacityManagerCondition
5151
* DimensionCondition: { // DimensionCondition
52-
* Dimension: "resource-region" || "availability-zone-id" || "account-id" || "instance-family" || "instance-type" || "instance-platform" || "reservation-arn" || "reservation-id" || "reservation-type" || "reservation-create-timestamp" || "reservation-start-timestamp" || "reservation-end-timestamp" || "reservation-end-date-type" || "tenancy" || "reservation-state" || "reservation-instance-match-criteria" || "reservation-unused-financial-owner",
52+
* Dimension: "resource-region" || "availability-zone-id" || "account-id" || "account-name" || "instance-family" || "instance-type" || "instance-platform" || "reservation-arn" || "reservation-id" || "reservation-type" || "reservation-create-timestamp" || "reservation-start-timestamp" || "reservation-end-timestamp" || "reservation-end-date-type" || "tenancy" || "reservation-state" || "reservation-instance-match-criteria" || "reservation-unused-financial-owner",
5353
* Comparison: "equals" || "in",
5454
* Values: [ // ConditionValueList
5555
* "STRING_VALUE",
@@ -74,6 +74,7 @@ export interface GetCapacityManagerMetricDimensionsCommandOutput extends GetCapa
7474
* // ResourceRegion: "STRING_VALUE",
7575
* // AvailabilityZoneId: "STRING_VALUE",
7676
* // AccountId: "STRING_VALUE",
77+
* // AccountName: "STRING_VALUE",
7778
* // InstanceFamily: "STRING_VALUE",
7879
* // InstanceType: "STRING_VALUE",
7980
* // InstancePlatform: "STRING_VALUE",
@@ -88,6 +89,12 @@ export interface GetCapacityManagerMetricDimensionsCommandOutput extends GetCapa
8889
* // ReservationState: "active" || "expired" || "cancelled" || "scheduled" || "pending" || "failed" || "delayed" || "unsupported" || "payment-pending" || "payment-failed" || "retired",
8990
* // ReservationInstanceMatchCriteria: "STRING_VALUE",
9091
* // ReservationUnusedFinancialOwner: "STRING_VALUE",
92+
* // Tags: [ // CapacityManagerTagDimensionSet
93+
* // { // CapacityManagerTagDimension
94+
* // Key: "STRING_VALUE",
95+
* // Value: "STRING_VALUE",
96+
* // },
97+
* // ],
9198
* // },
9299
* // ],
93100
* // NextToken: "STRING_VALUE",

0 commit comments

Comments
 (0)
⚡