Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cloudwatch exporter dependency #6835

Closed
Closed
Show file tree
Hide file tree
Changes from 46 commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
cea8573
Update YACE dependency for cloudwatch exporter and use aws sdk v2 by …
kgeckhart Feb 16, 2024
87aa701
Update YACE dependency for cloudwatch exporter
andriikushch Mar 1, 2024
c4fdb8a
Merge branch 'main' into kgeckhart/update-cloudwatch-exporter-dependency
andriikushch Mar 1, 2024
c5f0f42
Update missed dependencies
andriikushch Mar 1, 2024
b321b95
Fix tests
andriikushch Mar 11, 2024
8ec61a3
Merge branch 'main' into kgeckhart/update-cloudwatch-exporter-dependency
andriikushch Mar 11, 2024
4e43b85
go mod tidy
andriikushch Mar 11, 2024
6da44b0
Update YACE dependency for cloudwatch exporter
andriikushch Apr 8, 2024
7c1f7f7
Merge branch 'main' into kgeckhart/update-cloudwatch-exporter-dependency
andriikushch Apr 8, 2024
b09aa17
Update YACE dependency for cloudwatch exporter
andriikushch Apr 8, 2024
39dce77
Add logic to init v1 clients
andriikushch Apr 9, 2024
b89683b
Add version parameter
andriikushch Apr 9, 2024
9f99da3
Fix tests
andriikushch Apr 9, 2024
0a5e3b9
Do not use deprecated NewCollector method
andriikushch Apr 9, 2024
f70f467
Fix test
andriikushch Apr 10, 2024
03d6806
update go.mod
andriikushch Apr 10, 2024
f16f1ca
Merge branch 'main' into kgeckhart/update-cloudwatch-exporter-dependency
andriikushch Apr 10, 2024
df15427
update go.mod
andriikushch Apr 10, 2024
0b4c61c
Merge branch 'refs/heads/main' into kgeckhart/update-cloudwatch-expor…
andriikushch Apr 17, 2024
71f493c
update github.com/grafana/postgres_exporter
andriikushch Apr 17, 2024
1478feb
fix import
andriikushch Apr 17, 2024
5483f80
Merge branch 'refs/heads/main' into kgeckhart/update-cloudwatch-expor…
andriikushch Apr 22, 2024
cad543c
gofumpt
andriikushch Apr 22, 2024
8bd7013
gofumpt
andriikushch Apr 22, 2024
08df92a
Update github.com/prometheus-community/windows_exporter
andriikushch Apr 22, 2024
219d46c
Update github.com/prometheus-community/windows_exporter
andriikushch Apr 23, 2024
70c9201
Update go.mod
andriikushch Apr 23, 2024
faedf7d
Merge branch 'refs/heads/main' into kgeckhart/update-cloudwatch-expor…
andriikushch Apr 23, 2024
e39643a
Update github.com/ncabatoff/process-exporter
andriikushch Apr 23, 2024
6d2e63d
Update github.com/ncabatoff/process-exporter
andriikushch Apr 29, 2024
55a8c0a
Merge branch 'refs/heads/main' into kgeckhart/update-cloudwatch-expor…
andriikushch Apr 29, 2024
92e4d66
Update cloudwatch exporter code
andriikushch Apr 29, 2024
e029c38
Merge branch 'refs/heads/main' into kgeckhart/update-cloudwatch-expor…
andriikushch May 6, 2024
d4d8ac3
Update go.mod
andriikushch May 6, 2024
3ad3593
Update go.mod
andriikushch May 6, 2024
d004175
Fix config
andriikushch May 10, 2024
b223728
Update config test and docs
andriikushch May 10, 2024
c701476
Update CHANGELOG.md
andriikushch May 10, 2024
05724b2
Update cloudwatch-exporter-config.md: remove aliases
andriikushch May 10, 2024
68311b2
Change default version for v2
andriikushch May 10, 2024
62f7b7a
Update docs
andriikushch May 10, 2024
843bb1c
Update docs generator
andriikushch May 10, 2024
0606624
Fix test
andriikushch May 10, 2024
db54ddd
Fix test
andriikushch May 10, 2024
5d6beed
Update github.com/prometheus-community/windows_exporter
andriikushch May 10, 2024
7207077
go mod tidy
andriikushch May 10, 2024
4e5beb3
Update docs/sources/flow/reference/components/prometheus.exporter.clo…
andriikushch May 14, 2024
ab62d75
Merge branch 'refs/heads/main' into kgeckhart/update-cloudwatch-expor…
andriikushch May 16, 2024
509ca5b
merge changes from the main
andriikushch May 16, 2024
bd945c0
fix converter
andriikushch May 16, 2024
dc8b6b5
fix test
andriikushch May 16, 2024
62437c4
fix test
andriikushch May 16, 2024
cb912fe
fix test
andriikushch May 21, 2024
4d657bf
Change flag to be a boolean value
andriikushch May 23, 2024
273eff6
Merge branch 'main' into kgeckhart/update-cloudwatch-exporter-dependency
andriikushch May 23, 2024
ac79b25
Merge branch 'main' into kgeckhart/update-cloudwatch-exporter-dependency
andriikushch May 29, 2024
c395b8c
Fix build
andriikushch May 29, 2024
53a174d
Merge branch 'main' into kgeckhart/update-cloudwatch-exporter-dependency
andriikushch May 29, 2024
49d49a6
Merge branch 'main' into kgeckhart/update-cloudwatch-exporter-dependency
andriikushch Jun 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ Main (unreleased)
`pg_stat_bgwriter_checkpoints_timed`, `pg_stat_bgwriter_maxwritten_clean`,
`pg_stat_bgwriter_stats_reset` - the new names include the `_total` suffix. (@thampiotr)

