upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-06-08 16:26:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'master' of https://github.com/jonmilby/nagios-plugins

Browse source 
* 'master' of https://github.com/jonmilby/nagios-plugins:
  Updated check_mysql.c to take client options file and group parameters

Conflicts:
	plugins/check_mysql.c
This commit is contained in:
Holger Weiss 2013-08-18 22:25:08 +02:00
commit 14bc7af323
1 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
plugins/check_mysql.c
View file

@ -55,6 +55,8 @@ char *cert = NULL;
char *key = NULL; char *key = NULL;
char *ciphers = NULL; char *ciphers = NULL;
bool ssl = false; bool ssl = false;
char *opt_file = NULL;
char *opt_group = NULL;
unsigned int db_port = MYSQL_PORT; unsigned int db_port = MYSQL_PORT;
int check_slave = 0, warn_sec = 0, crit_sec = 0; int check_slave = 0, warn_sec = 0, crit_sec = 0;
int verbose = 0; int verbose = 0;
@ -121,8 +123,14 @@ main (int argc, char **argv)
/* initialize mysql */ /* initialize mysql */
mysql_init (&mysql); mysql_init (&mysql);
if (opt_file != NULL)
mysql_options(&mysql,MYSQL_READ_DEFAULT_FILE,opt_file);
mysql_options(&mysql,MYSQL_READ_DEFAULT_GROUP,"client"); if (opt_group != NULL)
mysql_options(&mysql,MYSQL_READ_DEFAULT_GROUP,opt_group);
else
mysql_options(&mysql,MYSQL_READ_DEFAULT_GROUP,"client");
if (ssl) if (ssl)
mysql_ssl_set(&mysql,key,cert,ca_cert,ca_dir,ciphers); mysql_ssl_set(&mysql,key,cert,ca_cert,ca_dir,ciphers);
@ -327,6 +335,8 @@ process_arguments (int argc, char **argv)
{"database", required_argument, 0, 'd'}, {"database", required_argument, 0, 'd'},
{"username", required_argument, 0, 'u'}, {"username", required_argument, 0, 'u'},
{"password", required_argument, 0, 'p'}, {"password", required_argument, 0, 'p'},
{"file", required_argument, 0, 'f'},
{"group", required_argument, 0, 'g'},
{"port", required_argument, 0, 'P'}, {"port", required_argument, 0, 'P'},
{"critical", required_argument, 0, 'c'}, {"critical", required_argument, 0, 'c'},
{"warning", required_argument, 0, 'w'}, {"warning", required_argument, 0, 'w'},
@ -347,7 +357,7 @@ process_arguments (int argc, char **argv)
return ERROR; return ERROR;
while (1) { while (1) {
c = getopt_long (argc, argv, "hlvVSP:p:u:d:H:s:c:w:a:k:C:D:L:", longopts, &option); c = getopt_long (argc, argv, "hlvVSP:p:u:d:H:s:c:w:a:k:C:D:L:f:g:", longopts, &option);
if (c == -1 || c == EOF) if (c == -1 || c == EOF)
break; break;
@ -397,6 +407,12 @@ process_arguments (int argc, char **argv)
optarg++; optarg++;
} }
break; break;
case 'f': /* username */
opt_file = optarg;
break;
case 'g': /* username */
opt_group = optarg;
break;
case 'P': /* critical time threshold */ case 'P': /* critical time threshold */
db_port = atoi (optarg); db_port = atoi (optarg);
break; break;
@ -440,6 +456,10 @@ process_arguments (int argc, char **argv)
} }
else if (db_user == NULL) else if (db_user == NULL)
db_user = argv[c++]; db_user = argv[c++];
else if (opt_file == NULL)
opt_file = argv[c++];
else if (opt_group == NULL)
opt_group = argv[c++];
else if (db_pass == NULL) else if (db_pass == NULL)
db_pass = argv[c++]; db_pass = argv[c++];
else if (db == NULL) else if (db == NULL)
@ -460,6 +480,12 @@ validate_arguments (void)
if (db_user == NULL) if (db_user == NULL)
db_user = strdup(""); db_user = strdup("");
if (opt_file == NULL)
opt_file = strdup("");
if (opt_group == NULL)
opt_group = strdup("");
if (db_host == NULL) if (db_host == NULL)
db_host = strdup(""); db_host = strdup("");
@ -474,7 +500,7 @@ void
print_help (void) print_help (void)
{ {
char *myport; char *myport;
xasprintf (&myport, "%d", MYSQL_PORT); asprintf (&myport, "%d", MYSQL_PORT);
print_revision (progname, NP_VERSION); print_revision (progname, NP_VERSION);
@ -495,6 +521,10 @@ print_help (void)
printf (" %s\n", "-d, --database=STRING"); printf (" %s\n", "-d, --database=STRING");
printf (" %s\n", _("Check database with indicated name")); printf (" %s\n", _("Check database with indicated name"));
printf (" %s\n", "-f, --file=STRING");
printf (" %s\n", _("Read from the specified client options file"));
printf (" %s\n", "-g, --group=STRING");
printf (" %s\n", _("Use a client options group"));
printf (" %s\n", "-u, --username=STRING"); printf (" %s\n", "-u, --username=STRING");
printf (" %s\n", _("Connect using the indicated username")); printf (" %s\n", _("Connect using the indicated username"));
printf (" %s\n", "-p, --password=STRING"); printf (" %s\n", "-p, --password=STRING");
@ -543,5 +573,5 @@ print_usage (void)
printf ("%s\n", _("Usage:")); printf ("%s\n", _("Usage:"));
printf (" %s [-d database] [-H host] [-P port] [-s socket]\n",progname); printf (" %s [-d database] [-H host] [-P port] [-s socket]\n",progname);
printf (" [-u user] [-p password] [-S] [-l] [-a cert] [-k key]\n"); printf (" [-u user] [-p password] [-S] [-l] [-a cert] [-k key]\n");
printf (" [-C ca-cert] [-D ca-dir] [-L ciphers]\n"); printf (" [-C ca-cert] [-D ca-dir] [-L ciphers] [-f optfile] [-g group]\n");
} }