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

Accepting request 888965 from server:monitoring

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/888965
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/monitoring-plugins?expand=0&rev=19
This commit is contained in:
Dominique Leuenberger 2021-04-28 23:38:18 +00:00 committed by Git OBS Bridge
commit 5e6a1334d9
15 changed files with 130 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
_service
View File

@ -1,16 +0,0 @@
<?xml version="1.0"?>
<services>
<service name="obs_scm" mode="disabled">
<param name="versionformat">2.3~alpha.%ci.%h</param>
<param name="url">https://github.com/monitoring-plugins/monitoring-plugins.git</param>
<param name="scm">git</param>
<param name="revision">master</param>
</service>
<service name="set_version" mode="disabled"/>
<service name="tar" mode="disabled"/>
<service name="recompress" mode="disabled">
<param name="compression">xz</param>
<param name="file">*.tar</param>
</service>
</services>

10
monitoring-plugins-1.4.6-no_chown.patch
View File

@ -1,7 +1,7 @@
Index: monitoring-plugins-2.2/plugins-root/Makefile.am
Index: monitoring-plugins-2.3.1/plugins-root/Makefile.am
===================================================================
--- monitoring-plugins-2.2.orig/plugins-root/Makefile.am
+++ monitoring-plugins-2.2/plugins-root/Makefile.am
--- monitoring-plugins-2.3.1.orig/plugins-root/Makefile.am
+++ monitoring-plugins-2.3.1/plugins-root/Makefile.am
@@ -47,7 +47,6 @@ INSTALL_SUID = \
echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \
$(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \
@ -16,10 +16,10 @@ Index: monitoring-plugins-2.2/plugins-root/Makefile.am
rm -f $$TMPFILE; \
- if test $$can_create_suid_root_executable = yes; then \
- $(INSTALL_SUID); \
+ $(INSTALL_SUID); \
+ if test $$can_create_suid_root_executable != yes; then \
- else \
- echo "WARNING: insufficient access; not installing setuid plugins"; \
+ $(INSTALL_SUID); \
+ if test $$can_create_suid_root_executable != yes; then \
+ echo "WARNING: insufficient access; not installing plugins as setuid"; \
echo "NOTE: to install setuid plugins, run 'make install-root' as root"; \
+ echo "NOTE: or fix this in your packaging (like the specfile)"; \

6
monitoring-plugins-2.1.1-check_logfile.patch
View File

@ -1,7 +1,7 @@
Index: monitoring-plugins-2.2/plugins-scripts/check_log.sh
Index: monitoring-plugins-2.3.1/plugins-scripts/check_log.sh
===================================================================
--- monitoring-plugins-2.2.orig/plugins-scripts/check_log.sh
+++ monitoring-plugins-2.2/plugins-scripts/check_log.sh
--- monitoring-plugins-2.3.1.orig/plugins-scripts/check_log.sh
+++ monitoring-plugins-2.3.1/plugins-scripts/check_log.sh
@@ -115,27 +115,27 @@ while test -n "$1"; do
exit $STATE_OK
;;

23
monitoring-plugins-2.2-mariadb_102_build_fix.patch
View File

@ -30,11 +30,11 @@ Closes: https://github.com/monitoring-plugins/monitoring-plugins/issues/1508
plugins/check_mysql_query.c | 8 ++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 5773afd9..c44919d0 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -36,6 +36,10 @@ const char *email = "devel@monitoring-plugins.org";
Index: monitoring-plugins-2.3.1/plugins/check_mysql.c
===================================================================
--- monitoring-plugins-2.3.1.orig/plugins/check_mysql.c
+++ monitoring-plugins-2.3.1/plugins/check_mysql.c
@@ -36,6 +36,10 @@ const char *email = "devel@monitoring-pl
#define SLAVERESULTSIZE 70
@ -54,7 +54,7 @@ index 5773afd9..c44919d0 100644
int check_slave = 0, warn_sec = 0, crit_sec = 0;
int ignore_auth = 0;
int verbose = 0;
@@ -505,7 +509,7 @@ void
@@ -508,7 +512,7 @@ void
print_help (void)
{
char *myport;
@ -63,11 +63,11 @@ index 5773afd9..c44919d0 100644
print_revision (progname, NP_VERSION);
diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
index 49a14dd3..6f492442 100644
--- a/plugins/check_mysql_query.c
+++ b/plugins/check_mysql_query.c
@@ -33,6 +33,10 @@ const char *progname = "check_mysql_query";
Index: monitoring-plugins-2.3.1/plugins/check_mysql_query.c
===================================================================
--- monitoring-plugins-2.3.1.orig/plugins/check_mysql_query.c
+++ monitoring-plugins-2.3.1/plugins/check_mysql_query.c
@@ -33,6 +33,10 @@ const char *progname = "check_mysql_quer
const char *copyright = "1999-2007";
const char *email = "devel@monitoring-plugins.org";
@ -96,4 +96,3 @@ index 49a14dd3..6f492442 100644
print_revision (progname, NP_VERSION);

8
monitoring-plugins-2.3-check_ntp_perf_absolute.patch
View File

@ -1,6 +1,8 @@
--- monitoring-plugins-2.3~alpha.20200520T233014.cadac85e/plugins/check_ntp_time.c 2020/10/12 16:05:30 1.1
+++ monitoring-plugins-2.3~alpha.20200520T233014.cadac85e/plugins/check_ntp_time.c 2020/10/12 16:07:13
@@ -533,7 +533,7 @@
Index: monitoring-plugins-2.3.1/plugins/check_ntp_time.c
===================================================================
--- monitoring-plugins-2.3.1.orig/plugins/check_ntp_time.c
+++ monitoring-plugins-2.3.1/plugins/check_ntp_time.c
@@ -533,7 +533,7 @@ int process_arguments(int argc, char **a
char *perfd_offset (double offset)
{

3
monitoring-plugins-2.3.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f56eb84871983fd719247249e3532228b37e2efaae657a3979bd14ac1f84a35b
size 2529669

1
monitoring-plugins-2.3.1.tar.gz.sha1 Normal file
View File

@ -0,0 +1 @@
8cb4d72920ed99ff922b6989fe5213ea76b9388e *monitoring-plugins-2.3.1.tar.gz

3
monitoring-plugins-2.3~alpha.20200520T233014.cadac85e.obscpio
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:34e90e390323dc545d3b86664695b99d04d520db68dd5d5e89937b3375856350
size 6768653

3
monitoring-plugins-2.3~alpha.20200520T233014.cadac85e.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4d6d2a56cd2c638504263215c10d19ed1db3ef8746704741919bc8221c9c88b0
size 1797632

8
monitoring-plugins-too_few_arguments_for_check_disk.patch
View File

@ -1,8 +1,8 @@
Index: monitoring-plugins-2.2/plugins/check_disk.c
Index: monitoring-plugins-2.3.1/plugins/check_disk.c
===================================================================
--- monitoring-plugins-2.2.orig/plugins/check_disk.c
+++ monitoring-plugins-2.2/plugins/check_disk.c
@@ -997,7 +997,7 @@ get_stats (struct parameter_list *p, str
--- monitoring-plugins-2.3.1.orig/plugins/check_disk.c
+++ monitoring-plugins-2.3.1/plugins/check_disk.c
@@ -1030,7 +1030,7 @@ get_stats (struct parameter_list *p, str
if (verbose >= 3)
printf("Group %s: adding %llu blocks sized %llu, (%s) used_units=%g free_units=%g total_units=%g fsu_blocksize=%llu mult=%llu\n",
p_list->group, tmpfsp.fsu_bavail, tmpfsp.fsu_blocksize, p_list->best_match->me_mountdir, p_list->dused_units, p_list->dfree_units,

8
monitoring-plugins-wrong_return_in_check_swap.patch
View File

@ -29,11 +29,11 @@ SWAP CRITICAL - 0% free (0 MB out of 0 MB) |swap=0MB;0;0;0;0
Additional info:
https://bugzilla.redhat.com/512559
Index: monitoring-plugins-2.2/plugins/check_swap.c
Index: monitoring-plugins-2.3.1/plugins/check_swap.c
===================================================================
--- monitoring-plugins-2.2.orig/plugins/check_swap.c
+++ monitoring-plugins-2.2/plugins/check_swap.c
@@ -125,7 +125,7 @@
--- monitoring-plugins-2.3.1.orig/plugins/check_swap.c
+++ monitoring-plugins-2.3.1/plugins/check_swap.c
@@ -125,7 +125,7 @@ main (int argc, char **argv)
free_swap_mb += dskfree_mb;
if (allswaps) {
if (dsktotal_mb == 0)

78
monitoring-plugins.changes
View File

@ -1,3 +1,81 @@
-------------------------------------------------------------------
Wed Apr 21 07:47:25 UTC 2021 - Lars Vogdt <lars@linux-schulserver.de>
- Update to 2.3.1:
Enhancements
* check_curl: Add an option to verify the peer certificate & host using the system CA's
Fixes
* check_icmp: fix simple typo, conspicuosly -> conspicuously
* check_curl: fixed help, usage and errors for TLS 1.3
* check_curl: fixed a potential buffer overflow in url buffer
* check_dns: split multiple IP addresses passed in one -a argument
* check_curl: added string_statuscode function for printing HTTP/1.1 and HTTP/2 correctly
* check_curl: fix crash if http header contains leading spaces
* check_curl: display a specific human-readable error message where possible
* check_pgsql: Using snprintf which honors the buffers size and guarantees null termination.
* check_snmp: put the "c" (to mark a counter) after the perfdata value
* check_http: Increase regexp limit
* check_http: make -C obvious
* check_curl: Increase regexp limit (to 1024 as in check_http)
* check_curl: make -C obvious (from check_http)
- refreshed patches:
+ monitoring-plugins-1.4.6-no_chown.patch
+ monitoring-plugins-2.1.1-check_logfile.patch
+ monitoring-plugins-2.2-mariadb_102_build_fix.patch
+ monitoring-plugins-2.3-check_ntp_perf_absolute.patch
+ monitoring-plugins-too_few_arguments_for_check_disk.patch
+ monitoring-plugins-wrong_return_in_check_swap.patch
+ monitoring-plugins.check_hpjd.c-64bit-portability-issue.patch
+ monitoring-plugins.check_snmp.arrayaddress.patch
- add sha1 checksum file as source
-------------------------------------------------------------------
Thu Jan 14 20:47:42 UTC 2021 - Lars Vogdt <lars@linux-schulserver.de>
- Update to 2.3 (final):
Enhancements
* check_dns: allow 'expected address' (-a) to be specified in CIDR notation (IPv4 only).
* check_dns: allow for IPv6 RDNS
* check_dns: Accept CIDR
* check_dns: allow unsorted addresses
* check_dns: allow forcing complete match of all addresses
* check_apt: add --only-critical switch
* check_apt: add -l/--list option to print packages
* check_file_age: add range checking
* check_file_age: enable to test for maximum file size
* check_apt: adding packages-warning option
* check_load: Adding top consuming processes option
* check_http: Adding Proxy-Authorization and extra headers
* check_snmp: make calcualtion of timeout value in help output more clear
* check_uptime: new plugin for checking uptime to see how long the system is running
* check_curl: check_http replacement based on libcurl
* check_http: Allow user to specify HTTP method after proxy CONNECT
* check_http: Add new flag --show-body/-B to print body
* check_cluster: Added data argument validation
* check_icmp: Add IPv6 support
* check_icmp: Automatically detect IP protocol
* check_icmp: emit error if multiple protocol version
* check_disk: add support to display inodes usage in perfdata
* check_hpjd: Added -D option to disable warning on 'out of paper'
* check_http: support the --show-body/-B flag when --expect is used
* check_mysql: allow mariadbclient to be used
* check_tcp: add --sni
* check_dns: detect unreachable dns service in nslookup output
Fixes
* Fix regression where check_dhcp was rereading response in a tight loop
* check_dns: fix error detection on sles nslookup
* check_disk_smb: fix timeout issue
* check_swap: repaired -n behaviour
* check_icmp: Correctly set address_family on lookup
* check_icmp: Do not overwrite -4,-6 on lookup
* check_smtp: initializes n before it is used
* check_dns: fix typo in parameter description
* check_by_ssh: fix child process leak on timeouts
* check_mysql: Allow sockets to be specified to -H
* check_procs: improve command examples for 'at least' processes
* check_disk: include -P switch in help
* check_mailq: restore accidentially removed options
-------------------------------------------------------------------
Tue Oct 13 11:05:10 CEST 2020 - ro@suse.de

8
monitoring-plugins.check_hpjd.c-64bit-portability-issue.patch
View File

@ -1,8 +1,8 @@
Index: monitoring-plugins-2.2/plugins/check_hpjd.c
Index: monitoring-plugins-2.3.1/plugins/check_hpjd.c
===================================================================
--- monitoring-plugins-2.2.orig/plugins/check_hpjd.c
+++ monitoring-plugins-2.2/plugins/check_hpjd.c
@@ -66,7 +66,7 @@
--- monitoring-plugins-2.3.1.orig/plugins/check_hpjd.c
+++ monitoring-plugins-2.3.1/plugins/check_hpjd.c
@@ -66,7 +66,7 @@ void print_usage (void);
char *community = NULL;
char *address = NULL;

16
monitoring-plugins.check_snmp.arrayaddress.patch
View File

@ -1,13 +1,13 @@
Index: monitoring-plugins-2.2/plugins/check_snmp.c
Index: monitoring-plugins-2.3.1/plugins/check_snmp.c
===================================================================
--- monitoring-plugins-2.2.orig/plugins/check_snmp.c
+++ monitoring-plugins-2.2/plugins/check_snmp.c
@@ -588,7 +588,7 @@ main (int argc, char **argv)
strncat(perfstr, critical_thresholds, sizeof(perfstr)-strlen(perfstr)-1);
}
--- monitoring-plugins-2.3.1.orig/plugins/check_snmp.c
+++ monitoring-plugins-2.3.1/plugins/check_snmp.c
@@ -576,7 +576,7 @@ main (int argc, char **argv)
len = sizeof(perfstr)-strlen(perfstr)-1;
strncat(perfstr, show, len>ptr-show ? ptr-show : len);
- if (type)
+ if (type[0])
strncat(perfstr, type, sizeof(perfstr)-strlen(perfstr)-1);
strncat(perfstr, " ", sizeof(perfstr)-strlen(perfstr)-1);
}
if (warning_thresholds) {

7
monitoring-plugins.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package monitoring-plugins
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,14 +17,15 @@
Name: monitoring-plugins
Version: 2.3~alpha.20200520T233014.cadac85e
Version: 2.3.1
Release: 0
Summary: The Monitoring Plug-Ins
License: GPL-2.0-or-later AND GPL-3.0-only
Group: System/Monitoring
URL: http://monitoring-plugins.org/
Source0: %{name}-%{version}.tar.xz
Source0: %{name}-%{version}.tar.gz
Source1: %{name}-rpmlintrc
Source2: %{name}-%{version}.tar.gz.sha1
Source11: %{name}-permissions
Source12: %{name}-README.SUSE
Source13: %{name}-README.SUSE-check_dhcp