- Cloudwatch exporter is not allowing aliases for the namespaces as `type` value. For example: "s3" is not allowed, "AWS/S3" should be used. (@kgeckhart, @andriikushch)

### Enhancements

- Add support for importing folders as single module to `import.file`. (@wildum)
Expand Down Expand Up @@ -61,6 +63,7 @@ Main (unreleased)
### Features

- A new `loki.rules.kubernetes` component that discovers `PrometheusRule` Kubernetes resources and loads them into a Loki Ruler instance. (@EStork09)
- A new parameter `aws_sdk_version` is added for the cloudwatch exporters configuration. It enables the use of aws sdk v2 which is expected to come with performance benefits. (@kgeckhart, @andriikushch)

### Bugfixes

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ To use all of the integration features, use the following AWS IAM Policy:
prometheus.exporter.cloudwatch "queues" {
sts_region = "us-east-2"

aws_sdk_version = "v1"

discovery {
type = "sqs"
regions = ["us-east-2"]
Expand Down Expand Up @@ -124,11 +126,12 @@ prometheus.exporter.cloudwatch "queues" {
You can use the following arguments to configure the exporter's behavior.
Omitted fields take their default values.

| Name | Type | Description | Default | Required |
| ------------------------- | ------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- | -------- |
| `sts_region` | `string` | AWS region to use when calling [STS][] for retrieving account information. | | yes |
| `fips_disabled` | `bool` | Disable use of FIPS endpoints. Set 'true' when running outside of USA regions. | `true` | no |
| `debug` | `bool` | Enable debug logging on CloudWatch exporter internals. | `false` | no |
| Name | Type | Description | Default | Required |
| ------------------------- | ------------------- |----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|----------|
| `sts_region` | `string` | AWS region to use when calling [STS][] for retrieving account information. | | yes |
| `aws_sdk_version` | `string` | AWS SDK version | `v2` | no |
andriikushch marked this conversation as resolved.
Show resolved Hide resolved
| `fips_disabled` | `bool` | Disable use of FIPS endpoints. Set 'true' when running outside of USA regions. | `true` | no |
| `debug` | `bool` | Enable debug logging on CloudWatch exporter internals. | `false` | no |
| `discovery_exported_tags` | `map(list(string))` | List of tags (value) per service (key) to export in all metrics. For example, defining the `["name", "type"]` under `"AWS/EC2"` will export the name and type tags and its values as labels in all metrics. Affects all discovery jobs. | `{}` | no |

[STS]: https://docs.aws.amazon.com/STS/latest/APIReference/welcome.html
Expand Down Expand Up @@ -369,91 +372,91 @@ See the examples described under each [discovery][] and [static] sections.
## Supported services in discovery jobs

The following is a list of AWS services that are supported in `cloudwatch_exporter` discovery jobs. When configuring a
discovery job, the `type` field of each `discovery_job` must match either the desired job namespace or alias.

- Namespace: `CWAgent` or Alias: `cwagent`
- Namespace: `AWS/Usage` or Alias: `usage`
- Namespace: `AWS/CertificateManager` or Alias: `acm`
- Namespace: `AWS/ACMPrivateCA` or Alias: `acm-pca`
- Namespace: `AmazonMWAA` or Alias: `airflow`
- Namespace: `AWS/MWAA` or Alias: `mwaa`
- Namespace: `AWS/ApplicationELB` or Alias: `alb`
- Namespace: `AWS/AppStream` or Alias: `appstream`
- Namespace: `AWS/Backup` or Alias: `backup`
- Namespace: `AWS/ApiGateway` or Alias: `apigateway`
- Namespace: `AWS/AmazonMQ` or Alias: `mq`
- Namespace: `AWS/AppSync` or Alias: `appsync`
- Namespace: `AWS/Athena` or Alias: `athena`
- Namespace: `AWS/AutoScaling` or Alias: `asg`
- Namespace: `AWS/ElasticBeanstalk` or Alias: `beanstalk`
- Namespace: `AWS/Billing` or Alias: `billing`
- Namespace: `AWS/Cassandra` or Alias: `cassandra`
- Namespace: `AWS/CloudFront` or Alias: `cloudfront`
- Namespace: `AWS/Cognito` or Alias: `cognito-idp`
- Namespace: `AWS/DMS` or Alias: `dms`
- Namespace: `AWS/DDoSProtection` or Alias: `shield`
- Namespace: `AWS/DocDB` or Alias: `docdb`
- Namespace: `AWS/DX` or Alias: `dx`
- Namespace: `AWS/DynamoDB` or Alias: `dynamodb`
- Namespace: `AWS/EBS` or Alias: `ebs`
- Namespace: `AWS/ElastiCache` or Alias: `ec`
- Namespace: `AWS/MemoryDB` or Alias: `memorydb`
- Namespace: `AWS/EC2` or Alias: `ec2`
- Namespace: `AWS/EC2Spot` or Alias: `ec2Spot`
- Namespace: `AWS/ECS` or Alias: `ecs-svc`
- Namespace: `ECS/ContainerInsights` or Alias: `ecs-containerinsights`
- Namespace: `AWS/EFS` or Alias: `efs`
- Namespace: `AWS/ELB` or Alias: `elb`
- Namespace: `AWS/ElasticMapReduce` or Alias: `emr`
- Namespace: `AWS/EMRServerless` or Alias: `emr-serverless`
- Namespace: `AWS/ES` or Alias: `es`
- Namespace: `AWS/Firehose` or Alias: `firehose`
- Namespace: `AWS/FSx` or Alias: `fsx`
- Namespace: `AWS/GameLift` or Alias: `gamelift`
- Namespace: `AWS/GlobalAccelerator` or Alias: `ga`
- Namespace: `Glue` or Alias: `glue`
- Namespace: `AWS/IoT` or Alias: `iot`
- Namespace: `AWS/Kafka` or Alias: `kafka`
- Namespace: `AWS/KafkaConnect` or Alias: `kafkaconnect`
- Namespace: `AWS/Kinesis` or Alias: `kinesis`
- Namespace: `AWS/KinesisAnalytics` or Alias: `kinesis-analytics`
- Namespace: `AWS/Lambda` or Alias: `lambda`
- Namespace: `AWS/MediaConnect` or Alias: `mediaconnect`
- Namespace: `AWS/MediaConvert` or Alias: `mediaconvert`
- Namespace: `AWS/MediaLive` or Alias: `medialive`
- Namespace: `AWS/MediaTailor` or Alias: `mediatailor`
- Namespace: `AWS/Neptune` or Alias: `neptune`
- Namespace: `AWS/NetworkFirewall` or Alias: `nfw`
- Namespace: `AWS/NATGateway` or Alias: `ngw`
- Namespace: `AWS/NetworkELB` or Alias: `nlb`
- Namespace: `AWS/PrivateLinkEndpoints` or Alias: `vpc-endpoint`
- Namespace: `AWS/PrivateLinkServices` or Alias: `vpc-endpoint-service`
- Namespace: `AWS/Prometheus` or Alias: `amp`
- Namespace: `AWS/QLDB` or Alias: `qldb`
- Namespace: `AWS/RDS` or Alias: `rds`
- Namespace: `AWS/Redshift` or Alias: `redshift`
- Namespace: `AWS/Route53Resolver` or Alias: `route53-resolver`
- Namespace: `AWS/Route53` or Alias: `route53`
- Namespace: `AWS/S3` or Alias: `s3`
- Namespace: `AWS/SES` or Alias: `ses`
- Namespace: `AWS/States` or Alias: `sfn`
- Namespace: `AWS/SNS` or Alias: `sns`
- Namespace: `AWS/SQS` or Alias: `sqs`
- Namespace: `AWS/StorageGateway` or Alias: `storagegateway`
- Namespace: `AWS/TransitGateway` or Alias: `tgw`
- Namespace: `AWS/TrustedAdvisor` or Alias: `trustedadvisor`
- Namespace: `AWS/VPN` or Alias: `vpn`
- Namespace: `AWS/ClientVPN` or Alias: `clientvpn`
- Namespace: `AWS/WAFV2` or Alias: `wafv2`
- Namespace: `AWS/WorkSpaces` or Alias: `workspaces`
- Namespace: `AWS/AOSS` or Alias: `aoss`
- Namespace: `AWS/SageMaker` or Alias: `sagemaker`
- Namespace: `/aws/sagemaker/Endpoints` or Alias: `sagemaker-endpoints`
- Namespace: `/aws/sagemaker/TrainingJobs` or Alias: `sagemaker-training`
- Namespace: `/aws/sagemaker/ProcessingJobs` or Alias: `sagemaker-processing`
- Namespace: `/aws/sagemaker/TransformJobs` or Alias: `sagemaker-transform`
- Namespace: `/aws/sagemaker/InferenceRecommendationsJobs` or Alias: `sagemaker-inf-rec`
- Namespace: `AWS/Sagemaker/ModelBuildingPipeline` or Alias: `sagemaker-model-building-pipeline`
discovery job, the `type` field of each `discovery_job` must match the desired job namespace.

- Namespace: `CWAgent`
- Namespace: `AWS/Usage`
- Namespace: `AWS/CertificateManager`
- Namespace: `AWS/ACMPrivateCA`
- Namespace: `AmazonMWAA`
- Namespace: `AWS/MWAA`
- Namespace: `AWS/ApplicationELB`
- Namespace: `AWS/AppStream`
- Namespace: `AWS/Backup`
- Namespace: `AWS/ApiGateway`
- Namespace: `AWS/AmazonMQ`
- Namespace: `AWS/AppSync`
- Namespace: `AWS/Athena`
- Namespace: `AWS/AutoScaling`
- Namespace: `AWS/ElasticBeanstalk`
- Namespace: `AWS/Billing`
- Namespace: `AWS/Cassandra`
- Namespace: `AWS/CloudFront`
- Namespace: `AWS/Cognito`
- Namespace: `AWS/DMS`
- Namespace: `AWS/DDoSProtection`
- Namespace: `AWS/DocDB`
- Namespace: `AWS/DX`
- Namespace: `AWS/DynamoDB`
- Namespace: `AWS/EBS`
- Namespace: `AWS/ElastiCache`
- Namespace: `AWS/MemoryDB`
- Namespace: `AWS/EC2`
- Namespace: `AWS/EC2Spot`
- Namespace: `AWS/ECS`
- Namespace: `ECS/ContainerInsights`
- Namespace: `AWS/EFS`
- Namespace: `AWS/ELB`
- Namespace: `AWS/ElasticMapReduce`
- Namespace: `AWS/EMRServerless`
- Namespace: `AWS/ES`
- Namespace: `AWS/Firehose`
- Namespace: `AWS/FSx`
- Namespace: `AWS/GameLift`
- Namespace: `AWS/GlobalAccelerator`
- Namespace: `Glue`
- Namespace: `AWS/IoT`
- Namespace: `AWS/Kafka`
- Namespace: `AWS/KafkaConnect`
- Namespace: `AWS/Kinesis`
- Namespace: `AWS/KinesisAnalytics`
- Namespace: `AWS/Lambda`
- Namespace: `AWS/MediaConnect`
- Namespace: `AWS/MediaConvert`
- Namespace: `AWS/MediaLive`
- Namespace: `AWS/MediaTailor`
- Namespace: `AWS/Neptune`
- Namespace: `AWS/NetworkFirewall`
- Namespace: `AWS/NATGateway`
- Namespace: `AWS/NetworkELB`
- Namespace: `AWS/PrivateLinkEndpoints`
- Namespace: `AWS/PrivateLinkServices`
- Namespace: `AWS/Prometheus`
- Namespace: `AWS/QLDB`
- Namespace: `AWS/RDS`
- Namespace: `AWS/Redshift`
- Namespace: `AWS/Route53Resolver`
- Namespace: `AWS/Route53`
- Namespace: `AWS/S3`
- Namespace: `AWS/SES`
- Namespace: `AWS/States`
- Namespace: `AWS/SNS`
- Namespace: `AWS/SQS`
- Namespace: `AWS/StorageGateway`
- Namespace: `AWS/TransitGateway`
- Namespace: `AWS/TrustedAdvisor`
- Namespace: `AWS/VPN`
- Namespace: `AWS/ClientVPN`
- Namespace: `AWS/WAFV2`
- Namespace: `AWS/WorkSpaces`
- Namespace: `AWS/AOSS`
- Namespace: `AWS/SageMaker`
- Namespace: `/aws/sagemaker/Endpoints`
- Namespace: `/aws/sagemaker/TrainingJobs`
- Namespace: `/aws/sagemaker/ProcessingJobs`
- Namespace: `/aws/sagemaker/TransformJobs`
- Namespace: `/aws/sagemaker/InferenceRecommendationsJobs`
- Namespace: `AWS/Sagemaker/ModelBuildingPipeline`

<!-- START GENERATED COMPATIBLE COMPONENTS -->

Expand Down
Loading
Loading