diff options
| author | Joshua Lambert <joshua@gitlab.com> | 2018-12-17 23:48:55 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-12-17 23:48:55 +0000 |
| commit | 3b9ab3f50f9286d0aae88f57708f97121597a64b (patch) | |
| tree | 5386def2747e3fa93ddf03f81dffadcf39a45af9 /app/models/prometheus_metric.rb | |
| parent | 735d24f368ccaa28667e480b3e20a4d555a62955 (diff) | |
| download | gitlab-ce-3b9ab3f50f9286d0aae88f57708f97121597a64b.tar.gz | |
Add NGINX 0.16.0 and above metrics
Diffstat (limited to 'app/models/prometheus_metric.rb')
| -rw-r--r-- | app/models/prometheus_metric.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/models/prometheus_metric.rb b/app/models/prometheus_metric.rb index ce2db9cb44c..defbade1ed6 100644 --- a/app/models/prometheus_metric.rb +++ b/app/models/prometheus_metric.rb @@ -5,11 +5,12 @@ class PrometheusMetric < ActiveRecord::Base enum group: { # built-in groups - nginx_ingress: -1, + nginx_ingress_vts: -1, ha_proxy: -2, aws_elb: -3, nginx: -4, kubernetes: -5, + nginx_ingress: -6, # custom/user groups business: 0, @@ -30,6 +31,7 @@ class PrometheusMetric < ActiveRecord::Base GROUP_TITLES = { # built-in groups + nginx_ingress_vts: _('Response metrics (NGINX Ingress VTS)'), nginx_ingress: _('Response metrics (NGINX Ingress)'), ha_proxy: _('Response metrics (HA Proxy)'), aws_elb: _('Response metrics (AWS ELB)'), @@ -43,7 +45,8 @@ class PrometheusMetric < ActiveRecord::Base }.freeze REQUIRED_METRICS = { - nginx_ingress: %w(nginx_upstream_responses_total nginx_upstream_response_msecs_avg), + nginx_ingress_vts: %w(nginx_upstream_responses_total nginx_upstream_response_msecs_avg), + nginx_ingress: %w(nginx_ingress_controller_requests nginx_ingress_controller_ingress_upstream_latency_seconds_sum), ha_proxy: %w(haproxy_frontend_http_requests_total haproxy_frontend_http_responses_total), aws_elb: %w(aws_elb_request_count_sum aws_elb_latency_average aws_elb_httpcode_backend_5_xx_sum), nginx: %w(nginx_server_requests nginx_server_requestMsec), |