From 3e8fdf9b35ab750e3fe964ce289bbbdaffb3b800 Mon Sep 17 00:00:00 2001 From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> Date: Wed, 20 Sep 2023 18:22:55 +0200 Subject: check_disk: Fix printf format string diff --git a/plugins/check_disk.c b/plugins/check_disk.c index 05e5502..6cb4cb2 100644 --- a/plugins/check_disk.c +++ b/plugins/check_disk.c @@ -1027,7 +1027,7 @@ void print_usage (void) { printf ("%s\n", _("Usage:")); - printf (" %s {-w absolute_limit |-w percentage_limit% | -W inode_percentage_limit } {-c absolute_limit|-c percentage_limit% | -K inode_percentage_limit } {-p path | -x device}\n", progname); + printf (" %s {-w absolute_limit |-w percentage_limit%% | -W inode_percentage_limit } {-c absolute_limit|-c percentage_limit%% | -K inode_percentage_limit } {-p path | -x device}\n", progname); printf ("[-C] [-E] [-e] [-f] [-g group ] [-k] [-l] [-M] [-m] [-R path ] [-r path ]\n"); printf ("[-t timeout] [-u unit] [-v] [-X type] [-N type]\n"); } -- cgit v0.10-9-g596f From 2f916675b3b0ecb7cdeac045304607265cc57065 Mon Sep 17 00:00:00 2001 From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> Date: Wed, 20 Sep 2023 18:23:42 +0200 Subject: check_disk: Mention -A and long options in error message about missing thresholds diff --git a/plugins/check_disk.c b/plugins/check_disk.c index 6cb4cb2..bd64148 100644 --- a/plugins/check_disk.c +++ b/plugins/check_disk.c @@ -798,7 +798,7 @@ process_arguments (int argc, char **argv) crit_freespace_percent || warn_usedspace_units || crit_usedspace_units || warn_usedspace_percent || crit_usedspace_percent || warn_usedinodes_percent || crit_usedinodes_percent || warn_freeinodes_percent || crit_freeinodes_percent )) { - die (STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"), _("Must set a threshold value before using -r/-R\n")); + die (STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"), _("Must set a threshold value before using -r/-R/-A (--ereg-path/--eregi-path/--all)\n")); } err = regcomp(&re, optarg, cflags); -- cgit v0.10-9-g596f From b01aa8c43390a4e32197abedc84af20fd8a8faf6 Mon Sep 17 00:00:00 2001 From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> Date: Wed, 20 Sep 2023 18:24:08 +0200 Subject: check_disk: More spacing to separate examples diff --git a/plugins/check_disk.c b/plugins/check_disk.c index bd64148..35fd481 100644 --- a/plugins/check_disk.c +++ b/plugins/check_disk.c @@ -1011,10 +1011,10 @@ print_help (void) printf ("\n"); printf ("%s\n", _("Examples:")); printf (" %s\n", "check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /"); - printf (" %s\n", _("Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB")); + printf (" %s\n\n", _("Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB")); printf (" %s\n", "check_disk -w 100 -c 50 -C -w 1000 -c 500 -g sidDATA -r '^/oracle/SID/data.*$'"); printf (" %s\n", _("Checks all filesystems not matching -r at 100M and 50M. The fs matching the -r regex")); - printf (" %s\n", _("are grouped which means the freespace thresholds are applied to all disks together")); + printf (" %s\n\n", _("are grouped which means the freespace thresholds are applied to all disks together")); printf (" %s\n", "check_disk -w 100 -c 50 -C -w 1000 -c 500 -p /foo -C -w 5% -c 3% -p /bar"); printf (" %s\n", _("Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use 100M/50M")); -- cgit v0.10-9-g596f From 8faf7afad389b74d6fe67a2ece10e85b9f614a13 Mon Sep 17 00:00:00 2001 From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> Date: Thu, 21 Sep 2023 09:00:33 +0200 Subject: check_disk: Add some general usage hints diff --git a/plugins/check_disk.c b/plugins/check_disk.c index 35fd481..b3edc41 100644 --- a/plugins/check_disk.c +++ b/plugins/check_disk.c @@ -1009,6 +1009,14 @@ print_help (void) printf (" %s\n", _("Check only filesystems of indicated type (may be repeated)")); printf ("\n"); + printf ("%s\n", _("General usage hints:")); + printf (" %s\n", _("- Arguments are positional! \"-w 5 -c 1 -p /foo -w6 -c2 -p /bar\" is not the same as")); + printf (" %s\n", _("\"-w 5 -c 1 -p /bar w6 -c2 -p /foo\".")); + printf (" %s\n", _("- The syntax is broadly: \"{thresholds a} {paths a} {thresholds b} {thresholds b} ...\"")); + + + + printf ("\n"); printf ("%s\n", _("Examples:")); printf (" %s\n", "check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /"); printf (" %s\n\n", _("Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB")); -- cgit v0.10-9-g596f From 2ef36843abf3b2ec7142aa2f52b66d5d3c7b543b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20K=C3=A4stle?= Date: Thu, 21 Sep 2023 09:50:53 +0200 Subject: Add -C to general usage hints diff --git a/plugins/check_disk.c b/plugins/check_disk.c index b3edc41..7dc1c4b 100644 --- a/plugins/check_disk.c +++ b/plugins/check_disk.c @@ -1012,7 +1012,7 @@ print_help (void) printf ("%s\n", _("General usage hints:")); printf (" %s\n", _("- Arguments are positional! \"-w 5 -c 1 -p /foo -w6 -c2 -p /bar\" is not the same as")); printf (" %s\n", _("\"-w 5 -c 1 -p /bar w6 -c2 -p /foo\".")); - printf (" %s\n", _("- The syntax is broadly: \"{thresholds a} {paths a} {thresholds b} {thresholds b} ...\"")); + printf (" %s\n", _("- The syntax is broadly: \"{thresholds a} {paths a} -C {thresholds b} {thresholds b} ...\"")); -- cgit v0.10-9-g596f From b6bb2a18c9c772d41e2bf703f02b95e0bfe9b31d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20K=C3=A4stle?= Date: Thu, 21 Sep 2023 12:14:24 +0200 Subject: Update translations diff --git a/po/de.po b/po/de.po index d597203..0dedfc1 100644 --- a/po/de.po +++ b/po/de.po @@ -9,10 +9,11 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n" -"POT-Creation-Date: 2023-09-05 00:31+0200\n" +"POT-Creation-Date: 2023-09-21 12:09+0200\n" "PO-Revision-Date: 2004-12-23 17:46+0100\n" "Last-Translator: \n" -"Language-Team: Monitoring Plugin Development Team \n" +"Language-Team: Monitoring Plugin Development Team \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -321,7 +322,9 @@ msgstr "" msgid "Could not compile regular expression" msgstr "" -msgid "Must set a threshold value before using -r/-R\n" +msgid "" +"Must set a threshold value before using -r/-R/-A (--ereg-path/--eregi-path/--" +"all)\n" msgstr "" msgid "Regular expression did not match any path or disk" @@ -449,6 +452,22 @@ msgstr "" msgid "Check only filesystems of indicated type (may be repeated)" msgstr "" +msgid "General usage hints:" +msgstr "Allgemeine Nutzungshinweise:" + +msgid "" +"- Arguments are positional! \"-w 5 -c 1 -p /foo -w6 -c2 -p /bar\" is not the " +"same as" +msgstr "" + +msgid "\"-w 5 -c 1 -p /bar w6 -c2 -p /foo\"." +msgstr "" + +msgid "" +"- The syntax is broadly: \"{thresholds a} {paths a} -C {thresholds b} " +"{thresholds b} ...\"" +msgstr "" + msgid "Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB" msgstr "" diff --git a/po/fr.po b/po/fr.po index dfc2c5d..ec5651d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10,10 +10,11 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n" -"POT-Creation-Date: 2023-09-05 00:31+0200\n" +"POT-Creation-Date: 2023-09-21 12:09+0200\n" "PO-Revision-Date: 2010-04-21 23:38-0400\n" "Last-Translator: \n" -"Language-Team: Monitoring Plugin Development Team \n" +"Language-Team: Monitoring Plugin Development Team \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -320,7 +321,9 @@ msgstr "" msgid "Could not compile regular expression" msgstr "Impossible de compiler l'expression rationnelle" -msgid "Must set a threshold value before using -r/-R\n" +msgid "" +"Must set a threshold value before using -r/-R/-A (--ereg-path/--eregi-path/--" +"all)\n" msgstr "" msgid "Regular expression did not match any path or disk" @@ -469,6 +472,22 @@ msgstr "" "Ignorer tout les systèmes de fichiers qui correspondent au type indiqué " "(peut être utilisé plusieurs fois)" +msgid "General usage hints:" +msgstr "" + +msgid "" +"- Arguments are positional! \"-w 5 -c 1 -p /foo -w6 -c2 -p /bar\" is not the " +"same as" +msgstr "" + +msgid "\"-w 5 -c 1 -p /bar w6 -c2 -p /foo\"." +msgstr "" + +msgid "" +"- The syntax is broadly: \"{thresholds a} {paths a} -C {thresholds b} " +"{thresholds b} ...\"" +msgstr "" + msgid "Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB" msgstr "Vérifie /tmp à 10% et /var à 5% et / à 100MB et 50MB" diff --git a/po/monitoring-plugins.pot b/po/monitoring-plugins.pot index af48f03..2cd94b1 100644 --- a/po/monitoring-plugins.pot +++ b/po/monitoring-plugins.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n" -"POT-Creation-Date: 2023-09-12 01:33+0200\n" +"POT-Creation-Date: 2023-09-21 12:09+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -305,7 +305,9 @@ msgstr "" msgid "Could not compile regular expression" msgstr "" -msgid "Must set a threshold value before using -r/-R\n" +msgid "" +"Must set a threshold value before using -r/-R/-A (--ereg-path/--eregi-path/--" +"all)\n" msgstr "" msgid "Regular expression did not match any path or disk" @@ -427,6 +429,22 @@ msgstr "" msgid "Check only filesystems of indicated type (may be repeated)" msgstr "" +msgid "General usage hints:" +msgstr "" + +msgid "" +"- Arguments are positional! \"-w 5 -c 1 -p /foo -w6 -c2 -p /bar\" is not the " +"same as" +msgstr "" + +msgid "\"-w 5 -c 1 -p /bar w6 -c2 -p /foo\"." +msgstr "" + +msgid "" +"- The syntax is broadly: \"{thresholds a} {paths a} -C {thresholds b} " +"{thresholds b} ...\"" +msgstr "" + msgid "Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB" msgstr "" -- cgit v0.10-9-g596f