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

- update to 2.2:

Browse Source 
Enhancements
  + The check_http -S/--ssl option now accepts the arguments 1.1 and 
    1.2 to force TLSv1.1 and TLSv1.2 connections, respectively
  + The check_http -S/--ssl option now allows for specifying the 
    desired protocol with a + suffix to also accept newer versions
  + Let check_http check HTTPS web sites via proxies
  + check_http: add timeout to performance data as max value
  + check_http: report certificate expiry date in UTC
  + check_snmp: add IPv6 support
  + check_snmp's performance data now also includes warning/
    critical thresholds
  + New check_snmp -N option to specify SNMPv3 context name
  + Let check_smtp's -D option imply -S
  + Let check_smtp's -e option match against the full SMTP response
  + check_dig: expected response is now case-insensitive
  + New check_mailq -s option which tells the plugin to use sudo(8)
  + New check_nt -l parameters: seconds|minutes|hours|days
  + New -W/-C option for check_ldap to check number of entries
  + check_users: add support for range thresholds
  + check_fping now auto-detects IPv6 addresses
  + check_radius now supports the radcli library
  + Support OpenSSL 1.1
  Fixes
  + check_http: fix host header port handling
  + Let check_real terminate lines with CRLF when talking to the server, 
    as mandated by RFC 2326
  + Fix check_procs on HP-UX
  + check_smtp's -e/--expect option can now be combined with -S/--starttls
  + Fix incorrect performance data thresholds emitted by check_ups

