Merge pull request masterzen#27 from dhutty/galera-support

Merging in some Galera monitoring support

Author: Brice Figureau

MYSQL-SERVER-MIB.txt

@@ -32,7 +32,7 @@ IMPORTS
     FROM SNMPv2-CONF;
 
 mySQL		MODULE-IDENTITY
-    LAST-UPDATED "201211220000Z"	-- Nov. 22, 2012
+    LAST-UPDATED "201403110000Z"	-- Mar. 11, 2014
     ORGANIZATION "Days of Wonder, Inc."
     CONTACT-INFO
     "Days of Wonder
@@ -42,6 +42,10 @@ mySQL		MODULE-IDENTITY
     DESCRIPTION
     "This MIB describes a MySQL Database Server counters."
 
+    REVISION "201403110000Z"	    -- Mar. 3, 2014
+    DESCRIPTION
+    "Added support for some wsrep/galera data"
+
     REVISION "201211220000Z"	    -- Nov. 22, 2012
     DESCRIPTION
     "Removed errors and warnings."
@@ -1279,6 +1283,88 @@ myInnoDBRowLockWaits OBJECT-TYPE
     "The number of times a row lock had to be waited for"
     ::= { myStatus 150 }
 
+myWsrepClusterStateUuid OBJECT-TYPE
+    SYNTAX	OCTET STRING
+    MAX-ACCESS	read-only
+    STATUS	current
+    DESCRIPTION
+    "UUID for the cluster"
+    ::= { myStatus 151 }
+
+myWsrepClusterConfId OBJECT-TYPE
+    SYNTAX	INTEGER
+    MAX-ACCESS	read-only
+    STATUS	current
+    DESCRIPTION
+    "wsrep conf id for the cluster"
+    ::= { myStatus 152 }
+
+myWsrepClusterSize OBJECT-TYPE
+    SYNTAX	INTEGER
+    MAX-ACCESS	read-only
+    STATUS	current
+    DESCRIPTION
+    "Number of online nodes in the cluster"
+    ::= { myStatus 153 }
+
+myWsrepClusterStatus OBJECT-TYPE
+    SYNTAX	OCTET STRING
+    MAX-ACCESS	read-only
+    STATUS	current
+    DESCRIPTION
+    "Cluster status"
+    ::= { myStatus 154 }
+
+myWsrepReady OBJECT-TYPE
+    SYNTAX	OCTET STRING
+    MAX-ACCESS	read-only
+    STATUS	current
+    DESCRIPTION
+    "Node can accept SQL load"
+    ::= { myStatus 155 }
+
+myWsrepConnected OBJECT-TYPE
+    SYNTAX	OCTET STRING
+    MAX-ACCESS	read-only
+    STATUS	current
+    DESCRIPTION
+    "Cluster connection status"
+    ::= { myStatus 156 }
+
+myWsrepLocalStateComment OBJECT-TYPE
+    SYNTAX	OCTET STRING
+    MAX-ACCESS	read-only
+    STATUS	current
+    DESCRIPTION
+    "Description of local state"
+    ::= { myStatus 157 }
+
+myWsrepFlowControlPaused OBJECT-TYPE
+    SYNTAX	OCTET STRING
+    MAX-ACCESS	read-only
+    STATUS	current
+    DESCRIPTION
+    "indicates the fraction of time replication was paused since last SHOW
+    STATUS"
+    ::= { myStatus 158 }
+
+myWsrepReplicatedBytes OBJECT-TYPE
+    SYNTAX	Counter64
+    MAX-ACCESS	read-only
+    STATUS	current
+    DESCRIPTION
+    "Number of bytes replicated"
+    ::= { myStatus 159 }
+
+myWsrepReceivedBytes OBJECT-TYPE
+    SYNTAX	Counter64
+    MAX-ACCESS	read-only
+    STATUS	current
+    DESCRIPTION
+    "Number of wsrep bytes received"
+    ::= { myStatus 160 }
+
+
 -- conformance information
 
 mySQLMIBConformance OBJECT IDENTIFIER ::= { mySQL 2 }
@@ -1449,8 +1535,19 @@ mySQLGroup OBJECT-GROUP
 			myKeyBufBytesUsed,
 			myKeyBufferSize,
 			myInnoDBRowLockTime,
-			myInnoDBRowLockWaits
-    }
+			myInnoDBRowLockWaits,
+            myWsrepClusterStateUuid,
+            myWsrepClusterConfId,
+            myWsrepClusterSize,
+            myWsrepClusterStatus,
+            myWsrepReady,
+            myWsrepConnected,
+            myWsrepLocalStateComment,
+            myWsrepFlowControlPaused,
+            myWsrepReplicatedBytes,
+            myWsrepReceivedBytes
+
+}
     STATUS    current
     DESCRIPTION
      "The group of objects providing for management of MYSQL entities."

mysql-snmp

@@ -514,7 +514,10 @@ my @types = (
     'Counter64', 'Counter64', 'Counter64', 'Counter64',    # 137 - 140
     'Counter64', 'Counter64', 'Counter64', 'Counter64',    # 141 - 144
     'Counter64', 'Counter64', 'Counter64', 'Counter64',    # 145 - 148
-    'Counter64', 'Counter64',                              # 149 - 150
+    'Counter64', 'Counter64', 'String',    'Integer',      # 149 - 152
+    'Integer',   'String',    'String',    'String',       # 153 - 156
+    'String',    'String',    'Counter64', 'Counter64'     # 157 - 160
+
 );
 
 my @newkeys = (
@@ -593,6 +596,12 @@ my @newkeys = (
     'myInnoDBSemWaitTime',        'myKeyBufBytesUnflushed',      # 145 - 146
     'myKeyBufBytesUsed',          'myKeyBufferSize',             # 147 - 148
     'myInnoDBRowLockTime',        'myInnoDBRowLockWaits',        # 149 - 150
+    'myWsrepClusterStateUuid',    'myWsrepClusterConfId',        # 151 - 152
+    'myWsrepClusterSize',         'myWsrepClusterStatus',        # 153 - 154
+    'myWsrepReady',               'myWsrepConnected',            # 155 - 156
+    'myWsrepLocalStateComment',   'myWsrepFlowControlPaused',    # 157 - 158
+    'myWsrepReplicatedBytes',     'myWsrepReceivedBytes'         # 159 - 160
+
 );
 
 my @oldkeys = (
@@ -671,6 +680,12 @@ my @oldkeys = (
     'innodb_sem_wait_time_ms',    'key_buf_bytes_unflushed',       # 145 - 146
     'key_buf_bytes_used',         'key_buffer_size',               # 147 - 148
     'Innodb_row_lock_time',       'Innodb_row_lock_waits',         # 149 - 150
+    'wsrep_cluster_state_uuid',   'wsrep_cluster_conf_id',         # 151 - 152
+    'wsrep_cluster_size',         'wsrep_cluster_status',          # 153 - 154
+    'wsrep_ready',                'wsrep_connected',               # 155 - 156
+    'wsrep_local_state_comment',  'wsrep_flow_control_paused',     # 157 - 158
+    'wsrep_replicated_bytes',     'wsrep_received_bytes'           # 159 - 160
+
 );
 
 run() unless caller();
@@ -956,6 +971,9 @@ sub getASNType {
     elsif ($type eq 'OID') {
         return ASN_OBJECT_ID;
     }
+    elsif ($type eq 'Integer') {
+        return ASN_INTEGER;
+    }
     return ASN_OCTET_STR;
 }