       (merge-with (fn weighted-avg+count-fn
                     [avg cnt]
                     [(* avg cnt) cnt])
-                  (get (:execute-latencies m) "600")
-                  (get (:executed m) "600"))
+                  (get (:execute-latencies m) (str TEN-MIN-IN-SECONDS))
+                  (get (:executed m) (str TEN-MIN-IN-SECONDS)))
       vals ;; Ignore the stream ids.
       (reduce add-pairs
               [0. 0]) ;; Combine weighted averages and counts.
       ((fn [[weighted-avg cnt]]
-        (div weighted-avg (* 1000 (min uptime 600))))))))
+        (div weighted-avg (* 1000 (min uptime TEN-MIN-IN-SECONDS))))))))
 
 (defn agg-pre-merge-comp-page-bolt
   [{exec-id :exec-id

  (:use [backtype.storm.daemon [common :only [system-id?]]]))

;;TODO: consider replacing this with some sort of RRD

(defn curr-time-bucket
  [^Integer time-secs ^Integer bucket-size-secs]

                    (aggregate-bolt-stats true)
                    (aggregate-bolt-streams)
                    swap-map-order
                    (get (str TEN-MIN-IN-SECONDS))))
        uptime (nil-to-zero (.get_uptime_secs e))
        window (if (< uptime TEN-MIN-IN-SECONDS) uptime TEN-MIN-IN-SECONDS)
        executed (-> stats :executed nil-to-zero)
        latency (-> stats :execute-latencies nil-to-zero)]
    (if (> window 0)
