Implement master status MIB

4 files changed, 172 insertions, 54 deletions

diff --git a/src/MYSQL-STAT-MIB.txt b/src/MYSQL-STAT-MIB.txt
index 33bae3b..9efc19d 100644
--- a/src/MYSQL-STAT-MIB.txt
+++ b/src/MYSQL-STAT-MIB.txt
@@ -18,12 +18,12 @@ IMPORTS
                 FROM INET-ADDRESS-MIB;
 
 mysql MODULE-IDENTITY
-        LAST-UPDATED "201606071145Z"
+        LAST-UPDATED "201606090926Z"
         ORGANIZATION "Gray Software"
         CONTACT-INFO "Sergey Poznyakoff <gray@gnu.org>"
         DESCRIPTION
                 "This MIB module defines objects for MySQL statistics."
-        REVISION "201606071145Z"
+        REVISION "201606090926Z"
         DESCRIPTION
                 "First revision."
         ::= { enterprises 9163 102 }
@@ -69,7 +69,7 @@ ReplSlaveStatusEntry	::= SEQUENCE {
         replLastIOErrno         Integer32,
         replLastIOError         SQLErrorString,
         replExecMasterLogPos    Counter32,
-        replRelayLogSpace       Counter64,
+        replRelayLogSpace       Gauge32,
         replSecondsBehindMaster TimeStamp,
         replMasterHost          DisplayString,
         replMasterUser          DisplayString,
@@ -81,7 +81,7 @@ ReplSlaveStatusEntry	::= SEQUENCE {
         replReplicateIgnoreTable        DisplayString,
         replReplicateWildDoTable        DisplayString,
         replReplicateWildIgnoreTable    DisplayString,
-        replSkipCounter         Counter32,
+        replSkipCounter         Gauge32,
         replUntilCondition      DisplayString,
         replUntilLogFile        DisplayString,
         replUntilLogPos         DisplayString,
@@ -461,6 +461,77 @@ replMasterSSLVerifyServerCert	OBJECT-TYPE
         ::= { replSlaveStatusEntry 38 }
 
 --
+-- Replication master status
+--
+        
+replMasterStatusTable   OBJECT-TYPE
+        SYNTAX  SEQUENCE OF ReplMasterStatusEntry
+        MAX-ACCESS      not-accessible
+        STATUS  current
+        DESCRIPTION
+                "A table of replication master status.  On replication master,
+                 it contains a single row, describing the current
+                 status."
+        ::= { replication 2 }
+
+replMasterStatusEntry   OBJECT-TYPE
+        SYNTAX  ReplMasterStatusEntry
+        MAX-ACCESS      not-accessible
+        STATUS  current
+        DESCRIPTION
+                "An entry describing master status."
+        INDEX { replMasterIndex }
+        ::= { replMasterStatusTable 1 }
+
+ReplMasterStatusEntry   ::= SEQUENCE {
+        replMasterIndex                 Integer32,
+        replMasterCurrentLogFile        DisplayString,
+        replMasterCurrentLogPos                 Counter32,
+        replMasterBinlogDoDB            DisplayString,
+        replMasterBinlogIgnoreDB        DisplayString
+}
+
+replMasterIndex OBJECT-TYPE
+        SYNTAX  Integer32 (0..65535)
+        MAX-ACCESS not-accessible
+        STATUS  current
+        DESCRIPTION
+                "A number uniquely identifying master status row."
+        ::= { replMasterStatusEntry 1 }
+
+replMasterCurrentLogFile        OBJECT-TYPE
+        SYNTAX DisplayString
+        MAX-ACCESS read-only
+        STATUS current
+        DESCRIPTION
+                "The name of the master binary log file."
+        ::= { replMasterStatusEntry 2 }
+
+replMasterCurrentLogPos         OBJECT-TYPE
+        SYNTAX Counter32
+        MAX-ACCESS read-only
+        STATUS current
+        DESCRIPTION
+                "The position in the current master binary log file."
+        ::= { replMasterStatusEntry 3 }
+        
+replMasterBinlogDoDB    OBJECT-TYPE
+        SYNTAX  DisplayString
+        MAX-ACCESS read-only
+        STATUS current
+        DESCRIPTION
+                "The list of database names to include in the binlog."
+        ::= { replMasterStatusEntry 4 }
+        
+replMasterBinlogIgnoreDB        OBJECT-TYPE
+        SYNTAX  DisplayString
+        MAX-ACCESS read-only
+        STATUS current
+        DESCRIPTION
+                "The list of database names to exclude from the binlog."
+        ::= { replMasterStatusEntry 5 }
+        
+--
 -- Process List
 --
 
diff --git a/src/mysqlstat.8 b/src/mysqlstat.8
index f79e9cf..e0bcb7f 100644
--- a/src/mysqlstat.8
+++ b/src/mysqlstat.8
@@ -48,6 +48,18 @@ privileges.
 To configure the module, it is recommended to use the
 .BR mysqlstat\-setup (1)
 utility.
+.SS Caching
+In order to minimize its impact on MySQL server, the
+.B mysqlstat
+module caches the data obtained from the server.  Default caching
+interval is 10 seconds for tabular information.  Additionally, results
+of each
+.B SHOW PROCESSLIST
+are cached for 10 seconds.  This means that updates of 
+.B processListTable 
+entries may delay for up to 20 seconds.
+.PP
+As of version 1.0, these delays are not configurable.
 .SH CONFIGURATION
 MySQL credentials are read from file
 .BR /etc/snmp/mysqlstat.cnf .
diff --git a/src/mysqlstat.c b/src/mysqlstat.c
index 9d9975e..4eb5a18 100644
--- a/src/mysqlstat.c
+++ b/src/mysqlstat.c
@@ -275,6 +275,9 @@ store_slave_status_row(struct replSlaveStatusTable_entry *ent,
                 ent->replSecondsBehindMaster = strtoul(value, NULL, 10) * 100;
         } else if (STREQ(Master_SSL_Verify_Server_Cert, name)) {
                 ent->replMasterSSLVerifyServerCert = val_bool(value);
+        } else {
+                snmp_log(LOG_ERR, "unrecognized slave status column: %s\n",
+                         name);
         }
 }
 
@@ -366,6 +369,88 @@ replSlaveStatusTable_entry_free(void *data)
 }
 
 static void
