!23 [sync] PR-21: Fix metric name include histogram error
From: @openeuler-sync-bot Reviewed-by: @jxy_git Signed-off-by: @jxy_git
This commit is contained in:
openeuler-ci-bot
Gitee
commit
5e2bb26001
133
Change-client_golang-dependency-version-to-v1.20.0.patch
Normal file
133
Change-client_golang-dependency-version-to-v1.20.0.patch
Normal file
@ -0,0 +1,133 @@
|
|||||||
|
From 47d9aac119d3538eb19f7f0ee46664734c96f0ce Mon Sep 17 00:00:00 2001
|
||||||
|
From: jxy_git <jiangxinyu@kylinos.cn>
|
||||||
|
Date: Wed, 4 Dec 2024 14:46:33 +0800
|
||||||
|
Subject: [PATCH] Change client_golang dependency version to v1.20.0
|
||||||
|
|
||||||
|
---
|
||||||
|
go.mod | 12 ++++++------
|
||||||
|
go.sum | 24 ++++++++++++------------
|
||||||
|
2 files changed, 18 insertions(+), 18 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/go.mod b/go.mod
|
||||||
|
index 8caf807..b3c0943 100644
|
||||||
|
--- a/go.mod
|
||||||
|
+++ b/go.mod
|
||||||
|
@@ -39,7 +39,7 @@ require (
|
||||||
|
github.com/hetznercloud/hcloud-go/v2 v2.9.0
|
||||||
|
github.com/ionos-cloud/sdk-go/v6 v6.1.11
|
||||||
|
github.com/json-iterator/go v1.1.12
|
||||||
|
- github.com/klauspost/compress v1.17.8
|
||||||
|
+ github.com/klauspost/compress v1.17.9
|
||||||
|
github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b
|
||||||
|
github.com/linode/linodego v1.35.0
|
||||||
|
github.com/miekg/dns v1.1.59
|
||||||
|
@@ -50,9 +50,9 @@ require (
|
||||||
|
github.com/oklog/ulid v1.3.1
|
||||||
|
github.com/ovh/go-ovh v1.5.1
|
||||||
|
github.com/prometheus/alertmanager v0.27.0
|
||||||
|
- github.com/prometheus/client_golang v1.19.1
|
||||||
|
+ github.com/prometheus/client_golang v1.20.0
|
||||||
|
github.com/prometheus/client_model v0.6.1
|
||||||
|
- github.com/prometheus/common v0.54.0
|
||||||
|
+ github.com/prometheus/common v0.55.0
|
||||||
|
github.com/prometheus/common/assets v0.2.0
|
||||||
|
github.com/prometheus/common/sigv4 v0.1.0
|
||||||
|
github.com/prometheus/exporter-toolkit v0.11.0
|
||||||
|
@@ -76,13 +76,13 @@ require (
|
||||||
|
golang.org/x/net v0.26.0
|
||||||
|
golang.org/x/oauth2 v0.21.0
|
||||||
|
golang.org/x/sync v0.7.0
|
||||||
|
- golang.org/x/sys v0.21.0
|
||||||
|
+ golang.org/x/sys v0.22.0
|
||||||
|
golang.org/x/time v0.5.0
|
||||||
|
golang.org/x/tools v0.22.0
|
||||||
|
google.golang.org/api v0.183.0
|
||||||
|
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157
|
||||||
|
google.golang.org/grpc v1.64.0
|
||||||
|
- google.golang.org/protobuf v1.34.1
|
||||||
|
+ google.golang.org/protobuf v1.34.2
|
||||||
|
gopkg.in/yaml.v2 v2.4.0
|
||||||
|
gopkg.in/yaml.v3 v3.0.1
|
||||||
|
k8s.io/api v0.29.3
|
||||||
|
@@ -175,7 +175,7 @@ require (
|
||||||
|
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
|
||||||
|
github.com/pkg/errors v0.9.1 // indirect
|
||||||
|
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
|
||||||
|
- github.com/prometheus/procfs v0.12.0 // indirect
|
||||||
|
+ github.com/prometheus/procfs v0.15.1 // indirect
|
||||||
|
github.com/sirupsen/logrus v1.9.3 // indirect
|
||||||
|
github.com/spf13/pflag v1.0.5 // indirect
|
||||||
|
github.com/stretchr/objx v0.5.2 // indirect
|
||||||
|
diff --git a/go.sum b/go.sum
|
||||||
|
index 06db002..b0f5cc4 100644
|
||||||
|
--- a/go.sum
|
||||||
|
+++ b/go.sum
|
||||||
|
@@ -455,8 +455,8 @@ github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8
|
||||||
|
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
|
||||||
|
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
|
||||||
|
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
||||||
|
-github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU=
|
||||||
|
-github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
|
||||||
|
+github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
|
||||||
|
+github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
|
||||||
|
github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b h1:udzkj9S/zlT5X367kqJis0QP7YMxobob6zhzq6Yre00=
|
||||||
|
github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b/go.mod h1:pcaDhQK0/NJZEvtCO0qQPPropqV0sJOJ6YW7X+9kRwM=
|
||||||
|
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
|
||||||
|
@@ -609,8 +609,8 @@ github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeD
|
||||||
|
github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
|
||||||
|
github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
|
||||||
|
github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
|
||||||
|
-github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE=
|
||||||
|
-github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho=
|
||||||
|
+github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI=
|
||||||
|
+github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
|
||||||
|
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=
|
||||||
|
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
||||||
|
@@ -626,8 +626,8 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b
|
||||||
|
github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
|
||||||
|
github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
|
||||||
|
github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
|
||||||
|
-github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8=
|
||||||
|
-github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ=
|
||||||
|
+github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=
|
||||||
|
+github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
|
||||||
|
github.com/prometheus/common/assets v0.2.0 h1:0P5OrzoHrYBOSM1OigWL3mY8ZvV2N4zIE/5AahrSrfM=
|
||||||
|
github.com/prometheus/common/assets v0.2.0/go.mod h1:D17UVUE12bHbim7HzwUvtqm6gwBEaDQ0F+hIGbFbccI=
|
||||||
|
github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4=
|
||||||
|
@@ -640,8 +640,8 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT
|
||||||
|
github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
|
||||||
|
github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
|
||||||
|
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
|
||||||
|
-github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
|
||||||
|
-github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
|
||||||
|
+github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
|
||||||
|
+github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
|
||||||
|
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
|
||||||
|
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
|
||||||
|
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
|
||||||
|
@@ -947,8 +947,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
|
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
|
-golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
|
||||||
|
-golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
|
+golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
|
||||||
|
+golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
|
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||||
|
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||||
|
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
|
||||||
|
@@ -1120,8 +1120,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
|
||||||
|
google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
|
||||||
|
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
|
||||||
|
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
||||||
|
-google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
|
||||||
|
-google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
|
||||||
|
+google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
|
||||||
|
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
|
||||||
|
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
|
||||||
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
--
|
||||||
|
2.46.0
|
||||||
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
prometheus-2.53.3.tar.gz
Normal file
BIN
prometheus-2.53.3.tar.gz
Normal file
Binary file not shown.
BIN
prometheus-vendor.tar.gz
Normal file
BIN
prometheus-vendor.tar.gz
Normal file
Binary file not shown.
@ -1,23 +1,23 @@
|
|||||||
%define debug_package %{nil}
|
%define debug_package %{nil}
|
||||||
|
|
||||||
Name: prometheus2
|
Name: prometheus2
|
||||||
Version: 2.46.0
|
Version: 2.53.3
|
||||||
Release: 2
|
Release: 1
|
||||||
Summary: The Prometheus 2.x monitoring system and time series database.
|
Summary: The Prometheus 2.x monitoring system and time series database.
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
URL: https://prometheus.io
|
URL: https://prometheus.io
|
||||||
# Source0 for example
|
Source0: https://github.com/prometheus/prometheus/archive/v%{version}/prometheus-%{version}.tar.gz
|
||||||
# wget -O - https://github.com/prometheus/prometheus/archive/refs/tags/v%{version}.tar.gz | tar -xzvf -
|
# tar -xvf Source0
|
||||||
# run 'make build' in it
|
# run 'go mod vendor' in it
|
||||||
# tar -czvf prometheus-%{version}.linux-arm64.tar.gz console_libraries/ consoles/ LICENSE NOTICE prometheus prometheus.yml promtool
|
# tar -czvf prometheus-vendor.tar.gz vendor
|
||||||
Source0: prometheus-%{version}.linux-arm64.tar.gz
|
Source1: prometheus-vendor.tar.gz
|
||||||
Source1: prometheus-%{version}.linux-amd64.tar.gz
|
|
||||||
Source2: prometheus-%{version}.linux-riscv64.tar.gz
|
|
||||||
Source3: prometheus.service
|
Source3: prometheus.service
|
||||||
Source4: prometheus.default
|
Source4: prometheus.default
|
||||||
Source5: prometheus.yml
|
Source5: prometheus.yml
|
||||||
Source6: prometheus.logrotate
|
Source6: prometheus.logrotate
|
||||||
|
|
||||||
|
Patch0: Change-client_golang-dependency-version-to-v1.20.0.patch
|
||||||
|
|
||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
BuildRequires: golang
|
BuildRequires: golang
|
||||||
BuildRequires: npm
|
BuildRequires: npm
|
||||||
@ -34,20 +34,16 @@ configured targets at given intervals, evaluates rule expressions, displays the
|
|||||||
results, and can trigger alerts if some condition is observed to be true.
|
results, and can trigger alerts if some condition is observed to be true.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%ifarch aarch64
|
%setup -n prometheus-%{version}
|
||||||
%setup -q -b 0 -n prometheus-%{version}.linux-arm64
|
tar -xzvf %{SOURCE1}
|
||||||
%endif
|
%patch 0 -p1
|
||||||
|
# Compile using the promu installed on the system, not the downloaded one
|
||||||
%ifarch x86_64
|
sed -i 's|PROMU[[:space:]]*:=.*$(FIRST_GOPATH)/bin/promu|PROMU := /bin/promu|' Makefile.common
|
||||||
%setup -q -b 1 -n prometheus-%{version}.linux-amd64
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%ifarch riscv64
|
|
||||||
%setup -q -b 2 -n prometheus-%{version}.linux-riscv64
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
/bin/true
|
export GOFLAGS="-mod=vendor -buildmode=pie"
|
||||||
|
export BUILDTAGS="netgo builtinassets"
|
||||||
|
make build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
mkdir -vp %{buildroot}%{_sharedstatedir}/prometheus
|
mkdir -vp %{buildroot}%{_sharedstatedir}/prometheus
|
||||||
@ -95,16 +91,22 @@ exit 0
|
|||||||
%dir %attr(755, prometheus, prometheus)%{_sharedstatedir}/prometheus
|
%dir %attr(755, prometheus, prometheus)%{_sharedstatedir}/prometheus
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Dec 04 2024 jiangxinyu <jiangxinyu@kylinos.cn> - 2.53.3-1
|
||||||
|
- Update package to version 2.53.3
|
||||||
|
* Fix metric name include histogram error
|
||||||
|
* TSDB: Let queries with heavy regex matches be cancelled and not use up the CPU
|
||||||
|
* Scraping: allow multiple samples on same series, with explicit timestamps
|
||||||
|
|
||||||
* Sun Dec 31 2023 menmazqj <qijia.oerv@isrc.iscas.ac.cn> - 2.46.0-2
|
* Sun Dec 31 2023 menmazqj <qijia.oerv@isrc.iscas.ac.cn> - 2.46.0-2
|
||||||
- add riscv64 support for prometheus
|
- add riscv64 support for prometheus
|
||||||
|
|
||||||
* Fri Sep 08 2023 jiangxinyu <jiangxinyu@kylinos.cn> - 2.46.0-1
|
* Fri Sep 08 2023 jiangxinyu <jiangxinyu@kylinos.cn> - 2.46.0-1
|
||||||
- Update package to version 2.46.0
|
- Update package to version 2.46.0
|
||||||
|
|
||||||
* Tue Jun 6 2023 Wenlong Zhang<zhangwenlong@loongson.cn> - 2.20.0-4
|
* Tue Jun 6 2023 Wenlong Zhang <zhangwenlong@loongson.cn> - 2.20.0-4
|
||||||
- add loong64 support for prometheus
|
- add loong64 support for prometheus
|
||||||
|
|
||||||
* Wed Apr 20 2022 zhuang.li <zhuang.li@turbolinux.com.cn>
|
* Wed Apr 20 2022 zhuang.li <zhuang.li@turbolinux.com.cn> - 2.20.0-3
|
||||||
- Modify the schema judgment, resulting in compilation failure
|
- Modify the schema judgment, resulting in compilation failure
|
||||||
|
|
||||||
* Tue Dec 14 2021 konglidong <konglidong@uniontech.com> - 2.20.0-2
|
* Tue Dec 14 2021 konglidong <konglidong@uniontech.com> - 2.20.0-2
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user