X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmysql.c;h=aafd4dbdb662de7a96d2678b181f73ec71218850;hb=965115a9ec6d4beaea5c6c1483176b80445c5f96;hp=5244d29c3100d87e5b9dc0d6480ed05bf3f9e2ea;hpb=abaa1c8a24e8eff5632dd6052b1da5f6535caf19;p=collectd.git diff --git a/src/mysql.c b/src/mysql.c index 5244d29c..aafd4dbd 100644 --- a/src/mysql.c +++ b/src/mysql.c @@ -225,7 +225,8 @@ static int mysql_config_database(oconfig_item_t *ci) /* {{{ */ plugin_register_complex_read( /* group = */ NULL, cb_name, mysql_read, /* interval = */ 0, &(user_data_t){ - .data = db, .free_func = mysql_database_free, + .data = db, + .free_func = mysql_database_free, }); } else { mysql_database_free(db); @@ -354,7 +355,8 @@ static void derive_submit(const char *type, const char *type_instance, static void traffic_submit(derive_t rx, derive_t tx, mysql_database_t *db) { value_t values[] = { - {.derive = rx}, {.derive = tx}, + {.derive = rx}, + {.derive = tx}, }; submit("mysql_octets", NULL, values, STATIC_ARRAY_SIZE(values), db); @@ -501,14 +503,14 @@ static int mysql_read_slave_stats(mysql_database_t *db, MYSQL *con) { (db->slave_io_running)) { n.severity = NOTIF_WARNING; ssnprintf(n.message, sizeof(n.message), - "slave I/O thread not started or not connected to master"); + "slave I/O thread not started or not connected to master"); plugin_dispatch_notification(&n); db->slave_io_running = false; } else if (((io != NULL) && (strcasecmp(io, "yes") == 0)) && (!db->slave_io_running)) { n.severity = NOTIF_OKAY; ssnprintf(n.message, sizeof(n.message), - "slave I/O thread started and connected to master"); + "slave I/O thread started and connected to master"); plugin_dispatch_notification(&n); db->slave_io_running = true; } @@ -905,6 +907,8 @@ static int mysql_read(user_data_t *ud) { } else if (strncmp(key, "Slow_queries", strlen("Slow_queries")) == 0) { derive_submit("mysql_slow_queries", NULL, val, db); + } else if (strcmp(key, "Uptime") == 0) { + gauge_submit("uptime", NULL, val, db); } } mysql_free_result(res);