Skip to content

Commit 02068e2

Browse files
author
AWS
committed
Amazon Managed Grafana Update: Adds support for the new GrafanaToken as part of the Amazon Managed Grafana Enterprise plugins upgrade to associate your AWS account with a Grafana Labs account.
1 parent bd23e3b commit 02068e2

File tree

3 files changed

+58
-29
lines changed

3 files changed

+58
-29
lines changed

‎.changes/next-release/feature-AmazonManagedGrafana-313828a.json

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 Managed Grafana",
4+
"contributor": "",
5+
"description": "Adds support for the new GrafanaToken as part of the Amazon Managed Grafana Enterprise plugins upgrade to associate your AWS account with a Grafana Labs account."
6+
}

‎services/grafana/src/main/resources/codegen-resources/endpoint-rule-set.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
]
4141
}
4242
],
43-
"type": "tree",
4443
"rules": [
4544
{
4645
"conditions": [
@@ -83,7 +82,8 @@
8382
},
8483
"type": "endpoint"
8584
}
86-
]
85+
],
86+
"type": "tree"
8787
},
8888
{
8989
"conditions": [
@@ -96,7 +96,6 @@
9696
]
9797
}
9898
],
99-
"type": "tree",
10099
"rules": [
101100
{
102101
"conditions": [
@@ -110,7 +109,6 @@
110109
"assign": "PartitionResult"
111110
}
112111
],
113-
"type": "tree",
114112
"rules": [
115113
{
116114
"conditions": [
@@ -133,7 +131,6 @@
133131
]
134132
}
135133
],
136-
"type": "tree",
137134
"rules": [
138135
{
139136
"conditions": [
@@ -168,7 +165,6 @@
168165
]
169166
}
170167
],
171-
"type": "tree",
172168
"rules": [
173169
{
174170
"conditions": [],
@@ -179,14 +175,16 @@
179175
},
180176
"type": "endpoint"
181177
}
182-
]
178+
],
179+
"type": "tree"
183180
},
184181
{
185182
"conditions": [],
186183
"error": "FIPS and DualStack are enabled, but this partition does not support one or both",
187184
"type": "error"
188185
}
189-
]
186+
],
187+
"type": "tree"
190188
},
191189
{
192190
"conditions": [
@@ -200,14 +198,12 @@
200198
]
201199
}
202200
],
203-
"type": "tree",
204201
"rules": [
205202
{
206203
"conditions": [
207204
{
208205
"fn": "booleanEquals",
209206
"argv": [
210-
true,
211207
{
212208
"fn": "getAttr",
213209
"argv": [
@@ -216,11 +212,11 @@
216212
},
217213
"supportsFIPS"
218214
]
219-
}
215+
},
216+
true
220217
]
221218
}
222219
],
223-
"type": "tree",
224220
"rules": [
225221
{
226222
"conditions": [],
@@ -231,14 +227,16 @@
231227
},
232228
"type": "endpoint"
233229
}
234-
]
230+
],
231+
"type": "tree"
235232
},
236233
{
237234
"conditions": [],
238235
"error": "FIPS is enabled but this partition does not support FIPS",
239236
"type": "error"
240237
}
241-
]
238+
],
239+
"type": "tree"
242240
},
243241
{
244242
"conditions": [
@@ -252,7 +250,6 @@
252250
]
253251
}
254252
],
255-
"type": "tree",
256253
"rules": [
257254
{
258255
"conditions": [
@@ -272,7 +269,6 @@
272269
]
273270
}
274271
],
275-
"type": "tree",
276272
"rules": [
277273
{
278274
"conditions": [],
@@ -283,14 +279,16 @@
283279
},
284280
"type": "endpoint"
285281
}
286-
]
282+
],
283+
"type": "tree"
287284
},
288285
{
289286
"conditions": [],
290287
"error": "DualStack is enabled but this partition does not support DualStack",
291288
"type": "error"
292289
}
293-
]
290+
],
291+
"type": "tree"
294292
},
295293
{
296294
"conditions": [],
@@ -301,9 +299,11 @@
301299
},
302300
"type": "endpoint"
303301
}
304-
]
302+
],
303+
"type": "tree"
305304
}
306-
]
305+
],
306+
"type": "tree"
307307
},
308308
{
309309
"conditions": [],

‎services/grafana/src/main/resources/codegen-resources/service-2.json

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -444,9 +444,15 @@
444444
"workspaceId"
445445
],
446446
"members":{
447+
"grafanaToken":{
448+
"shape":"GrafanaToken",
449+
"documentation":"<p>A token from Grafana Labs that ties your Amazon Web Services account with a Grafana Labs account. For more information, see <a href=\"https://docs.aws.amazon.com/grafana/latest/userguide/upgrade-to-Grafana-Enterprise.html#AMG-workspace-register-enterprise\">Register with Grafana Labs</a>.</p>",
450+
"location":"header",
451+
"locationName":"Grafana-Token"
452+
},
447453
"licenseType":{
448454
"shape":"LicenseType",
449-
"documentation":"<p>The type of license to associate with the workspace.</p>",
455+
"documentation":"<p>The type of license to associate with the workspace.</p> <note> <p>Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.</p> </note>",
450456
"location":"uri",
451457
"locationName":"licenseType"
452458
},
@@ -630,7 +636,7 @@
630636
},
631637
"authenticationProviders":{
632638
"shape":"AuthenticationProviders",
633-
"documentation":"<p>Specifies whether this workspace uses SAML 2.0, IAM Identity Center (successor to Single Sign-On), or both to authenticate users for using the Grafana console within a workspace. For more information, see <a href=\"https://docs.aws.amazon.com/grafana/latest/userguide/authentication-in-AMG.html\">User authentication in Amazon Managed Grafana</a>.</p>"
639+
"documentation":"<p>Specifies whether this workspace uses SAML 2.0, IAM Identity Center, or both to authenticate users for using the Grafana console within a workspace. For more information, see <a href=\"https://docs.aws.amazon.com/grafana/latest/userguide/authentication-in-AMG.html\">User authentication in Amazon Managed Grafana</a>.</p>"
634640
},
635641
"clientToken":{
636642
"shape":"ClientToken",
@@ -644,7 +650,7 @@
644650
},
645651
"grafanaVersion":{
646652
"shape":"GrafanaVersion",
647-
"documentation":"<p>Specifies the version of Grafana to support in the new workspace.</p> <p>To get a list of supported version, use the <code>ListVersions</code> operation.</p>"
653+
"documentation":"<p>Specifies the version of Grafana to support in the new workspace. If not specified, defaults to the latest version (for example, 9.4).</p> <p>To get a list of supported versions, use the <code>ListVersions</code> operation.</p>"
648654
},
649655
"networkAccessControl":{
650656
"shape":"NetworkAccessConfiguration",
@@ -897,6 +903,11 @@
897903
"max":2048,
898904
"min":1
899905
},
906+
"GrafanaToken":{
907+
"type":"string",
908+
"max":36,
909+
"min":1
910+
},
900911
"GrafanaVersion":{
901912
"type":"string",
902913
"max":255,
@@ -1596,7 +1607,7 @@
15961607
"members":{
15971608
"authenticationProviders":{
15981609
"shape":"AuthenticationProviders",
1599-
"documentation":"<p>Specifies whether this workspace uses SAML 2.0, IAM Identity Center (successor to Single Sign-On), or both to authenticate users for using the Grafana console within a workspace. For more information, see <a href=\"https://docs.aws.amazon.com/grafana/latest/userguide/authentication-in-AMG.html\">User authentication in Amazon Managed Grafana</a>.</p>"
1610+
"documentation":"<p>Specifies whether this workspace uses SAML 2.0, IAM Identity Center, or both to authenticate users for using the Grafana console within a workspace. For more information, see <a href=\"https://docs.aws.amazon.com/grafana/latest/userguide/authentication-in-AMG.html\">User authentication in Amazon Managed Grafana</a>.</p>"
16001611
},
16011612
"samlConfiguration":{
16021613
"shape":"SamlConfiguration",
@@ -1634,7 +1645,7 @@
16341645
},
16351646
"grafanaVersion":{
16361647
"shape":"GrafanaVersion",
1637-
"documentation":"<p>Specifies the version of Grafana to support in the new workspace.</p> <p>Can only be used to upgrade (for example, from 8.4 to 9.4), not downgrade (for example, from 9.4 to 8.4).</p> <p>To know what versions are available to upgrade to for a specific workspace, see the <code>ListVersions</code> operation.</p>"
1648+
"documentation":"<p>Specifies the version of Grafana to support in the workspace. If not specified, keeps the current version of the workspace.</p> <p>Can only be used to upgrade (for example, from 8.4 to 9.4), not downgrade (for example, from 9.4 to 8.4).</p> <p>To know what versions are available to upgrade to for a specific workspace, see the <a href=\"https://docs.aws.amazon.com/grafana/latest/APIReference/API_ListVersions.html\">ListVersions</a> operation.</p>"
16381649
},
16391650
"workspaceId":{
16401651
"shape":"WorkspaceId",
@@ -1880,11 +1891,15 @@
18801891
},
18811892
"freeTrialConsumed":{
18821893
"shape":"Boolean",
1883-
"documentation":"<p>Specifies whether this workspace has already fully used its free trial for Grafana Enterprise.</p>"
1894+
"documentation":"<p>Specifies whether this workspace has already fully used its free trial for Grafana Enterprise.</p> <note> <p>Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.</p> </note>"
18841895
},
18851896
"freeTrialExpiration":{
18861897
"shape":"Timestamp",
1887-
"documentation":"<p>If this workspace is currently in the free trial period for Grafana Enterprise, this value specifies when that free trial ends.</p>"
1898+
"documentation":"<p>If this workspace is currently in the free trial period for Grafana Enterprise, this value specifies when that free trial ends.</p> <note> <p>Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.</p> </note>"
1899+
},
1900+
"grafanaToken":{
1901+
"shape":"GrafanaToken",
1902+
"documentation":"<p>The token that ties this workspace to a Grafana Labs account. For more information, see <a href=\"https://docs.aws.amazon.com/grafana/latest/userguide/upgrade-to-Grafana-Enterprise.html#AMG-workspace-register-enterprise\">Register with Grafana Labs</a>.</p>"
18881903
},
18891904
"grafanaVersion":{
18901905
"shape":"GrafanaVersion",
@@ -1896,11 +1911,11 @@
18961911
},
18971912
"licenseExpiration":{
18981913
"shape":"Timestamp",
1899-
"documentation":"<p>If this workspace has a full Grafana Enterprise license, this specifies when the license ends and will need to be renewed.</p>"
1914+
"documentation":"<p>If this workspace has a full Grafana Enterprise license purchased through Amazon Web Services Marketplace, this specifies when the license ends and will need to be renewed. Purchasing the Enterprise plugins option through Amazon Managed Grafana does not have an expiration. It is valid until the license is removed.</p>"
19001915
},
19011916
"licenseType":{
19021917
"shape":"LicenseType",
1903-
"documentation":"<p>Specifies whether this workspace has a full Grafana Enterprise license or a free trial license.</p>"
1918+
"documentation":"<p>Specifies whether this workspace has a full Grafana Enterprise license.</p> <note> <p>Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.</p> </note>"
19041919
},
19051920
"modified":{
19061921
"shape":"Timestamp",
@@ -2012,6 +2027,10 @@
20122027
"shape":"Endpoint",
20132028
"documentation":"<p>The URL endpoint to use to access the Grafana console in the workspace.</p>"
20142029
},
2030+
"grafanaToken":{
2031+
"shape":"GrafanaToken",
2032+
"documentation":"<p>The token that ties this workspace to a Grafana Labs account. For more information, see <a href=\"https://docs.aws.amazon.com/grafana/latest/userguide/upgrade-to-Grafana-Enterprise.html#AMG-workspace-register-enterprise\">Register with Grafana Labs</a>.</p>"
2033+
},
20152034
"grafanaVersion":{
20162035
"shape":"GrafanaVersion",
20172036
"documentation":"<p>The Grafana version that the workspace is running.</p>"
@@ -2020,6 +2039,10 @@
20202039
"shape":"WorkspaceId",
20212040
"documentation":"<p>The unique ID of the workspace.</p>"
20222041
},
2042+
"licenseType":{
2043+
"shape":"LicenseType",
2044+
"documentation":"<p>Specifies whether this workspace has a full Grafana Enterprise license.</p> <note> <p>Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.</p> </note>"
2045+
},
20232046
"modified":{
20242047
"shape":"Timestamp",
20252048
"documentation":"<p>The most recent date that the workspace was modified.</p>"

0 commit comments

Comments
 (0)