+store_master_status_row(struct replMasterStatusTable_entry *ent,
+                       char const *name, char const *value)
+{
+        if (STREQ(File, name)) {
+                ASSIGN_STRING(ent, replMasterCurrentLogFile, value);
+        } else if (STREQ(Position, name)) {
+                ent->replMasterCurrentLogPos = strtoul(value, NULL, 10);
+        } else if (STREQ(Binlog_Do_DB, name)) {
+                ASSIGN_STRING(ent, replMasterBinlogDoDB, value);
+        } else if (STREQ(Binlog_Ignore_DB, name)) {
+                ASSIGN_STRING(ent, replMasterBinlogIgnoreDB, value);
+        } else {
+                snmp_log(LOG_ERR, "unrecognized master status column: %s\n",
+                         name);
+        }
+}
+                
+int
+replMasterStatusTable_load(netsnmp_cache *cache, void *vmagic)
+{
+        mysqlstat_connection_t conn;
+        MYSQL_RES *res;
+        MYSQL_ROW row;
+        MYSQL_FIELD *fields;
+        unsigned int num_fields, i;
+        netsnmp_tdata *table = (netsnmp_tdata *) vmagic;
+        struct replMasterStatusTable_entry *ent;
+        netsnmp_tdata_row *data_row;
+        
+        conn = mysqlstat_connect();
+        if (!conn)
+                return SNMP_ERR_NOSUCHNAME;
+        
+        DEBUGMSGTL(("mysqlstat:sql", "Getting master status\n"));
+        if (mysql_query(&conn->mysql, "SHOW MASTER STATUS")) {
+                snmp_log(LOG_ERR, "can't get master status: %s\n",
+                         mysql_error(&conn->mysql));
+                return SNMP_ERR_NOSUCHNAME;
+        }
+
+        res = mysql_store_result(&conn->mysql);
+        if (mysql_num_rows(res) < 1)
+                return 0;
+
+        num_fields = mysql_num_fields(res);
+        fields = mysql_fetch_fields(res);
+        row = mysql_fetch_row(res);
+
+        ent = SNMP_MALLOC_TYPEDEF(struct replMasterStatusTable_entry);
+        if (!ent)
+                return SNMP_ERR_GENERR;
+        
+        data_row = netsnmp_tdata_create_row();
+        if (!data_row) {
+                SNMP_FREE(ent);
+                return SNMP_ERR_GENERR;
+        }
+        data_row->data = ent