Skip to content

Commit e97dba2

Browse files
Amazon GuardDuty now returns filter lifecycle metadata in GetFilter responses. The response includes createdAt and updatedAt timestamps and a version number that increments on each update, giving you visibility into when a filter was created and last modified.
This adds CLI examples for the IpAddressType field on SourceIpConfig, enabling Network Load Balancer listener rules to match traffic based on whether the source IP is IPv4 or IPv6. Adds documented value constraints for CloudWatch Log Alarm scheduled query configuration fields, and makes LogGroupIdentifiers optional for log alarms. Add CloudWatch dataset destinations for Amazon Managed Service for Prometheus collectors. Enablement for ALB and Bedrock Knowledge Base logs via Observability Admin Telemetry Rule for account and organization level Launching DEED and MREP in US GOV Adds Qualifications Association APIs that enable partners to associate a subsidiary account's qualifications with a primary account. Once associated, qualifications are shared across all connected accounts and scorecards are consolidated. Partners can start and track association and disassociation. AWS PCS Node Lifecycle Actions provides a structured way to run custom scripts at defined points in a compute node's lifecycle directly through the AWS PCS compute node group API. Adds support for a client token in StartPlanExecution to make plan execution requests idempotent for safe retries.
1 parent 562b244 commit e97dba2

118 files changed

Lines changed: 6637 additions & 728 deletions

File tree

Some content is hidden

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

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.11.852
1+
1.11.853

generated/src/aws-cpp-sdk-amp/include/aws/amp/PrometheusServiceClient.h

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -255,17 +255,16 @@ class AWS_PROMETHEUSSERVICE_API PrometheusServiceClient : public Aws::Client::AW
255255
}
256256

257257
/**
258-
* <p>The <code>CreateScraper</code> operation creates a scraper to collect
259-
* metrics. A scraper pulls metrics from Prometheus-compatible sources and sends
260-
* them to your Amazon Managed Service for Prometheus workspace. You can configure
261-
* scrapers to collect metrics from Amazon EKS clusters, Amazon MSK clusters, or
262-
* from VPC-based sources that support DNS-based service discovery. Scrapers are
263-
* flexible, and can be configured to control what metrics are collected, the
264-
* frequency of collection, what transformations are applied to the metrics, and
265-
* more.</p> <p>An IAM role will be created for you that Amazon Managed Service for
266-
* Prometheus uses to access the metrics in your source. You must configure this
267-
* role with a policy that allows it to scrape metrics from your source. For Amazon
268-
* EKS sources, see <a
258+
* <p>Creates a scraper to collect metrics from Prometheus-compatible sources. The
259+
* scraper sends the collected metrics to Amazon Managed Service for Prometheus
260+
* workspaces or CloudWatch datasets. You can configure scrapers to collect metrics
261+
* from Amazon EKS clusters, Amazon MSK clusters, or from VPC-based sources that
262+
* support DNS-based service discovery. Scrapers are flexible. You can configure a
263+
* scraper to control which metrics to collect, the frequency of collection, which
264+
* transformations to apply to the metrics, and more.</p> <p>An IAM role will be
265+
* created for you that Amazon Managed Service for Prometheus uses to access the
266+
* metrics in your source. You must configure this role with a policy that allows
267+
* it to scrape metrics from your source. For Amazon EKS sources, see <a
269268
* href="https://docs.aws.amazon.com/prometheus/latest/userguide/AMP-collector-how-to.html#AMP-collector-eks-setup">Configuring
270269
* your Amazon EKS cluster</a> in the <i>Amazon Managed Service for Prometheus User
271270
* Guide</i>.</p> <p>The <code>scrapeConfiguration</code> parameter contains the
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
6+
#pragma once
7+
#include <aws/amp/PrometheusService_EXPORTS.h>
8+
#include <aws/core/utils/memory/stl/AWSString.h>
9+
10+
#include <utility>
11+
12+
namespace Aws {
13+
namespace Utils {
14+
namespace Json {
15+
class JsonValue;
16+
class JsonView;
17+
} // namespace Json
18+
} // namespace Utils
19+
namespace PrometheusService {
20+
namespace Model {
21+
22+
/**
23+
* <p>The configuration identifies the CloudWatch dataset used as a scraper
24+
* destination.</p><p><h3>See Also:</h3> <a
25+
* href="http://docs.aws.amazon.com/goto/WebAPI/amp-2020-08-01/CloudWatchConfiguration">AWS
26+
* API Reference</a></p>
27+
*/
28+
class CloudWatchConfiguration {
29+
public:
30+
AWS_PROMETHEUSSERVICE_API CloudWatchConfiguration() = default;
31+
AWS_PROMETHEUSSERVICE_API CloudWatchConfiguration(Aws::Utils::Json::JsonView jsonValue);
32+
AWS_PROMETHEUSSERVICE_API CloudWatchConfiguration& operator=(Aws::Utils::Json::JsonView jsonValue);
33+
AWS_PROMETHEUSSERVICE_API Aws::Utils::Json::JsonValue Jsonize() const;
34+
35+
///@{
36+
/**
37+
* <p>The Amazon Resource Name (ARN) of the CloudWatch dataset. To use the default
38+
* dataset, specify
39+
* <code>arn:aws:cloudwatch:&lt;region&gt;:&lt;account-id&gt;:dataset/default</code>.</p>
40+
*/
41+
inline const Aws::String& GetDatasetArn() const { return m_datasetArn; }
42+
inline bool DatasetArnHasBeenSet() const { return m_datasetArnHasBeenSet; }
43+
template <typename DatasetArnT = Aws::String>
44+
void SetDatasetArn(DatasetArnT&& value) {
45+
m_datasetArnHasBeenSet = true;
46+
m_datasetArn = std::forward<DatasetArnT>(value);
47+
}
48+
template <typename DatasetArnT = Aws::String>
49+
CloudWatchConfiguration& WithDatasetArn(DatasetArnT&& value) {
50+
SetDatasetArn(std::forward<DatasetArnT>(value));
51+
return *this;
52+
}
53+
///@}
54+
private:
55+
Aws::String m_datasetArn;
56+
bool m_datasetArnHasBeenSet = false;
57+
};
58+
59+
} // namespace Model
60+
} // namespace PrometheusService
61+
} // namespace Aws

