rpm/golang-github-prometheus-prometheus
SHA256
1
0
Fork 0
forked from pool/golang-github-prometheus-prometheus
Code Pull Requests Activity

Accepting request 890467 from home:witekbedyk:branches:server:monitoring

Browse Source 
- Upgrade to upstream version 2.26.0
- Add vendor and web_assets tarballs
- Uyuni: Read formula data from exporters map
- Uyuni: Add support for TLS targets
  + Changed:
    * 0003-Add-Uyuni-service-discovery.patch

OBS-URL: https://build.opensuse.org/request/show/890467
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/golang-github-prometheus-prometheus?expand=0&rev=40
This commit is contained in:
Stefano Torresi 2021-05-04 17:11:11 +00:00 committed by Git OBS Bridge
parent 2f9621e7cd
commit 076e8aae29
9 changed files with 79 additions and 1261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
0001-Do-not-force-the-pure-Go-name-resolver.patch
View File

@ -1,4 +1,4 @@
From 7953e106d8afa5ba660396c1c59bcc674ef3a404 Mon Sep 17 00:00:00 2001
From dca10001054ba4f61a8be3f4ef67223509a26683 Mon Sep 17 00:00:00 2001
From: Jan Fajerski <jfajerski@suse.com>
Date: Fri, 8 Feb 2019 09:17:06 +0100
Subject: [PATCH 1/3] Do not force the pure Go name resolver
@ -15,18 +15,18 @@ Signed-off-by: Jan Fajerski <jfajerski@suse.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.promu.yml b/.promu.yml
index caaa63a55..f75af963d 100644
index f52a646de..782f973a8 100644
--- a/.promu.yml
+++ b/.promu.yml
@@ -10,7 +10,7 @@ build:
path: ./cmd/prometheus
- name: promtool
path: ./cmd/promtool
- flags: -mod=vendor -a -tags netgo,builtinassets
- flags: -a -tags netgo,builtinassets
+ flags: -mod=vendor -a -tags builtinassets
ldflags: |
-X github.com/prometheus/common/version.Version={{.Version}}
-X github.com/prometheus/common/version.Revision={{.Revision}}
--
2.29.2
2.26.2

12
0002-Default-settings.patch
View File

