From 654923047bb6845d794d4e3aeaab7c12a2b98146a868be2a8fcb17f9e2dca0c4 Mon Sep 17 00:00:00 2001 From: Witek Bedyk Date: Mon, 14 Mar 2022 08:21:16 +0000 Subject: [PATCH 1/2] Accepting request 960480 from home:witekbedyk:branches:server:monitoring - Update vendor tarball with prometheus/client_golang 1.12.1 (bsc#1196338) * Added 0003-Bump-client_golang-to-1.12.1.patch OBS-URL: https://build.opensuse.org/request/show/960480 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/golang-github-prometheus-prometheus?expand=0&rev=53 --- 0003-Bump-client_golang-to-1.12.1.patch | 44 +++++++++++++++++++++ _service | 2 +- golang-github-prometheus-prometheus.changes | 7 ++++ golang-github-prometheus-prometheus.spec | 3 ++ prometheus-2.32.1.tar.gz | 4 +- vendor.tar.gz | 4 +- 6 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 0003-Bump-client_golang-to-1.12.1.patch diff --git a/0003-Bump-client_golang-to-1.12.1.patch b/0003-Bump-client_golang-to-1.12.1.patch new file mode 100644 index 0000000..9728545 --- /dev/null +++ b/0003-Bump-client_golang-to-1.12.1.patch @@ -0,0 +1,44 @@ +From 9ed87910fca5ba2967c165446e73f19c8e30b318 Mon Sep 17 00:00:00 2001 +From: beorn7 +Date: Sat, 29 Jan 2022 16:08:32 +0100 +Subject: [PATCH] Bump client_golang to 1.12.1 + +This pulls in a data-race fix and reduces the excessive number of +histogram buckets in the Go runtime metrics. + +Signed-off-by: beorn7 +(cherry picked from commit d27e7666cc920c752c45caf2cfc1d28986b141ad) +--- + go.mod | 2 +- + go.sum | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/go.mod b/go.mod +index 1ba1f5e87..744c0c60d 100644 +--- a/go.mod ++++ b/go.mod +@@ -46,7 +46,7 @@ require ( + github.com/opentracing/opentracing-go v1.2.0 + github.com/pkg/errors v0.9.1 + github.com/prometheus/alertmanager v0.23.0 +- github.com/prometheus/client_golang v1.11.0 ++ github.com/prometheus/client_golang v1.12.1 + github.com/prometheus/client_model v0.2.0 + github.com/prometheus/common v0.32.1 + github.com/prometheus/common/sigv4 v0.1.0 +diff --git a/go.sum b/go.sum +index a09845d2f..8d889737a 100644 +--- a/go.sum ++++ b/go.sum +@@ -1143,6 +1143,8 @@ github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3O + github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= + github.com/prometheus/client_golang v1.11.0 h1:HNkLOAEQMIDv/K+04rukrLx6ch7msSRwf3/SASFAGtQ= + github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= ++github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk= ++github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= + github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= + github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= + github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +-- +2.34.1 + diff --git a/_service b/_service index da0f36b..3a0dba1 100644 --- a/_service +++ b/_service @@ -14,7 +14,7 @@ prometheus - + prometheus-2.32.1.tar.gz diff --git a/golang-github-prometheus-prometheus.changes b/golang-github-prometheus-prometheus.changes index c9e58d8..c6e29a5 100644 --- a/golang-github-prometheus-prometheus.changes +++ b/golang-github-prometheus-prometheus.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 7 16:40:16 UTC 2022 - Witek Bedyk + +- Update vendor tarball with prometheus/client_golang 1.12.1 + (bsc#1196338) + * Added 0003-Bump-client_golang-to-1.12.1.patch + ------------------------------------------------------------------- Tue Feb 22 15:27:25 UTC 2022 - Witek Bedyk diff --git a/golang-github-prometheus-prometheus.spec b/golang-github-prometheus-prometheus.spec index dd68aac..562aa95 100644 --- a/golang-github-prometheus-prometheus.spec +++ b/golang-github-prometheus-prometheus.spec @@ -35,6 +35,7 @@ Group: System/Monitoring URL: https://prometheus.io/ # also includes web assets generated with `make assets` Source: prometheus-%{version}.tar.gz +# generated after applying 0003-Bump-client_golang-to-1.12.1.patch Source1: vendor.tar.gz Source2: prometheus.service Source3: prometheus.yml @@ -43,6 +44,8 @@ Source5: prometheus.firewall.xml Patch1: 0001-Do-not-force-the-pure-Go-name-resolver.patch # Lifted from Debian's prometheus package Patch2: 0002-Default-settings.patch +# This patch has been applied before generating vendor tarball +#Patch3: 0003-Bump-client_golang-to-1.12.1.patch BuildRequires: fdupes %if 0%{?suse_version} == 1500 && 0%{?sle_version} < 150300 BuildRequires: firewall-macros diff --git a/prometheus-2.32.1.tar.gz b/prometheus-2.32.1.tar.gz index 377a249..89e4f74 100644 --- a/prometheus-2.32.1.tar.gz +++ b/prometheus-2.32.1.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3367897c209164827790491963a2655614828817a01f03576b5622dd0b406b30 -size 14068076 +oid sha256:1a2ce5186a8ec8fc360f5608b5a0c4e799511676af637d33df51c73fd0d56b65 +size 14124168 diff --git a/vendor.tar.gz b/vendor.tar.gz index 972fd1f..c5ec12e 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f3436fa6bd375da1d236c89f3ff2550c670ab33dcc43501fa69c658b866310e -size 10456772 +oid sha256:58f38356a4d797276130d1f93f229c831449602e3e9749469994c7b2216d5a83 +size 10935414 From dbd469994e695282a03500d12fc2071ebbab7e82becb2cb6b1ee7d437197836e Mon Sep 17 00:00:00 2001 From: Witek Bedyk Date: Fri, 18 Mar 2022 12:20:01 +0000 Subject: [PATCH 2/2] Accepting request 961620 from home:witekbedyk:branches:server:monitoring Update 0003-Bump-client_golang-to-1.12.1.patch OBS-URL: https://build.opensuse.org/request/show/961620 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/golang-github-prometheus-prometheus?expand=0&rev=54 --- 0003-Bump-client_golang-to-1.12.1.patch | 50 +++++++++++++++++------- golang-github-prometheus-prometheus.spec | 2 +- prometheus-2.32.1.tar.gz | 4 +- vendor.tar.gz | 4 +- 4 files changed, 41 insertions(+), 19 deletions(-) diff --git a/0003-Bump-client_golang-to-1.12.1.patch b/0003-Bump-client_golang-to-1.12.1.patch index 9728545..d8911a6 100644 --- a/0003-Bump-client_golang-to-1.12.1.patch +++ b/0003-Bump-client_golang-to-1.12.1.patch @@ -1,20 +1,15 @@ -From 9ed87910fca5ba2967c165446e73f19c8e30b318 Mon Sep 17 00:00:00 2001 -From: beorn7 -Date: Sat, 29 Jan 2022 16:08:32 +0100 -Subject: [PATCH] Bump client_golang to 1.12.1 +From d3a1b60688ff41e20de595a7fdc1d7ccacd2914f Mon Sep 17 00:00:00 2001 +From: Witek Bedyk +Date: Mon, 14 Mar 2022 10:23:38 +0100 +Subject: [PATCH] Upgrade prometheus/client to version 1.12.1 -This pulls in a data-race fix and reduces the excessive number of -histogram buckets in the Go runtime metrics. - -Signed-off-by: beorn7 -(cherry picked from commit d27e7666cc920c752c45caf2cfc1d28986b141ad) --- - go.mod | 2 +- - go.sum | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) + go.mod | 4 ++-- + go.sum | 6 ++++++ + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod -index 1ba1f5e87..744c0c60d 100644 +index 1ba1f5e87..d2b3d864f 100644 --- a/go.mod +++ b/go.mod @@ -46,7 +46,7 @@ require ( @@ -26,8 +21,17 @@ index 1ba1f5e87..744c0c60d 100644 github.com/prometheus/client_model v0.2.0 github.com/prometheus/common v0.32.1 github.com/prometheus/common/sigv4 v0.1.0 +@@ -62,7 +62,7 @@ require ( + golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9 + golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c +- golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 ++ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 + golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 + golang.org/x/tools v0.1.7 + google.golang.org/api v0.60.0 diff --git a/go.sum b/go.sum -index a09845d2f..8d889737a 100644 +index a09845d2f..9711e1d96 100644 --- a/go.sum +++ b/go.sum @@ -1143,6 +1143,8 @@ github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3O @@ -39,6 +43,24 @@ index a09845d2f..8d889737a 100644 github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +@@ -1184,6 +1186,8 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O + github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= + github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4= + github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= ++github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= ++github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= + github.com/prometheus/prometheus v0.0.0-20200609090129-a6600f564e3c/go.mod h1:S5n0C6tSgdnwWshBUceRx5G1OsjLv/EeZ9t3wIfEtsY= + github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= + github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +@@ -1675,6 +1679,8 @@ golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBc + golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 h1:TyHqChC80pFkXWraUUf6RuB5IqFdQieMLwwCJokV2pc= + golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= ++golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= ++golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= + golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE= -- 2.34.1 diff --git a/golang-github-prometheus-prometheus.spec b/golang-github-prometheus-prometheus.spec index 562aa95..196f7a1 100644 --- a/golang-github-prometheus-prometheus.spec +++ b/golang-github-prometheus-prometheus.spec @@ -45,7 +45,7 @@ Patch1: 0001-Do-not-force-the-pure-Go-name-resolver.patch # Lifted from Debian's prometheus package Patch2: 0002-Default-settings.patch # This patch has been applied before generating vendor tarball -#Patch3: 0003-Bump-client_golang-to-1.12.1.patch +Patch3: 0003-Bump-client_golang-to-1.12.1.patch BuildRequires: fdupes %if 0%{?suse_version} == 1500 && 0%{?sle_version} < 150300 BuildRequires: firewall-macros diff --git a/prometheus-2.32.1.tar.gz b/prometheus-2.32.1.tar.gz index 89e4f74..377a249 100644 --- a/prometheus-2.32.1.tar.gz +++ b/prometheus-2.32.1.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a2ce5186a8ec8fc360f5608b5a0c4e799511676af637d33df51c73fd0d56b65 -size 14124168 +oid sha256:3367897c209164827790491963a2655614828817a01f03576b5622dd0b406b30 +size 14068076 diff --git a/vendor.tar.gz b/vendor.tar.gz index c5ec12e..3c73f6b 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58f38356a4d797276130d1f93f229c831449602e3e9749469994c7b2216d5a83 -size 10935414 +oid sha256:ab1d32af1fc5d5c6bc7bf0ba589d17052b0adac5c8f91ef39c92e6ac4569bf2c +size 10935610