Skip to content

Commit 8f66142

Browse files
author
AWS
committed
Amazon EMR Update: Add CloudWatch Logs integration for Spark driver, executor and step logs
1 parent 8bb1168 commit 8f66142

File tree

2 files changed

+60
-4
lines changed

2 files changed

+60
-4
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"type": "feature",
3+
"category": "Amazon EMR",
4+
"contributor": "",
5+
"description": "Add CloudWatch Logs integration for Spark driver, executor and step logs"
6+
}

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

Lines changed: 54 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,6 +1256,33 @@
12561256
},
12571257
"documentation":"<p>The definition of a CloudWatch metric alarm, which determines when an automatic scaling activity is triggered. When the defined alarm conditions are satisfied, scaling activity begins.</p>"
12581258
},
1259+
"CloudWatchLogConfiguration":{
1260+
"type":"structure",
1261+
"required":["Enabled"],
1262+
"members":{
1263+
"Enabled":{
1264+
"shape":"Boolean",
1265+
"documentation":"<p>Specifies if CloudWatch logging is enabled.</p>"
1266+
},
1267+
"LogGroupName":{
1268+
"shape":"XmlString",
1269+
"documentation":"<p>The name of the CloudWatch log group where logs are published.</p>"
1270+
},
1271+
"LogStreamNamePrefix":{
1272+
"shape":"XmlString",
1273+
"documentation":"<p>The prefix of the log stream name.</p>"
1274+
},
1275+
"EncryptionKeyArn":{
1276+
"shape":"XmlString",
1277+
"documentation":"<p>The ARN of the encryption key used to encrypt the logs.</p>"
1278+
},
1279+
"LogTypes":{
1280+
"shape":"LogTypesMap",
1281+
"documentation":"<p>A map of log types to file names for publishing logs to the standard output or standard error streams for CloudWatch. Valid log types include STEP_LOGS, SPARK_DRIVER, and SPARK_EXECUTOR. Valid file names for each type include STDOUT and STDERR.</p>"
1282+
}
1283+
},
1284+
"documentation":"<p>Holds CloudWatch log configuration settings and metadata that specify settings like log files to monitor and where to send them.</p>"
1285+
},
12591286
"Cluster":{
12601287
"type":"structure",
12611288
"members":{
@@ -1398,6 +1425,10 @@
13981425
"ExtendedSupport":{
13991426
"shape":"BooleanObject",
14001427
"documentation":"<p>Reserved.</p>"
1428+
},
1429+
"MonitoringConfiguration":{
1430+
"shape":"MonitoringConfiguration",
1431+
"documentation":"<p>Contains Cloudwatch log configuration metadata and settings.</p>"
14011432
}
14021433
},
14031434
"documentation":"<p>The detailed description of the cluster.</p>"
@@ -2881,7 +2912,7 @@
28812912
},
28822913
"BidPrice":{
28832914
"shape":"String",
2884-
"documentation":"<p>If specified, indicates that the instance group uses Spot Instances. This is the maximum price you are willing to pay for Spot Instances. Specify <code>OnDemandPrice</code> to set the amount equal to the On-Demand price, or specify an amount in USD.</p>"
2915+
"documentation":"<p>The bid price for each Amazon EC2 Spot Instance type as defined by <code>InstanceType</code>. Expressed in USD. If neither <code>BidPrice</code> nor <code>BidPriceAsPercentageOfOnDemandPrice</code> is provided, <code>BidPriceAsPercentageOfOnDemandPrice</code> defaults to 100%.</p>"
28852916
},
28862917
"InstanceType":{
28872918
"shape":"InstanceType",
@@ -2960,7 +2991,7 @@
29602991
},
29612992
"BidPrice":{
29622993
"shape":"XmlStringMaxLen256",
2963-
"documentation":"<p>If specified, indicates that the instance group uses Spot Instances. This is the maximum price you are willing to pay for Spot Instances. Specify <code>OnDemandPrice</code> to set the amount equal to the On-Demand price, or specify an amount in USD.</p>"
2994+
"documentation":"<p>The bid price for each Amazon EC2 Spot Instance type as defined by <code>InstanceType</code>. Expressed in USD. If neither <code>BidPrice</code> nor <code>BidPriceAsPercentageOfOnDemandPrice</code> is provided, <code>BidPriceAsPercentageOfOnDemandPrice</code> defaults to 100%.</p>"
29642995
},
29652996
"InstanceType":{
29662997
"shape":"InstanceType",
@@ -3023,7 +3054,7 @@
30233054
},
30243055
"BidPrice":{
30253056
"shape":"XmlStringMaxLen256",
3026-
"documentation":"<p>If specified, indicates that the instance group uses Spot Instances. This is the maximum price you are willing to pay for Spot Instances. Specify <code>OnDemandPrice</code> to set the amount equal to the On-Demand price, or specify an amount in USD.</p>"
3057+
"documentation":"<p>The bid price for each Amazon EC2 Spot Instance type as defined by <code>InstanceType</code>. Expressed in USD. If neither <code>BidPrice</code> nor <code>BidPriceAsPercentageOfOnDemandPrice</code> is provided, <code>BidPriceAsPercentageOfOnDemandPrice</code> defaults to 100%.</p>"
30273058
},
30283059
"InstanceType":{
30293060
"shape":"InstanceType",
@@ -3370,7 +3401,7 @@
33703401
},
33713402
"BidPrice":{
33723403
"shape":"XmlStringMaxLen256",
3373-
"documentation":"<p>The bid price for each Amazon EC2 Spot Instance type as defined by <code>InstanceType</code>. Expressed in USD.</p>"
3404+
"documentation":"<p>The bid price for each Amazon EC2 Spot Instance type as defined by <code>InstanceType</code>. Expressed in USD. If neither <code>BidPrice</code> nor <code>BidPriceAsPercentageOfOnDemandPrice</code> is provided, <code>BidPriceAsPercentageOfOnDemandPrice</code> defaults to 100%.</p>"
33743405
},
33753406
"BidPriceAsPercentageOfOnDemandPrice":{
33763407
"shape":"NonNegativeDouble",
@@ -4138,6 +4169,11 @@
41384169
}
41394170
}
41404171
},
4172+
"LogTypesMap":{
4173+
"type":"map",
4174+
"key":{"shape":"XmlString"},
4175+
"value":{"shape":"XmlStringList"}
4176+
},
41414177
"Long":{"type":"long"},
41424178
"ManagedScalingPolicy":{
41434179
"type":"structure",
@@ -4250,6 +4286,16 @@
42504286
},
42514287
"documentation":"<p>Change the size of some instance groups.</p>"
42524288
},
4289+
"MonitoringConfiguration":{
4290+
"type":"structure",
4291+
"members":{
4292+
"CloudWatchLogConfiguration":{
4293+
"shape":"CloudWatchLogConfiguration",
4294+
"documentation":"<p>CloudWatch log configuration settings and metadata that specify settings like log files to monitor and where to send them.</p>"
4295+
}
4296+
},
4297+
"documentation":"<p>Contains CloudWatch log configuration metadata and settings.</p>"
4298+
},
42534299
"NewSupportedProductsList":{
42544300
"type":"list",
42554301
"member":{"shape":"SupportedProductConfig"}
@@ -4997,6 +5043,10 @@
49975043
"ExtendedSupport":{
49985044
"shape":"BooleanObject",
49995045
"documentation":"<p>Reserved.</p>"
5046+
},
5047+
"MonitoringConfiguration":{
5048+
"shape":"MonitoringConfiguration",
5049+
"documentation":"<p>Contains CloudWatch log configuration metadata and settings.</p>"
50005050
}
50015051
},
50025052
"documentation":"<p> Input to the <a>RunJobFlow</a> operation. </p>"

0 commit comments

Comments
 (0)