From 82fa8a3d1e8466ef36b58604d20fcc145ea12118 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 10 Mar 2020 09:08:10 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 config/environments/development.rb   |  2 ++
 config/prometheus/common_metrics.yml | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

(limited to 'config')

diff --git a/config/environments/development.rb b/config/environments/development.rb
index b6b025112fe..41d20b5062b 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -59,5 +59,7 @@ Rails.application.configure do
     config.active_record.migration_error = false
     config.active_record.verbose_query_logs = false
     config.action_view.cache_template_loading = true
+
+    config.middleware.delete BetterErrors::Middleware
   end
 end
diff --git a/config/prometheus/common_metrics.yml b/config/prometheus/common_metrics.yml
index 314ee44ed71..6eae29c3906 100644
--- a/config/prometheus/common_metrics.yml
+++ b/config/prometheus/common_metrics.yml
@@ -17,6 +17,8 @@ panel_groups:
   - title: "Latency"
     type: "area-chart"
     y_label: "Latency (ms)"
+    y_axis:
+      format: milliseconds
     weight: 1
     metrics:
     - id: response_metrics_nginx_ingress_latency_pod_average
@@ -26,6 +28,8 @@ panel_groups:
   - title: "HTTP Error Rate"
     type: "area-chart"
     y_label: "HTTP Errors (%)"
+    y_axis:
+      format: percentHundred
     weight: 1
     metrics:
     - id: response_metrics_nginx_ingress_http_error_rate
@@ -138,6 +142,8 @@ panel_groups:
   - title: "HTTP Error Rate (Errors / Sec)"
     type: "area-chart"
     y_label: "HTTP 500 Errors / Sec"
+    y_axis:
+      precision: 0
     weight: 1
     metrics:
     - id: response_metrics_nginx_http_error_rate
@@ -150,6 +156,8 @@ panel_groups:
   - title: "Memory Usage (Total)"
     type: "area-chart"
     y_label: "Total Memory Used (GB)"
+    y_axis:
+      format: "gibibytes"
     weight: 4
     metrics:
     - id: system_metrics_kubernetes_container_memory_total
@@ -168,6 +176,8 @@ panel_groups:
   - title: "Memory Usage (Pod average)"
     type: "line-chart"
     y_label: "Memory Used per Pod (MB)"
+    y_axis:
+      format: "mebibytes"
     weight: 2
     metrics:
     - id: system_metrics_kubernetes_container_memory_average
@@ -177,6 +187,8 @@ panel_groups:
   - title: "Canary: Memory Usage (Pod Average)"
     type: "line-chart"
     y_label: "Memory Used per Pod (MB)"
+    y_axis:
+      format: "mebibytes"
     weight: 2
     metrics:
     - id: system_metrics_kubernetes_container_memory_average_canary
@@ -206,6 +218,8 @@ panel_groups:
   - title: "Knative function invocations"
     type: "area-chart"
     y_label: "Invocations"
+    y_axis:
+      precision: 0
     weight: 1
     metrics:
     - id: system_metrics_knative_function_invocation_count
-- 
cgit v1.2.3