Merge pull request #1568 from prometheus-community/superq/prom_community

Update for Prometheus Community

Author: SuperQ

.golangci.yml

@@ -37,4 +37,4 @@ linters-settings:
     exclude-functions:
       - (github.com/go-kit/log.Logger).Log
   goimports:
-    local-prefixes: "github.com/nerdswords/yet-another-cloudwatch-exporter"
+    local-prefixes: "github.com/prometheus-community/yet-another-cloudwatch-exporter"

.goreleaser.yml

@@ -0,0 +1,19 @@
+go:
+    # This must match .circle/config.yml.
+    version: 1.23
+repository:
+    path: github.com/prometheus-community/yet-another-cloudwatch-exporter
+build:
+    binaries:
+        - name: yace
+          path: ./cmd/yace
+    ldflags: |
+        -X github.com/prometheus/common/version.Version={{.Version}}
+        -X github.com/prometheus/common/version.Revision={{.Revision}}
+        -X github.com/prometheus/common/version.Branch={{.Branch}}
+        -X github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
+        -X github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
+tarball:
+    files:
+        - LICENSE
+        - NOTICE

.promu.yml

@@ -32,13 +32,13 @@ Refactoring:
 
 Bugfix release to update the `goreleaser` configuration (again!), please refer to the release notes for `0.61.0` for actual code changes.
 
-https://github.com/nerdswords/yet-another-cloudwatch-exporter/releases/tag/v0.61.0
+https://github.com/prometheus-community/yet-another-cloudwatch-exporter/releases/tag/v0.61.0
 
 # 0.61.1
 
 Bugfix release to update the `goreleaser` configuration, please refer to the release notes for `0.61.0` for actual code changes.
 
-https://github.com/nerdswords/yet-another-cloudwatch-exporter/releases/tag/v0.61.0
+https://github.com/prometheus-community/yet-another-cloudwatch-exporter/releases/tag/v0.61.0
 
 # 0.61.0
 
@@ -71,10 +71,10 @@ Refactoring:
 
 **New contributors**
 
-* @luismy made their first contribution in https://github.com/nerdswords/yet-another-cloudwatch-exporter/pull/1341
-* @fabiiw05 made their first contribution in https://github.com/nerdswords/yet-another-cloudwatch-exporter/pull/1433
+* @luismy made their first contribution in https://github.com/prometheus-community/yet-another-cloudwatch-exporter/pull/1341
+* @fabiiw05 made their first contribution in https://github.com/prometheus-community/yet-another-cloudwatch-exporter/pull/1433
 
-**Full Changelog**: https://github.com/nerdswords/yet-another-cloudwatch-exporter/compare/v0.60.0...v0.61.0
+**Full Changelog**: https://github.com/prometheus-community/yet-another-cloudwatch-exporter/compare/v0.60.0...v0.61.0
 
 # 0.60.0
 
@@ -109,15 +109,15 @@ Refactoring:
 * @Roberdvs made their first contribution
 * @hexionas made their first contribution
 
-**Full Changelog**: https://github.com/nerdswords/yet-another-cloudwatch-exporter/compare/v0.59.0...v0.60.0
+**Full Changelog**: https://github.com/prometheus-community/yet-another-cloudwatch-exporter/compare/v0.59.0...v0.60.0
 
 # 0.59.0
 
 **Important news and breaking changes**
 
 This release brings a bunch of breaking changes:
-* Setting `roundingPeriod` for discovery jobs is deprecated, a warning will be logged at startup. This is being deprecated in favor of always using the metric period. The implementation for `roundingPeriod` can result in inconsistent Start and EndTime between batches. This negates its intent to ensure Start and EndTimes align with the metric period for [CloudWatch best practices](https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_GetMetricData.html). This has the potential to produce data which will look inaccurate when compared against CloudWatch itself driving a lot of confusion. See https://github.com/nerdswords/yet-another-cloudwatch-exporter/issues/1290 for further context.
-* Setting `delay` at the metric level is deprecated, a warning will be logged at startup. This `delay` configuration has existed for a long time but was never utilized. Deprecating it and eventually removing it was chosen to simplify the configuration. See https://github.com/nerdswords/yet-another-cloudwatch-exporter/issues/1290#issuecomment-1948904375 for further context.
+* Setting `roundingPeriod` for discovery jobs is deprecated, a warning will be logged at startup. This is being deprecated in favor of always using the metric period. The implementation for `roundingPeriod` can result in inconsistent Start and EndTime between batches. This negates its intent to ensure Start and EndTimes align with the metric period for [CloudWatch best practices](https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_GetMetricData.html). This has the potential to produce data which will look inaccurate when compared against CloudWatch itself driving a lot of confusion. See https://github.com/prometheus-community/yet-another-cloudwatch-exporter/issues/1290 for further context.
+* Setting `delay` at the metric level is deprecated, a warning will be logged at startup. This `delay` configuration has existed for a long time but was never utilized. Deprecating it and eventually removing it was chosen to simplify the configuration. See https://github.com/prometheus-community/yet-another-cloudwatch-exporter/issues/1290#issuecomment-1948904375 for further context.
 * For discovery jobs, the `type` field and the keys of `exportedTagsOnMetrics` must be the AWS namespace rather than the alias (the README contains an up-to-date list of namespaces). Aliases are not allowed anymore. An error will be thrown at startup in an invalid namespace or an alias is used.
 * Some metric names have been changed to avoid duplicating the namespace. This includes:
   - `aws_es_esreporting_failed_request_sys_err_count` is `aws_es_reporting_failed_request_sys_err_count`
