diff options
-rw-r--r-- | NEWS | 3 | ||||
-rw-r--r-- | README | 36 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | monitoring-plugins.spec.in | 6 | ||||
-rwxr-xr-x | plugins-scripts/check_oracle.sh | 2 | ||||
-rw-r--r-- | plugins/check_http.c | 10 | ||||
-rw-r--r-- | plugins/check_ssh.c | 2 | ||||
-rw-r--r-- | plugins/t/check_http.t | 2 | ||||
-rw-r--r-- | plugins/t/check_tcp.t | 18 | ||||
-rw-r--r-- | plugins/utils.h | 11 | ||||
-rw-r--r-- | po/de.po | 12 | ||||
-rw-r--r-- | po/fr.po | 18 | ||||
-rw-r--r-- | po/monitoring-plugins.pot | 12 |
13 files changed, 79 insertions, 55 deletions
@@ -1,6 +1,9 @@ | |||
1 | This file documents the major additions and syntax changes between releases. | 1 | This file documents the major additions and syntax changes between releases. |
2 | 2 | ||
3 | 1.6 ... | 3 | 1.6 ... |
4 | FIXES | ||
5 | Don't let e.g. check_http's -C option reset SSL version if e.g. -S 1 -C 5 is specified | ||
6 | |||
4 | WARNINGS | 7 | WARNINGS |
5 | check_procs now ignores its parent process to avoid unexpected results when invoked via certain shells | 8 | check_procs now ignores its parent process to avoid unexpected results when invoked via certain shells |
6 | utils.sh no longer defines ECHO | 9 | utils.sh no longer defines ECHO |
@@ -23,17 +23,18 @@ You can check for the latest plugins at: | |||
23 | 23 | ||
24 | * <https://www.monitoring-plugins.org/> | 24 | * <https://www.monitoring-plugins.org/> |
25 | 25 | ||
26 | Send an email to <help@monitoring-plugins.org> for assistance. | 26 | Send an email to <help@monitoring-plugins.org> for assistance. Please |
27 | Please include the OS type and version that you are using. Also, run the | 27 | include the OS type and version that you are using. Also, run the plugin |
28 | plugin with the `-vvv` option and provide the resulting version information. | 28 | with the `-vvv` option and provide the resulting version information. Of |
29 | Of course, there may be additional diagnostic information required as well. | 29 | course, there may be additional diagnostic information required as well. Use |
30 | Use good judgment. | 30 | good judgment. |
31 | 31 | ||
32 | Send an email to <devel@monitoring-plugins.org> for developer | 32 | Send an email to <devel@monitoring-plugins.org> for developer discussions. |
33 | discussions. | ||
34 | 33 | ||
35 | For patch submissions and bug reports, please use the appropriate resources | 34 | For patch submissions and bug reports, please use the appropriate resources |
36 | at <https://github.com/monitoring-plugins/monitoring-plugins>. | 35 | at: |
36 | |||
37 | * <https://github.com/monitoring-plugins> | ||
37 | 38 | ||
38 | 39 | ||
39 | Installation Instructions | 40 | Installation Instructions |
@@ -80,11 +81,18 @@ That's it! If you have any problems or questions, feel free to send an | |||
80 | email to <help@monitoring-plugins.org>. | 81 | email to <help@monitoring-plugins.org>. |
81 | 82 | ||
82 | 83 | ||
83 | License Stuff | 84 | License Notice |
84 | ------------- | 85 | -------------- |
86 | |||
87 | You can redistribute and/or modify this software under the terms of the GNU | ||
88 | General Public License as published by the Free Software Foundation; either | ||
89 | version 3 of the License, or (at your option) any later version; with the | ||
90 | additional exemption that compiling, linking, and/or using OpenSSL is | ||
91 | allowed. | ||
85 | 92 | ||
86 | This software is released under the GNU General Public License, Version 3, | 93 | This software is distributed in the hope that it will be useful, but WITHOUT |
87 | with the additional exemption that compiling, linking and/or using OpenSSL | 94 | ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
88 | is allowed. | 95 | FITNESS FOR A PARTICULAR PURPOSE. |
89 | 96 | ||
90 | See the `COPYING` file for the complete GPLv3 text. | 97 | See the `COPYING` file for the complete text of the GNU General Public |
98 | License, version 3. | ||
diff --git a/configure.in b/configure.in index 2cec17d9..c0506114 100644 --- a/configure.in +++ b/configure.in | |||
@@ -59,7 +59,7 @@ AC_SUBST(SCRIPT_TEST)dnl | |||
59 | WARRANTY="The monitoring plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\ncopies of the plugins under the terms of the GNU General Public License.\nFor more information about these matters, see the file named COPYING.\n" | 59 | WARRANTY="The monitoring plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\ncopies of the plugins under the terms of the GNU General Public License.\nFor more information about these matters, see the file named COPYING.\n" |
60 | AC_SUBST(WARRANTY) | 60 | AC_SUBST(WARRANTY) |
61 | 61 | ||
62 | SUPPORT="Send email to devel@monitoring-plugins.org if you have questions\nregarding use of this software. To submit patches or suggest improvements,\nsend email to devel@monitoring-plugins.org.\nPlease include version information with all correspondence (when possible,\nuse output from the --version option of the plugin itself).\n" | 62 | SUPPORT="Send email to help@monitoring-plugins.org if you have questions regarding use\nof this software. To submit patches or suggest improvements, send email to\ndevel@monitoring-plugins.org. Please include version information with all\ncorrespondence (when possible, use output from the --version option of the\nplugin itself).\n" |
63 | AC_SUBST(SUPPORT) | 63 | AC_SUBST(SUPPORT) |
64 | 64 | ||
65 | dnl CGIURL has changed for Nagios with 1.0 beta | 65 | dnl CGIURL has changed for Nagios with 1.0 beta |
diff --git a/monitoring-plugins.spec.in b/monitoring-plugins.spec.in index 62e5e4fd..f0034982 100644 --- a/monitoring-plugins.spec.in +++ b/monitoring-plugins.spec.in | |||
@@ -163,8 +163,6 @@ fi | |||
163 | %install | 163 | %install |
164 | rm -rf $RPM_BUILD_ROOT | 164 | rm -rf $RPM_BUILD_ROOT |
165 | make AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=${RPM_BUILD_ROOT} install | 165 | make AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=${RPM_BUILD_ROOT} install |
166 | build-aux/install-sh -c -d ${RPM_BUILD_ROOT}%{_sysconfdir} | ||
167 | build-aux/install-sh -c -m 664 command.cfg ${RPM_BUILD_ROOT}%{_sysconfdir} | ||
168 | %find_lang %{name} | 166 | %find_lang %{name} |
169 | echo "%defattr(755,%{npusr},%{npgrp})" >> %{name}.lang | 167 | echo "%defattr(755,%{npusr},%{npgrp})" >> %{name}.lang |
170 | comm -13 %{npdir}/ls-plugins-before %{npdir}/ls-plugins-after | egrep -v "\.o$|^\." | gawk -v libexecdir=%{_libexecdir} '{printf( "%s/%s\n", libexecdir, $0);}' >> %{name}.lang | 168 | comm -13 %{npdir}/ls-plugins-before %{npdir}/ls-plugins-after | egrep -v "\.o$|^\." | gawk -v libexecdir=%{_libexecdir} '{printf( "%s/%s\n", libexecdir, $0);}' >> %{name}.lang |
@@ -174,6 +172,10 @@ echo "%defattr(755,%{npusr},%{npgrp})" >> %{name}.lang | |||
174 | comm -13 %{npdir}/ls-plugins-scripts-before %{npdir}/ls-plugins-scripts-after | egrep -v "\.o$|^\." | gawk -v libexecdir=%{_libexecdir} '{printf( "%s/%s\n", libexecdir, $0);}' >> %{name}.lang | 172 | comm -13 %{npdir}/ls-plugins-scripts-before %{npdir}/ls-plugins-scripts-after | egrep -v "\.o$|^\." | gawk -v libexecdir=%{_libexecdir} '{printf( "%s/%s\n", libexecdir, $0);}' >> %{name}.lang |
175 | echo "%{_libexecdir}/utils.pm" >> %{name}.lang | 173 | echo "%{_libexecdir}/utils.pm" >> %{name}.lang |
176 | echo "%{_libexecdir}/utils.sh" >> %{name}.lang | 174 | echo "%{_libexecdir}/utils.sh" >> %{name}.lang |
175 | echo "%{_libexecdir}/check_ldaps" >> %{name}.lang | ||
176 | |||
177 | sed -i '/libnpcommon/d' %{name}.lang | ||
178 | sed -i '/monitoring-plugins.mo/d' %{name}.lang | ||
177 | 179 | ||
178 | %clean | 180 | %clean |
179 | rm -rf $RPM_BUILD_ROOT | 181 | rm -rf $RPM_BUILD_ROOT |
diff --git a/plugins-scripts/check_oracle.sh b/plugins-scripts/check_oracle.sh index 73a19cff..b653372e 100755 --- a/plugins-scripts/check_oracle.sh +++ b/plugins-scripts/check_oracle.sh | |||
@@ -163,7 +163,7 @@ case "$cmd" in | |||
163 | }' | 163 | }' |
164 | ;; | 164 | ;; |
165 | --db) | 165 | --db) |
166 | pmonchk=`ps -ef | grep -v grep | grep -c "ora_pmon_${2}$"` | 166 | pmonchk=`ps -ef | grep -v grep | grep -E -c "(asm|ora)_pmon_${2}$"` |
167 | if [ ${pmonchk} -ge 1 ] ; then | 167 | if [ ${pmonchk} -ge 1 ] ; then |
168 | echo "${2} OK - ${pmonchk} PMON process(es) running" | 168 | echo "${2} OK - ${pmonchk} PMON process(es) running" |
169 | exit $STATE_OK | 169 | exit $STATE_OK |
diff --git a/plugins/check_http.c b/plugins/check_http.c index d8b3f9c5..92861d97 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c | |||
@@ -57,7 +57,7 @@ enum { | |||
57 | 57 | ||
58 | #ifdef HAVE_SSL | 58 | #ifdef HAVE_SSL |
59 | int check_cert = FALSE; | 59 | int check_cert = FALSE; |
60 | int ssl_version; | 60 | int ssl_version = 0; |
61 | int days_till_exp_warn, days_till_exp_crit; | 61 | int days_till_exp_warn, days_till_exp_crit; |
62 | char *randbuff; | 62 | char *randbuff; |
63 | X509 *server_cert; | 63 | X509 *server_cert; |
@@ -257,7 +257,7 @@ process_arguments (int argc, char **argv) | |||
257 | } | 257 | } |
258 | 258 | ||
259 | while (1) { | 259 | while (1) { |
260 | c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:b:d:e:p:s:R:r:u:f:C:J:K:nlLS::m:M:N:E", longopts, &option); | 260 | c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:b:d:e:p:s:R:r:u:f:C:J:K:nlLS::m:M:NE", longopts, &option); |
261 | if (c == -1 || c == EOF) | 261 | if (c == -1 || c == EOF) |
262 | break; | 262 | break; |
263 | 263 | ||
@@ -339,10 +339,10 @@ process_arguments (int argc, char **argv) | |||
339 | case 'S': /* use SSL */ | 339 | case 'S': /* use SSL */ |
340 | #ifdef HAVE_SSL | 340 | #ifdef HAVE_SSL |
341 | enable_ssl: | 341 | enable_ssl: |
342 | /* ssl_version initialized to 0 as a default. Only set if it's non-zero. This helps when we include multiple | ||
343 | parameters, like -S and -C combinations */ | ||
342 | use_ssl = TRUE; | 344 | use_ssl = TRUE; |
343 | if (optarg == NULL || c != 'S') | 345 | if (c=='S' && optarg != NULL) { |
344 | ssl_version = 0; | ||
345 | else { | ||
346 | ssl_version = atoi(optarg); | 346 | ssl_version = atoi(optarg); |
347 | if (ssl_version < 1 || ssl_version > 3) | 347 | if (ssl_version < 1 || ssl_version > 3) |
348 | usage4 (_("Invalid option - Valid values for SSL Version are 1 (TLSv1), 2 (SSLv2) or 3 (SSLv3)")); | 348 | usage4 (_("Invalid option - Valid values for SSL Version are 1 (TLSv1), 2 (SSLv2) or 3 (SSLv3)")); |
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c index f4522e2b..5c75d278 100644 --- a/plugins/check_ssh.c +++ b/plugins/check_ssh.c | |||
@@ -250,6 +250,7 @@ ssh_connect (char *haddr, int hport, char *remote_version) | |||
250 | printf | 250 | printf |
251 | (_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"), | 251 | (_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"), |
252 | ssh_server, ssh_proto, remote_version); | 252 | ssh_server, ssh_proto, remote_version); |
253 | recv (sd, output, BUFF_SZ, 0); | ||
253 | close(sd); | 254 | close(sd); |
254 | exit (STATE_WARNING); | 255 | exit (STATE_WARNING); |
255 | } | 256 | } |
@@ -260,6 +261,7 @@ ssh_connect (char *haddr, int hport, char *remote_version) | |||
260 | (_("SSH OK - %s (protocol %s) | %s\n"), | 261 | (_("SSH OK - %s (protocol %s) | %s\n"), |
261 | ssh_server, ssh_proto, fperfdata("time", elapsed_time, "s", | 262 | ssh_server, ssh_proto, fperfdata("time", elapsed_time, "s", |
262 | FALSE, 0, FALSE, 0, TRUE, 0, TRUE, (int)socket_timeout)); | 263 | FALSE, 0, FALSE, 0, TRUE, 0, TRUE, (int)socket_timeout)); |
264 | recv (sd, output, BUFF_SZ, 0); | ||
263 | close(sd); | 265 | close(sd); |
264 | exit (STATE_OK); | 266 | exit (STATE_OK); |
265 | } | 267 | } |
diff --git a/plugins/t/check_http.t b/plugins/t/check_http.t index a74220e2..2539a289 100644 --- a/plugins/t/check_http.t +++ b/plugins/t/check_http.t | |||
@@ -82,7 +82,7 @@ SKIP: { | |||
82 | cmp_ok( $res->return_code, "==", 0, "And also when not found"); | 82 | cmp_ok( $res->return_code, "==", 0, "And also when not found"); |
83 | } | 83 | } |
84 | SKIP: { | 84 | SKIP: { |
85 | skip "No internet access", 11 if $internet_access eq "no"; | 85 | skip "No internet access", 16 if $internet_access eq "no"; |
86 | 86 | ||
87 | $res = NPTest->testCmd( | 87 | $res = NPTest->testCmd( |
88 | "./check_http --ssl www.verisign.com" | 88 | "./check_http --ssl www.verisign.com" |
diff --git a/plugins/t/check_tcp.t b/plugins/t/check_tcp.t index abb16aec..f996685d 100644 --- a/plugins/t/check_tcp.t +++ b/plugins/t/check_tcp.t | |||
@@ -12,7 +12,6 @@ BEGIN { | |||
12 | use NPTest; | 12 | use NPTest; |
13 | $has_ipv6 = NPTest::has_ipv6(); | 13 | $has_ipv6 = NPTest::has_ipv6(); |
14 | $tests = $has_ipv6 ? 14 : 11; | 14 | $tests = $has_ipv6 ? 14 : 11; |
15 | plan tests => $tests; | ||
16 | } | 15 | } |
17 | 16 | ||
18 | 17 | ||
@@ -25,20 +24,29 @@ my $host_nonresponsive = getTestParameter( "host_nonresponsive", "NP_HOST_NONRES | |||
25 | my $hostname_invalid = getTestParameter( "hostname_invalid", "NP_HOSTNAME_INVALID", "nosuchhost", | 24 | my $hostname_invalid = getTestParameter( "hostname_invalid", "NP_HOSTNAME_INVALID", "nosuchhost", |
26 | "An invalid (not known to DNS) hostname" ); | 25 | "An invalid (not known to DNS) hostname" ); |
27 | 26 | ||
27 | my $internet_access = getTestParameter( "NP_INTERNET_ACCESS", | ||
28 | "Is this system directly connected to the internet?", | ||
29 | "yes"); | ||
30 | |||
28 | my $successOutput = '/^TCP OK\s-\s+[0-9]?\.?[0-9]+ second response time on port [0-9]+/'; | 31 | my $successOutput = '/^TCP OK\s-\s+[0-9]?\.?[0-9]+ second response time on port [0-9]+/'; |
29 | 32 | ||
30 | my $failedExpect = '/^TCP WARNING\s-\sUnexpected response from host/socket on port [0-9]+/'; | 33 | my $failedExpect = '/^TCP WARNING\s-\sUnexpected response from host/socket on port [0-9]+/'; |
31 | 34 | ||
32 | my $t; | 35 | my $t; |
33 | 36 | ||
37 | $tests = $tests - 4 if $internet_access eq "no"; | ||
38 | plan tests => $tests; | ||
39 | |||
34 | $t += checkCmd( "./check_tcp $host_tcp_http -p 80 -wt 300 -ct 600", 0, $successOutput ); | 40 | $t += checkCmd( "./check_tcp $host_tcp_http -p 80 -wt 300 -ct 600", 0, $successOutput ); |
35 | $t += checkCmd( "./check_tcp $host_tcp_http -p 81 -wt 0 -ct 0 -to 1", 2 ); # use invalid port for this test | 41 | $t += checkCmd( "./check_tcp $host_tcp_http -p 81 -wt 0 -ct 0 -to 1", 2 ); # use invalid port for this test |
36 | $t += checkCmd( "./check_tcp $host_nonresponsive -p 80 -wt 0 -ct 0 -to 1", 2 ); | 42 | $t += checkCmd( "./check_tcp $host_nonresponsive -p 80 -wt 0 -ct 0 -to 1", 2 ); |
37 | $t += checkCmd( "./check_tcp $hostname_invalid -p 80 -wt 0 -ct 0 -to 1", 2 ); | 43 | $t += checkCmd( "./check_tcp $hostname_invalid -p 80 -wt 0 -ct 0 -to 1", 2 ); |
38 | $t += checkCmd( "./check_tcp -S -D 1 -H www.verisign.com -p 443", 0 ); | 44 | if($internet_access ne "no") { |
39 | $t += checkCmd( "./check_tcp -S -D 9000,1 -H www.verisign.com -p 443", 1 ); | 45 | $t += checkCmd( "./check_tcp -S -D 1 -H www.verisign.com -p 443", 0 ); |
40 | $t += checkCmd( "./check_tcp -S -D 9000 -H www.verisign.com -p 443", 1 ); | 46 | $t += checkCmd( "./check_tcp -S -D 9000,1 -H www.verisign.com -p 443", 1 ); |
41 | $t += checkCmd( "./check_tcp -S -D 9000,8999 -H www.verisign.com -p 443", 2 ); | 47 | $t += checkCmd( "./check_tcp -S -D 9000 -H www.verisign.com -p 443", 1 ); |
48 | $t += checkCmd( "./check_tcp -S -D 9000,8999 -H www.verisign.com -p 443", 2 ); | ||
49 | } | ||
42 | 50 | ||
43 | # Need the \r\n to make it more standards compliant with web servers. Need the various quotes | 51 | # Need the \r\n to make it more standards compliant with web servers. Need the various quotes |
44 | # so that perl doesn't interpret the \r\n and is passed onto command line correctly | 52 | # so that perl doesn't interpret the \r\n and is passed onto command line correctly |
diff --git a/plugins/utils.h b/plugins/utils.h index c9fd68d2..1f376542 100644 --- a/plugins/utils.h +++ b/plugins/utils.h | |||
@@ -185,7 +185,8 @@ char *fperfdata (const char *, | |||
185 | #ifdef NP_EXTRA_OPTS | 185 | #ifdef NP_EXTRA_OPTS |
186 | #define UT_EXTRA_OPTS _("\ | 186 | #define UT_EXTRA_OPTS _("\ |
187 | --extra-opts=[section][@file]\n\ | 187 | --extra-opts=[section][@file]\n\ |
188 | Read options from an ini file. See http://monitoring-plugins.org/doc/extra-opts.html\n\ | 188 | Read options from an ini file. See\n\ |
189 | https://www.monitoring-plugins.org/doc/extra-opts.html\n\ | ||
189 | for usage and examples.\n") | 190 | for usage and examples.\n") |
190 | #else | 191 | #else |
191 | #define UT_EXTRA_OPTS "" | 192 | #define UT_EXTRA_OPTS "" |
@@ -193,13 +194,13 @@ char *fperfdata (const char *, | |||
193 | 194 | ||
194 | #define UT_THRESHOLDS_NOTES _("\ | 195 | #define UT_THRESHOLDS_NOTES _("\ |
195 | See:\n\ | 196 | See:\n\ |
196 | http://monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n\ | 197 | https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n\ |
197 | for THRESHOLD format and examples.\n") | 198 | for THRESHOLD format and examples.\n") |
198 | 199 | ||
199 | #define UT_SUPPORT _("\n\ | 200 | #define UT_SUPPORT _("\n\ |
200 | Send email to help@monitoring-plugins.org if you have questions\n\ | 201 | Send email to help@monitoring-plugins.org if you have questions regarding\n\ |
201 | regarding use of this software. To submit patches or suggest improvements,\n\ | 202 | use of this software. To submit patches or suggest improvements, send email\n\ |
202 | send email to devel@monitoring-plugins.org\n\n") | 203 | to devel@monitoring-plugins.org\n\n") |
203 | 204 | ||
204 | #define UT_NOWARRANTY _("\n\ | 205 | #define UT_NOWARRANTY _("\n\ |
205 | The monitoring plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\ | 206 | The monitoring plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\ |
@@ -5748,24 +5748,24 @@ msgstr "" | |||
5748 | #: plugins/utils.h:182 | 5748 | #: plugins/utils.h:182 |
5749 | msgid "" | 5749 | msgid "" |
5750 | " --extra-opts=[section][@file]\n" | 5750 | " --extra-opts=[section][@file]\n" |
5751 | " Read options from an ini file. See http://monitoring-plugins.org/doc/" | 5751 | " Read options from an ini file. See\n" |
5752 | "extra-opts.html\n" | 5752 | " https://www.monitoring-plugins.org/doc/extra-opts.html\n" |
5753 | " for usage and examples.\n" | 5753 | " for usage and examples.\n" |
5754 | msgstr "" | 5754 | msgstr "" |
5755 | 5755 | ||
5756 | #: plugins/utils.h:190 | 5756 | #: plugins/utils.h:190 |
5757 | msgid "" | 5757 | msgid "" |
5758 | " See:\n" | 5758 | " See:\n" |
5759 | " http://monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n" | 5759 | " https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n" |
5760 | " for THRESHOLD format and examples.\n" | 5760 | " for THRESHOLD format and examples.\n" |
5761 | msgstr "" | 5761 | msgstr "" |
5762 | 5762 | ||
5763 | #: plugins/utils.h:195 | 5763 | #: plugins/utils.h:195 |
5764 | msgid "" | 5764 | msgid "" |
5765 | "\n" | 5765 | "\n" |
5766 | "Send email to help@monitoring-plugins.org if you have questions\n" | 5766 | "Send email to help@monitoring-plugins.org if you have questions regarding\n" |
5767 | "regarding use of this software. To submit patches or suggest improvements,\n" | 5767 | "use of this software. To submit patches or suggest improvements, send email\n" |
5768 | "send email to devel@monitoring-plugins.org\n" | 5768 | "to devel@monitoring-plugins.org\n" |
5769 | "\n" | 5769 | "\n" |
5770 | msgstr "" | 5770 | msgstr "" |
5771 | 5771 | ||
@@ -5891,24 +5891,24 @@ msgstr "" | |||
5891 | #, fuzzy | 5891 | #, fuzzy |
5892 | msgid "" | 5892 | msgid "" |
5893 | " --extra-opts=[section][@file]\n" | 5893 | " --extra-opts=[section][@file]\n" |
5894 | " Read options from an ini file. See http://monitoring-plugins.org/doc/" | 5894 | " Read options from an ini file. See\n" |
5895 | "extra-opts.html\n" | 5895 | " https://www.monitoring-plugins.org/doc/extra-opts.html\n" |
5896 | " for usage and examples.\n" | 5896 | " for usage and examples.\n" |
5897 | msgstr "" | 5897 | msgstr "" |
5898 | " --extra-opts=[section][@file]\n" | 5898 | " --extra-opts=[section][@file]\n" |
5899 | " Lire les options d'un fichier ini. Voir http://nagiosplugins.org/extra-" | 5899 | " Lire les options d'un fichier ini. Voir\n" |
5900 | "opts\n" | 5900 | " https://www.monitoring-plugins.org/doc/extra-opts.html\n" |
5901 | " pour les instructions et examples.\n" | 5901 | " pour les instructions et examples.\n" |
5902 | 5902 | ||
5903 | #: plugins/utils.h:190 | 5903 | #: plugins/utils.h:190 |
5904 | #, fuzzy | 5904 | #, fuzzy |
5905 | msgid "" | 5905 | msgid "" |
5906 | " See:\n" | 5906 | " See:\n" |
5907 | " http://monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n" | 5907 | " https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n" |
5908 | " for THRESHOLD format and examples.\n" | 5908 | " for THRESHOLD format and examples.\n" |
5909 | msgstr "" | 5909 | msgstr "" |
5910 | " Voir:\n" | 5910 | " Voir:\n" |
5911 | " http://nagiosplug.sourceforge.net/developer-guidelines." | 5911 | " https://www.monitoring-plugins.org/doc/guidelines.html." |
5912 | "html#THRESHOLDFORMAT\n" | 5912 | "html#THRESHOLDFORMAT\n" |
5913 | " pour le format et examples des seuils (THRESHOLD).\n" | 5913 | " pour le format et examples des seuils (THRESHOLD).\n" |
5914 | 5914 | ||
@@ -5916,9 +5916,9 @@ msgstr "" | |||
5916 | #, fuzzy | 5916 | #, fuzzy |
5917 | msgid "" | 5917 | msgid "" |
5918 | "\n" | 5918 | "\n" |
5919 | "Send email to help@monitoring-plugins.org if you have questions\n" | 5919 | "Send email to help@monitoring-plugins.org if you have questions regarding\n" |
5920 | "regarding use of this software. To submit patches or suggest improvements,\n" | 5920 | "use of this software. To submit patches or suggest improvements, send email\n" |
5921 | "send email to devel@monitoring-plugins.org\n" | 5921 | "to devel@monitoring-plugins.org\n" |
5922 | "\n" | 5922 | "\n" |
5923 | msgstr "" | 5923 | msgstr "" |
5924 | "\n" | 5924 | "\n" |
diff --git a/po/monitoring-plugins.pot b/po/monitoring-plugins.pot index bfb6ea83..088d8c14 100644 --- a/po/monitoring-plugins.pot +++ b/po/monitoring-plugins.pot | |||
@@ -5595,24 +5595,24 @@ msgstr "" | |||
5595 | #: plugins/utils.h:182 | 5595 | #: plugins/utils.h:182 |
5596 | msgid "" | 5596 | msgid "" |
5597 | " --extra-opts=[section][@file]\n" | 5597 | " --extra-opts=[section][@file]\n" |
5598 | " Read options from an ini file. See http://monitoring-plugins.org/doc/" | 5598 | " Read options from an ini file. See\n" |
5599 | "extra-opts.html\n" | 5599 | " https://www.monitoring-plugins.org/doc/extra-opts.html\n" |
5600 | " for usage and examples.\n" | 5600 | " for usage and examples.\n" |
5601 | msgstr "" | 5601 | msgstr "" |
5602 | 5602 | ||
5603 | #: plugins/utils.h:190 | 5603 | #: plugins/utils.h:190 |
5604 | msgid "" | 5604 | msgid "" |
5605 | " See:\n" | 5605 | " See:\n" |
5606 | " http://monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n" | 5606 | " https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n" |
5607 | " for THRESHOLD format and examples.\n" | 5607 | " for THRESHOLD format and examples.\n" |
5608 | msgstr "" | 5608 | msgstr "" |
5609 | 5609 | ||
5610 | #: plugins/utils.h:195 | 5610 | #: plugins/utils.h:195 |
5611 | msgid "" | 5611 | msgid "" |
5612 | "\n" | 5612 | "\n" |
5613 | "Send email to help@monitoring-plugins.org if you have questions\n" | 5613 | "Send email to help@monitoring-plugins.org if you have questions regarding\n" |
5614 | "regarding use of this software. To submit patches or suggest improvements,\n" | 5614 | "use of this software. To submit patches or suggest improvements, send email\n" |
5615 | "send email to devel@monitoring-plugins.org\n" | 5615 | "to devel@monitoring-plugins.org\n" |
5616 | "\n" | 5616 | "\n" |
5617 | msgstr "" | 5617 | msgstr "" |
5618 | 5618 | ||