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
This commit is contained in:
Witek Bedyk 2022-03-14 08:21:16 +00:00 committed by Git OBS Bridge
parent 1b48191ffe
commit 654923047b
6 changed files with 59 additions and 5 deletions

View File

@ -0,0 +1,44 @@
From 9ed87910fca5ba2967c165446e73f19c8e30b318 Mon Sep 17 00:00:00 2001
From: beorn7 <beorn@grafana.com>
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 <beorn@grafana.com>
(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

View File

@ -14,7 +14,7 @@
<service name="set_version" mode="disabled">
<param name="basename">prometheus</param>
</service>
<service name="go_modules" mode="disabled">
<service name="go_modules" mode="manual">
<param name="archive">prometheus-2.32.1.tar.gz</param>
</service>
</services>

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Mar 7 16:40:16 UTC 2022 - Witek Bedyk <witold.bedyk@suse.com>
- 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 <witold.bedyk@suse.com>

View File

@ -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

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3367897c209164827790491963a2655614828817a01f03576b5622dd0b406b30
size 14068076
oid sha256:1a2ce5186a8ec8fc360f5608b5a0c4e799511676af637d33df51c73fd0d56b65
size 14124168

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1f3436fa6bd375da1d236c89f3ff2550c670ab33dcc43501fa69c658b866310e
size 10456772
oid sha256:58f38356a4d797276130d1f93f229c831449602e3e9749469994c7b2216d5a83
size 10935414