From: Matthias Runge <mrunge@redhat.com>
Date: Wed, 2 Sep 2020 06:09:18 +0000 (+0200)
Subject: Do not change counter/gauge names for now
X-Git-Tag: 6.0.0-rc0~140^2~2^2~4^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=404450abd278bc7e58cc288bebdf3ff57c854d62;p=thirdparty%2Fcollectd.git

Do not change counter/gauge names for now

This is a change to be committed for 6.0.
---

diff --git a/src/mysql.c b/src/mysql.c
index 4c5ab341a..622c51c25 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -418,7 +418,7 @@ static int mysql_read_primary_stats(mysql_database_t *db, MYSQL *con) {
   }
 
   position = atoll(row[1]);
-  derive_submit("mysql_log_position", "primary-bin", position, db);
+  derive_submit("mysql_log_position", "master-bin", position, db);
 
   row = mysql_fetch_row(res);
   if (row != NULL)
@@ -474,21 +474,21 @@ static int mysql_read_replica_stats(mysql_database_t *db, MYSQL *con) {
     unsigned long long counter;
     double gauge;
 
-    gauge_submit("bool", "replica-sql-running",
+    gauge_submit("bool", "slave-sql-running",
                  (row[SLAVE_SQL_RUNNING_IDX] != NULL) &&
                      (strcasecmp(row[SLAVE_SQL_RUNNING_IDX], "yes") == 0),
                  db);
 
-    gauge_submit("bool", "replica-io-running",
+    gauge_submit("bool", "slave-io-running",
                  (row[SLAVE_IO_RUNNING_IDX] != NULL) &&
                      (strcasecmp(row[SLAVE_IO_RUNNING_IDX], "yes") == 0),
                  db);
 
     counter = atoll(row[READ_MASTER_LOG_POS_IDX]);
-    derive_submit("mysql_log_position", "replica-read", counter, db);
+    derive_submit("mysql_log_position", "slave-read", counter, db);
 
     counter = atoll(row[EXEC_MASTER_LOG_POS_IDX]);
-    derive_submit("mysql_log_position", "replica-exec", counter, db);
+    derive_submit("mysql_log_position", "slave-exec", counter, db);
 
     if (row[SECONDS_BEHIND_MASTER_IDX] != NULL) {
       gauge = atof(row[SECONDS_BEHIND_MASTER_IDX]);