Skip to content

Commit 79f7533

Browse files
CloudWatch Observability Admin adds the ability to enable telemetry on AWS resources such as Amazon VPCs (Flow Logs) in customers AWS Accounts and Organizations. The release introduces new APIs to manage telemetry rules, which define telemetry settings to be applied on AWS resources.
1 parent ca30c57 commit 79f7533

File tree

106 files changed

+13324
-384
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+13324
-384
lines changed

generator/ServiceModels/observabilityadmin/observabilityadmin-2018-05-10.api.json

Lines changed: 575 additions & 11 deletions
Large diffs are not rendered by default.

generator/ServiceModels/observabilityadmin/observabilityadmin-2018-05-10.docs.json

Lines changed: 311 additions & 16 deletions
Large diffs are not rendered by default.

generator/ServiceModels/observabilityadmin/observabilityadmin-2018-05-10.normal.json

Lines changed: 801 additions & 23 deletions
Large diffs are not rendered by default.

generator/ServiceModels/observabilityadmin/observabilityadmin-2018-05-10.paginators.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,18 @@
1111
"output_token": "NextToken",
1212
"limit_key": "MaxResults",
1313
"result_key": "TelemetryConfigurations"
14+
},
15+
"ListTelemetryRules": {
16+
"input_token": "NextToken",
17+
"output_token": "NextToken",
18+
"limit_key": "MaxResults",
19+
"result_key": "TelemetryRuleSummaries"
20+
},
21+
"ListTelemetryRulesForOrganization": {
22+
"input_token": "NextToken",
23+
"output_token": "NextToken",
24+
"limit_key": "MaxResults",
25+
"result_key": "TelemetryRuleSummaries"
1426
}
1527
}
1628
}

