Automatic merge of gitlab-org/gitlab-ce master

lib/peek/views/active_record.rb

@@ -5,15 +5,15 @@ module Peek
     class ActiveRecord < DetailedView
       DEFAULT_THRESHOLDS = {
         calls: 100,
-        duration: 3,
-        individual_call: 1
+        duration: 3000,
+        individual_call: 1000
       }.freeze
 
       THRESHOLDS = {
         production: {
           calls: 100,
-          duration: 15,
-          individual_call: 5
+          duration: 15000,
+          individual_call: 5000
         }
       }.freeze
 

lib/peek/views/gitaly.rb

@@ -5,15 +5,15 @@ module Peek
     class Gitaly < DetailedView
       DEFAULT_THRESHOLDS = {
         calls: 30,
-        duration: 1,
-        individual_call: 0.5
+        duration: 1000,
+        individual_call: 500
       }.freeze
 
       THRESHOLDS = {
         production: {
           calls: 30,
-          duration: 1,
-          individual_call: 0.5
+          duration: 1000,
+          individual_call: 500
         }
       }.freeze
 
@@ -24,7 +24,7 @@ module Peek
       private
 
       def duration
-        ::Gitlab::GitalyClient.query_time
+        ::Gitlab::GitalyClient.query_time * 1000
       end
 
       def calls