rpm/monitoring-plugins
SHA256
1
0
Fork 0
forked from pool/monitoring-plugins
Code Pull Requests Activity

Accepting request 1142573 from home:dimstar:Factory

Browse Source 
- Do not ship check_mssql unless built explicitly with mssql
  support. DBD::Sybase is not available in openSUSE distros.

Fix issue reported in https://build.opensuse.org/request/show/1139160

OBS-URL: https://build.opensuse.org/request/show/1142573
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/monitoring-plugins?expand=0&rev=118
This commit is contained in:
Lars Vogdt 2024-02-05 13:33:08 +00:00 committed by Git OBS Bridge
parent db13358820
commit 2bc4b20bc9
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
monitoring-plugins.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jan 29 15:11:15 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Do not ship check_mssql unless built explicitly with mssql
support. DBD::Sybase is not available in openSUSE distros.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 15 10:44:48 UTC 2024 - Pedro Monreal <pmonreal@suse.com> Mon Jan 15 10:44:48 UTC 2024 - Pedro Monreal <pmonreal@suse.com>

14
monitoring-plugins.spec
View File

@ -15,6 +15,7 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
%bcond_with mssql
Name: monitoring-plugins Name: monitoring-plugins
Version: 2.3.5 Version: 2.3.5
@ -199,7 +200,9 @@ Requires: %{name}-common = %{version}
Recommends: %{name}-fping Recommends: %{name}-fping
Recommends: %{name}-hpjd Recommends: %{name}-hpjd
Recommends: %{name}-ldap Recommends: %{name}-ldap
%if %{with mssql}
Recommends: %{name}-mssql Recommends: %{name}-mssql
%endif
Recommends: %{name}-mysql Recommends: %{name}-mysql
Recommends: %{name}-pgsql Recommends: %{name}-pgsql
Recommends: %{name}-snmp Recommends: %{name}-snmp
@ -259,7 +262,9 @@ Recommends: %{name}-maintenance
Recommends: %{name}-mem Recommends: %{name}-mem
Recommends: %{name}-mrtg Recommends: %{name}-mrtg
Recommends: %{name}-mrtgtraf Recommends: %{name}-mrtgtraf
%if %{with mssql}
Recommends: %{name}-mssql Recommends: %{name}-mssql
%endif
Recommends: %{name}-mysql Recommends: %{name}-mysql
Recommends: %{name}-mysql_health Recommends: %{name}-mysql_health
Recommends: %{name}-nagios Recommends: %{name}-nagios
@ -742,6 +747,7 @@ incoming or outgoing rates exceed the <icl> or <ocl> thresholds (in
Bytes/sec), a CRITICAL status results. If either of the rates exceed Bytes/sec), a CRITICAL status results. If either of the rates exceed
the <iwl> or <owl> thresholds (in Bytes/sec), a WARNING status results. the <iwl> or <owl> thresholds (in Bytes/sec), a WARNING status results.
%if %{with mssql}
%package mssql %package mssql
Summary: MS-SQL server or Sybase server query check Summary: MS-SQL server or Sybase server query check
Group: System/Monitoring Group: System/Monitoring
@ -756,6 +762,7 @@ This plugin runs a query against a MS-SQL server or Sybase server and returns
the first row. It returns an error if no responses are running. Row is passed the first row. It returns an error if no responses are running. Row is passed
to perfdata in semicolon delimited format. to perfdata in semicolon delimited format.
A simple sql statement like \"select getdate()\" verifies server responsiveness. A simple sql statement like \"select getdate()\" verifies server responsiveness.
%endif
%package mysql %package mysql
Summary: Test a MySQL DBMS Summary: Test a MySQL DBMS
@ -1203,6 +1210,11 @@ rm %{buildroot}%{nagios_plugindir}/check_apt
rm %{buildroot}%{nagios_plugindir}/check_game rm %{buildroot}%{nagios_plugindir}/check_game
%endif %endif
# mssql plugin is not installable due to missing package DBD::Sybase - Do not ship until built --with=mssql
%if %{without mssql}
rm %{buildroot}%{nagios_plugindir}/check_mssql
%endif
# fix "use lib" on installed perl checks # fix "use lib" on installed perl checks
pushd %{buildroot}%{nagios_plugindir} pushd %{buildroot}%{nagios_plugindir}
for file in $(find -maxdepth 1 -type f); do for file in $(find -maxdepth 1 -type f); do
@ -1523,10 +1535,12 @@ fi
%{nagios_plugindir}/check_mrtgtraf %{nagios_plugindir}/check_mrtgtraf
%if %{with mssql}
%files mssql %files mssql
%defattr(0755,root,root) %defattr(0755,root,root)
%dir %{nagios_plugindir} %dir %{nagios_plugindir}
%{nagios_plugindir}/check_mssql %{nagios_plugindir}/check_mssql
%endif
%files mysql %files mysql
%defattr(0755,root,root) %defattr(0755,root,root)