Amazon CloudWatch Update: Amazon CloudWatch Contributor Insights adds support for tags and tagging on resource creation.

AWS · AWS · commit daf9e14191cf · 2020-04-02T18:05:53.000Z
diff --git a/.changes/next-release/feature-AmazonCloudWatch-7e2dbb4.json b/.changes/next-release/feature-AmazonCloudWatch-7e2dbb4.json
@@ -0,0 +1,5 @@
+{
+    "type": "feature",
+    "category": "Amazon CloudWatch",
+    "description": "Amazon CloudWatch Contributor Insights adds support for tags and tagging on resource creation."
+}
diff --git a/services/cloudwatch/src/main/resources/codegen-resources/service-2.json b/services/cloudwatch/src/main/resources/codegen-resources/service-2.json
@@ -344,7 +344,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InternalServiceFault"}
       ],
-      "documentation":"<p>Displays the tags associated with a CloudWatch resource. Alarms support tagging.</p>"
+      "documentation":"<p>Displays the tags associated with a CloudWatch resource. Currently, alarms and Contributor Insights rules support tagging.</p>"
     },
     "PutAnomalyDetector":{
       "name":"PutAnomalyDetector",
@@ -469,7 +469,7 @@
         {"shape":"ConcurrentModificationException"},
         {"shape":"InternalServiceFault"}
       ],
-      "documentation":"<p>Assigns one or more tags (key-value pairs) to the specified CloudWatch resource. Currently, the only CloudWatch resources that can be tagged are alarms.</p> <p>Tags can help you organize and categorize your resources. You can also use them to scope user permissions, by granting a user permission to access or change only resources with certain tag values.</p> <p>Tags don't have any semantic meaning to AWS and are interpreted strictly as strings of characters.</p> <p>You can use the <code>TagResource</code> action with an alarm that already has tags. If you specify a new tag key for the alarm, this tag is appended to the list of tags associated with the alarm. If you specify a tag key that is already associated with the alarm, the new tag value that you specify replaces the previous value for that tag.</p> <p>You can associate as many as 50 tags with a resource.</p>"
+      "documentation":"<p>Assigns one or more tags (key-value pairs) to the specified CloudWatch resource. Currently, the only CloudWatch resources that can be tagged are alarms and Contributor Insights rules.</p> <p>Tags can help you organize and categorize your resources. You can also use them to scope user permissions, by granting a user permission to access or change only resources with certain tag values.</p> <p>Tags don't have any semantic meaning to AWS and are interpreted strictly as strings of characters.</p> <p>You can use the <code>TagResource</code> action with an alarm that already has tags. If you specify a new tag key for the alarm, this tag is appended to the list of tags associated with the alarm. If you specify a tag key that is already associated with the alarm, the new tag value that you specify replaces the previous value for that tag.</p> <p>You can associate as many as 50 tags with a CloudWatch resource.</p>"
     },
     "UntagResource":{
       "name":"UntagResource",
@@ -594,7 +594,7 @@
           "documentation":"<p>The metric dimensions associated with the anomaly detection model.</p>"
         },
         "Stat":{
-          "shape":"Stat",
+          "shape":"AnomalyDetectorMetricStat",
           "documentation":"<p>The statistic associated with the anomaly detection model.</p>"
         },
         "Configuration":{
@@ -626,7 +626,15 @@
       "type":"list",
       "member":{"shape":"Range"}
     },
-    "AnomalyDetectorMetricTimezone":{"type":"string"},
+    "AnomalyDetectorMetricStat":{
+      "type":"string",
+      "pattern":"(SampleCount|Average|Sum|Minimum|Maximum|p(\\d{1,2}|100)(\\.\\d{0,2})?|[ou]\\d+(\\.\\d*)?)(_E|_L|_H)?"
+    },
+    "AnomalyDetectorMetricTimezone":{
+      "type":"string",
+      "max":50,
+      "pattern":".*"
+    },
     "AnomalyDetectorStateValue":{
       "type":"string",
       "enum":[
@@ -927,7 +935,7 @@
           "documentation":"<p>The metric dimensions associated with the anomaly detection model to delete.</p>"
         },
         "Stat":{
-          "shape":"Stat",
+          "shape":"AnomalyDetectorMetricStat",
           "documentation":"<p>The statistic associated with the anomaly detection model to delete.</p>"
         }
       }