OBS-URL: https://build.opensuse.org/package/show/server:monitoring/monitoring-plugins?expand=0&rev=27
This commit is contained in:
Lars Vogdt 2017-01-13 13:54:52 +00:00 committed by Git OBS Bridge
parent 403e91d08e
commit 0257e1ccd8
11 changed files with 80 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
Index: monitoring-plugins-2.1.2/plugins-root/Makefile.am
Index: monitoring-plugins-2.2/plugins-root/Makefile.am
===================================================================
--- monitoring-plugins-2.1.2.orig/plugins-root/Makefile.am
+++ monitoring-plugins-2.1.2/plugins-root/Makefile.am
--- monitoring-plugins-2.2.orig/plugins-root/Makefile.am
+++ monitoring-plugins-2.2/plugins-root/Makefile.am
@@ -47,7 +47,6 @@ INSTALL_SUID = \
echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \
$(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \
@ -26,11 +26,11 @@ Index: monitoring-plugins-2.1.2/plugins-root/Makefile.am
fi
# /* Author Coreutils team sub-citation */
Index: monitoring-plugins-2.1.2/plugins-root/Makefile.in
Index: monitoring-plugins-2.2/plugins-root/Makefile.in
===================================================================
--- monitoring-plugins-2.1.2.orig/plugins-root/Makefile.in
+++ monitoring-plugins-2.1.2/plugins-root/Makefile.in
@@ -1341,7 +1341,6 @@ INSTALL_SUID = \
--- monitoring-plugins-2.2.orig/plugins-root/Makefile.in
+++ monitoring-plugins-2.2/plugins-root/Makefile.in
@@ -1344,7 +1344,6 @@ INSTALL_SUID = \
echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \
$(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \
echo " chown root $(DESTDIR)$(libexecdir)/$$p"; \
@ -38,7 +38,7 @@ Index: monitoring-plugins-2.1.2/plugins-root/Makefile.in
echo " chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p"; \
chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \
done
@@ -1782,11 +1781,11 @@ install-exec-local: $(noinst_PROGRAMS)
@@ -1785,11 +1784,11 @@ install-exec-local: $(noinst_PROGRAMS)
&& chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \
&& can_create_suid_root_executable=yes; \
rm -f $$TMPFILE; \

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

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

3
monitoring-plugins-2.1.2.tar.bz2
View File

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

3
monitoring-plugins-2.2.tar.bz2 Normal file
View File

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

8
monitoring-plugins-too_few_arguments_for_check_disk.patch
View File

@ -1,8 +1,8 @@
Index: monitoring-plugins-2.1.2/plugins/check_disk.c
Index: monitoring-plugins-2.2/plugins/check_disk.c
===================================================================
--- monitoring-plugins-2.1.2.orig/plugins/check_disk.c
+++ monitoring-plugins-2.1.2/plugins/check_disk.c
@@ -1002,7 +1002,7 @@ get_stats (struct parameter_list *p, str
--- 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
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,

6
monitoring-plugins-wrong_return_in_check_swap.patch
View File

@ -29,10 +29,10 @@ 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.1.2/plugins/check_swap.c
Index: monitoring-plugins-2.2/plugins/check_swap.c
===================================================================
--- monitoring-plugins-2.1.2.orig/plugins/check_swap.c
+++ monitoring-plugins-2.1.2/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 @@ main (int argc, char **argv)
free_swap_mb += dskfree_mb;
if (allswaps) {

46
monitoring-plugins.changes
View File

@ -1,3 +1,49 @@
-------------------------------------------------------------------
Fri Jan 13 10:11:02 UTC 2017 - lars@linux-schulserver.de
- update to 2.2:
Enhancements
+ The check_http -S/--ssl option now accepts the arguments 1.1 and
1.2 to force TLSv1.1 and TLSv1.2 connections, respectively
+ The check_http -S/--ssl option now allows for specifying the
desired protocol with a + suffix to also accept newer versions
+ Let check_http check HTTPS web sites via proxies
+ check_http: add timeout to performance data as max value
+ check_http: report certificate expiry date in UTC
+ check_snmp: add IPv6 support
+ check_snmp's performance data now also includes warning/
critical thresholds
+ New check_snmp -N option to specify SNMPv3 context name
+ Let check_smtp's -D option imply -S
+ Let check_smtp's -e option match against the full SMTP response
+ check_dig: expected response is now case-insensitive
+ New check_mailq -s option which tells the plugin to use sudo(8)
+ New check_nt -l parameters: seconds|minutes|hours|days
+ New -W/-C option for check_ldap to check number of entries
+ check_users: add support for range thresholds
+ check_fping now auto-detects IPv6 addresses
+ check_radius now supports the radcli library
+ Support OpenSSL 1.1
Fixes
+ check_http: fix host header port handling
+ Let check_real terminate lines with CRLF when talking to the server,
as mandated by RFC 2326
+ Fix check_procs on HP-UX
+ check_smtp's -e/--expect option can now be combined with -S/--starttls
+ Fix incorrect performance data thresholds emitted by check_ups
+ Don't let check_procs miss some processes on busy Solaris systems
Warnings
+ The format of the performance data emitted by check_mrtgtraf has
been changed to comply with the development guidelines
+ check_ssh now returns CRITICAL for protocol/version errors
+ If a plugin is invoked with -h/--help or -V/--version, the exit status
is now UNKNOWN
+ The superseeded check_ntp.pl was removed, please use check_ntp_peer
or check_ntp_time instead
- refreshed patches
- removed monitoring-plugins.check_snmp.snmpv3-context.patch:
included upstream
-------------------------------------------------------------------
Wed Feb 24 13:33:09 CET 2016 - ro@suse.de

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

@ -1,7 +1,7 @@
Index: monitoring-plugins-2.1.2/plugins/check_hpjd.c
Index: monitoring-plugins-2.2/plugins/check_hpjd.c
===================================================================
--- monitoring-plugins-2.1.2.orig/plugins/check_hpjd.c
+++ monitoring-plugins-2.1.2/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 @@ void print_usage (void);
char *community = NULL;

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

@ -1,10 +1,10 @@
Index: monitoring-plugins-2.1.2/plugins/check_snmp.c
Index: monitoring-plugins-2.2/plugins/check_snmp.c
===================================================================
--- monitoring-plugins-2.1.2.orig/plugins/check_snmp.c
+++ monitoring-plugins-2.1.2/plugins/check_snmp.c
@@ -566,7 +566,7 @@ main (int argc, char **argv)
len = sizeof(perfstr)-strlen(perfstr)-1;
strncat(perfstr, show, len>ptr-show ? ptr-show : len);
--- 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);
}
- if (type)
+ if (type[0])

125
monitoring-plugins.check_snmp.snmpv3-context.patch
View File

@ -1,125 +0,0 @@
Index: monitoring-plugins-2.1.2/plugins/check_snmp.c
===================================================================
--- monitoring-plugins-2.1.2.orig/plugins/check_snmp.c
+++ monitoring-plugins-2.1.2/plugins/check_snmp.c
@@ -103,6 +103,8 @@ int errcode, excode;
char *server_address = NULL;
char *community = NULL;
+char **context = NULL;
+char *v3context = NULL;
char **authpriv = NULL;
char *proto = NULL;
char *seclevel = NULL;
@@ -127,6 +129,7 @@ size_t nunits = 0;
size_t unitv_size = OID_COUNT_STEP;
int numoids = 0;
int numauthpriv = 0;
+int numcontext = 0;
int verbose = 0;
int usesnmpgetnext = FALSE;
char *warning_thresholds = NULL;
@@ -296,8 +299,8 @@ main (int argc, char **argv)
snmpcmd = strdup (PATH_TO_SNMPGET);
}
- /* 10 arguments to pass before authpriv options + 1 for host and numoids. Add one for terminating NULL */
- command_line = calloc (10 + numauthpriv + 1 + numoids + 1, sizeof (char *));
+ /* 10 arguments to pass before context and authpriv options + 1 for host and numoids. Add one for terminating NULL */
+ command_line = calloc (10 + numcontext + numauthpriv + 1 + numoids + 1, sizeof (char *));
command_line[0] = snmpcmd;
command_line[1] = strdup ("-Le");
command_line[2] = strdup ("-t");
@@ -309,23 +312,27 @@ main (int argc, char **argv)
command_line[8] = "-v";
command_line[9] = strdup (proto);
+ for (i = 0; i < numcontext; i++) {
+ command_line[10 + i] = context[i];
+ }
+
for (i = 0; i < numauthpriv; i++) {
- command_line[10 + i] = authpriv[i];
+ command_line[10 + numcontext + i] = authpriv[i];
}
- xasprintf (&command_line[10 + numauthpriv], "%s:%s", server_address, port);
+ xasprintf (&command_line[10 + numcontext + numauthpriv], "%s:%s", server_address, port);
/* This is just for display purposes, so it can remain a string */
- xasprintf(&cl_hidden_auth, "%s -Le -t %d -r %d -m %s -v %s %s %s:%s",
- snmpcmd, timeout_interval, retries, strlen(miblist) ? miblist : "''", proto, "[authpriv]",
+ xasprintf(&cl_hidden_auth, "%s -Le -t %d -r %d -m %s -v %s %s %s %s:%s",
+ snmpcmd, timeout_interval, retries, strlen(miblist) ? miblist : "''", proto, "[context]", "[authpriv]",
server_address, port);
for (i = 0; i < numoids; i++) {
- command_line[10 + numauthpriv + 1 + i] = oids[i];
+ command_line[10 + numcontext + numauthpriv + 1 + i] = oids[i];
xasprintf(&cl_hidden_auth, "%s %s", cl_hidden_auth, oids[i]);
}
- command_line[10 + numauthpriv + 1 + numoids] = NULL;
+ command_line[10 + numcontext + numauthpriv + 1 + numoids] = NULL;
if (verbose)
printf ("%s\n", cl_hidden_auth);
@@ -645,6 +652,7 @@ process_arguments (int argc, char **argv
{"retries", required_argument, 0, 'e'},
{"miblist", required_argument, 0, 'm'},
{"protocol", required_argument, 0, 'P'},
+ {"context", required_argument, 0, 'N'},
{"seclevel", required_argument, 0, 'L'},
{"secname", required_argument, 0, 'U'},
{"authproto", required_argument, 0, 'a'},
@@ -674,7 +682,7 @@ process_arguments (int argc, char **argv
}
while (1) {
- c = getopt_long (argc, argv, "nhvVOt:c:w:H:C:o:e:E:d:D:s:t:R:r:l:u:p:m:P:L:U:a:x:A:X:",
+ c = getopt_long (argc, argv, "nhvVOt:c:w:H:C:o:e:E:d:D:s:t:R:r:l:u:p:m:P:N:L:U:a:x:A:X:",
longopts, &option);
if (c == -1 || c == EOF)
@@ -712,6 +720,9 @@ process_arguments (int argc, char **argv
case 'P': /* SNMP protocol version */
proto = optarg;
break;
+ case 'N': /* SNMPv3 context */
+ v3context = optarg;
+ break;
case 'L': /* security level */
seclevel = optarg;
break;
@@ -959,6 +970,13 @@ validate_arguments ()
authpriv[1] = strdup (community);
}
else if ( strcmp (proto, "3") == 0 ) { /* snmpv3 args */
+ if (!(v3context == NULL)) {
+ numcontext = 2;
+ context = calloc (numcontext, sizeof (char *));
+ context[0] = strdup ("-n");
+ context[1] = strdup (v3context);
+ }
+
if (seclevel == NULL)
xasprintf(&seclevel, "noAuthNoPriv");
@@ -1102,6 +1120,8 @@ print_help (void)
printf (" %s\n", _("Use SNMP GETNEXT instead of SNMP GET"));
printf (" %s\n", "-P, --protocol=[1|2c|3]");
printf (" %s\n", _("SNMP protocol version"));
+ printf (" %s\n", "-N, --context=CONTEXT");
+ printf (" %s\n", _("SNMPv3 context"));
printf (" %s\n", "-L, --seclevel=[noAuthNoPriv|authNoPriv|authPriv]");
printf (" %s\n", _("SNMPv3 securityLevel"));
printf (" %s\n", "-a, --authproto=[MD5|SHA]");
@@ -1209,6 +1229,6 @@ print_usage (void)
printf ("%s -H <ip_address> -o <OID> [-w warn_range] [-c crit_range]\n",progname);
printf ("[-C community] [-s string] [-r regex] [-R regexi] [-t timeout] [-e retries]\n");
printf ("[-l label] [-u units] [-p port-number] [-d delimiter] [-D output-delimiter]\n");
- printf ("[-m miblist] [-P snmp version] [-L seclevel] [-U secname] [-a authproto]\n");
- printf ("[-A authpasswd] [-x privproto] [-X privpasswd]\n");
+ printf ("[-m miblist] [-P snmp version] [-N context] [-L seclevel] [-U secname]\n");
+ printf ("[-a authproto] [-A authpasswd] [-x privproto] [-X privpasswd]\n");
}

11
monitoring-plugins.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package monitoring-plugins
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: monitoring-plugins
Version: 2.1.2
Version: 2.2
Release: 0
Summary: The Monitoring Plug-Ins
License: GPL-2.0+ and GPL-3.0
@ -58,8 +58,6 @@ Patch11: %{name}.check_snmp.arrayaddress.patch
Patch15: %{name}-too_few_arguments_for_check_disk.patch
# PATCH-FIX-UPSTREAM see https://bugzilla.redhat.com/512559
Patch116: %{name}-wrong_return_in_check_swap.patch
# PATCH-FIX-UPSTREAM pass correct arguments before context and authpriv options
Patch117: %{name}.check_snmp.snmpv3-context.patch
# PATCH-FIX-UPSTREAM port should be integer, not character
Patch118: %{name}.check_hpjd.c-64bit-portability-issue.patch
BuildRequires: bind-utils
@ -1064,7 +1062,6 @@ done
%patch15 -p1
# Debian patches
%patch116 -p1
%patch117 -p1
%patch118 -p1
find -type f -exec %{__chmod} 644 {} \;
@ -1208,7 +1205,7 @@ fi
%files
%defattr(-,root,root)
%doc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS ChangeLog CODING COPYING FAQ LEGAL
%doc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS ChangeLog CODING COPYING FAQ
%doc NEWS README REQUIREMENTS SUPPORT THANKS README.SUSE
%doc example
@ -1240,7 +1237,7 @@ fi
%files common -f %{name}.lang
%defattr(-,root,root)
%doc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS ChangeLog CODING COPYING FAQ LEGAL
%doc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS ChangeLog CODING COPYING FAQ
%doc NEWS README REQUIREMENTS SUPPORT THANKS README.SUSE
%doc example
%dir %{nagios_libdir}