summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/check_snmp.c137
-rw-r--r--plugins/check_ssh.c2
2 files changed, 64 insertions, 75 deletions
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index e2b4555..be7810e 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -908,95 +908,84 @@ print_help (void)
908 printf (_(UT_HOST_PORT), 'p', DEFAULT_PORT); 908 printf (_(UT_HOST_PORT), 'p', DEFAULT_PORT);
909 909
910 /* SNMP and Authentication Protocol */ 910 /* SNMP and Authentication Protocol */
911 printf (_("\ 911 printf (" %s\n", "-n, --next");
912 -n, --next\n\ 912 printf (" %s\n", _("Use SNMP GETNEXT instead of SNMP GET"));
913 Use SNMP GETNEXT instead of SNMP GET\n\ 913 printf (" %s\n", "-P, --protocol=[1|2c|3]");
914 -P, --protocol=[1|2c|3]\n\ 914 printf (" %s\n", _("SNMP protocol version"));
915 SNMP protocol version\n\ 915 printf (" %s\n", "-L, --seclevel=[noAuthNoPriv|authNoPriv|authPriv]");
916 -L, --seclevel=[noAuthNoPriv|authNoPriv|authPriv]\n\ 916 printf (" %s\n", _("SNMPv3 securityLevel"));
917 SNMPv3 securityLevel\n\ 917 printf (" %s\n", "-a, --authproto=[MD5|SHA]");
918 -a, --authproto=[MD5|SHA]\n\ 918 printf (" %s\n", _("SNMPv3 auth proto"));
919 SNMPv3 auth proto\n"));
920 919
921 /* Authentication Tokens*/ 920 /* Authentication Tokens*/
922 printf (_("\ 921 printf (" %s\n", "-C, --community=STRING");
923 -C, --community=STRING\n\ 922 printf (" %s\n", _("Optional community string for SNMP communication"));
924 Optional community string for SNMP communication\n\ 923 printf (_("(default is \"%s\")"),DEFAULT_COMMUNITY);
925 (default is \"%s\")\n\ 924 printf (" %s\n", "-U, --secname=USERNAME");
926 -U, --secname=USERNAME\n\ 925 printf (" %s\n", _("SNMPv3 username"));
927 SNMPv3 username\n\ 926 printf (" %s\n", "-A, --authpassword=PASSWORD");
928 -A, --authpassword=PASSWORD\n\ 927 printf (" %s\n", _("SNMPv3 authentication password"));
929 SNMPv3 authentication password\n\ 928 printf (" %s\n", "-X, --privpasswd=PASSWORD");
930 -X, --privpasswd=PASSWORD\n\ 929 printf (" %s\n", _("SNMPv3 crypt passwd (DES)"));
931 SNMPv3 crypt passwd (DES)\n"), DEFAULT_COMMUNITY);
932 930
933 /* OID Stuff */ 931 /* OID Stuff */
934 printf (_("\ 932 printf (" %s\n", "-o, --oid=OID(s)");
935 -o, --oid=OID(s)\n\ 933 printf (" %s\n", _("Object identifier(s) or SNMP variables whose value you wish to query"));
936 Object identifier(s) or SNMP variables whose value you wish to query\n\ 934 printf (" %s\n", "-m, --miblist=STRING");
937 -m, --miblist=STRING\n\ 935 printf (" %s\n", _("List of MIBS to be loaded (default = none if using numeric oids or 'ALL'"));
938 List of MIBS to be loaded (default = none if using numeric oids or 'ALL'\n\ 936 printf (" %s\n", _("for symbolic oids.)"));
939 for symbolic oids.)\n\ 937 printf (" %s\n", "-d, --delimiter=STRING");
940 -d, --delimiter=STRING\n\ 938 printf (_(" Delimiter to use when parsing returned data. Default is \"%s\""), DEFAULT_DELIMITER);
941 Delimiter to use when parsing returned data. Default is \"%s\"\n\ 939 printf (" %s\n", _("Any data on the right hand side of the delimiter is considered"));
942 Any data on the right hand side of the delimiter is considered\n\ 940 printf (" %s\n", _("to be the data that should be used in the evaluation."));
943 to be the data that should be used in the evaluation.\n"), DEFAULT_DELIMITER);
944 941
945 /* Tests Against Integers */ 942 /* Tests Against Integers */
946 printf (_("\ 943 printf (" %s\n", "-w, --warning=INTEGER_RANGE(s)");
947 -w, --warning=INTEGER_RANGE(s)\n\ 944 printf (" %s\n", _("Range(s) which will not result in a WARNING status"));
948 Range(s) which will not result in a WARNING status\n\ 945 printf (" %s\n", "-c, --critical=INTEGER_RANGE(s)");
949 -c, --critical=INTEGER_RANGE(s)\n\ 946 printf (" %s\n", _("Range(s) which will not result in a CRITICAL status"));
950 Range(s) which will not result in a CRITICAL status\n"));
951 947
952 /* Tests Against Strings */ 948 /* Tests Against Strings */
953 printf (_("\ 949 printf (" %s\n", "-s, --string=STRING");
954 -s, --string=STRING\n\ 950 printf (" %s\n", _("Return OK state (for that OID) if STRING is an exact match"));
955 Return OK state (for that OID) if STRING is an exact match\n\ 951 printf (" %s\n", "-r, --ereg=REGEX");
956 -r, --ereg=REGEX\n\ 952 printf (" %s\n", _("Return OK state (for that OID) if extended regular expression REGEX matches"));
957 Return OK state (for that OID) if extended regular expression REGEX matches\n\ 953 printf (" %s\n", "-R, --eregi=REGEX");
958 -R, --eregi=REGEX\n\ 954 printf (" %s\n", _("Return OK state (for that OID) if case-insensitive extended REGEX matches"));
959 Return OK state (for that OID) if case-insensitive extended REGEX matches\n\ 955 printf (" %s\n", "-l, --label=STRING");
960 -l, --label=STRING\n\ 956 printf (" %s\n", _("Prefix label for output from plugin (default -s 'SNMP')"));
961 Prefix label for output from plugin (default -s 'SNMP')\n"));
962 957
963 /* Output Formatting */ 958 /* Output Formatting */
964 printf (_("\ 959 printf (" %s\n", "-u, --units=STRING");
965 -u, --units=STRING\n\ 960 printf (" %s\n", _("Units label(s) for output data (e.g., 'sec.')."));
966 Units label(s) for output data (e.g., 'sec.').\n\ 961 printf (" %s\n", "-D, --output-delimiter=STRING");
967 -D, --output-delimiter=STRING\n\ 962 printf (" %s\n", _("Separates output on multiple OID requests"));
968 Separates output on multiple OID requests\n"));
969 963
970 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 964 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
971 965
972 printf (_(UT_VERBOSE)); 966 printf (_(UT_VERBOSE));
973 967
974 printf (_("\n\ 968 printf ("%s\n", _("This plugin uses the 'snmpget' command included with the NET-SNMP package."));
975- This plugin uses the 'snmpget' command included with the NET-SNMP package.\n\ 969 printf ("%s\n", _("if you don't have the package installed, you will need to download it from"));
976 If you don't have the package installed, you will need to download it from\n\ 970 printf ("%s\n", _("http://net-snmp.sourceforge.net before you can use this plugin."));
977 http://net-snmp.sourceforge.net before you can use this plugin.\n")); 971
978 972 printf ("%s\n", _("- Multiple OIDs may be indicated by a comma- or space-delimited list (lists with"));
979 printf (_("\ 973 printf ("%s\n", _(" internal spaces must be quoted) [max 8 OIDs]"));
980- Multiple OIDs may be indicated by a comma- or space-delimited list (lists with\n\ 974
981 internal spaces must be quoted) [max 8 OIDs]\n")); 975 printf ("%s\n", _("- Ranges are inclusive and are indicated with colons. When specified as"));
982 976 printf ("%s\n", _(" 'min:max' a STATE_OK will be returned if the result is within the indicated"));
983 printf (_("\ 977 printf ("%s\n", _(" range or is equal to the upper or lower bound. A non-OK state will be"));
984- Ranges are inclusive and are indicated with colons. When specified as\n\ 978 printf ("%s\n", _(" returned if the result is outside the specified range."));
985 'min:max' a STATE_OK will be returned if the result is within the indicated\n\ 979
986 range or is equal to the upper or lower bound. A non-OK state will be\n\ 980 printf ("%s\n", _("- If specified in the order 'max:min' a non-OK state will be returned if the"));
987 returned if the result is outside the specified range.\n")); 981 printf ("%s\n", _(" result is within the (inclusive) range."));
988 982
989 printf (_("\ 983 printf ("%s\n", _("- Upper or lower bounds may be omitted to skip checking the respective limit."));
990- If specified in the order 'max:min' a non-OK state will be returned if the\n\ 984 printf ("%s\n", _("- Bare integers are interpreted as upper limits."));
991 result is within the (inclusive) range.\n")); 985 printf ("%s\n", _("- When checking multiple OIDs, separate ranges by commas like '-w 1:10,1:,:20'"));
992 986 printf ("%s\n", _("- Note that only one string and one regex may be checked at present"));
993 printf (_("\ 987 printf ("%s\n", _("- All evaluation methods other than PR, STR, and SUBSTR expect that the value"));
994- Upper or lower bounds may be omitted to skip checking the respective limit.\n\ 988 printf ("%s\n", _(" returned from the SNMP query is an unsigned integer."));
995- Bare integers are interpreted as upper limits.\n\
996- When checking multiple OIDs, separate ranges by commas like '-w 1:10,1:,:20'\n\
997- Note that only one string and one regex may be checked at present\n\
998- All evaluation methods other than PR, STR, and SUBSTR expect that the value\n\
999 returned from the SNMP query is an unsigned integer.\n"));
1000 989
1001 printf (_(UT_SUPPORT)); 990 printf (_(UT_SUPPORT));
1002} 991}
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 1a99e24..ba31df0 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -285,7 +285,7 @@ print_help (void)
285 285
286 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 286 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
287 287
288 printf (" %s\n" "-r, --remote-version=STRING"); 288 printf (" %s\n", "-r, --remote-version=STRING");
289 printf (" %s\n", _("Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)")); 289 printf (" %s\n", _("Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)"));
290 290
291 printf (_(UT_VERBOSE)); 291 printf (_(UT_VERBOSE));