@@ -153,10 +153,10 @@ Refactoring:
 
 **New contributors**
 
-* @taraspos made their first contribution in https://github.com/nerdswords/yet-another-cloudwatch-exporter/pull/1330
-* @HristoStoyanovYotpo made their first contribution in https://github.com/nerdswords/yet-another-cloudwatch-exporter/pull/1359
+* @taraspos made their first contribution in https://github.com/prometheus-community/yet-another-cloudwatch-exporter/pull/1330
+* @HristoStoyanovYotpo made their first contribution in https://github.com/prometheus-community/yet-another-cloudwatch-exporter/pull/1359
 
-**Full Changelog**: https://github.com/nerdswords/yet-another-cloudwatch-exporter/compare/v0.58.0...v0.59.0
+**Full Changelog**: https://github.com/prometheus-community/yet-another-cloudwatch-exporter/compare/v0.58.0...v0.59.0
 
 # 0.58.0
 
@@ -183,9 +183,9 @@ Refactoring:
 
 **New contributors**
 
-* @tristanburgess made their first contribution in https://github.com/nerdswords/yet-another-cloudwatch-exporter/pull/1351
+* @tristanburgess made their first contribution in https://github.com/prometheus-community/yet-another-cloudwatch-exporter/pull/1351
 
-**Full Changelog**: https://github.com/nerdswords/yet-another-cloudwatch-exporter/compare/v0.57.1...v0.58.0
+**Full Changelog**: https://github.com/prometheus-community/yet-another-cloudwatch-exporter/compare/v0.57.1...v0.58.0
 
 
 # 0.57.1
@@ -208,7 +208,7 @@ Bugs:
 * Bump github.com/stretchr/testify from 1.8.4 to 1.9.0
 * Bump the aws-sdk-v2 group
 
-**Full Changelog**: https://github.com/nerdswords/yet-another-cloudwatch-exporter/compare/v0.57.0...v0.57.1
+**Full Changelog**: https://github.com/prometheus-community/yet-another-cloudwatch-exporter/compare/v0.57.0...v0.57.1
 
 # v0.57.0
 
@@ -250,11 +250,11 @@ Refactoring:
 
 **New contributors**
 
-* @vainiusd made their first contribution in https://github.com/nerdswords/yet-another-cloudwatch-exporter/pull/1093
-* @daharon made their first contribution in https://github.com/nerdswords/yet-another-cloudwatch-exporter/pull/1306
-* @keyolk made their first contribution in https://github.com/nerdswords/yet-another-cloudwatch-exporter/pull/939
+* @vainiusd made their first contribution in https://github.com/prometheus-community/yet-another-cloudwatch-exporter/pull/1093
+* @daharon made their first contribution in https://github.com/prometheus-community/yet-another-cloudwatch-exporter/pull/1306
+* @keyolk made their first contribution in https://github.com/prometheus-community/yet-another-cloudwatch-exporter/pull/939
 
-**Full Changelog**: https://github.com/nerdswords/yet-another-cloudwatch-exporter/compare/v0.56.0...v0.57.0
+**Full Changelog**: https://github.com/prometheus-community/yet-another-cloudwatch-exporter/compare/v0.56.0...v0.57.0
 
 # v0.56.0
 
@@ -306,7 +306,7 @@ Refactoring:
 * @wkneewalden
 * @pkubicsek-sb
 