@ -1,4 +1,4 @@
From 129223e15588c384c39b279213c81ba24e2f7ac9 Mon Sep 17 00:00:00 2001
From 7860b67a0a684d2d51087e323b780410031d83af Mon Sep 17 00:00:00 2001
From: Jan Fajerski <jfajerski@suse.com>
Date: Fri, 8 Feb 2019 09:28:12 +0100
Subject: [PATCH 2/3] Default settings
@ -9,10 +9,10 @@ Signed-off-by: Jan Fajerski <jfajerski@suse.com>
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmd/prometheus/main.go b/cmd/prometheus/main.go
index fa6b6fa88..ac9f9dcfa 100644
index 37a7f3535..ae43ded89 100644
--- a/cmd/prometheus/main.go
+++ b/cmd/prometheus/main.go
@@ -147,7 +147,7 @@ func main() {
@@ -187,7 +187,7 @@ func main() {
a.HelpFlag.Short('h')
a.Flag("config.file", "Prometheus configuration file path.").
@ -21,7 +21,7 @@ index fa6b6fa88..ac9f9dcfa 100644
a.Flag("web.listen-address", "Address to listen on for UI, API, and telemetry.").
Default("0.0.0.0:9090").StringVar(&cfg.web.ListenAddress)
@@ -177,10 +177,10 @@ func main() {
@@ -219,10 +219,10 @@ func main() {
Default("false").BoolVar(&cfg.web.EnableAdminAPI)
a.Flag("web.console.templates", "Path to the console template directory, available at /consoles.").
@ -34,7 +34,7 @@ index fa6b6fa88..ac9f9dcfa 100644
a.Flag("web.page-title", "Document title of Prometheus instance.").
Default("Prometheus Time Series Collection and Processing Server").StringVar(&cfg.web.PageTitle)
@@ -189,7 +189,7 @@ func main() {
@@ -231,7 +231,7 @@ func main() {
Default(".*").StringVar(&cfg.corsRegexString)
a.Flag("storage.tsdb.path", "Base path for metrics storage.").
@ -44,5 +44,5 @@ index fa6b6fa88..ac9f9dcfa 100644
a.Flag("storage.tsdb.min-block-duration", "Minimum duration of a data block before being persisted. For use in testing.").
Hidden().Default("2h").SetValue(&cfg.tsdb.MinBlockDuration)
--
2.29.2
2.26.2

1273
0003-Add-Uyuni-service-discovery.patch
View File

File diff suppressed because it is too large Load Diff

6
_service
View File

@ -4,12 +4,12 @@
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="revision">v2.22.1</param>
<param name="revision">v2.26.0</param>
<param name="versionrewrite-pattern">v(.*)</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">prometheus-*.tar</param>
<param name="compression">xz</param>
<param name="file">*.tar</param>
<param name="compression">gz</param>
</service>
<service name="set_version" mode="disabled">
<param name="basename">prometheus</param>

10
golang-github-prometheus-prometheus.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue May 4 14:35:58 UTC 2021 - Witek Bedyk <witold.bedyk@suse.com>
- Upgrade to upstream version 2.26.0
- Add vendor and web_assets tarballs
- Uyuni: Read formula data from exporters map
- Uyuni: Add support for TLS targets
+ Changed:
* 0003-Add-Uyuni-service-discovery.patch
-------------------------------------------------------------------
Tue Mar 9 13:28:50 UTC 2021 - Witek Bedyk <witold.bedyk@suse.com>

22
golang-github-prometheus-prometheus.spec
View File

@ -27,16 +27,19 @@
%endif
Name: golang-github-prometheus-prometheus
Version: 2.22.1
Version: 2.26.0
Release: 0
Summary: The Prometheus monitoring system and time series database
License: Apache-2.0
Group: System/Monitoring
URL: https://prometheus.io/
Source: prometheus-%{version}.tar.xz
Source1: prometheus.service
Source2: prometheus.yml
Source3: prometheus.sysconfig
Source: prometheus-%{version}.tar.gz
# generated after applying Patch3 and running `go mod vendor`
# also includes web assets generated with `make assets`
Source1: vendor.tar.gz
Source2: prometheus.service
Source3: prometheus.yml
Source4: prometheus.sysconfig
Patch1: 0001-Do-not-force-the-pure-Go-name-resolver.patch
# Lifted from Debian's prometheus package
Patch2: 0002-Default-settings.patch
@ -48,7 +51,6 @@ BuildRequires: fdupes
BuildRequires: glibc-devel-static
BuildRequires: golang-github-prometheus-promu
BuildRequires: golang-packaging
BuildRequires: xz
BuildRequires: golang(API) >= 1.14
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(pre): user(prometheus)
@ -70,7 +72,7 @@ Prometheus's main features are:
- multiple modes of graphing and dashboarding support
%prep
%autosetup -p1 -n prometheus-%{version}
%autosetup -a1 -p1 -n prometheus-%{version}
%build
%goprep github.com/prometheus/prometheus
@ -79,9 +81,9 @@ GOPATH=%{_builddir}/go promu build -v
%install
install -D -m0755 %{_builddir}/prometheus-%{version}/prometheus %{buildroot}/%{_bindir}/prometheus
install -D -m0755 %{_builddir}/prometheus-%{version}/promtool %{buildroot}/%{_bindir}/promtool
install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/prometheus.service
install -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/prometheus.service
install -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/prometheus/prometheus.yml
install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/prometheus/prometheus.yml
install -d -m 0755 %{buildroot}%{_sbindir}
ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcprometheus
@ -90,7 +92,7 @@ install -m 0755 -d %{buildroot}%{_datarootdir}/prometheus
cp -fr console_libraries/ consoles/ %{buildroot}%{_datarootdir}/prometheus
install -m 0755 -d %{buildroot}%{_fillupdir}
install -m 0644 %{SOURCE3} %{buildroot}%{_fillupdir}/sysconfig.prometheus
install -m 0644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.prometheus
install -Dd -m 0750 %{buildroot}%{_localstatedir}/lib/prometheus
install -Dd -m 0750 %{buildroot}%{_localstatedir}/lib/prometheus/data

3
prometheus-2.22.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:56fa74d4989d05e3585a784f44961aca9eaac9cbfc0cc07dbaaf797194bcb6e2
size 12706560

3
prometheus-2.26.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0d66c6169273f5dabccbc482a13103b635db73135c009f929c8351277aabc75e
size 62006663

3
vendor.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:82c0d517e9ac1393040a2d5ddfdc5cf65100199137c5870c9309f5fbdaf39905
size 18078140