generated/src/aws-cpp-sdk-amp/include/aws/amp/model/CreateScraperRequest.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,9 @@ class CreateScraperRequest : public PrometheusServiceRequest {
100100

101101
///@{
102102
/**
103-
* <p>The Amazon Managed Service for Prometheus workspace to send metrics to.</p>
103+
* <p>The destination where the scraper sends the collected metrics. Valid
104+
* destinations are Amazon Managed Service for Prometheus workspaces and CloudWatch
105+
* datasets.</p>
104106
*/
105107
inline const Destination& GetDestination() const { return m_destination; }
106108
inline bool DestinationHasBeenSet() const { return m_destinationHasBeenSet; }

generated/src/aws-cpp-sdk-amp/include/aws/amp/model/Destination.h

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#pragma once
77
#include <aws/amp/PrometheusService_EXPORTS.h>
88
#include <aws/amp/model/AmpConfiguration.h>
9+
#include <aws/amp/model/CloudWatchConfiguration.h>
910

1011
#include <utility>
1112

@@ -48,9 +49,30 @@ class Destination {
4849
return *this;
4950
}
5051
///@}
52+
53+
///@{
54+
/**
55+
* <p>The CloudWatch dataset to send metrics to.</p>
56+
*/
57+
inline const CloudWatchConfiguration& GetCloudWatchConfiguration() const { return m_cloudWatchConfiguration; }
58+
inline bool CloudWatchConfigurationHasBeenSet() const { return m_cloudWatchConfigurationHasBeenSet; }
59+
template <typename CloudWatchConfigurationT = CloudWatchConfiguration>
60+
void SetCloudWatchConfiguration(CloudWatchConfigurationT&& value) {
61+
m_cloudWatchConfigurationHasBeenSet = true;
62+
m_cloudWatchConfiguration = std::forward<CloudWatchConfigurationT>(value);
63+
}
64+
template <typename CloudWatchConfigurationT = CloudWatchConfiguration>
65+
Destination& WithCloudWatchConfiguration(CloudWatchConfigurationT&& value) {
66+
SetCloudWatchConfiguration(std::forward<CloudWatchConfigurationT>(value));
67+
return *this;
68+
}
69+
///@}
5170
private:
5271
AmpConfiguration m_ampConfiguration;
72+
73+
CloudWatchConfiguration m_cloudWatchConfiguration;
5374
bool m_ampConfigurationHasBeenSet = false;
75+
bool m_cloudWatchConfigurationHasBeenSet = false;
5476
};
5577

