Skip to content

Commit d379004

Browse files
author
AWS
committed
Amazon Prometheus Service Update: Add support for sending metrics to cross account and CMCK AMP workspaces through RoleConfiguration on Create/Update Scraper.
1 parent e7d281c commit d379004

File tree

2 files changed

+34
-3
lines changed

2 files changed

+34
-3
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 Prometheus Service",
4+
"contributor": "",
5+
"description": "Add support for sending metrics to cross account and CMCK AMP workspaces through RoleConfiguration on Create/Update Scraper."
6+
}

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

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -800,6 +800,10 @@
800800
"shape":"Destination",
801801
"documentation":"<p>The Amazon Managed Service for Prometheus workspace to send metrics to.</p>"
802802
},
803+
"roleConfiguration":{
804+
"shape":"RoleConfiguration",
805+
"documentation":"<p>The scraper role configuration for the workspace.</p>"
806+
},
803807
"scrapeConfiguration":{
804808
"shape":"ScrapeConfiguration",
805809
"documentation":"<p>The configuration file to use in the new scraper. For more information, see <a href=\"https://docs.aws.amazon.com/prometheus/latest/userguide/AMP-collector-how-to.html#AMP-collector-configuration\">Scraper configuration</a> in the <i>Amazon Managed Service for Prometheus User Guide</i>.</p>"
@@ -1223,7 +1227,8 @@
12231227
},
12241228
"IamRoleArn":{
12251229
"type":"string",
1226-
"documentation":"<p>An ARN identifying an IAM role used by the scraper.</p>"
1230+
"documentation":"<p>An ARN identifying an IAM role used by the scraper.</p>",
1231+
"pattern":"^arn:aws[-a-z]*:iam::[0-9]{12}:role/.+$"
12271232
},
12281233
"IdempotencyToken":{
12291234
"type":"string",
@@ -1262,7 +1267,7 @@
12621267
"documentation":"<p>A KMS Key ARN.</p>",
12631268
"max":2048,
12641269
"min":20,
1265-
"pattern":"^arn:aws:kms:[a-z0-9\\-]+:\\d+:key/[a-f0-9\\-]+$"
1270+
"pattern":"^arn:aws[-a-z]*:kms:[-a-z0-9]+:[0-9]{12}:key/[-a-f0-9]+$"
12661271
},
12671272
"ListRuleGroupsNamespacesRequest":{
12681273
"type":"structure",
@@ -1428,7 +1433,7 @@
14281433
},
14291434
"LogGroupArn":{
14301435
"type":"string",
1431-
"pattern":"^arn:aws[a-z0-9-]*:logs:[a-z0-9-]+:\\d{12}:log-group:[A-Za-z0-9\\.\\-\\_\\#/]{1,512}\\:\\*$"
1436+
"pattern":"^arn:aws[-a-z]*:logs:[-a-z0-9]+:[0-9]{12}:log-group:[A-Za-z0-9\\.\\-\\_\\#/]{1,512}\\:\\*$"
14321437
},
14331438
"LoggingConfigurationMetadata":{
14341439
"type":"structure",
@@ -1619,6 +1624,20 @@
16191624
},
16201625
"exception":true
16211626
},
1627+
"RoleConfiguration":{
1628+
"type":"structure",
1629+
"members":{
1630+
"sourceRoleArn":{
1631+
"shape":"IamRoleArn",
1632+
"documentation":"<p>A ARN identifying the source role configuration.</p>"
1633+
},
1634+
"targetRoleArn":{
1635+
"shape":"IamRoleArn",
1636+
"documentation":"<p>A ARN identifying the target role configuration.</p>"
1637+
}
1638+
},
1639+
"documentation":"<p>To configure roles that allows users to write to an Amazon Managed Service for Prometheus workspace in a different account.</p>"
1640+
},
16221641
"RuleGroupsNamespaceArn":{
16231642
"type":"string",
16241643
"documentation":"<p>An ARN identifying a rule groups namespace.</p>"
@@ -1805,6 +1824,7 @@
18051824
"shape":"IamRoleArn",
18061825
"documentation":"<p>The Amazon Resource Name (ARN) of the IAM role that provides permissions for the scraper to discover and collect metrics on your behalf.</p> <p>For example, <code>arn:aws:iam::123456789012:role/service-role/AmazonGrafanaServiceRole-12example</code>.</p>"
18071826
},
1827+
"roleConfiguration":{"shape":"RoleConfiguration"},
18081828
"scrapeConfiguration":{
18091829
"shape":"ScrapeConfiguration",
18101830
"documentation":"<p>The configuration in use by the scraper.</p>"
@@ -1914,6 +1934,7 @@
19141934
"shape":"IamRoleArn",
19151935
"documentation":"<p>The Amazon Resource Name (ARN) of the IAM role that provides permissions for the scraper to discover and collect metrics on your behalf.</p>"
19161936
},
1937+
"roleConfiguration":{"shape":"RoleConfiguration"},
19171938
"scraperId":{
19181939
"shape":"ScraperId",
19191940
"documentation":"<p>The ID of the scraper.</p>"
@@ -2191,6 +2212,10 @@
21912212
"shape":"Destination",
21922213
"documentation":"<p>The new Amazon Managed Service for Prometheus workspace to send metrics to.</p>"
21932214
},
2215+
"roleConfiguration":{
2216+
"shape":"RoleConfiguration",
2217+
"documentation":"<p>The scraper role configuration for the workspace.</p>"
2218+
},
21942219
"scrapeConfiguration":{
21952220
"shape":"ScrapeConfiguration",
21962221
"documentation":"<p>Contains the base-64 encoded YAML configuration for the scraper.</p> <note> <p>For more information about configuring a scraper, see <a href=\"https://docs.aws.amazon.com/prometheus/latest/userguide/AMP-collector-how-to.html\">Using an Amazon Web Services managed collector</a> in the <i>Amazon Managed Service for Prometheus User Guide</i>.</p> </note>"

0 commit comments

Comments
 (0)