forked from pool/monitoring-plugins
Accepting request 491853 from server:monitoring
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/491853 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/monitoring-plugins?expand=0&rev=5
This commit is contained in:
commit
23bd60f14d
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 21 15:25:57 CEST 2017 - ro@suse.de
|
||||
|
||||
- disable requires for apparmor on non-suse for now
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 21 12:13:06 CEST 2017 - ro@suse.de
|
||||
|
||||
- adapt buildrequires for centos
|
||||
- enclose all permissions handling with if suse_version
|
||||
- wrap recommends with if suse_version
|
||||
- disable radius check (no freeradius-client-devel rpm found)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 13 10:11:02 UTC 2017 - lars@linux-schulserver.de
|
||||
|
||||
|
@ -63,7 +63,9 @@ Patch118: %{name}.check_hpjd.c-64bit-portability-issue.patch
|
||||
BuildRequires: bind-utils
|
||||
BuildRequires: dhcp-devel
|
||||
BuildRequires: fping
|
||||
%if 0%{?suse_version}
|
||||
PreReq: permissions
|
||||
%endif
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if 0%{?suse_version} > 1210
|
||||
BuildRequires: libgnutls-devel
|
||||
@ -79,7 +81,12 @@ BuildRequires: net-snmp-devel
|
||||
BuildRequires: openldap2-devel
|
||||
BuildRequires: openssh
|
||||
BuildRequires: openssl-devel
|
||||
%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
|
||||
BuildRequires: net-snmp-perl
|
||||
BuildRequires: net-snmp-utils
|
||||
%else
|
||||
BuildRequires: perl-Net-SNMP
|
||||
%endif
|
||||
BuildRequires: postfix
|
||||
BuildRequires: postgresql-devel
|
||||
BuildRequires: procps
|
||||
@ -108,6 +115,7 @@ BuildRequires: krb5-devel
|
||||
%endif
|
||||
# recommend the old, included checks to allow an easy update - but
|
||||
# also allow users to deselect some of the new sub-packages
|
||||
%if 0%{?suse_version}
|
||||
Recommends: %{name}-bgpstate
|
||||
Recommends: %{name}-breeze
|
||||
Recommends: %{name}-by_ssh
|
||||
@ -155,8 +163,12 @@ Recommends: %{name}-ups
|
||||
Recommends: %{name}-users
|
||||
Recommends: %{name}-wave
|
||||
Suggests: %{name}-cups
|
||||
%endif
|
||||
%define apt_get_command %{_bindir}/apt-get
|
||||
%define qstat_command %{_bindir}/qstat
|
||||
%if ! 0%{?suse_version}
|
||||
%define _libexecdir %{nagios_plugindir}
|
||||
%endif
|
||||
|
||||
%description
|
||||
The actual service checks on current monitoring solutions like Icinga,
|
||||
@ -170,6 +182,7 @@ This package contains those plugins.
|
||||
Summary: Plug-Ins which depend on additional packages
|
||||
Group: System/Monitoring
|
||||
Requires: %{name}-common = %{version}
|
||||
%if 0%{?suse_version}
|
||||
Recommends: %{name}-fping
|
||||
Recommends: %{name}-hpjd
|
||||
Recommends: %{name}-ldap
|
||||
@ -178,6 +191,7 @@ Recommends: %{name}-pgsql
|
||||
Recommends: %{name}-snmp
|
||||
Suggests: %{name}-apt
|
||||
Suggests: %{name}-game
|
||||
%endif
|
||||
Provides: nagios-plugins-extras = %{version}
|
||||
Obsoletes: nagios-plugins-extras <= 1.5
|
||||
|
||||
@ -188,6 +202,7 @@ which have to be installed.
|
||||
%package all
|
||||
Summary: All Monitoring-Plugin checks
|
||||
Group: System/Monitoring
|
||||
%if 0%{?suse_version}
|
||||
Recommends: %{name}-apt
|
||||
Recommends: %{name}-bgpstate
|
||||
Recommends: %{name}-bind
|
||||
@ -249,8 +264,10 @@ Recommends: %{name}-radius
|
||||
Recommends: %{name}-real
|
||||
Recommends: %{name}-rpc
|
||||
Recommends: %{name}-rsync
|
||||
%endif
|
||||
Provides: nagios-plugins-all = %{version}
|
||||
Obsoletes: nagios-plugins-all <= 1.5
|
||||
%if 0%{?suse_version}
|
||||
%ifnarch ppc ppc64 sparc sparc64 s390 s390x
|
||||
Recommends: %{name}-sensors
|
||||
%endif
|
||||
@ -266,6 +283,7 @@ Recommends: %{name}-users
|
||||
Recommends: %{name}-wave
|
||||
Recommends: %{name}-zypper
|
||||
Recommends: nagios-xen-host
|
||||
%endif
|
||||
|
||||
%description all
|
||||
This virtual package recommends all currently available, official
|
||||
@ -415,8 +433,8 @@ Obsoletes: nagios-plugins-dhcp <= 1.5
|
||||
Recommends: apparmor-parser
|
||||
Recommends: apparmor-profiles
|
||||
%else
|
||||
Requires: apparmor-parser
|
||||
Requires: apparmor-profiles
|
||||
#Requires: apparmor-parser
|
||||
#Requires: apparmor-profiles
|
||||
%endif
|
||||
|
||||
%description dhcp
|
||||
@ -585,7 +603,12 @@ for details how to setup this check.
|
||||
Summary: Monitor network interfaces
|
||||
Group: System/Monitoring
|
||||
Requires: %{name}-common = %{version}
|
||||
%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
|
||||
Requires: net-snmp-perl
|
||||
Requires: net-snmp-utils
|
||||
%else
|
||||
Requires: perl-Net-SNMP
|
||||
%endif
|
||||
Provides: nagios-plugins-ifoperstatus = %{version}
|
||||
Obsoletes: nagios-plugins-ifoperstatus <= 1.5
|
||||
|
||||
@ -597,7 +620,12 @@ the target host.
|
||||
Summary: Monitor operational status network interfaces
|
||||
Group: System/Monitoring
|
||||
Requires: %{name}-common = %{version}
|
||||
%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
|
||||
Requires: net-snmp-perl
|
||||
Requires: net-snmp-utils
|
||||
%else
|
||||
Requires: perl-Net-SNMP
|
||||
%endif
|
||||
Provides: nagios-plugins-ifstatus = %{version}
|
||||
Obsoletes: nagios-plugins-ifstatus <= 1.5
|
||||
|
||||
@ -667,7 +695,9 @@ sendmail queues, qmail).
|
||||
%package mrtg
|
||||
Summary: Check average or maximum value in an MRTG logfile
|
||||
Group: System/Monitoring
|
||||
%if 0%{?suse_version}
|
||||
Recommends: mrtg
|
||||
%endif
|
||||
Provides: nagios-plugins-mrtg = %{version}
|
||||
Obsoletes: nagios-plugins-mrtg <= 1.5
|
||||
|
||||
@ -678,7 +708,9 @@ two variables recorded in an MRTG log file.
|
||||
%package mrtgtraf
|
||||
Summary: Check incoming/outgoing transfer rates of a router
|
||||
Group: System/Monitoring
|
||||
%if 0%{?suse_version}
|
||||
Recommends: mrtg
|
||||
%endif
|
||||
Provides: nagios-plugins-mrtgtraf = %{version}
|
||||
Obsoletes: nagios-plugins-mrtgtraf <= 1.5
|
||||
|
||||
@ -748,8 +780,8 @@ Provides: %{name}-ntp = %{version}
|
||||
Recommends: apparmor-parser
|
||||
Recommends: apparmor-profiles
|
||||
%else
|
||||
Requires: apparmor-parser
|
||||
Requires: apparmor-profiles
|
||||
#Requires: apparmor-parser
|
||||
#Requires: apparmor-profiles
|
||||
%endif
|
||||
|
||||
%description ntp_time
|
||||
@ -825,6 +857,7 @@ threshold ranges.
|
||||
The process count can be filtered by process owner, parent process PID, current
|
||||
state (e.g., 'Z'), or may be the total number of running processes.
|
||||
|
||||
%if 0%{?suse_version}
|
||||
%package radius
|
||||
Summary: Test RADIUS server
|
||||
Group: System/Monitoring
|
||||
@ -841,6 +874,7 @@ possibly be determined by careful watching of the command line in a process
|
||||
listing. This risk is exacerbated because nagios will run the plugin at regular
|
||||
predictable intervals. Please be sure that the password used does not allow
|
||||
access to sensitive system resources.
|
||||
%endif
|
||||
|
||||
%package real
|
||||
Summary: Test REAL service
|
||||
@ -1033,8 +1067,10 @@ it will provide the size of the queue of age of queue.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%if 0%{?suse_version}
|
||||
%{__mkdir_p} example/permissions.d
|
||||
%{__cp} %{S:11} example/permissions.d/%{name}
|
||||
%endif
|
||||
%{__cp} %{S:12} ./README.SUSE
|
||||
%{__cp} %{S:13} ./README.SUSE-check_dhcp
|
||||
%{__cp} %{S:14} ./README.SUSE-check_icmp
|
||||
@ -1090,7 +1126,7 @@ chmod +x configure # needed as configure script is not executable in 1.5..
|
||||
--with-ps-format='%s %d %d %d %d %d %f %s %s %n' \
|
||||
--with-ps-cols=10 \
|
||||
--with-ps-varlist='procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos' \
|
||||
%if 0%{suse_version} > 1300
|
||||
%if 0%{?suse_version} > 1300
|
||||
--with-rpcinfo-command=/sbin/rpcinfo \
|
||||
%else
|
||||
--with-rpcinfo-command=%{_sbindir}/rpcinfo \
|
||||
@ -1170,6 +1206,7 @@ touch %{buildroot}%{_sysconfdir}/%{name}/%{name}.ini
|
||||
%clean
|
||||
%{__rm} -rf %{buildroot}
|
||||
|
||||
%if 0%{?suse_version}
|
||||
%post dhcp
|
||||
# in case somebody uses the permissions file we provide
|
||||
# in docdir, run permission here
|
||||
@ -1202,12 +1239,15 @@ if [ -f %{_sysconfdir}/permissions.d/monitoring-plugins ]; then
|
||||
%set_permissions monitoring-plugins
|
||||
%endif
|
||||
fi
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS ChangeLog CODING COPYING FAQ
|
||||
%doc NEWS README REQUIREMENTS SUPPORT THANKS README.SUSE
|
||||
%if 0%{?suse_version}
|
||||
%doc example
|
||||
%endif
|
||||
|
||||
%files all
|
||||
%defattr(-,root,root)
|
||||
@ -1239,7 +1279,9 @@ fi
|
||||
%defattr(-,root,root)
|
||||
%doc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS ChangeLog CODING COPYING FAQ
|
||||
%doc NEWS README REQUIREMENTS SUPPORT THANKS README.SUSE
|
||||
%if 0%{?suse_version}
|
||||
%doc example
|
||||
%endif
|
||||
%dir %{nagios_libdir}
|
||||
%dir %{nagios_plugindir}
|
||||
%dir %{_sysconfdir}/%{name}
|
||||
@ -1459,10 +1501,12 @@ fi
|
||||
%{nagios_plugindir}/check_procs_perf
|
||||
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/apparmor.d/usr.lib.nagios.plugins.check_procs
|
||||
|
||||
%if 0%{?suse_version}
|
||||
%files radius
|
||||
%defattr(0755,root,root)
|
||||
%dir %{nagios_plugindir}
|
||||
%{nagios_plugindir}/check_radius
|
||||
%endif
|
||||
|
||||
%files real
|
||||
%defattr(0755,root,root)
|
||||
|
Loading…
x
Reference in New Issue
Block a user