From 531da7866743bfa077a6b25d180c0839aa268e0b Mon Sep 17 00:00:00 2001 From: EKS Distro PR Bot <75336432+eks-distro-pr-bot@users.noreply.github.com> Date: Mon, 8 Jul 2024 19:02:43 -0700 Subject: [PATCH] Bump prometheus/prometheus to latest release (#3356) --- UPSTREAM_PROJECTS.yaml | 4 +- .../prometheus/prometheus/ATTRIBUTION.txt | 117 ++++++++---------- projects/prometheus/prometheus/CHECKSUMS | 8 +- projects/prometheus/prometheus/GIT_TAG | 2 +- projects/prometheus/prometheus/GOLANG_VERSION | 2 +- projects/prometheus/prometheus/README.md | 2 +- 6 files changed, 63 insertions(+), 72 deletions(-) diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml index f359830b5f..ea7c64a582 100644 --- a/UPSTREAM_PROJECTS.yaml +++ b/UPSTREAM_PROJECTS.yaml @@ -231,8 +231,8 @@ projects: go_version: "1.21" - name: prometheus versions: - - tag: v2.52.0 - go_version: "1.21" + - tag: v2.53.0 + go_version: "1.22" - org: rancher repos: - name: local-path-provisioner diff --git a/projects/prometheus/prometheus/ATTRIBUTION.txt b/projects/prometheus/prometheus/ATTRIBUTION.txt index 33071c0cc8..ef26866597 100644 --- a/projects/prometheus/prometheus/ATTRIBUTION.txt +++ b/projects/prometheus/prometheus/ATTRIBUTION.txt @@ -1,20 +1,20 @@ -** cloud.google.com/go/auth; version v0.2.0 -- +** cloud.google.com/go/auth; version v0.5.1 -- https://github.com/googleapis/google-cloud-go -** cloud.google.com/go/auth/oauth2adapt; version v0.2.0 -- +** cloud.google.com/go/auth/oauth2adapt; version v0.2.2 -- https://github.com/googleapis/google-cloud-go ** cloud.google.com/go/compute/metadata; version v0.3.0 -- https://github.com/googleapis/google-cloud-go -** github.com/aws/aws-sdk-go; version v1.51.25 -- +** github.com/aws/aws-sdk-go; version v1.53.16 -- https://github.com/aws/aws-sdk-go ** github.com/bboreham/go-loser; version v0.0.0-20230920113527-fcc2c21820a3 -- https://github.com/bboreham/go-loser -** github.com/cncf/xds/go; version v0.0.0-20231128003011-0fa0005c9caa -- +** github.com/cncf/xds/go; version v0.0.0-20240318125728-8a4994d93e50 -- https://github.com/cncf/xds/go ** github.com/containerd/cgroups/v3; version v3.0.3 -- @@ -26,7 +26,7 @@ https://github.com/coreos/go-systemd/v22 ** github.com/distribution/reference; version v0.5.0 -- https://github.com/distribution/reference -** github.com/docker/docker; version v26.0.1+incompatible -- +** github.com/docker/docker; version v26.1.3+incompatible -- https://github.com/moby/moby ** github.com/docker/go-connections; version v0.4.0 -- @@ -83,7 +83,7 @@ https://github.com/google/gnostic-models ** github.com/google/gofuzz; version v1.2.0 -- https://github.com/google/gofuzz -** github.com/google/pprof/profile; version v0.0.0-20240416155748-26353dc0451f -- +** github.com/google/pprof/profile; version v0.0.0-20240528025155-186aa0362fba -- https://github.com/google/pprof ** github.com/google/s2a-go; version v0.1.7 -- @@ -92,7 +92,7 @@ https://github.com/google/s2a-go ** github.com/googleapis/enterprise-certificate-proxy/client; version v0.3.2 -- https://github.com/googleapis/enterprise-certificate-proxy -** github.com/gophercloud/gophercloud; version v1.11.0 -- +** github.com/gophercloud/gophercloud; version v1.12.0 -- https://github.com/gophercloud/gophercloud ** github.com/hashicorp/cronexpr; version v1.1.2 -- @@ -140,13 +140,13 @@ https://github.com/opencontainers/runtime-spec ** github.com/prometheus/alertmanager/api/v2/models; version v0.27.0 -- https://github.com/prometheus/alertmanager -** github.com/prometheus/client_golang; version v1.19.0 -- +** github.com/prometheus/client_golang; version v1.19.1 -- https://github.com/prometheus/client_golang ** github.com/prometheus/client_model/go; version v0.6.1 -- https://github.com/prometheus/client_model -** github.com/prometheus/common; version v0.53.0 -- +** github.com/prometheus/common; version v0.54.0 -- https://github.com/prometheus/common ** github.com/prometheus/common/sigv4; version v0.1.0 -- @@ -158,10 +158,10 @@ https://github.com/prometheus/exporter-toolkit ** github.com/prometheus/procfs; version v0.12.0 -- https://github.com/prometheus/procfs -** github.com/prometheus/prometheus; version v2.52.0 -- +** github.com/prometheus/prometheus; version v2.53.0 -- https://github.com/prometheus/prometheus -** github.com/scaleway/scaleway-sdk-go; version v1.0.0-beta.26 -- +** github.com/scaleway/scaleway-sdk-go; version v1.0.0-beta.27 -- https://github.com/scaleway/scaleway-sdk-go ** go.mongodb.org/mongo-driver; version v1.14.0 -- @@ -170,49 +170,46 @@ https://github.com/mongodb/mongo-go-driver ** go.opencensus.io; version v0.24.0 -- https://github.com/census-instrumentation/opencensus-go -** go.opentelemetry.io/collector/featuregate; version v1.5.0 -- +** go.opentelemetry.io/collector/pdata; version v1.8.0 -- https://github.com/open-telemetry/opentelemetry-collector -** go.opentelemetry.io/collector/pdata; version v1.5.0 -- +** go.opentelemetry.io/collector/semconv/v1.6.1; version v0.101.0 -- https://github.com/open-telemetry/opentelemetry-collector -** go.opentelemetry.io/collector/semconv/v1.6.1; version v0.98.0 -- -https://github.com/open-telemetry/opentelemetry-collector - -** go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp; version v0.50.0 -- +** go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp; version v0.52.0 -- https://github.com/open-telemetry/opentelemetry-go-contrib -** go.opentelemetry.io/otel; version v1.25.0 -- +** go.opentelemetry.io/otel; version v1.27.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/exporters/otlp/otlptrace; version v1.25.0 -- +** go.opentelemetry.io/otel/exporters/otlp/otlptrace; version v1.27.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc; version v1.25.0 -- +** go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc; version v1.27.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp; version v1.25.0 -- +** go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp; version v1.27.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/metric; version v1.25.0 -- +** go.opentelemetry.io/otel/metric; version v1.27.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/sdk; version v1.25.0 -- +** go.opentelemetry.io/otel/sdk; version v1.27.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/otel/trace; version v1.25.0 -- +** go.opentelemetry.io/otel/trace; version v1.27.0 -- https://github.com/open-telemetry/opentelemetry-go -** go.opentelemetry.io/proto/otlp; version v1.1.0 -- +** go.opentelemetry.io/proto/otlp; version v1.2.0 -- https://github.com/open-telemetry/opentelemetry-proto-go -** google.golang.org/genproto/googleapis/api; version v0.0.0-20240415180920-8c6c420018be -- +** google.golang.org/genproto/googleapis/api; version v0.0.0-20240528184218-531527333157 -- https://github.com/googleapis/go-genproto -** google.golang.org/genproto/googleapis/rpc; version v0.0.0-20240415180920-8c6c420018be -- +** google.golang.org/genproto/googleapis/rpc; version v0.0.0-20240528184218-531527333157 -- https://github.com/googleapis/go-genproto -** google.golang.org/grpc; version v1.63.2 -- +** google.golang.org/grpc; version v1.64.0 -- https://github.com/grpc/grpc-go ** gopkg.in/ini.v1; version v1.67.0 -- @@ -803,37 +800,37 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/aws/aws-sdk-go/internal/sync/singleflight; version v1.51.25 -- +** github.com/aws/aws-sdk-go/internal/sync/singleflight; version v1.53.16 -- https://github.com/aws/aws-sdk-go -** github.com/grafana/regexp; version v0.0.0-20221122212121-6b5c0a4cb7fd -- +** github.com/grafana/regexp; version v0.0.0-20240518133315-a468a5bfb3bc -- https://github.com/grafana/regexp -** golang.org/go; version go1.21.11 -- +** golang.org/go; version go1.22.4 -- https://github.com/golang/go -** golang.org/x/crypto; version v0.22.0 -- +** golang.org/x/crypto; version v0.24.0 -- https://golang.org/x/crypto ** golang.org/x/exp; version v0.0.0-20240119083558-1b970713d09a -- https://golang.org/x/exp -** golang.org/x/net; version v0.24.0 -- +** golang.org/x/net; version v0.26.0 -- https://golang.org/x/net -** golang.org/x/oauth2; version v0.19.0 -- +** golang.org/x/oauth2; version v0.21.0 -- https://golang.org/x/oauth2 ** golang.org/x/sync; version v0.7.0 -- https://golang.org/x/sync -** golang.org/x/sys; version v0.19.0 -- +** golang.org/x/sys; version v0.21.0 -- https://golang.org/x/sys -** golang.org/x/term; version v0.19.0 -- +** golang.org/x/term; version v0.21.0 -- https://golang.org/x/term -** golang.org/x/text; version v0.14.0 -- +** golang.org/x/text; version v0.16.0 -- https://golang.org/x/text ** golang.org/x/time/rate; version v0.5.0 -- @@ -1210,7 +1207,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/googleapis/gax-go/v2; version v2.12.3 -- +** github.com/googleapis/gax-go/v2; version v2.12.4 -- https://github.com/googleapis/gax-go/v2 Copyright 2016, Google Inc. @@ -1243,7 +1240,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/grpc-ecosystem/grpc-gateway/v2; version v2.19.0 -- +** github.com/grpc-ecosystem/grpc-gateway/v2; version v2.20.0 -- https://github.com/grpc-ecosystem/grpc-gateway/v2 Copyright (c) 2015, Gengo, Inc. @@ -1417,7 +1414,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/ovh/go-ovh/ovh; version v1.4.3 -- +** github.com/ovh/go-ovh/ovh; version v1.5.1 -- https://github.com/ovh/go-ovh BSD 3-Clause License @@ -1519,7 +1516,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg; version v0.53.0 -- +** github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg; version v0.54.0 -- https://github.com/prometheus/common Copyright (c) 2011, Open Knowledge Foundation Ltd. @@ -1621,7 +1618,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** google.golang.org/api; version v0.174.0 -- +** google.golang.org/api; version v0.183.0 -- https://github.com/googleapis/google-api-go-client Copyright (c) 2011 Google Inc. All rights reserved. @@ -1654,7 +1651,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** google.golang.org/api/internal/third_party/uritemplates; version v0.174.0 -- +** google.golang.org/api/internal/third_party/uritemplates; version v0.183.0 -- https://github.com/googleapis/google-api-go-client Copyright (c) 2013 Joshua Tacoma. All rights reserved. @@ -1687,7 +1684,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** google.golang.org/protobuf; version v1.33.0 -- +** google.golang.org/protobuf; version v1.34.1 -- https://go.googlesource.com/protobuf Copyright (c) 2018 The Go Authors. All rights reserved. @@ -1857,7 +1854,7 @@ Copyright (c) 2013 Armon Dadgar https://github.com/asaskevich/govalidator Copyright (c) 2014-2020 Alex Saskevich -** github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5; version v5.6.0 -- +** github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5; version v5.7.0 -- https://github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 Copyright (c) Microsoft Corporation. All rights reserved. @@ -1895,7 +1892,7 @@ Copyright (c) 2019 Denys Smirnov https://github.com/emicklei/go-restful/v3 Copyright (c) 2012,2013 Ernest Micklei -** github.com/fatih/color; version v1.15.0 -- +** github.com/fatih/color; version v1.16.0 -- https://github.com/fatih/color Copyright (c) 2013 Fatih Arslan @@ -1915,7 +1912,7 @@ Copyright (c) 2021 Go kit https://github.com/go-logfmt/logfmt Copyright (c) 2015 go-logfmt -** github.com/go-resty/resty/v2; version v2.12.0 -- +** github.com/go-resty/resty/v2; version v2.13.1 -- https://github.com/go-resty/resty/v2 Copyright (c) 2015-2023 Jeevanandam M., https://myjeeva.com @@ -1928,7 +1925,7 @@ Copyright (c) 2021 golang-jwt maintainers https://github.com/hashicorp/go-hclog Copyright (c) 2017 HashiCorp, Inc. -** github.com/hetznercloud/hcloud-go/v2/hcloud; version v2.7.2 -- +** github.com/hetznercloud/hcloud-go/v2/hcloud; version v2.9.0 -- https://github.com/hetznercloud/hcloud-go/v2 Copyright (c) 2018-2020 Hetzner Cloud GmbH @@ -1944,7 +1941,7 @@ Copyright (c) 2017 Jaime Pillora https://github.com/json-iterator/go Copyright (c) 2016 json-iterator -** github.com/KimMachineGun/automemlimit/memlimit; version v0.6.0 -- +** github.com/KimMachineGun/automemlimit/memlimit; version v0.6.1 -- https://github.com/KimMachineGun/automemlimit Copyright (c) 2022 Geon Kim @@ -1956,7 +1953,7 @@ Copyright (c) 2016 Caleb Spare https://github.com/kolo/xmlrpc Copyright (C) 2012 Dmitry Maksimov -** github.com/linode/linodego; version v1.32.0 -- +** github.com/linode/linodego; version v1.35.0 -- https://github.com/linode/linodego Copyright (c) 2017 Christopher "Chief" Najewicz @@ -1968,7 +1965,7 @@ Copyright (c) 2016 Mail.Ru Group https://github.com/mattn/go-colorable Copyright (c) 2016 Yasuhiro Matsumoto -** github.com/mattn/go-isatty; version v0.0.19 -- +** github.com/mattn/go-isatty; version v0.0.20 -- https://github.com/mattn/go-isatty Copyright (c) Yasuhiro MATSUMOTO @@ -2039,7 +2036,7 @@ Copyright (c) Microsoft Corporation. https://github.com/Azure/azure-sdk-for-go/sdk/azidentity Copyright (c) Microsoft Corporation. -** github.com/Azure/azure-sdk-for-go/sdk/internal; version v1.5.2 -- +** github.com/Azure/azure-sdk-for-go/sdk/internal; version v1.6.0 -- https://github.com/Azure/azure-sdk-for-go/sdk/internal Copyright (c) Microsoft Corporation. @@ -2089,7 +2086,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE ------ -** github.com/digitalocean/godo; version v1.113.0 -- +** github.com/digitalocean/godo; version v1.117.0 -- https://github.com/digitalocean/godo Copyright (c) 2014-2016 The godo AUTHORS. All rights reserved. Copyright (c) 2013 The go-github AUTHORS. All rights reserved. @@ -2272,11 +2269,11 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/hashicorp/consul/api; version v1.28.2 -- +** github.com/hashicorp/consul/api; version v1.29.1 -- https://github.com/hashicorp/consul/api * Package github.com/hashicorp/consul/api's source code may be found at: - https://github.com/hashicorp/consul/api/tree/v1.28.2 + https://github.com/hashicorp/consul/api/tree/v1.29.1 Copyright (c) 2020 HashiCorp, Inc. @@ -2652,12 +2649,6 @@ https://github.com/hashicorp/errwrap * Package github.com/hashicorp/errwrap's source code may be found at: https://github.com/hashicorp/errwrap/tree/v1.1.0 -** github.com/hashicorp/go-version; version v1.6.0 -- -https://github.com/hashicorp/go-version - - * Package github.com/hashicorp/go-version's source code may be found at: - https://github.com/hashicorp/go-version/tree/v1.6.0 - ** github.com/hashicorp/serf/coordinate; version v0.10.1 -- https://github.com/hashicorp/serf @@ -3773,11 +3764,11 @@ https://github.com/hashicorp/go-retryablehttp * Package github.com/hashicorp/go-retryablehttp's source code may be found at: https://github.com/hashicorp/go-retryablehttp/tree/v0.7.4 -** github.com/hashicorp/nomad/api; version v0.0.0-20240418183417-ea5f2f6748c7 -- +** github.com/hashicorp/nomad/api; version v0.0.0-20240604134157-e73d8bb1140d -- https://github.com/hashicorp/nomad/api * Package github.com/hashicorp/nomad/api's source code may be found at: - https://github.com/hashicorp/nomad/api/tree/v0.0.0-20240418183417-ea5f2f6748c7 + https://github.com/hashicorp/nomad/api/tree/v0.0.0-20240604134157-e73d8bb1140d Copyright (c) 2015 HashiCorp, Inc. diff --git a/projects/prometheus/prometheus/CHECKSUMS b/projects/prometheus/prometheus/CHECKSUMS index cd1dd27f23..faf4af49ba 100644 --- a/projects/prometheus/prometheus/CHECKSUMS +++ b/projects/prometheus/prometheus/CHECKSUMS @@ -1,4 +1,4 @@ -684010782c1e8ef7751e853d68a9d98895d57d1bfa2ff5ffb6fc9830d5b21990 _output/bin/prometheus/linux-amd64/prometheus -6b8f2027e6eaa1da7806f591f59767ad309e2b062f5bedf4849ae00eeac551b0 _output/bin/prometheus/linux-amd64/promtool -2312a8b59cd50d5c485b6f7a2ee05d0b6c8089a677e6dabcd1c40e13ed2fa1ac _output/bin/prometheus/linux-arm64/prometheus -7098aa707a731c261ba8ae493746127184e36e4c6bdf9c9c7d54d55b2abef432 _output/bin/prometheus/linux-arm64/promtool +9a57de5cd225f17841023a44b67f41e341c5788c029fbfa9cf90e5474bd10d87 _output/bin/prometheus/linux-amd64/prometheus +c10e5d95a30f666581826a42aa395443bc9535f77ba9f5e33fc8c9dbf3bc9ea3 _output/bin/prometheus/linux-amd64/promtool +1f7839c9113ad5a7049cc86a72ff1e56ebd1fd8e70cc115810c8ac3bb022c332 _output/bin/prometheus/linux-arm64/prometheus +b84af5e8c9df3b12dd055ef15b160a9c39d7a033b4b6d0c89985c62665fc240d _output/bin/prometheus/linux-arm64/promtool diff --git a/projects/prometheus/prometheus/GIT_TAG b/projects/prometheus/prometheus/GIT_TAG index 6e380ebf98..804c37de60 100644 --- a/projects/prometheus/prometheus/GIT_TAG +++ b/projects/prometheus/prometheus/GIT_TAG @@ -1 +1 @@ -v2.52.0 +v2.53.0 diff --git a/projects/prometheus/prometheus/GOLANG_VERSION b/projects/prometheus/prometheus/GOLANG_VERSION index d2ab029d32..71f7f51df9 100644 --- a/projects/prometheus/prometheus/GOLANG_VERSION +++ b/projects/prometheus/prometheus/GOLANG_VERSION @@ -1 +1 @@ -1.21 +1.22 diff --git a/projects/prometheus/prometheus/README.md b/projects/prometheus/prometheus/README.md index d34ceadd3f..71b4778a6b 100644 --- a/projects/prometheus/prometheus/README.md +++ b/projects/prometheus/prometheus/README.md @@ -1,4 +1,4 @@ -![Version](https://img.shields.io/badge/version-v2.52.0-blue) +![Version](https://img.shields.io/badge/version-v2.53.0-blue) ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiTldscmdZWkd6NzlhUHJBbFJDRzlMc3NmaGxBOFJlYWE1a3BsVG9KcXhldDRCK05PL0lxNmVVUi9odlMzdXZCYXFxWTBCOUZDbS91R21KL1c5VkdQQ004PSIsIml2UGFyYW1ldGVyU3BlYyI6Im94dGM3UFc0MGRDN0pyREIiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main) ## **Prometheus**