Merge pull request #1521 from DataDog/leo/phpfpm

[phpfpm] Use monotonic counts instead of counters
DataDog · Apr 9, 2015 · e233fa2 · e233fa2
2 parents a694c2a + 09472ef
commit e233fa2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/checks.d/php_fpm.py b/checks.d/php_fpm.py
@@ -22,13 +22,10 @@ class PHPFPMCheck(AgentCheck):
         'total processes': 'php_fpm.processes.total',
     }
 
-    RATES = {
-        'max children reached': 'php_fpm.processes.max_reached'
-    }
-
-    COUNTERS = {
+    MONOTONIC_COUNTS = {
         'accepted conn': 'php_fpm.requests.accepted',
-        'slow requests': 'php_fpm.requests.slow'
+        'max children reached': 'php_fpm.processes.max_reached',
+        'slow requests': 'php_fpm.requests.slow',
     }
 
     def check(self, instance):
@@ -86,17 +83,11 @@ def _process_status(self, status_url, auth, tags):
                 continue
             self.gauge(mname, int(data[key]), tags=metric_tags)
 
-        for key, mname in self.RATES.iteritems():
-            if key not in data:
-                self.log.warn("Rate metric {0} is missing from FPM status".format(key))
-                continue
-            self.rate(mname, int(data[key]), tags=metric_tags)
-
-        for key, mname in self.COUNTERS.iteritems():
+        for key, mname in self.MONOTONIC_COUNTS.iteritems():
             if key not in data:
                 self.log.warn("Counter metric {0} is missing from FPM status".format(key))
                 continue
-            self.increment(mname, int(data[key]), tags=metric_tags)
+            self.monotonic_count(mname, int(data[key]), tags=metric_tags)
 
         # return pool, to tag the service check with it if we have one
         return pool_name

diff --git a/tests/test_php_fpm.py b/tests/test_php_fpm.py
@@ -62,7 +62,7 @@ def test_status(self):
             'tags': ['cluster:forums']
         }
 
-        self.run_check({'instances': [instance]})
+        self.run_check_twice({'instances': [instance]})
 
         metrics = [
             'php_fpm.listen_queue.size',
@@ -83,8 +83,5 @@ def test_status(self):
 
         self.assertServiceCheck('php_fpm.can_ping', status=AgentCheck.OK,
                                 count=1)
-        time.sleep(1)
 
-        # Run check second time to get the rate
-        self.run_check({'instances': [instance]})
         self.assertMetric('php_fpm.processes.max_reached', count=1)