From be9dd63238e60908f6aa30e5996b4ff730cd8cc8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?William=20Tis=C3=A4ter?= Date: Tue, 23 Apr 2013 12:56:52 +0200 Subject: [PATCH] Add Alias and ConnectTimeout options to MySQL plugin --- src/collectd.conf.in | 2 ++ src/collectd.conf.pod | 11 +++++++++++ src/mysql.c | 22 ++++++++++++++++++++-- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/src/collectd.conf.in b/src/collectd.conf.in index e95fae6a..1b93f6c5 100644 --- a/src/collectd.conf.in +++ b/src/collectd.conf.in @@ -534,9 +534,11 @@ # Password "secret" # Database "db_name" # MasterStats true +# ConnectTimeout 10 # # # +# Alias "squeeze" # Host "localhost" # Socket "/var/run/mysql/mysqld.sock" # SlaveStats true diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod index 8606d3e0..beb5bfb4 100644 --- a/src/collectd.conf.pod +++ b/src/collectd.conf.pod @@ -2397,9 +2397,11 @@ Synopsis: Password "password" Port "3306" MasterStats true + ConnectTimeout 10 + Alias "squeeze" Host "localhost" Socket "/var/run/mysql/mysqld.sock" SlaveStats true @@ -2414,6 +2416,11 @@ section "mysql_real_connect()" in the B. =over 4 +=item B I + +Alias to use as sender instead of hostname when reporting. This may be useful +when having cryptic hostnames. + =item B I Hostname of the database server. Defaults to B. @@ -2465,6 +2472,10 @@ privileges. See the B documentation above. If enabled, the plugin sends a notification if the replication slave I/O and / or SQL threads are not running. +=item B I + +Sets the connect timeout for the MySQL client. + =back =head2 Plugin C diff --git a/src/mysql.c b/src/mysql.c index d2d0b4bf..670179bf 100644 --- a/src/mysql.c +++ b/src/mysql.c @@ -43,12 +43,14 @@ struct mysql_database_s /* {{{ */ { char *instance; + char *alias; char *host; char *user; char *pass; char *database; char *socket; int port; + int timeout; _Bool master_stats; _Bool slave_stats; @@ -62,8 +64,12 @@ struct mysql_database_s /* {{{ */ }; typedef struct mysql_database_s mysql_database_t; /* }}} */ +struct st_mysql_options *options; static int mysql_read (user_data_t *ud); +void mysql_read_default_options(struct st_mysql_options *options, + const char *filename,const char *group); + static void mysql_database_free (void *arg) /* {{{ */ { mysql_database_t *db; @@ -78,6 +84,7 @@ static void mysql_database_free (void *arg) /* {{{ */ if (db->con != NULL) mysql_close (db->con); + sfree (db->alias); sfree (db->host); sfree (db->user); sfree (db->pass); @@ -120,12 +127,14 @@ static int mysql_config_database (oconfig_item_t *ci) /* {{{ */ memset (db, 0, sizeof (*db)); /* initialize all the pointers */ + db->alias = NULL; db->host = NULL; db->user = NULL; db->pass = NULL; db->database = NULL; db->socket = NULL; db->con = NULL; + db->timeout = 0; /* trigger a notification, if it's not running */ db->slave_io_running = 1; @@ -144,7 +153,9 @@ static int mysql_config_database (oconfig_item_t *ci) /* {{{ */ { oconfig_item_t *child = ci->children + i; - if (strcasecmp ("Host", child->key) == 0) + if (strcasecmp ("Alias", child->key) == 0) + status = cf_util_get_string (child, &db->alias); + else if (strcasecmp ("Host", child->key) == 0) status = cf_util_get_string (child, &db->host); else if (strcasecmp ("User", child->key) == 0) status = cf_util_get_string (child, &db->user); @@ -163,6 +174,8 @@ static int mysql_config_database (oconfig_item_t *ci) /* {{{ */ status = cf_util_get_string (child, &db->socket); else if (strcasecmp ("Database", child->key) == 0) status = cf_util_get_string (child, &db->database); + else if (strcasecmp ("ConnectTimeout", child->key) == 0) + status = cf_util_get_int (child, &db->timeout); else if (strcasecmp ("MasterStats", child->key) == 0) status = cf_util_get_boolean (child, &db->master_stats); else if (strcasecmp ("SlaveStats", child->key) == 0) @@ -261,6 +274,9 @@ static MYSQL *getconnection (mysql_database_t *db) } } + options->connect_timeout = db->timeout; + mysql_read_default_options(options, NULL, NULL); + if (mysql_real_connect (db->con, db->host, db->user, db->pass, db->database, db->port, db->socket, 0) == NULL) { @@ -285,7 +301,9 @@ static MYSQL *getconnection (mysql_database_t *db) static void set_host (mysql_database_t *db, char *buf, size_t buflen) { - if ((db->host == NULL) + if (db->alias) + sstrncpy (buf, db->alias, buflen); + else if ((db->host == NULL) || (strcmp ("", db->host) == 0) || (strcmp ("localhost", db->host) == 0)) sstrncpy (buf, hostname_g, buflen); -- 2.11.0