Amazon Elastic Compute Cloud Update: EC2 Capacity Manager adds new dimensions for grouping and filtering capacity metrics, including tag-based dimensions and Account Name.

Author: AWS

.changes/next-release/feature-AmazonElasticComputeCloud-be53374.json

@@ -0,0 +1,6 @@
+{
+    "type": "feature",
+    "category": "Amazon Elastic Compute Cloud",
+    "contributor": "",
+    "description": "EC2 Capacity Manager adds new dimensions for grouping and filtering capacity metrics, including tag-based dimensions and Account Name."
+}

services/ec2/src/main/resources/codegen-resources/paginators-1.json

@@ -875,6 +875,12 @@
       "output_token": "NextToken",
       "result_key": "MetricDimensionResults"
     },
+    "GetCapacityManagerMonitoredTagKeys": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "CapacityManagerTagKeys"
+    },
     "GetGroupsForCapacityReservation": {
       "input_token": "NextToken",
       "limit_key": "MaxResults",

services/ec2/src/main/resources/codegen-resources/service-2.json

@@ -5291,6 +5291,16 @@
       "output":{"shape":"GetCapacityManagerMetricDimensionsResult"},
       "documentation":"<p> Retrieves the available dimension values for capacity metrics within a specified time range. This is useful for discovering what accounts, regions, instance families, and other dimensions have data available for filtering and grouping. </p>"
     },
+    "GetCapacityManagerMonitoredTagKeys":{
+      "name":"GetCapacityManagerMonitoredTagKeys",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetCapacityManagerMonitoredTagKeysRequest"},
+      "output":{"shape":"GetCapacityManagerMonitoredTagKeysResult"},
+      "documentation":"<p> Retrieves the tag keys that are currently being monitored by EC2 Capacity Manager. Monitored tag keys are included as dimensions in capacity metric data, enabling you to group and filter metrics by tag values. </p>"
+    },
     "GetCapacityReservationUsage":{
       "name":"GetCapacityReservationUsage",
       "http":{
@@ -7471,6 +7481,16 @@
       "output":{"shape":"UnmonitorInstancesResult"},
       "documentation":"<p>Disables detailed monitoring for a running instance. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-cloudwatch.html\">Monitoring your instances and volumes</a> in the <i>Amazon EC2 User Guide</i>.</p>"
     },
+    "UpdateCapacityManagerMonitoredTagKeys":{
+      "name":"UpdateCapacityManagerMonitoredTagKeys",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateCapacityManagerMonitoredTagKeysRequest"},
+      "output":{"shape":"UpdateCapacityManagerMonitoredTagKeysResult"},
+      "documentation":"<p> Activates or deactivates tag keys for monitoring by EC2 Capacity Manager. Activated tag keys are included as dimensions in capacity metric data, enabling you to group and filter metrics by tag values. </p>"
+    },
     "UpdateCapacityManagerOrganizationsAccess":{
       "name":"UpdateCapacityManagerOrganizationsAccess",
       "http":{
@@ -12558,6 +12578,11 @@
           "documentation":"<p> The Amazon Web Services account ID that owns the capacity resource. </p>",
           "locationName":"accountId"
         },
+        "AccountName":{
+          "shape":"String",
+          "documentation":"<p> The name of the Amazon Web Services account that owns the capacity resource. This dimension is only available when Organizations access is enabled for Capacity Manager. </p>",
+          "locationName":"accountName"
+        },
         "InstanceFamily":{
           "shape":"String",
           "documentation":"<p> The EC2 instance family of the capacity resource. </p>",
@@ -12627,17 +12652,92 @@
           "shape":"String",
           "documentation":"<p> The Amazon Web Services account ID that is financially responsible for unused capacity reservation costs. </p>",
           "locationName":"reservationUnusedFinancialOwner"
+        },
+        "Tags":{
+          "shape":"CapacityManagerTagDimensionSet",
+          "documentation":"<p> The tags associated with the capacity resource, represented as key-value pairs. Only tags that have been activated for monitoring via <code>UpdateCapacityManagerMonitoredTagKeys</code> are included. </p>",
+          "locationName":"tagSet"
         }
       },
       "documentation":"<p> Represents dimension values for capacity metrics, including resource identifiers, geographic information, and reservation details used for grouping and filtering capacity data. </p>"
     },
+    "CapacityManagerMonitoredTagKey":{
+      "type":"structure",
+      "members":{
+        "TagKey":{
+          "shape":"String",
+          "documentation":"<p> The tag key being monitored. </p>",
+          "locationName":"tagKey"
+        },
+        "Status":{
+          "shape":"CapacityManagerMonitoredTagKeyStatus",
+          "documentation":"<p> The current status of the monitored tag key. Valid values are <code>activating</code>, <code>activated</code>, <code>deactivating</code>, and <code>suspended</code>. </p>",
+          "locationName":"status"
+        },
+        "StatusMessage":{
+          "shape":"String",
+          "documentation":"<p> A message providing additional details about the current status of the monitored tag key. </p>",
+          "locationName":"statusMessage"
+        },
+        "CapacityManagerProvided":{
+          "shape":"Boolean",
+          "documentation":"<p> Indicates whether this tag key is provided by Capacity Manager by default, rather than being user-activated. </p>",
+          "locationName":"capacityManagerProvided"
+        },
+        "EarliestDatapointTimestamp":{
+          "shape":"MillisecondDateTime",
+          "documentation":"<p> The earliest timestamp from which tag data is available for queries, in UTC ISO 8601 format. </p>",
+          "locationName":"earliestDatapointTimestamp"
+        }
+      },
+      "documentation":"<p> Describes a tag key that is being monitored by Capacity Manager, including its activation status and the earliest available data point. </p>"
+    },
+    "CapacityManagerMonitoredTagKeyList":{
+      "type":"list",
+      "member":{
+        "shape":"CapacityManagerMonitoredTagKey",
+        "locationName":"item"
+      }
+    },
+    "CapacityManagerMonitoredTagKeyStatus":{
+      "type":"string",
+      "enum":[
+        "activating",
+        "activated",
+        "deactivating",
+        "suspended"
+      ]
+    },
     "CapacityManagerStatus":{
       "type":"string",
       "enum":[
         "enabled",
         "disabled"
       ]
     },