5678
} // namespace Model

generated/src/aws-cpp-sdk-amp/include/aws/amp/model/ScraperDescription.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,8 @@ class ScraperDescription {
249249

250250
///@{
251251
/**
252-
* <p>The Amazon Managed Service for Prometheus workspace the scraper sends metrics
253-
* to.</p>
252+
* <p>The destination where the scraper sends metrics. Valid destinations are
253+
* Amazon Managed Service for Prometheus workspaces and CloudWatch datasets.</p>
254254
*/
255255
inline const Destination& GetDestination() const { return m_destination; }
256256
inline bool DestinationHasBeenSet() const { return m_destinationHasBeenSet; }

generated/src/aws-cpp-sdk-amp/include/aws/amp/model/ScraperSummary.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,8 @@ class ScraperSummary {
227227

228228
///@{
229229
/**
230-
* <p>The Amazon Managed Service for Prometheus workspace the scraper sends metrics
231-
* to.</p>
230+
* <p>The destination where the scraper sends metrics. Valid destinations are
231+
* Amazon Managed Service for Prometheus workspaces and CloudWatch datasets.</p>
232232
*/
233233
inline const Destination& GetDestination() const { return m_destination; }
234234
inline bool DestinationHasBeenSet() const { return m_destinationHasBeenSet; }

generated/src/aws-cpp-sdk-amp/include/aws/amp/model/UpdateScraperRequest.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ class UpdateScraperRequest : public PrometheusServiceRequest {
9292

9393
///@{
9494
/**
95-
* <p>The new Amazon Managed Service for Prometheus workspace to send metrics
96-
* to.</p>
95+
* <p>The new destination where the scraper sends metrics. Valid destinations are
96+
* Amazon Managed Service for Prometheus workspaces and CloudWatch datasets.</p>
9797
*/
9898
inline const Destination& GetDestination() const { return m_destination; }
9999
inline bool DestinationHasBeenSet() const { return m_destinationHasBeenSet; }
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
6+
#include <aws/amp/model/CloudWatchConfiguration.h>
7+
#include <aws/core/utils/json/JsonSerializer.h>
8+
9+
#include <utility>
10+
11+
using namespace Aws::Utils::Json;
12+
using namespace Aws::Utils;
13+
14+
namespace Aws {
15+
namespace PrometheusService {
16+
namespace Model {
17+
18+
CloudWatchConfiguration::CloudWatchConfiguration(JsonView jsonValue) { *this = jsonValue; }
19+
20+
CloudWatchConfiguration& CloudWatchConfiguration::operator=(JsonView jsonValue) {
21+
if (jsonValue.ValueExists("datasetArn")) {
22+
m_datasetArn = jsonValue.GetString("datasetArn");
23+
m_datasetArnHasBeenSet = true;
24+
}
25+
return *this;
26+
}
27+
28+
JsonValue CloudWatchConfiguration::Jsonize() const {
29+
JsonValue payload;
30+
31+
if (m_datasetArnHasBeenSet) {
32+
payload.WithString("datasetArn", m_datasetArn);
33+
}
34+
35+
return payload;
36+
}
37+
38+
} // namespace Model
39+
} // namespace PrometheusService
40+
} // namespace Aws

generated/src/aws-cpp-sdk-amp/source/model/Destination.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ Destination& Destination::operator=(JsonView jsonValue) {
2222
m_ampConfiguration = jsonValue.GetObject("ampConfiguration");
2323
m_ampConfigurationHasBeenSet = true;
2424
}
25+
if (jsonValue.ValueExists("cloudWatchConfiguration")) {
26+
m_cloudWatchConfiguration = jsonValue.GetObject("cloudWatchConfiguration");
27+
m_cloudWatchConfigurationHasBeenSet = true;
28+
}
2529
return *this;
2630
}
2731

@@ -32,6 +36,10 @@ JsonValue Destination::Jsonize() const {
3236
payload.WithObject("ampConfiguration", m_ampConfiguration.Jsonize());
3337
}
3438

39+
if (m_cloudWatchConfigurationHasBeenSet) {
40+
payload.WithObject("cloudWatchConfiguration", m_cloudWatchConfiguration.Jsonize());
41+
}
42+
3543
return payload;
3644
}
3745

0 commit comments

Comments
 (0)