Accepting request 967519 from server:monitoring
OBS-URL: https://build.opensuse.org/request/show/967519 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/golang-github-prometheus-prometheus?expand=0&rev=23
This commit is contained in:
commit
9d6c020bc0
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 7 12:36:08 UTC 2022 - Julio González Gil <jgonzalez@suse.com>
|
||||
|
||||
- Build firewalld-prometheus-config only for SUSE Linux Enterprise
|
||||
15, 15.1 and 15.2, and require firewalld for it
|
||||
- firewalld-prometheus-config needs to be a Recommends, not a
|
||||
Requires, as prometheus does not require it to run
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 18 12:20:59 UTC 2022 - Witek Bedyk <witold.bedyk@suse.com>
|
||||
|
||||
|
@ -57,7 +57,9 @@ BuildRequires: golang-github-prometheus-promu
|
||||
BuildRequires: golang-packaging
|
||||
BuildRequires: golang(API) >= 1.16
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Requires: firewalld-prometheus-config
|
||||
%if 0%{?suse_version} >= 1500
|
||||
Recommends: firewalld-prometheus-config
|
||||
%endif
|
||||
Requires(pre): user(prometheus)
|
||||
Requires(pre): group(prometheus)
|
||||
Requires(post): %fillup_prereq
|
||||
@ -147,19 +149,20 @@ install -Dd -m 0750 %{buildroot}%{_localstatedir}/lib/prometheus/metrics
|
||||
%dir %{_sysconfdir}/prometheus
|
||||
%config(noreplace) %{_sysconfdir}/prometheus/prometheus.yml
|
||||
|
||||
%if 0%{?suse_version} == 1500 && 0%{?sle_version} < 150300
|
||||
%package -n firewalld-prometheus-config
|
||||
Summary: Firewalld configuration file for Prometheus
|
||||
Group: Productivity/Networking/Security
|
||||
Version: 0.1
|
||||
Release: 0
|
||||
License: GPL-2.0-or-later
|
||||
Requires: firewalld
|
||||
|
||||
%description -n firewalld-prometheus-config
|
||||
This package contains configuration file for Prometheus for older versions of
|
||||
Firewalld which do not provide this in own package.
|
||||
|
||||
%files -n firewalld-prometheus-config
|
||||
%if 0%{?suse_version} == 1500 && 0%{?sle_version} < 150300
|
||||
%dir %{_prefix}/lib/firewalld
|
||||
%dir %{_prefix}/lib/firewalld/services
|
||||
%{_prefix}/lib/firewalld/services/prometheus.xml
|
||||
|
Loading…
Reference in New Issue
Block a user