Add advanced stats support for request_time MeetMe#167

Author: gmr

newrelic_plugin_agent/plugins/nginx.py

@@ -9,11 +9,14 @@
 
 LOGGER = logging.getLogger(__name__)
 
-PATTERN = re.compile(r'^Active connections\:\s(?P<connections>\d+)\s+\n'
-                     r'server accepts handled requests\n\s+(?P<accepts>\d+)'
-                     r'\s+(?P<handled>\d+)\s+(?P<requests>\d+)\s+\nReading\:'
-                     r'\s+(?P<reading>\d+)\s+Writing\:\s+(?P<writing>\d+)'
-                     r'\s+Waiting\:\s+(?P<waiting>\d+)')
+PATTERN = re.compile(r'^Active connections: (?P<connections>\d+)\s+[\w ]+\n'
+                     r'\s+(?P<accepts>\d+)'
+                     r'\s+(?P<handled>\d+)'
+                     r'\s+(?P<requests>\d+)'
+                     r'(\s+(?P<time>\d+)|)'
+                     r'\s+Reading:\s+(?P<reading>\d+)'
+                     r'\s+Writing:\s+(?P<writing>\d+)'
+                     r'\s+Waiting:\s+(?P<waiting>\d+)')
 
 
 class Nginx(base.HTTPStatsPlugin):
@@ -26,17 +29,19 @@ class Nginx(base.HTTPStatsPlugin):
             'accepts': 'Requests/Accepted',
             'handled': 'Requests/Handled',
             'requests': 'Totals/Requests',
+            'time': 'Requests/Duration',
             'reading': 'Connections/Reading',
             'writing': 'Connections/Writing',
             'waiting': 'Connections/Waiting'}
 
     TYPES = {'connections': '',
-            'accepts': '',
-            'handled': '',
-            'requests': '',
-            'reading': '',
-            'writing': '',
-            'waiting': ''}
+             'accepts': '',
+             'handled': '',
+             'requests': '',
+             'reading': '',
+             'time': 'seconds',
+             'writing': '',
+             'waiting': ''}
 
     def add_datapoints(self, stats):
         """Add all of the data points for a node
@@ -50,10 +55,12 @@ def add_datapoints(self, stats):
         if matches:
             for key in self.KEYS.keys():
                 try:
-                    value = int(matches.group(key))
+                    value = int(matches.group(key) or 0)
                 except (IndexError, ValueError):
                     value = 0
                 if key in self.GAUGES:
                     self.add_gauge_value(self.KEYS[key], '', value)
                 else:
                     self.add_derive_value(self.KEYS[key], '', value)
+        else:
+            LOGGER.debug('Stats output: %r', stats)