From 2bc4b20bc91b08fc5c57e059feaacb15d7a223b72c9508615031b78a832ed71b Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Mon, 5 Feb 2024 13:33:08 +0000 Subject: [PATCH] Accepting request 1142573 from home:dimstar:Factory - 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 --- monitoring-plugins.changes | 6 ++++++ monitoring-plugins.spec | 14 ++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/monitoring-plugins.changes b/monitoring-plugins.changes index 2c3705c..b8bcf24 100644 --- a/monitoring-plugins.changes +++ b/monitoring-plugins.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 29 15:11:15 UTC 2024 - Dominique Leuenberger + +- 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 diff --git a/monitoring-plugins.spec b/monitoring-plugins.spec index 1fcc366..18328a9 100644 --- a/monitoring-plugins.spec +++ b/monitoring-plugins.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%bcond_with mssql Name: monitoring-plugins Version: 2.3.5 @@ -199,7 +200,9 @@ Requires: %{name}-common = %{version} Recommends: %{name}-fping Recommends: %{name}-hpjd Recommends: %{name}-ldap +%if %{with mssql} Recommends: %{name}-mssql +%endif Recommends: %{name}-mysql Recommends: %{name}-pgsql Recommends: %{name}-snmp @@ -259,7 +262,9 @@ Recommends: %{name}-maintenance Recommends: %{name}-mem Recommends: %{name}-mrtg Recommends: %{name}-mrtgtraf +%if %{with mssql} Recommends: %{name}-mssql +%endif Recommends: %{name}-mysql Recommends: %{name}-mysql_health Recommends: %{name}-nagios @@ -742,6 +747,7 @@ incoming or outgoing rates exceed the or thresholds (in Bytes/sec), a CRITICAL status results. If either of the rates exceed the or thresholds (in Bytes/sec), a WARNING status results. +%if %{with mssql} %package mssql Summary: MS-SQL server or Sybase server query check 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 to perfdata in semicolon delimited format. A simple sql statement like \"select getdate()\" verifies server responsiveness. +%endif %package mysql Summary: Test a MySQL DBMS @@ -1203,6 +1210,11 @@ rm %{buildroot}%{nagios_plugindir}/check_apt rm %{buildroot}%{nagios_plugindir}/check_game %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 pushd %{buildroot}%{nagios_plugindir} for file in $(find -maxdepth 1 -type f); do @@ -1523,10 +1535,12 @@ fi %{nagios_plugindir}/check_mrtgtraf +%if %{with mssql} %files mssql %defattr(0755,root,root) %dir %{nagios_plugindir} %{nagios_plugindir}/check_mssql +%endif %files mysql %defattr(0755,root,root)