generator/ServiceModels/observabilityadmin/observabilityadmin-2018-05-10.smoke2.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
{
22
"version" : 2,
33
"testCases" : [ {
4-
"id" : "GetTelemetryEvaluationStatusForOrganization",
5-
"operationName" : "GetTelemetryEvaluationStatusForOrganization",
4+
"id" : "GetTelemetryEvaluationStatus",
5+
"operationName" : "GetTelemetryEvaluationStatus",
66
"input" : { },
77
"expectation" : {
8-
"failure" : {
9-
"errorId" : "AccessDeniedException"
10-
}
8+
"success" : { }
119
},
1210
"config" : {
1311
"region" : "us-east-2",
@@ -16,8 +14,8 @@
1614
"useAccountIdRouting" : true
1715
}
1816
}, {
19-
"id" : "GetTelemetryEvaluationStatus",
20-
"operationName" : "GetTelemetryEvaluationStatus",
17+
"id" : "GetTelemetryEvaluationStatusForOrganization",
18+
"operationName" : "GetTelemetryEvaluationStatusForOrganization",
2119
"input" : { },
2220
"expectation" : {
2321
"failure" : {

sdk/code-analysis/ServiceAnalysis/ObservabilityAdmin/Generated/PropertyValueRules.xml

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,73 @@
11
<?xml version="1.0" encoding="utf-16"?>
22
<property-value-rules>
3+
<property-value-rule>
4+
<property>Amazon.ObservabilityAdmin.Model.CreateTelemetryRuleRequest.RuleName</property>
5+
<min>1</min>
6+
<max>100</max>
7+
<pattern>[0-9A-Za-z-]+</pattern>
8+
</property-value-rule>
9+
<property-value-rule>
10+
<property>Amazon.ObservabilityAdmin.Model.CreateTelemetryRuleResponse.RuleArn</property>
11+
<min>1</min>
12+
<max>1011</max>
13+
<pattern>arn:aws:([a-zA-Z0-9\-]+):([a-z0-9\-]+)?:([0-9]{12})?:(.+)</pattern>
14+
</property-value-rule>
15+
<property-value-rule>
16+
<property>Amazon.ObservabilityAdmin.Model.CreateTelemetryRuleForOrganizationRequest.RuleName</property>
17+
<min>1</min>
18+
<max>100</max>
19+
<pattern>[0-9A-Za-z-]+</pattern>
20+
</property-value-rule>
21+
<property-value-rule>
22+
<property>Amazon.ObservabilityAdmin.Model.CreateTelemetryRuleForOrganizationResponse.RuleArn</property>
23+
<min>1</min>
24+
<max>1011</max>
25+
<pattern>arn:aws:([a-zA-Z0-9\-]+):([a-z0-9\-]+)?:([0-9]{12})?:(.+)</pattern>
26+
</property-value-rule>
27+
<property-value-rule>
28+
<property>Amazon.ObservabilityAdmin.Model.DeleteTelemetryRuleRequest.RuleIdentifier</property>
29+
<min>1</min>
30+
<max>1011</max>
31+
</property-value-rule>
32+
<property-value-rule>
33+
<property>Amazon.ObservabilityAdmin.Model.DeleteTelemetryRuleForOrganizationRequest.RuleIdentifier</property>
34+
<min>1</min>
35+
<max>1011</max>
36+
</property-value-rule>
37+
<property-value-rule>
38+
<property>Amazon.ObservabilityAdmin.Model.GetTelemetryRuleRequest.RuleIdentifier</property>
39+
<min>1</min>
40+
<max>1011</max>
41+
</property-value-rule>
42+
<property-value-rule>
43+
<property>Amazon.ObservabilityAdmin.Model.GetTelemetryRuleResponse.RuleArn</property>
44+
<min>1</min>
45+
<max>1011</max>
46+
<pattern>arn:aws:([a-zA-Z0-9\-]+):([a-z0-9\-]+)?:([0-9]{12})?:(.+)</pattern>
47+
</property-value-rule>
48+
<property-value-rule>
49+
<property>Amazon.ObservabilityAdmin.Model.GetTelemetryRuleResponse.RuleName</property>
50+
<min>1</min>
51+
<max>100</max>
52+
<pattern>[0-9A-Za-z-]+</pattern>
53+
</property-value-rule>
54+
<property-value-rule>
55+
<property>Amazon.ObservabilityAdmin.Model.GetTelemetryRuleForOrganizationRequest.RuleIdentifier</property>
56+
<min>1</min>
57+
<max>1011</max>
58+
</property-value-rule>
59+
<property-value-rule>
60+
<property>Amazon.ObservabilityAdmin.Model.GetTelemetryRuleForOrganizationResponse.RuleArn</property>
61+
<min>1</min>
62+
<max>1011</max>
63+
<pattern>arn:aws:([a-zA-Z0-9\-]+):([a-z0-9\-]+)?:([0-9]{12})?:(.+)</pattern>
64+
</property-value-rule>
65+
<property-value-rule>
66+
<property>Amazon.ObservabilityAdmin.Model.GetTelemetryRuleForOrganizationResponse.RuleName</property>
67+
<min>1</min>
68+
<max>100</max>
69+
<pattern>[0-9A-Za-z-]+</pattern>
70+
</property-value-rule>
371
<property-value-rule>
472
<property>Amazon.ObservabilityAdmin.Model.ListResourceTelemetryRequest.MaxResults</property>
573
<min>1</min>
@@ -20,10 +88,77 @@
2088
<min>3</min>
2189
<max>768</max>
2290
</property-value-rule>
91+
<property-value-rule>
92+
<property>Amazon.ObservabilityAdmin.Model.ListTagsForResourceRequest.ResourceARN</property>
93+
<min>1</min>
94+
<max>1011</max>
95+
<pattern>arn:aws:([a-zA-Z0-9\-]+):([a-z0-9\-]+)?:([0-9]{12})?:(.+)</pattern>
96+
</property-value-rule>
97+
<property-value-rule>
98+
<property>Amazon.ObservabilityAdmin.Model.ListTelemetryRulesRequest.MaxResults</property>
99+
<min>1</min>
100+
<max>100</max>
101+
</property-value-rule>
102+
<property-value-rule>
103+
<property>Amazon.ObservabilityAdmin.Model.ListTelemetryRulesForOrganizationRequest.MaxResults</property>
104+
<min>1</min>
105+
<max>100</max>
106+
</property-value-rule>
107+
<property-value-rule>
108+
<property>Amazon.ObservabilityAdmin.Model.TagResourceRequest.ResourceARN</property>
109+
<min>1</min>
110+
<max>1011</max>
111+
<pattern>arn:aws:([a-zA-Z0-9\-]+):([a-z0-9\-]+)?:([0-9]{12})?:(.+)</pattern>
112+
</property-value-rule>
113+
<property-value-rule>
114+
<property>Amazon.ObservabilityAdmin.Model.UntagResourceRequest.ResourceARN</property>
115+
<min>1</min>
116+
<max>1011</max>
117+
<pattern>arn:aws:([a-zA-Z0-9\-]+):([a-z0-9\-]+)?:([0-9]{12})?:(.+)</pattern>
118+
</property-value-rule>
119+
<property-value-rule>
120+
<property>Amazon.ObservabilityAdmin.Model.UpdateTelemetryRuleRequest.RuleIdentifier</property>
121+
<min>1</min>
122+
<max>1011</max>
123+
</property-value-rule>
124+
<property-value-rule>
125+
<property>Amazon.ObservabilityAdmin.Model.UpdateTelemetryRuleResponse.RuleArn</property>
126+
<min>1</min>
127+
<max>1011</max>
128+
<pattern>arn:aws:([a-zA-Z0-9\-]+):([a-z0-9\-]+)?:([0-9]{12})?:(.+)</pattern>
129+
</property-value-rule>
130+
<property-value-rule>
131+
<property>Amazon.ObservabilityAdmin.Model.UpdateTelemetryRuleForOrganizationRequest.RuleIdentifier</property>
132+
<min>1</min>
133+
<max>1011</max>
134+
</property-value-rule>
135+
<property-value-rule>
136+
<property>Amazon.ObservabilityAdmin.Model.UpdateTelemetryRuleForOrganizationResponse.RuleArn</property>
137+
<min>1</min>
138+
<max>1011</max>
139+
<pattern>arn:aws:([a-zA-Z0-9\-]+):([a-z0-9\-]+)?:([0-9]{12})?:(.+)</pattern>
140+
</property-value-rule>
23141
<property-value-rule>
24142
<property>Amazon.ObservabilityAdmin.Model.TelemetryConfiguration.AccountIdentifier</property>
25143
<min>12</min>
26144
<max>12</max>
27145
<pattern>[0-9]{12}</pattern>
28146
</property-value-rule>
147+
<property-value-rule>
148+
<property>Amazon.ObservabilityAdmin.Model.TelemetryDestinationConfiguration.RetentionInDays</property>
149+
<min>1</min>
150+
<max>3653</max>
151+
</property-value-rule>
152+
<property-value-rule>
153+
<property>Amazon.ObservabilityAdmin.Model.TelemetryRuleSummary.RuleArn</property>
154+
<min>1</min>
155+
<max>1011</max>
156+
<pattern>arn:aws:([a-zA-Z0-9\-]+):([a-z0-9\-]+)?:([0-9]{12})?:(.+)</pattern>
157+
</property-value-rule>
158+
<property-value-rule>
159+
<property>Amazon.ObservabilityAdmin.Model.TelemetryRuleSummary.RuleName</property>
160+
<min>1</min>
161+
<max>100</max>
162+
<pattern>[0-9A-Za-z-]+</pattern>
163+
</property-value-rule>
29164
</property-value-rules>

sdk/src/Services/ObservabilityAdmin/Generated/Model/AccessDeniedException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace Amazon.ObservabilityAdmin.Model
3333
/// Indicates you don't have permissions to perform the requested operation. The user
3434
/// or role that is making the request must have at least one IAM permissions policy attached
3535
/// that grants the required permissions. For more information, see <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/access.html">Access
36-
/// management for AWS resources</a> in the IAM user guide.
36+
/// management for Amazon Web Services resources</a> in the IAM user guide.
3737
/// </summary>
3838
#if !NETSTANDARD
3939
[Serializable]
Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
7+
*
8+
* http://aws.amazon.com/apache2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
14+
*/
15+
16+
/*
17+
* Do not modify this file. This file is generated from the observabilityadmin-2018-05-10.normal.json service model.
18+
*/
19+
using System;
20+
using System.Collections.Generic;
21+
using System.Xml.Serialization;
22+
using System.Text;
23+
using System.IO;
24+
using System.Net;
25+
26+
using Amazon.Runtime;
27+
using Amazon.Runtime.Internal;
28+
29+
#pragma warning disable CS0612,CS0618,CS1570
30+
namespace Amazon.ObservabilityAdmin.Model
31+
{
32+
/// <summary>
33+
/// The requested operation conflicts with the current state of the specified resource
34+
/// or with another request.
35+
/// </summary>
36+
#if !NETSTANDARD
37+
[Serializable]
38+
#endif
39+
public partial class ConflictException : AmazonObservabilityAdminException
40+
{
41+
42+
/// <summary>
43+
/// Constructs a new ConflictException with the specified error
44+
/// message.
45+
/// </summary>
46+
/// <param name="message">
47+
/// Describes the error encountered.
48+
/// </param>
49+
public ConflictException(string message)
50+
: base(message) {}
51+
52+
/// <summary>
53+
/// Construct instance of ConflictException
54+
/// </summary>
55+
/// <param name="message"></param>
56+
/// <param name="innerException"></param>
57+
public ConflictException(string message, Exception innerException)
58+
: base(message, innerException) {}
59+
60+
/// <summary>
61+
/// Construct instance of ConflictException
62+
/// </summary>
63+
/// <param name="innerException"></param>
64+
public ConflictException(Exception innerException)
65+
: base(innerException) {}
66+
67+
/// <summary>
68+
/// Construct instance of ConflictException
69+
/// </summary>
70+
/// <param name="message"></param>
71+
/// <param name="innerException"></param>
72+
/// <param name="errorType"></param>
73+
/// <param name="errorCode"></param>
74+
/// <param name="requestId"></param>
75+
/// <param name="statusCode"></param>
76+
public ConflictException(string message, Exception innerException, Amazon.Runtime.ErrorType errorType, string errorCode, string requestId, HttpStatusCode statusCode)
77+
: base(message, innerException, errorType, errorCode, requestId, statusCode) {}
78+
79+
/// <summary>
80+
/// Construct instance of ConflictException
81+
/// </summary>
82+
/// <param name="message"></param>
83+
/// <param name="errorType"></param>
84+
/// <param name="errorCode"></param>
85+
/// <param name="requestId"></param>
86+
/// <param name="statusCode"></param>
87+
public ConflictException(string message, Amazon.Runtime.ErrorType errorType, string errorCode, string requestId, HttpStatusCode statusCode)
88+
: base(message, errorType, errorCode, requestId, statusCode) {}
89+
90+
91+
#if !NETSTANDARD
92+
/// <summary>
93+
/// Constructs a new instance of the ConflictException class with serialized data.
94+
/// </summary>
95+
/// <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo" /> that holds the serialized object data about the exception being thrown.</param>
96+
/// <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext" /> that contains contextual information about the source or destination.</param>
97+
/// <exception cref="T:System.ArgumentNullException">The <paramref name="info" /> parameter is null. </exception>
98+
/// <exception cref="T:System.Runtime.Serialization.SerializationException">The class name is null or <see cref="P:System.Exception.HResult" /> is zero (0). </exception>
99+
protected ConflictException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context)
100+
: base(info, context)
101+
{
102+
}
103+
104+
/// <summary>
105+
/// Sets the <see cref="T:System.Runtime.Serialization.SerializationInfo" /> with information about the exception.
106+
/// </summary>
107+
/// <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo" /> that holds the serialized object data about the exception being thrown.</param>
108+
/// <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext" /> that contains contextual information about the source or destination.</param>
109+
/// <exception cref="T:System.ArgumentNullException">The <paramref name="info" /> parameter is a null reference (Nothing in Visual Basic). </exception>
110+
[System.Security.SecurityCritical]
111+
// These FxCop rules are giving false-positives for this method
112+
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]
113+
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2134:MethodsMustOverrideWithConsistentTransparencyFxCopRule")]
114+
public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context)
115+
{
116+
base.GetObjectData(info, context);
117+
}
118+
#endif
119+
120+
}
121+
}

0 commit comments

Comments
 (0)