[mongo] Add WiredTiger metrics

[yann@datadoghq.com] rebased on #1979 → `wiredtiger` option.
DataDog · Nov 2, 2015 · 93cf083 · 93cf083
1 parent 0962b19
commit 93cf083
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 8 deletions.
diff --git a/checks.d/mongo.py b/checks.d/mongo.py
@@ -235,13 +235,25 @@ class MongoDb(AgentCheck):
     }
 
     """
-    Associates with the metric list to collect.
+    WiredTiger storage engine.
+
     """
-    AVAILABLE_METRICS = {
-        'durabilty': DURABILITY_METRICS,
-        'locks': LOCKS_METRICS,
-        'metrics.commands': COMMANDS_METRICS,
-        'tcmalloc': TCMALLOC_METRICS,
+    WIREDTIGER_METRICS = {
+
+        "wiredTiger.cache.bytes currently in the cache": GAUGE,
+        "wiredTiger.cache.failed eviction of pages that exceeded the in-memory maximum": GAUGE,
+        "wiredTiger.cache.in-memory page splits": GAUGE,
+        "wiredTiger.cache.maximum bytes configured": GAUGE,
+        "wiredTiger.cache.maximum page size at eviction": GAUGE,
+        "wiredTiger.cache.pages currently held in the cache": GAUGE,
+        "wiredTiger.cache.pages evicted because they exceeded the in-memory maximum": GAUGE,
+        "wiredTiger.cache.pages evicted by application threads": GAUGE,
+        "wiredTiger.concurrentTransactions.read.available": GAUGE,
+        "wiredTiger.concurrentTransactions.read.out": GAUGE,
+        "wiredTiger.concurrentTransactions.read.totalTickets": GAUGE,
+        "wiredTiger.concurrentTransactions.write.available": GAUGE,
+        "wiredTiger.concurrentTransactions.write.out": GAUGE,
+        "wiredTiger.concurrentTransactions.write.totalTickets": GAUGE,
     }
 
     """
@@ -256,6 +268,17 @@ class MongoDb(AgentCheck):
         '\.w\\b': ".intent_exclusive",
     }
 
+    """
+    Associates with the metric list to collect.
+    """
+    AVAILABLE_METRICS = {
+        'durabilty': DURABILITY_METRICS,
+        'locks': LOCKS_METRICS,
+        'metrics.commands': COMMANDS_METRICS,
+        'tcmalloc': TCMALLOC_METRICS,
+        'wiredtiger': WIREDTIGER_METRICS,
+    }
+
     def __init__(self, name, init_config, agentConfig, instances=None):
         AgentCheck.__init__(self, name, init_config, agentConfig, instances)
         self._last_state_by_server = {}

diff --git a/checks/__init__.py b/checks/__init__.py
@@ -91,7 +91,7 @@ def normalize(self, metric, prefix=None):
         """Turn a metric into a well-formed metric name
         prefix.b.c
         """
-        name = re.sub(r"[,\+\*\-/()\[\]{}]", "_", metric)
+        name = re.sub(r"[,\+\*\-/()\[\]{}\s]", "_", metric)
         # Eliminate multiple _
         name = re.sub(r"__+", "_", name)
         # Don't start/end with _
@@ -759,7 +759,7 @@ def normalize(self, metric, prefix=None, fix_case=False):
             if prefix is not None:
                 prefix = self.convert_to_underscore_separated(prefix)
         else:
-            name = re.sub(r"[,\+\*\-/()\[\]{}]", "_", metric)
+            name = re.sub(r"[,\+\*\-/()\[\]{}\s]", "_", metric)
         # Eliminate multiple _
         name = re.sub(r"__+", "_", name)
         # Don't start/end with _

diff --git a/conf.d/mongo.yaml.example b/conf.d/mongo.yaml.example
@@ -28,8 +28,10 @@ instances:
     # * `locks` - Locks
     # * `metrics.commands` - Use of database commands
     # * `tcmalloc` -  TCMalloc memory allocator
+    # * `wiredtiger` - WiredTiger storage engine
     # additional_metrics:
     #   - durability
     #   - locks
     #   - metrics.commands
     #   - tcmalloc
+    #   - wiredtiger