+    "CapacityManagerTagDimension":{
+      "type":"structure",
+      "members":{
+        "Key":{
+          "shape":"String",
+          "documentation":"<p> The tag key. </p>",
+          "locationName":"key"
+        },
+        "Value":{
+          "shape":"String",
+          "documentation":"<p> The tag value. </p>",
+          "locationName":"value"
+        }
+      },
+      "documentation":"<p> A key-value pair representing a tag associated with a capacity resource in Capacity Manager. </p>"
+    },
+    "CapacityManagerTagDimensionSet":{
+      "type":"list",
+      "member":{
+        "shape":"CapacityManagerTagDimension",
+        "locationName":"item"
+      }
+    },
     "CapacityReservation":{
       "type":"structure",
       "members":{
@@ -14318,10 +14418,15 @@
       "type":"string",
       "pattern":"[a-z]{2}-[a-z]+-[1-9]+"
     },
+    "ConditionValue":{
+      "type":"string",
+      "max":300,
+      "min":0
+    },
     "ConditionValueList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"ConditionValue",
         "locationName":"item"
       },
       "max":10,
@@ -36569,6 +36674,7 @@
         "resource-region",
         "availability-zone-id",
         "account-id",
+        "account-name",
         "instance-family",
         "instance-type",
         "instance-platform",
@@ -36583,7 +36689,9 @@
         "reservation-state",
         "reservation-instance-match-criteria",
         "reservation-unused-financial-owner"
-      ]
+      ],
+      "max":300,
+      "min":0
     },
     "FilterList":{
       "type":"list",
@@ -38020,6 +38128,43 @@
         }
       }
     },
+    "GetCapacityManagerMonitoredTagKeysRequest":{
+      "type":"structure",
+      "members":{
+        "MaxResults":{
+          "shape":"GetCapacityManagerMonitoredTagKeysRequestMaxResults",
+          "documentation":"<p> The maximum number of results to return in a single call. To retrieve the remaining results, make another call with the returned <code>NextToken</code> value. If not specified, up to 1000 results are returned. </p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p> The token for the next page of results. Use the value returned from a previous call to retrieve additional results. </p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p> Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>. </p>"
+        }
+      }
+    },
+    "GetCapacityManagerMonitoredTagKeysRequestMaxResults":{
+      "type":"integer",
+      "max":1000,
+      "min":1
+    },
+    "GetCapacityManagerMonitoredTagKeysResult":{
+      "type":"structure",
+      "members":{
+        "CapacityManagerTagKeys":{
+          "shape":"CapacityManagerMonitoredTagKeyList",
+          "documentation":"<p> The list of tag keys being monitored by Capacity Manager, including their current status and metadata. </p>",
+          "locationName":"capacityManagerTagKeySet"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p> The token to use to retrieve the next page of results. This value is null when there are no more results to return. </p>",
+          "locationName":"nextToken"
+        }
+      }
+    },
     "GetCapacityReservationUsageRequest":{
       "type":"structure",
       "required":["CapacityReservationId"],
@@ -40578,6 +40723,7 @@
         "resource-region",
         "availability-zone-id",
         "account-id",
+        "account-name",
         "instance-family",
         "instance-type",
         "instance-platform",
@@ -40592,7 +40738,9 @@
         "reservation-state",
         "reservation-instance-match-criteria",
         "reservation-unused-financial-owner"
-      ]
+      ],
+      "max":300,
+      "min":0
     },
     "GroupBySet":{
       "type":"list",
@@ -72793,6 +72941,40 @@
         "locationName":"item"
       }
     },
+    "UpdateCapacityManagerMonitoredTagKeysRequest":{
+      "type":"structure",
+      "members":{
+        "ActivateTagKeys":{
+          "shape":"ValueStringList",
+          "documentation":"<p> The tag keys to activate for monitoring. Once activated, these tag keys will be included as dimensions in capacity metric data. </p>",
+          "locationName":"ActivateTagKey"
+        },
+        "DeactivateTagKeys":{
+          "shape":"ValueStringList",
+          "documentation":"<p> The tag keys to deactivate. Deactivated tag keys will no longer be included as dimensions in capacity metric data. </p>",
+          "locationName":"DeactivateTagKey"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p> Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>. </p>"
+        },
+        "ClientToken":{
+          "shape":"String",
+          "documentation":"<p> Unique, case-sensitive identifier that you provide to ensure the idempotency of the request. </p>",
+          "idempotencyToken":true
+        }
+      }
+    },
+    "UpdateCapacityManagerMonitoredTagKeysResult":{
+      "type":"structure",
+      "members":{
+        "CapacityManagerTagKeys":{
+          "shape":"CapacityManagerMonitoredTagKeyList",
+          "documentation":"<p> The list of tag keys affected by the update, including their current status and metadata. </p>",
+          "locationName":"capacityManagerTagKeySet"
+        }
+      }
+    },
     "UpdateCapacityManagerOrganizationsAccessRequest":{
       "type":"structure",
       "required":["OrganizationsAccess"],