diff --git a/generator/ServiceModels/grafana/grafana-2020-08-18.api.json b/generator/ServiceModels/grafana/grafana-2020-08-18.api.json
index b4b989c8a595..debf7507245e 100644
--- a/generator/ServiceModels/grafana/grafana-2020-08-18.api.json
+++ b/generator/ServiceModels/grafana/grafana-2020-08-18.api.json
@@ -405,6 +405,11 @@
"workspaceId"
],
"members":{
+ "grafanaToken":{
+ "shape":"GrafanaToken",
+ "location":"header",
+ "locationName":"Grafana-Token"
+ },
"licenseType":{
"shape":"LicenseType",
"location":"uri",
@@ -723,6 +728,11 @@
"max":2048,
"min":1
},
+ "GrafanaToken":{
+ "type":"string",
+ "max":36,
+ "min":1
+ },
"GrafanaVersion":{
"type":"string",
"max":255,
@@ -1437,6 +1447,7 @@
"endpoint":{"shape":"Endpoint"},
"freeTrialConsumed":{"shape":"Boolean"},
"freeTrialExpiration":{"shape":"Timestamp"},
+ "grafanaToken":{"shape":"GrafanaToken"},
"grafanaVersion":{"shape":"GrafanaVersion"},
"id":{"shape":"WorkspaceId"},
"licenseExpiration":{"shape":"Timestamp"},
@@ -1502,8 +1513,10 @@
"created":{"shape":"Timestamp"},
"description":{"shape":"Description"},
"endpoint":{"shape":"Endpoint"},
+ "grafanaToken":{"shape":"GrafanaToken"},
"grafanaVersion":{"shape":"GrafanaVersion"},
"id":{"shape":"WorkspaceId"},
+ "licenseType":{"shape":"LicenseType"},
"modified":{"shape":"Timestamp"},
"name":{"shape":"WorkspaceName"},
"notificationDestinations":{"shape":"NotificationDestinationsList"},
diff --git a/generator/ServiceModels/grafana/grafana-2020-08-18.docs.json b/generator/ServiceModels/grafana/grafana-2020-08-18.docs.json
index 004c1d3e3b4a..45f5edf6bbcf 100644
--- a/generator/ServiceModels/grafana/grafana-2020-08-18.docs.json
+++ b/generator/ServiceModels/grafana/grafana-2020-08-18.docs.json
@@ -108,8 +108,8 @@
"refs": {
"AuthenticationDescription$providers": "Specifies whether this workspace uses IAM Identity Center, SAML, or both methods to authenticate users to use the Grafana console in the Amazon Managed Grafana workspace.
",
"AuthenticationSummary$providers": "Specifies whether the workspace uses SAML, IAM Identity Center, or both methods for user authentication.
",
- "CreateWorkspaceRequest$authenticationProviders": "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 User authentication in Amazon Managed Grafana.
",
- "UpdateWorkspaceAuthenticationRequest$authenticationProviders": "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 User authentication in Amazon Managed Grafana.
"
+ "CreateWorkspaceRequest$authenticationProviders": "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 User authentication in Amazon Managed Grafana.
",
+ "UpdateWorkspaceAuthenticationRequest$authenticationProviders": "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 User authentication in Amazon Managed Grafana.
"
}
},
"AuthenticationSummary": {
@@ -130,7 +130,7 @@
"refs": {
"UpdateWorkspaceRequest$removeNetworkAccessConfiguration": "Whether to remove the network access configuration from the workspace.
Setting this to true and providing a networkAccessControl to set will return an error.
If you remove this configuration by setting this to true, then all IP addresses and VPC endpoints will be allowed. Standard Grafana authentication and authorization will still be required.
",
"UpdateWorkspaceRequest$removeVpcConfiguration": "Whether to remove the VPC configuration from the workspace.
Setting this to true and providing a vpcConfiguration to set will return an error.
",
- "WorkspaceDescription$freeTrialConsumed": "Specifies whether this workspace has already fully used its free trial for Grafana Enterprise.
"
+ "WorkspaceDescription$freeTrialConsumed": "Specifies whether this workspace has already fully used its free trial for Grafana Enterprise.
Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.
"
}
},
"ClientToken": {
@@ -260,13 +260,21 @@
"WorkspaceSummary$endpoint": "The URL endpoint to use to access the Grafana console in the workspace.
"
}
},
+ "GrafanaToken": {
+ "base": null,
+ "refs": {
+ "AssociateLicenseRequest$grafanaToken": "A token from Grafana Labs that ties your Amazon Web Services account with a Grafana Labs account. For more information, see Register with Grafana Labs.
",
+ "WorkspaceDescription$grafanaToken": "The token that ties this workspace to a Grafana Labs account. For more information, see Register with Grafana Labs.
",
+ "WorkspaceSummary$grafanaToken": "The token that ties this workspace to a Grafana Labs account. For more information, see Register with Grafana Labs.
"
+ }
+ },
"GrafanaVersion": {
"base": null,
"refs": {
- "CreateWorkspaceRequest$grafanaVersion": "Specifies the version of Grafana to support in the new workspace.
To get a list of supported version, use the ListVersions operation.
",
+ "CreateWorkspaceRequest$grafanaVersion": "Specifies the version of Grafana to support in the new workspace. If not specified, defaults to the latest version (for example, 9.4).
To get a list of supported versions, use the ListVersions operation.
",
"DescribeWorkspaceConfigurationResponse$grafanaVersion": "The supported Grafana version for the workspace.
",
"GrafanaVersionList$member": null,
- "UpdateWorkspaceConfigurationRequest$grafanaVersion": "Specifies the version of Grafana to support in the new workspace.
Can only be used to upgrade (for example, from 8.4 to 9.4), not downgrade (for example, from 9.4 to 8.4).
To know what versions are available to upgrade to for a specific workspace, see the ListVersions operation.
",
+ "UpdateWorkspaceConfigurationRequest$grafanaVersion": "Specifies the version of Grafana to support in the workspace. If not specified, keeps the current version of the workspace.
Can only be used to upgrade (for example, from 8.4 to 9.4), not downgrade (for example, from 9.4 to 8.4).
To know what versions are available to upgrade to for a specific workspace, see the ListVersions operation.
",
"WorkspaceDescription$grafanaVersion": "The version of Grafana supported in this workspace.
",
"WorkspaceSummary$grafanaVersion": "The Grafana version that the workspace is running.
"
}
@@ -312,9 +320,10 @@
"LicenseType": {
"base": null,
"refs": {
- "AssociateLicenseRequest$licenseType": "The type of license to associate with the workspace.
",
+ "AssociateLicenseRequest$licenseType": "The type of license to associate with the workspace.
Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.
",
"DisassociateLicenseRequest$licenseType": "The type of license to remove from the workspace.
",
- "WorkspaceDescription$licenseType": "Specifies whether this workspace has a full Grafana Enterprise license or a free trial license.
"
+ "WorkspaceDescription$licenseType": "Specifies whether this workspace has a full Grafana Enterprise license.
Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.
",
+ "WorkspaceSummary$licenseType": "Specifies whether this workspace has a full Grafana Enterprise license.
Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.
"
}
},
"ListPermissionsRequest": {
@@ -657,8 +666,8 @@
"base": null,
"refs": {
"WorkspaceDescription$created": "The date that the workspace was created.
",
- "WorkspaceDescription$freeTrialExpiration": "If this workspace is currently in the free trial period for Grafana Enterprise, this value specifies when that free trial ends.
",
- "WorkspaceDescription$licenseExpiration": "If this workspace has a full Grafana Enterprise license, this specifies when the license ends and will need to be renewed.
",
+ "WorkspaceDescription$freeTrialExpiration": "If this workspace is currently in the free trial period for Grafana Enterprise, this value specifies when that free trial ends.
Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.
",
+ "WorkspaceDescription$licenseExpiration": "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.
",
"WorkspaceDescription$modified": "The most recent date that the workspace was modified.
",
"WorkspaceSummary$created": "The date that the workspace was created.
",
"WorkspaceSummary$modified": "The most recent date that the workspace was modified.
"
diff --git a/generator/ServiceModels/grafana/grafana-2020-08-18.normal.json b/generator/ServiceModels/grafana/grafana-2020-08-18.normal.json
index 1b29063437b0..336142eee594 100644
--- a/generator/ServiceModels/grafana/grafana-2020-08-18.normal.json
+++ b/generator/ServiceModels/grafana/grafana-2020-08-18.normal.json
@@ -444,9 +444,15 @@
"workspaceId"
],
"members":{
+ "grafanaToken":{
+ "shape":"GrafanaToken",
+ "documentation":"A token from Grafana Labs that ties your Amazon Web Services account with a Grafana Labs account. For more information, see Register with Grafana Labs.
",
+ "location":"header",
+ "locationName":"Grafana-Token"
+ },
"licenseType":{
"shape":"LicenseType",
- "documentation":"The type of license to associate with the workspace.
",
+ "documentation":"The type of license to associate with the workspace.
Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.
",
"location":"uri",
"locationName":"licenseType"
},
@@ -630,7 +636,7 @@
},
"authenticationProviders":{
"shape":"AuthenticationProviders",
- "documentation":"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 User authentication in Amazon Managed Grafana.
"
+ "documentation":"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 User authentication in Amazon Managed Grafana.
"
},
"clientToken":{
"shape":"ClientToken",
@@ -644,7 +650,7 @@
},
"grafanaVersion":{
"shape":"GrafanaVersion",
- "documentation":"Specifies the version of Grafana to support in the new workspace.
To get a list of supported version, use the ListVersions operation.
"
+ "documentation":"Specifies the version of Grafana to support in the new workspace. If not specified, defaults to the latest version (for example, 9.4).
To get a list of supported versions, use the ListVersions operation.
"
},
"networkAccessControl":{
"shape":"NetworkAccessConfiguration",
@@ -897,6 +903,11 @@
"max":2048,
"min":1
},
+ "GrafanaToken":{
+ "type":"string",
+ "max":36,
+ "min":1
+ },
"GrafanaVersion":{
"type":"string",
"max":255,
@@ -1596,7 +1607,7 @@
"members":{
"authenticationProviders":{
"shape":"AuthenticationProviders",
- "documentation":"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 User authentication in Amazon Managed Grafana.
"
+ "documentation":"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 User authentication in Amazon Managed Grafana.
"
},
"samlConfiguration":{
"shape":"SamlConfiguration",
@@ -1634,7 +1645,7 @@
},
"grafanaVersion":{
"shape":"GrafanaVersion",
- "documentation":"Specifies the version of Grafana to support in the new workspace.
Can only be used to upgrade (for example, from 8.4 to 9.4), not downgrade (for example, from 9.4 to 8.4).
To know what versions are available to upgrade to for a specific workspace, see the ListVersions operation.
"
+ "documentation":"Specifies the version of Grafana to support in the workspace. If not specified, keeps the current version of the workspace.
Can only be used to upgrade (for example, from 8.4 to 9.4), not downgrade (for example, from 9.4 to 8.4).
To know what versions are available to upgrade to for a specific workspace, see the ListVersions operation.
"
},
"workspaceId":{
"shape":"WorkspaceId",
@@ -1880,11 +1891,15 @@
},
"freeTrialConsumed":{
"shape":"Boolean",
- "documentation":"Specifies whether this workspace has already fully used its free trial for Grafana Enterprise.
"
+ "documentation":"Specifies whether this workspace has already fully used its free trial for Grafana Enterprise.
Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.
"
},
"freeTrialExpiration":{
"shape":"Timestamp",
- "documentation":"If this workspace is currently in the free trial period for Grafana Enterprise, this value specifies when that free trial ends.
"
+ "documentation":"If this workspace is currently in the free trial period for Grafana Enterprise, this value specifies when that free trial ends.
Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.
"
+ },
+ "grafanaToken":{
+ "shape":"GrafanaToken",
+ "documentation":"The token that ties this workspace to a Grafana Labs account. For more information, see Register with Grafana Labs.
"
},
"grafanaVersion":{
"shape":"GrafanaVersion",
@@ -1896,11 +1911,11 @@
},
"licenseExpiration":{
"shape":"Timestamp",
- "documentation":"If this workspace has a full Grafana Enterprise license, this specifies when the license ends and will need to be renewed.
"
+ "documentation":"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.
"
},
"licenseType":{
"shape":"LicenseType",
- "documentation":"Specifies whether this workspace has a full Grafana Enterprise license or a free trial license.
"
+ "documentation":"Specifies whether this workspace has a full Grafana Enterprise license.
Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.
"
},
"modified":{
"shape":"Timestamp",
@@ -2012,6 +2027,10 @@
"shape":"Endpoint",
"documentation":"The URL endpoint to use to access the Grafana console in the workspace.
"
},
+ "grafanaToken":{
+ "shape":"GrafanaToken",
+ "documentation":"The token that ties this workspace to a Grafana Labs account. For more information, see Register with Grafana Labs.
"
+ },
"grafanaVersion":{
"shape":"GrafanaVersion",
"documentation":"The Grafana version that the workspace is running.
"
@@ -2020,6 +2039,10 @@
"shape":"WorkspaceId",
"documentation":"The unique ID of the workspace.
"
},
+ "licenseType":{
+ "shape":"LicenseType",
+ "documentation":"Specifies whether this workspace has a full Grafana Enterprise license.
Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.
"
+ },
"modified":{
"shape":"Timestamp",
"documentation":"The most recent date that the workspace was modified.
"
diff --git a/sdk/code-analysis/ServiceAnalysis/ManagedGrafana/Generated/PropertyValueRules.xml b/sdk/code-analysis/ServiceAnalysis/ManagedGrafana/Generated/PropertyValueRules.xml
index b1de838b7dc0..962cf897c683 100644
--- a/sdk/code-analysis/ServiceAnalysis/ManagedGrafana/Generated/PropertyValueRules.xml
+++ b/sdk/code-analysis/ServiceAnalysis/ManagedGrafana/Generated/PropertyValueRules.xml
@@ -1,5 +1,10 @@
+
+ Amazon.ManagedGrafana.Model.AssociateLicenseRequest.GrafanaToken
+ 1
+ 36
+
Amazon.ManagedGrafana.Model.AssociateLicenseRequest.WorkspaceId
^g-[0-9a-f]{10}$
@@ -241,6 +246,11 @@
1
2048
+
+ Amazon.ManagedGrafana.Model.WorkspaceDescription.GrafanaToken
+ 1
+ 36
+
Amazon.ManagedGrafana.Model.WorkspaceDescription.GrafanaVersion
1
@@ -274,6 +284,11 @@
1
2048
+
+ Amazon.ManagedGrafana.Model.WorkspaceSummary.GrafanaToken
+ 1
+ 36
+
Amazon.ManagedGrafana.Model.WorkspaceSummary.GrafanaVersion
1
diff --git a/sdk/src/Services/ManagedGrafana/Generated/Model/AssociateLicenseRequest.cs b/sdk/src/Services/ManagedGrafana/Generated/Model/AssociateLicenseRequest.cs
index 47635cffa409..8e4c5e444cb2 100644
--- a/sdk/src/Services/ManagedGrafana/Generated/Model/AssociateLicenseRequest.cs
+++ b/sdk/src/Services/ManagedGrafana/Generated/Model/AssociateLicenseRequest.cs
@@ -36,14 +36,41 @@ namespace Amazon.ManagedGrafana.Model
///
public partial class AssociateLicenseRequest : AmazonManagedGrafanaRequest
{
+ private string _grafanaToken;
private LicenseType _licenseType;
private string _workspaceId;
+ ///
+ /// Gets and sets the property GrafanaToken.
+ ///
+ /// A token from Grafana Labs that ties your Amazon Web Services account with a Grafana
+ /// Labs account. For more information, see Register
+ /// with Grafana Labs.
+ ///
+ ///
+ [AWSProperty(Min=1, Max=36)]
+ public string GrafanaToken
+ {
+ get { return this._grafanaToken; }
+ set { this._grafanaToken = value; }
+ }
+
+ // Check to see if GrafanaToken property is set
+ internal bool IsSetGrafanaToken()
+ {
+ return this._grafanaToken != null;
+ }
+
///
/// Gets and sets the property LicenseType.
///
/// The type of license to associate with the workspace.
///
+ ///
+ ///
+ /// Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.
+ ///
+ ///
///
[AWSProperty(Required=true)]
public LicenseType LicenseType
diff --git a/sdk/src/Services/ManagedGrafana/Generated/Model/CreateWorkspaceRequest.cs b/sdk/src/Services/ManagedGrafana/Generated/Model/CreateWorkspaceRequest.cs
index 18653d02633a..b48cfbee5e9c 100644
--- a/sdk/src/Services/ManagedGrafana/Generated/Model/CreateWorkspaceRequest.cs
+++ b/sdk/src/Services/ManagedGrafana/Generated/Model/CreateWorkspaceRequest.cs
@@ -86,9 +86,9 @@ internal bool IsSetAccountAccessType()
///
/// Gets and sets the property AuthenticationProviders.
///
- /// 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 User
+ /// 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
+ /// User
/// authentication in Amazon Managed Grafana.
///
///
@@ -148,11 +148,12 @@ internal bool IsSetConfiguration()
///
/// Gets and sets the property GrafanaVersion.
///
- /// Specifies the version of Grafana to support in the new workspace.
+ /// Specifies the version of Grafana to support in the new workspace. If not specified,
+ /// defaults to the latest version (for example, 9.4).
///
///
///
- /// To get a list of supported version, use the ListVersions operation.
+ /// To get a list of supported versions, use the ListVersions operation.
///
///
[AWSProperty(Min=1, Max=255)]
diff --git a/sdk/src/Services/ManagedGrafana/Generated/Model/Internal/MarshallTransformations/AssociateLicenseRequestMarshaller.cs b/sdk/src/Services/ManagedGrafana/Generated/Model/Internal/MarshallTransformations/AssociateLicenseRequestMarshaller.cs
index 778052d7b555..a0acd83ed8b2 100644
--- a/sdk/src/Services/ManagedGrafana/Generated/Model/Internal/MarshallTransformations/AssociateLicenseRequestMarshaller.cs
+++ b/sdk/src/Services/ManagedGrafana/Generated/Model/Internal/MarshallTransformations/AssociateLicenseRequestMarshaller.cs
@@ -65,6 +65,11 @@ public IRequest Marshall(AssociateLicenseRequest publicRequest)
throw new AmazonManagedGrafanaException("Request object does not have required field WorkspaceId set");
request.AddPathResource("{workspaceId}", StringUtils.FromString(publicRequest.WorkspaceId));
request.ResourcePath = "/workspaces/{workspaceId}/licenses/{licenseType}";
+
+ if (publicRequest.IsSetGrafanaToken())
+ {
+ request.Headers["Grafana-Token"] = publicRequest.GrafanaToken;
+ }
return request;
}
diff --git a/sdk/src/Services/ManagedGrafana/Generated/Model/Internal/MarshallTransformations/WorkspaceDescriptionUnmarshaller.cs b/sdk/src/Services/ManagedGrafana/Generated/Model/Internal/MarshallTransformations/WorkspaceDescriptionUnmarshaller.cs
index ae56c75f2a38..9d6cbad53227 100644
--- a/sdk/src/Services/ManagedGrafana/Generated/Model/Internal/MarshallTransformations/WorkspaceDescriptionUnmarshaller.cs
+++ b/sdk/src/Services/ManagedGrafana/Generated/Model/Internal/MarshallTransformations/WorkspaceDescriptionUnmarshaller.cs
@@ -111,6 +111,12 @@ public WorkspaceDescription Unmarshall(JsonUnmarshallerContext context)
unmarshalledObject.FreeTrialExpiration = unmarshaller.Unmarshall(context);
continue;
}
+ if (context.TestExpression("grafanaToken", targetDepth))
+ {
+ var unmarshaller = StringUnmarshaller.Instance;
+ unmarshalledObject.GrafanaToken = unmarshaller.Unmarshall(context);
+ continue;
+ }
if (context.TestExpression("grafanaVersion", targetDepth))
{
var unmarshaller = StringUnmarshaller.Instance;
diff --git a/sdk/src/Services/ManagedGrafana/Generated/Model/Internal/MarshallTransformations/WorkspaceSummaryUnmarshaller.cs b/sdk/src/Services/ManagedGrafana/Generated/Model/Internal/MarshallTransformations/WorkspaceSummaryUnmarshaller.cs
index 4bd4f207d1ba..32587ef35f12 100644
--- a/sdk/src/Services/ManagedGrafana/Generated/Model/Internal/MarshallTransformations/WorkspaceSummaryUnmarshaller.cs
+++ b/sdk/src/Services/ManagedGrafana/Generated/Model/Internal/MarshallTransformations/WorkspaceSummaryUnmarshaller.cs
@@ -87,6 +87,12 @@ public WorkspaceSummary Unmarshall(JsonUnmarshallerContext context)
unmarshalledObject.Endpoint = unmarshaller.Unmarshall(context);
continue;
}
+ if (context.TestExpression("grafanaToken", targetDepth))
+ {
+ var unmarshaller = StringUnmarshaller.Instance;
+ unmarshalledObject.GrafanaToken = unmarshaller.Unmarshall(context);
+ continue;
+ }
if (context.TestExpression("grafanaVersion", targetDepth))
{
var unmarshaller = StringUnmarshaller.Instance;
@@ -99,6 +105,12 @@ public WorkspaceSummary Unmarshall(JsonUnmarshallerContext context)
unmarshalledObject.Id = unmarshaller.Unmarshall(context);
continue;
}
+ if (context.TestExpression("licenseType", targetDepth))
+ {
+ var unmarshaller = StringUnmarshaller.Instance;
+ unmarshalledObject.LicenseType = unmarshaller.Unmarshall(context);
+ continue;
+ }
if (context.TestExpression("modified", targetDepth))
{
var unmarshaller = DateTimeUnmarshaller.Instance;
diff --git a/sdk/src/Services/ManagedGrafana/Generated/Model/UpdateWorkspaceAuthenticationRequest.cs b/sdk/src/Services/ManagedGrafana/Generated/Model/UpdateWorkspaceAuthenticationRequest.cs
index 230af9735bc5..58a3fcc9a4ce 100644
--- a/sdk/src/Services/ManagedGrafana/Generated/Model/UpdateWorkspaceAuthenticationRequest.cs
+++ b/sdk/src/Services/ManagedGrafana/Generated/Model/UpdateWorkspaceAuthenticationRequest.cs
@@ -51,9 +51,9 @@ public partial class UpdateWorkspaceAuthenticationRequest : AmazonManagedGrafana
///
/// Gets and sets the property AuthenticationProviders.
///
- /// 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 User
+ /// 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
+ /// User
/// authentication in Amazon Managed Grafana.
///
///
diff --git a/sdk/src/Services/ManagedGrafana/Generated/Model/UpdateWorkspaceConfigurationRequest.cs b/sdk/src/Services/ManagedGrafana/Generated/Model/UpdateWorkspaceConfigurationRequest.cs
index a77949645e1a..b99d4b4d05f6 100644
--- a/sdk/src/Services/ManagedGrafana/Generated/Model/UpdateWorkspaceConfigurationRequest.cs
+++ b/sdk/src/Services/ManagedGrafana/Generated/Model/UpdateWorkspaceConfigurationRequest.cs
@@ -62,7 +62,8 @@ internal bool IsSetConfiguration()
///
/// Gets and sets the property GrafanaVersion.
///
- /// Specifies the version of Grafana to support in the new workspace.
+ /// Specifies the version of Grafana to support in the workspace. If not specified, keeps
+ /// the current version of the workspace.
///
///
///
@@ -72,7 +73,8 @@ internal bool IsSetConfiguration()
///
///
/// To know what versions are available to upgrade to for a specific workspace, see the
- /// ListVersions operation.
+ /// ListVersions
+ /// operation.
///
///
[AWSProperty(Min=1, Max=255)]
diff --git a/sdk/src/Services/ManagedGrafana/Generated/Model/WorkspaceDescription.cs b/sdk/src/Services/ManagedGrafana/Generated/Model/WorkspaceDescription.cs
index 67ac9acf017d..fc2aa8142e9f 100644
--- a/sdk/src/Services/ManagedGrafana/Generated/Model/WorkspaceDescription.cs
+++ b/sdk/src/Services/ManagedGrafana/Generated/Model/WorkspaceDescription.cs
@@ -42,6 +42,7 @@ public partial class WorkspaceDescription
private string _endpoint;
private bool? _freeTrialConsumed;
private DateTime? _freeTrialExpiration;
+ private string _grafanaToken;
private string _grafanaVersion;
private string _id;
private DateTime? _licenseExpiration;
@@ -189,6 +190,11 @@ internal bool IsSetEndpoint()
/// Specifies whether this workspace has already fully used its free trial for Grafana
/// Enterprise.
///
+ ///
+ ///
+ /// Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.
+ ///
+ ///
///
public bool FreeTrialConsumed
{
@@ -208,6 +214,11 @@ internal bool IsSetFreeTrialConsumed()
/// If this workspace is currently in the free trial period for Grafana Enterprise, this
/// value specifies when that free trial ends.
///
+ ///
+ ///
+ /// Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.
+ ///
+ ///
///
public DateTime FreeTrialExpiration
{
@@ -221,6 +232,27 @@ internal bool IsSetFreeTrialExpiration()
return this._freeTrialExpiration.HasValue;
}
+ ///
+ /// Gets and sets the property GrafanaToken.
+ ///
+ /// The token that ties this workspace to a Grafana Labs account. For more information,
+ /// see Register
+ /// with Grafana Labs.
+ ///
+ ///
+ [AWSProperty(Min=1, Max=36)]
+ public string GrafanaToken
+ {
+ get { return this._grafanaToken; }
+ set { this._grafanaToken = value; }
+ }
+
+ // Check to see if GrafanaToken property is set
+ internal bool IsSetGrafanaToken()
+ {
+ return this._grafanaToken != null;
+ }
+
///
/// Gets and sets the property GrafanaVersion.
///
@@ -262,8 +294,10 @@ internal bool IsSetId()
///
/// Gets and sets the property LicenseExpiration.
///
- /// If this workspace has a full Grafana Enterprise license, this specifies when the license
- /// ends and will need to be renewed.
+ /// 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.
///
///
public DateTime LicenseExpiration
@@ -281,9 +315,13 @@ internal bool IsSetLicenseExpiration()
///
/// Gets and sets the property LicenseType.
///
- /// Specifies whether this workspace has a full Grafana Enterprise license or a free trial
- /// license.
+ /// Specifies whether this workspace has a full Grafana Enterprise license.
+ ///
+ ///
+ ///
+ /// Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.
///
+ ///
///
public LicenseType LicenseType
{
diff --git a/sdk/src/Services/ManagedGrafana/Generated/Model/WorkspaceSummary.cs b/sdk/src/Services/ManagedGrafana/Generated/Model/WorkspaceSummary.cs
index 28baae17fdd3..5eaa9928d1f8 100644
--- a/sdk/src/Services/ManagedGrafana/Generated/Model/WorkspaceSummary.cs
+++ b/sdk/src/Services/ManagedGrafana/Generated/Model/WorkspaceSummary.cs
@@ -37,8 +37,10 @@ public partial class WorkspaceSummary
private DateTime? _created;
private string _description;
private string _endpoint;
+ private string _grafanaToken;
private string _grafanaVersion;
private string _id;
+ private LicenseType _licenseType;
private DateTime? _modified;
private string _name;
private List _notificationDestinations = new List();
@@ -121,6 +123,27 @@ internal bool IsSetEndpoint()
return this._endpoint != null;
}
+ ///
+ /// Gets and sets the property GrafanaToken.
+ ///
+ /// The token that ties this workspace to a Grafana Labs account. For more information,
+ /// see Register
+ /// with Grafana Labs.
+ ///
+ ///
+ [AWSProperty(Min=1, Max=36)]
+ public string GrafanaToken
+ {
+ get { return this._grafanaToken; }
+ set { this._grafanaToken = value; }
+ }
+
+ // Check to see if GrafanaToken property is set
+ internal bool IsSetGrafanaToken()
+ {
+ return this._grafanaToken != null;
+ }
+
///
/// Gets and sets the property GrafanaVersion.
///
@@ -159,6 +182,29 @@ internal bool IsSetId()
return this._id != null;
}
+ ///
+ /// Gets and sets the property LicenseType.
+ ///
+ /// Specifies whether this workspace has a full Grafana Enterprise license.
+ ///
+ ///
+ ///
+ /// Amazon Managed Grafana workspaces no longer support Grafana Enterprise free trials.
+ ///
+ ///
+ ///
+ public LicenseType LicenseType
+ {
+ get { return this._licenseType; }
+ set { this._licenseType = value; }
+ }
+
+ // Check to see if LicenseType property is set
+ internal bool IsSetLicenseType()
+ {
+ return this._licenseType != null;
+ }
+
///
/// Gets and sets the property Modified.
///