-**Full Changelog**: https://github.com/nerdswords/yet-another-cloudwatch-exporter/compare/v0.55.0...v0.56.0
+**Full Changelog**: https://github.com/prometheus-community/yet-another-cloudwatch-exporter/compare/v0.55.0...v0.56.0
 
 # v0.55.0
 
@@ -349,7 +349,7 @@ Refactoring:
 * @hc2p
 * @alexandre-alvarengazh
 
-**Full Changelog**: https://github.com/nerdswords/yet-another-cloudwatch-exporter/compare/v0.54.1...v0.55.0
+**Full Changelog**: https://github.com/prometheus-community/yet-another-cloudwatch-exporter/compare/v0.54.1...v0.55.0
 
 
 # v0.54.1
@@ -364,7 +364,7 @@ Bugs:
 * Bump golangci/golangci-lint-action from 3.6.0 to 3.7.0
 * Bump github.com/aws/aws-sdk-go from 1.44.327 to 1.44.328
 
-**Full Changelog**: https://github.com/nerdswords/yet-another-cloudwatch-exporter/compare/v0.54.0...v0.54.1
+**Full Changelog**: https://github.com/prometheus-community/yet-another-cloudwatch-exporter/compare/v0.54.0...v0.54.1
 
 # v0.54.0
 
@@ -407,7 +407,7 @@ Updates:
 * Bump github.com/aws/smithy-go from 1.13.5 to 1.14.2
 * Bump github.com/aws/aws-sdk-go and aws-sdk-go-v2 to latest versions
 
-**Full Changelog**: https://github.com/nerdswords/yet-another-cloudwatch-exporter/compare/v0.53.0...v0.54.0
+**Full Changelog**: https://github.com/prometheus-community/yet-another-cloudwatch-exporter/compare/v0.53.0...v0.54.0
 
 # v0.53.0
 
@@ -433,7 +433,7 @@ Bugs:
 * Bump github.com/prometheus/common from 0.43.0 to 0.44.0
 * Bump github.com/urfave/cli/v2 from 2.25.6 to 2.25.7
 
-**Full Changelog**: https://github.com/nerdswords/yet-another-cloudwatch-exporter/compare/v0.52.0...v0.53.0
+**Full Changelog**: https://github.com/prometheus-community/yet-another-cloudwatch-exporter/compare/v0.52.0...v0.53.0
 
 # v0.52.0
 
@@ -499,7 +499,7 @@ Updates:
 * Bump golang.org/x/sync from 0.1.0 to 0.3.0
 * Bump golangci/golangci-lint-action from 3.4.0 to 3.6.0
 
-**Full Changelog**: https://github.com/nerdswords/yet-another-cloudwatch-exporter/compare/v0.51.0...v0.52.0
+**Full Changelog**: https://github.com/prometheus-community/yet-another-cloudwatch-exporter/compare/v0.51.0...v0.52.0
 
 # v0.51.0
 
@@ -540,7 +540,7 @@ Refactoring:
 * Bump github.com/aws/aws-sdk-go from 1.44.235 to 1.44.249
 * Bump github.com/prometheus/common from 0.41.0 to 0.42.0
 
-**Full Changelog**: https://github.com/nerdswords/yet-another-cloudwatch-exporter/compare/v0.50.0...v0.51.0
+**Full Changelog**: https://github.com/prometheus-community/yet-another-cloudwatch-exporter/compare/v0.50.0...v0.51.0
 
 # v0.50.0
 
@@ -571,7 +571,7 @@ Refactoring:
 * Bump github.com/aws/aws-sdk-go from 1.44.215 to 1.44.235
 * Bump github.com/urfave/cli/v2 from 2.25.0 to 2.25.1
 
-**Full Changelog**: https://github.com/nerdswords/yet-another-cloudwatch-exporter/compare/v0.49.2...v0.50.0
+**Full Changelog**: https://github.com/prometheus-community/yet-another-cloudwatch-exporter/compare/v0.49.2...v0.50.0
 
 # v0.49.2
 
@@ -616,14 +616,14 @@ Internal refactoring:
 * Bump github.com/urfave/cli/v2 from 2.24.3 to 2.25.0
 * Bump golang.org/x/sync from 0.0.0-20220722155255-886fb9371eb4 to 0.1.0
 
-**Full Changelog**: https://github.com/nerdswords/yet-another-cloudwatch-exporter/compare/v0.48.0-alpha...v0.49.0
+**Full Changelog**: https://github.com/prometheus-community/yet-another-cloudwatch-exporter/compare/v0.48.0-alpha...v0.49.0
 
 # v0.48.0-alpha
 
 **Bugfixes and features**:
 * Revert "Publish helm chart before releasing binaries".
 