@@ -1945,7 +1953,7 @@
       "members":{
         "ResourceARN":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>The ARN of the CloudWatch resource that you want to view tags for. For more information on ARN format, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-cloudwatch\">Example ARNs</a> in the <i>Amazon Web Services General Reference</i>.</p>"
+          "documentation":"<p>The ARN of the CloudWatch resource that you want to view tags for.</p> <p>The ARN format of an alarm is <code>arn:aws:cloudwatch:<i>Region</i>:<i>account-id</i>:alarm:<i>alarm-name</i> </code> </p> <p>The ARN format of a Contributor Insights rule is <code>arn:aws:cloudwatch:<i>Region</i>:<i>account-id</i>:insight-rule:<i>insight-rule-name</i> </code> </p> <p>For more information on ARN format, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/list_amazoncloudwatch.html#amazoncloudwatch-resources-for-iam-policies\"> Resource Types Defined by Amazon CloudWatch</a> in the <i>Amazon Web Services General Reference</i>.</p>"
         }
       }
     },
@@ -2395,7 +2403,7 @@
           "documentation":"<p>The metric dimensions to create the anomaly detection model for.</p>"
         },
         "Stat":{
-          "shape":"Stat",
+          "shape":"AnomalyDetectorMetricStat",
           "documentation":"<p>The statistic to use for the metric and the anomaly detection model.</p>"
         },
         "Configuration":{
@@ -2494,6 +2502,10 @@
         "RuleDefinition":{
           "shape":"InsightRuleDefinition",
           "documentation":"<p>The definition of the rule, as a JSON object. For details on the valid syntax, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/ContributorInsights-RuleSyntax.html\">Contributor Insights Rule Syntax</a>.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of key-value pairs to associate with the Contributor Insights rule. You can associate as many as 50 tags with a rule.</p> <p>Tags can help you organize and categorize your resources. You can also use them to scope user permissions, by granting a user permission to access or change only the resources that have certain tag values.</p> <p>To be able to associate tags with a rule, you must have the <code>cloudwatch:TagResource</code> permission in addition to the <code>cloudwatch:PutInsightRule</code> permission.</p> <p>If you are using this operation to update an existing Contributor Insights rule, any tags you specify in this parameter are ignored. To change the tags of an existing rule, use <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_TagResource.html\">TagResource</a>.</p>"
         }
       }
     },
@@ -2863,7 +2875,7 @@
       "members":{
         "ResourceARN":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>The ARN of the CloudWatch alarm that you're adding tags to. The ARN format is <code>arn:aws:cloudwatch:<i>Region</i>:<i>account-id</i>:alarm:<i>alarm-name</i> </code> </p>"
+          "documentation":"<p>The ARN of the CloudWatch resource that you're adding tags to.</p> <p>The ARN format of an alarm is <code>arn:aws:cloudwatch:<i>Region</i>:<i>account-id</i>:alarm:<i>alarm-name</i> </code> </p> <p>The ARN format of a Contributor Insights rule is <code>arn:aws:cloudwatch:<i>Region</i>:<i>account-id</i>:insight-rule:<i>insight-rule-name</i> </code> </p> <p>For more information on ARN format, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/list_amazoncloudwatch.html#amazoncloudwatch-resources-for-iam-policies\"> Resource Types Defined by Amazon CloudWatch</a> in the <i>Amazon Web Services General Reference</i>.</p>"
         },
         "Tags":{
           "shape":"TagList",
@@ -2901,7 +2913,7 @@
       "members":{
         "ResourceARN":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>The ARN of the CloudWatch resource that you're removing tags from. For more information on ARN format, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-cloudwatch\">Example ARNs</a> in the <i>Amazon Web Services General Reference</i>.</p>"
+          "documentation":"<p>The ARN of the CloudWatch resource that you're removing tags from.</p> <p>The ARN format of an alarm is <code>arn:aws:cloudwatch:<i>Region</i>:<i>account-id</i>:alarm:<i>alarm-name</i> </code> </p> <p>The ARN format of a Contributor Insights rule is <code>arn:aws:cloudwatch:<i>Region</i>:<i>account-id</i>:insight-rule:<i>insight-rule-name</i> </code> </p> <p>For more information on ARN format, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/list_amazoncloudwatch.html#amazoncloudwatch-resources-for-iam-policies\"> Resource Types Defined by Amazon CloudWatch</a> in the <i>Amazon Web Services General Reference</i>.</p>"
         },
         "TagKeys":{
           "shape":"TagKeyList",
