Rename hits to requests.

vuksanv · vuksanv · commit 025bde543777 · 2011-09-19T20:26:20.000-04:00
Correctly calculate requests per second. Do not rely on built in RPS since
that calculates average since the server was started
diff --git a/apache_status/conf.d/apache_status.conf b/apache_status/conf.d/apache_status.conf
@@ -95,8 +95,8 @@ collection_group {
   }
 
   metric {
-    name  = "ap_hits"
-    title = "Hits"
+    name  = "ap_requests"
+    title = "Requests"
     value_threshold = 0.0
   }
 }
diff --git a/apache_status/python_modules/apache_status.py b/apache_status/python_modules/apache_status.py
@@ -9,6 +9,8 @@
 
 # global to store state for "total accesses"
 last_total_accesses = 0
+last_update = 0
+last_uptime = 0
 
 descriptors = list()
 Desc_Skel   = {}
@@ -80,31 +82,47 @@ def update_status(self):
                     scline = l.split(": ", 1)[1].rstrip()
                     for sck in scline:
                         self.status[ Scoreboard_bykey[sck] ] += 1
-                elif l.find("ReqPerSec:") == 0:
-                    scline = l.split(": ", 1)[1].rstrip()
-                    self.status["ap_rps"] = float(scline)
                 elif l.find("Total Accesses:") == 0:
-                    global last_total_accesses
+                    global last_total_accesses, last_update
                     new_value = int(l.split(": ", 1)[1].rstrip())
+                    now = time.time()
                     if (last_total_accesses == 0):
                         # if we don't have a value from last time, record a 0,
                         # otherwise we'll cause an enormous spike in the graph
                         # by recording the total value of the counter
-                        self.status["ap_hits"] = 0
+                        self.status["ap_requests"] = 0
+                        self.status["ap_rps"] = 0
                     else:
                         # subtract counter's old value from the new value and
                         # write it
                         hits = new_value - last_total_accesses
-                        self.status["ap_hits"] = hits
+                        self.status["ap_requests"] = hits
+                        # Calculate the average requests per second
+                        self.status["ap_rps"] = float(hits) / ( now - last_update )
                     # store for next time
                     last_total_accesses = new_value
+                    last_update = now
 
                 elif l.find("BusyWorkers:") == 0:
                     scline = l.split(": ", 1)[1].rstrip()
                     self.status["ap_busy_workers"] = int(scline)
                 elif l.find("IdleWorkers:") == 0:
                     scline = l.split(": ", 1)[1].rstrip()
                     self.status["ap_idle_workers"] = int(scline)
+                elif l.find("Uptime:") == 0:
+                    global last_uptime
+                    scline = l.split(": ", 1)[1].rstrip()
+                    uptime = int(scline)
+                    # Check whether uptime is less than what it used to be. If it is Apache
+                    # was restarted so we should set ap_requests and ap_rps to 0. Otherwise
+                    # we'll get a huge spike
+                    if ( last_uptime == 0 or uptime < last_uptime):
+                        print "Zero out ap_requests since Apache has been restarted"
+                        self.status["ap_requests"] = 0
+                        self.status["ap_rps"] = 0
+                    last_uptime = uptime
+                    self.status["ap_uptime"] = uptime
+
 
         except urllib2.URLError:
             traceback.print_exc()
@@ -170,7 +188,7 @@ def metric_init(params):
                 }))
 
     descriptors.append(create_desc({
-                "name"       : "ap_hits",
+                "name"       : "ap_requests",
                 "value_type" : "uint",
                 "units"      : "hits",
                 "format"     : "%u",
@@ -193,6 +211,15 @@ def metric_init(params):
                 "description": "Idle threads",
                 }))
 
+    descriptors.append(create_desc({
+                "name"       : "ap_uptime",
+                "value_type" : "uint",
+                "units"      : "seconds",
+                "format"     : "%u",
+                "description": "Uptime",
+                }))
+
+
     for k,v in Scoreboard.iteritems():
         descriptors.append(create_desc({
                     "name"        : k,
@@ -216,10 +243,9 @@ def metric_cleanup():
             for d in descriptors:
                 v = d['call_back'](d['name'])
                 if d['name'] == "ap_rps":
-                    print 'value for %s is %.3f' % (d['name'], v)
+                    print 'value for %s is %.4f' % (d['name'], v)
                 else:
                     print 'value for %s is %u'   % (d['name'], v)
             time.sleep(15)
     except KeyboardInterrupt:
-        time.sleep(0.2)
         os._exit(1)

Original file line number	Diff line number	Diff line change
`@@ -95,8 +95,8 @@ collection_group {`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`metric {`
`98`		`- name = "ap_hits"`
`99`		`- title = "Hits"`
	`98`	`+ name = "ap_requests"`
	`99`	`+ title = "Requests"`
`100`	`100`	`value_threshold = 0.0`
`101`	`101`	`}`
`102`	`102`	`}`