-**Full Changelog**: https://github.com/nerdswords/yet-another-cloudwatch-exporter/compare/v0.47.0-alpha...v0.48.0-alpha
+**Full Changelog**: https://github.com/prometheus-community/yet-another-cloudwatch-exporter/compare/v0.47.0-alpha...v0.48.0-alpha
 
 # v0.47.0-alpha
 
@@ -638,7 +638,7 @@ Internal refactoring:
 * Bump github.com/aws/aws-sdk-go from 1.44.192 to 1.44.194
 * Bump github.com/urfave/cli/v2 from 2.24.2 to 2.24.3
 
-**Full Changelog**: https://github.com/nerdswords/yet-another-cloudwatch-exporter/compare/v0.46.0-alpha...v0.47.0-alpha
+**Full Changelog**: https://github.com/prometheus-community/yet-another-cloudwatch-exporter/compare/v0.46.0-alpha...v0.47.0-alpha
 
 # 0.46.0-alpha
 
@@ -653,7 +653,7 @@ Internal refactoring:
 **Dependencies**:
 * Bump github.com/aws/aws-sdk-go from 1.44.189 to 1.44.192
 
-**Full Changelog**: https://github.com/nerdswords/yet-another-cloudwatch-exporter/compare/helm-chart-0.11.0...v0.46.0-alpha
+**Full Changelog**: https://github.com/prometheus-community/yet-another-cloudwatch-exporter/compare/helm-chart-0.11.0...v0.46.0-alpha
 
 # 0.45.0-alpha
 
@@ -674,7 +674,7 @@ Internal refactoring:
 * Bump github.com/urfave/cli/v2 from 2.23.7 to 2.24.2
 * Bump golangci/golangci-lint-action from 3.3.1 to 3.4.0
 
-**Full Changelog**: https://github.com/nerdswords/yet-another-cloudwatch-exporter/compare/v0.44.0-alpha...v0.45.0-alpha
+**Full Changelog**: https://github.com/prometheus-community/yet-another-cloudwatch-exporter/compare/v0.44.0-alpha...v0.45.0-alpha
 
 # 0.44.0-alpha
 
@@ -702,7 +702,7 @@ Internal refactoring:
 * Bump helm/chart-releaser-action from 1.4.1 to 1.5.0
 * Bump helm/kind-action from 1.2.0 to 1.5.0
 
-**Full Changelog**: https://github.com/nerdswords/yet-another-cloudwatch-exporter/compare/v0.43.0-alpha...v0.44.0-alpha
+**Full Changelog**: https://github.com/prometheus-community/yet-another-cloudwatch-exporter/compare/v0.43.0-alpha...v0.44.0-alpha
 
 # 0.43.0-alpha
 

.tool-versions

@@ -3,7 +3,7 @@
 ## Steps to Contribute
 
 * We use [golangci-lint](https://github.com/golangci/golangci-lint) for linting the code. Make it sure to install it first.
-* Check out repository running `git clone https://github.com/nerdswords/yet-another-cloudwatch-exporter.git`
+* Check out repository running `git clone https://github.com/prometheus-community/yet-another-cloudwatch-exporter.git`
 * For linting, please run `make lint`
 * For building, please run `make build`
 * For running locally, please run `./yace`

CHANGELOG.md

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2021 NERDSWORDS
+   Copyright 2024 The Prometheus Authors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

CONTRIBUTE.md

@@ -1,15 +1,22 @@
-.DEFAULT_GOAL := build
+# Copyright 2024 The Prometheus Authors
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-GIT_BRANCH   ?= $(shell git rev-parse --abbrev-ref HEAD)
-GIT_REVISION ?= $(shell git rev-parse --short HEAD)
-VERSION      ?= $(GIT_BRANCH)-$(GIT_REVISION)
-GO_LDFLAGS   := -X main.version=${VERSION}
+# Needs to be defined before including Makefile.common to auto-generate targets
+DOCKER_ARCHS ?= amd64 armv7 arm64
+DOCKER_REPO  ?= prometheuscommunity
 
-build:
-	go build -v -ldflags "$(GO_LDFLAGS)" -o yace ./cmd/yace
+include Makefile.common
 
-test:
-	go test -v -bench=^$$ -race -count=1 ./...
+STATICCHECK_IGNORE =
 
-lint:
-	golangci-lint run -v -c .golangci.yml
+DOCKER_IMAGE_NAME ?= yet-another-cloudwatch-exporter