Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package golang-github-prometheus-prometheus
for openSUSE:Factory checked in at 2021-07-12 01:24:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/golang-github-prometheus-prometheus (Old)
and
/work/SRC/openSUSE:Factory/.golang-github-prometheus-prometheus.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "golang-github-prometheus-prometheus"
Mon Jul 12 01:24:46 2021 rev:15 rq:905075 version:2.27.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/golang-github-prometheus-prometheus/golang-github-prometheus-prometheus.changes
2021-07-02 13:27:45.316626424 +0200
+++
/work/SRC/openSUSE:Factory/.golang-github-prometheus-prometheus.new.2625/golang-github-prometheus-prometheus.changes
2021-07-12 01:25:03.389222133 +0200
@@ -1,0 +2,7 @@
+Thu Jul 8 08:08:39 UTC 2021 - Witek Bedyk <[email protected]>
+
+- Provide and reload firewalld configuration only for:
+ + openSUSE Leap 15.0, 15.1, 15.2
+ + SUSE SLE15, SLE15 SP1, SLE15 SP2
+
+-------------------------------------------------------------------
@@ -10 +17 @@
-- Upgrade to upstream version 2.27.1
+- Upgrade to upstream version 2.27.1 (jsc#SLE-18254)
@@ -136,0 +144,8 @@
+
+-------------------------------------------------------------------
+Mon Aug 31 13:59:02 UTC 2020 - Patrick Seidensal <[email protected]>
+
+- Update package with changes from `server:monitoring` bsc#1175478
+
+ Left out removal of firewalld related configuration files as SLE-15-SP1's
+ `firewalld` package does not contain prometheus configuration yet.
New:
----
prometheus.firewall.xml
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ golang-github-prometheus-prometheus.spec ++++++
--- /var/tmp/diff_new_pack.r0YRFd/_old 2021-07-12 01:25:04.389214446 +0200
+++ /var/tmp/diff_new_pack.r0YRFd/_new 2021-07-12 01:25:04.393214414 +0200
@@ -40,12 +40,16 @@
Source2: prometheus.service
Source3: prometheus.yml
Source4: prometheus.sysconfig
+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
# PATCH-FEATURE-OPENSUSE 0003-Add-Uyuni-service-discovery.patch
[email protected]
Patch3: 0003-Add-Uyuni-service-discovery.patch
BuildRequires: fdupes
+%if 0%{?suse_version} == 1500 && 0%{?sle_version} < 150300
+BuildRequires: firewall-macros
+%endif
# Adding glibc-devel-static seems to be required for linking if building
# with -buildmode=pie
BuildRequires: glibc-devel-static
@@ -94,6 +98,11 @@
install -m 0755 -d %{buildroot}%{_fillupdir}
install -m 0644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.prometheus
+%if 0%{?suse_version} == 1500 && 0%{?sle_version} < 150300
+install -m 0755 -d %{buildroot}%{_libdir}/firewalld/services/
+install -m 0644 %{SOURCE5}
%{buildroot}%{_libdir}/firewalld/services/prometheus.xml
+%endif
+
install -Dd -m 0750 %{buildroot}%{_localstatedir}/lib/prometheus
install -Dd -m 0750 %{buildroot}%{_localstatedir}/lib/prometheus/data
install -Dd -m 0750 %{buildroot}%{_localstatedir}/lib/prometheus/metrics
@@ -107,6 +116,9 @@
%post
%fillup_only -n prometheus
%service_add_post prometheus.service
+%if 0%{?suse_version} == 1500 && 0%{?sle_version} < 150300
+%firewalld_reload
+%endif
%preun
%service_del_preun prometheus.service
@@ -133,4 +145,10 @@
%dir %{_sysconfdir}/prometheus
%config(noreplace) %{_sysconfdir}/prometheus/prometheus.yml
+%if 0%{?suse_version} == 1500 && 0%{?sle_version} < 150300
+%dir %{_libdir}/firewalld
+%dir %{_libdir}/firewalld/services
+%{_libdir}/firewalld/services/prometheus.xml
+%endif
+
%changelog
++++++ prometheus.firewall.xml ++++++
<?xml version="1.0" encoding="utf-8"?>
<service>
<short>Prometheus</short>
<description>Prometheus monitoring system and time series
database.</description>
<port protocol="tcp" port="9090"/>
</service>
