Commit 41b4f9fe authored by Mike Greiling's avatar Mike Greiling

Merge branch 'add-new-nginx-metrics' into 'master'

Add NGINX 0.16.0 and above metrics

Closes #50431

See merge request gitlab-org/gitlab-ce!22133
parents 735d24f3 3b9ab3f5
...@@ -92,7 +92,11 @@ function queryTimeSeries(query, graphDrawData, lineStyle) { ...@@ -92,7 +92,11 @@ function queryTimeSeries(query, graphDrawData, lineStyle) {
if (seriesCustomizationData) { if (seriesCustomizationData) {
metricTag = seriesCustomizationData.value || timeSeriesMetricLabel; metricTag = seriesCustomizationData.value || timeSeriesMetricLabel;
[lineColor, areaColor] = pickColor(seriesCustomizationData.color); [lineColor, areaColor] = pickColor(seriesCustomizationData.color);
if (timeSeriesParsed.length > 0) {
shouldRenderLegend = false; shouldRenderLegend = false;
} else {
shouldRenderLegend = true;
}
} else { } else {
metricTag = timeSeriesMetricLabel || query.label || `series ${timeSeriesNumber + 1}`; metricTag = timeSeriesMetricLabel || query.label || `series ${timeSeriesNumber + 1}`;
[lineColor, areaColor] = pickColor(); [lineColor, areaColor] = pickColor();
...@@ -101,19 +105,6 @@ function queryTimeSeries(query, graphDrawData, lineStyle) { ...@@ -101,19 +105,6 @@ function queryTimeSeries(query, graphDrawData, lineStyle) {
} }
} }
if (!shouldRenderLegend) {
if (!timeSeriesParsed[0].tracksLegend) {
timeSeriesParsed[0].tracksLegend = [];
}
timeSeriesParsed[0].tracksLegend.push({
max: maximumValue,
average: accum / timeSeries.values.length,
lineStyle,
lineColor,
metricTag,
});
}
const values = datesWithoutGaps.map(time => ({ const values = datesWithoutGaps.map(time => ({
time, time,
value: findByDate(timeSeries.values, time), value: findByDate(timeSeries.values, time),
...@@ -135,6 +126,19 @@ function queryTimeSeries(query, graphDrawData, lineStyle) { ...@@ -135,6 +126,19 @@ function queryTimeSeries(query, graphDrawData, lineStyle) {
shouldRenderLegend, shouldRenderLegend,
renderCanary, renderCanary,
}); });
if (!shouldRenderLegend) {
if (!timeSeriesParsed[0].tracksLegend) {
timeSeriesParsed[0].tracksLegend = [];
}
timeSeriesParsed[0].tracksLegend.push({
max: maximumValue,
average: accum / timeSeries.values.length,
lineStyle,
lineColor,
metricTag,
});
}
}); });
return timeSeriesParsed; return timeSeriesParsed;
......
...@@ -5,11 +5,12 @@ class PrometheusMetric < ActiveRecord::Base ...@@ -5,11 +5,12 @@ class PrometheusMetric < ActiveRecord::Base
enum group: { enum group: {
# built-in groups # built-in groups
nginx_ingress: -1, nginx_ingress_vts: -1,
ha_proxy: -2, ha_proxy: -2,
aws_elb: -3, aws_elb: -3,
nginx: -4, nginx: -4,
kubernetes: -5, kubernetes: -5,
nginx_ingress: -6,
# custom/user groups # custom/user groups
business: 0, business: 0,
...@@ -30,6 +31,7 @@ class PrometheusMetric < ActiveRecord::Base ...@@ -30,6 +31,7 @@ class PrometheusMetric < ActiveRecord::Base
GROUP_TITLES = { GROUP_TITLES = {
# built-in groups # built-in groups
nginx_ingress_vts: _('Response metrics (NGINX Ingress VTS)'),
nginx_ingress: _('Response metrics (NGINX Ingress)'), nginx_ingress: _('Response metrics (NGINX Ingress)'),
ha_proxy: _('Response metrics (HA Proxy)'), ha_proxy: _('Response metrics (HA Proxy)'),
aws_elb: _('Response metrics (AWS ELB)'), aws_elb: _('Response metrics (AWS ELB)'),
...@@ -43,7 +45,8 @@ class PrometheusMetric < ActiveRecord::Base ...@@ -43,7 +45,8 @@ class PrometheusMetric < ActiveRecord::Base
}.freeze }.freeze
REQUIRED_METRICS = { 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), 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), 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), nginx: %w(nginx_server_requests nginx_server_requestMsec),
......
---
title: Add NGINX 0.16.0 and above metrics
merge_request: 22133
author:
type: added
- group: Response metrics (NGINX Ingress) # NGINX Ingress metrics for pre-0.16.0 versions
- group: Response metrics (NGINX Ingress VTS)
priority: 10 priority: 10
metrics: metrics:
- title: "Throughput" - title: "Throughput"
...@@ -40,6 +41,51 @@ ...@@ -40,6 +41,51 @@
query_range: 'sum(rate(nginx_upstream_responses_total{status_code="5xx", upstream=~"%{kube_namespace}-%{ci_environment_slug}-.*"}[2m])) / sum(rate(nginx_upstream_responses_total{upstream=~"%{kube_namespace}-%{ci_environment_slug}-.*"}[2m])) * 100' query_range: 'sum(rate(nginx_upstream_responses_total{status_code="5xx", upstream=~"%{kube_namespace}-%{ci_environment_slug}-.*"}[2m])) / sum(rate(nginx_upstream_responses_total{upstream=~"%{kube_namespace}-%{ci_environment_slug}-.*"}[2m])) * 100'
label: 5xx Errors label: 5xx Errors
unit: "%" unit: "%"
# NGINX Ingress metrics for post-0.16.0 versions
- group: Response metrics (NGINX Ingress)
priority: 10
metrics:
- title: "Throughput"
y_label: "Requests / Sec"
required_metrics:
- nginx_ingress_controller_requests
weight: 1
queries:
- id: response_metrics_nginx_ingress_16_throughput_status_code
query_range: 'sum(label_replace(rate(nginx_ingress_controller_requests{namespace="%{kube_namespace}",ingress=~".*%{ci_environment_slug}.*"}[2m]), "status_code", "${1}xx", "status", "(.)..")) by (status_code)'
unit: req / sec
label: Status Code
series:
- label: status_code
when:
- value: 2xx
color: green
- value: 3xx
color: blue
- value: 4xx
color: orange
- value: 5xx
color: red
- title: "Latency"
y_label: "Latency (ms)"
required_metrics:
- nginx_ingress_controller_ingress_upstream_latency_seconds_sum
weight: 1
queries:
- id: response_metrics_nginx_ingress_16_latency_pod_average
query_range: 'sum(rate(nginx_ingress_controller_ingress_upstream_latency_seconds_sum{namespace="%{kube_namespace}",ingress=~".*%{ci_environment_slug}.*"}[2m])) / sum(rate(nginx_ingress_controller_ingress_upstream_latency_seconds_count{namespace="%{kube_namespace}",ingress=~".*%{ci_environment_slug}.*"}[2m])) * 1000'
label: Pod average
unit: ms
- title: "HTTP Error Rate"
y_label: "HTTP Errors"
required_metrics:
- nginx_ingress_controller_requests
weight: 1
queries:
- id: response_metrics_nginx_ingress_16_http_error_rate
query_range: 'sum(rate(nginx_ingress_controller_requests{status=~"5.*",namespace="%{kube_namespace}",ingress=~".*%{ci_environment_slug}.*"}[2m])) / sum(rate(nginx_ingress_controller_requests{namespace="%{kube_namespace}",ingress=~".*%{ci_environment_slug}.*"}[2m])) * 100'
label: 5xx Errors
unit: "%"
- group: Response metrics (HA Proxy) - group: Response metrics (HA Proxy)
priority: 10 priority: 10
metrics: metrics:
......
...@@ -4,11 +4,12 @@ module Importers ...@@ -4,11 +4,12 @@ module Importers
class PrometheusMetric < ActiveRecord::Base class PrometheusMetric < ActiveRecord::Base
enum group: { enum group: {
# built-in groups # built-in groups
nginx_ingress: -1, nginx_ingress_vts: -1,
ha_proxy: -2, ha_proxy: -2,
aws_elb: -3, aws_elb: -3,
nginx: -4, nginx: -4,
kubernetes: -5, kubernetes: -5,
nginx_ingress: -6,
# custom groups # custom groups
business: 0, business: 0,
...@@ -22,6 +23,7 @@ module Importers ...@@ -22,6 +23,7 @@ module Importers
business: _('Business metrics (Custom)'), business: _('Business metrics (Custom)'),
response: _('Response metrics (Custom)'), response: _('Response metrics (Custom)'),
system: _('System metrics (Custom)'), system: _('System metrics (Custom)'),
nginx_ingress_vts: _('Response metrics (NGINX Ingress VTS)'),
nginx_ingress: _('Response metrics (NGINX Ingress)'), nginx_ingress: _('Response metrics (NGINX Ingress)'),
ha_proxy: _('Response metrics (HA Proxy)'), ha_proxy: _('Response metrics (HA Proxy)'),
aws_elb: _('Response metrics (AWS ELB)'), aws_elb: _('Response metrics (AWS ELB)'),
......
class ImportCommonMetricsNginxVts < ActiveRecord::Migration
include Gitlab::Database::MigrationHelpers
require Rails.root.join('db/importers/common_metrics_importer.rb')
DOWNTIME = false
def up
Importers::CommonMetricsImporter.new.execute
end
def down
# no-op
end
end
...@@ -5647,6 +5647,9 @@ msgstr "" ...@@ -5647,6 +5647,9 @@ msgstr ""
msgid "Response metrics (HA Proxy)" msgid "Response metrics (HA Proxy)"
msgstr "" msgstr ""
msgid "Response metrics (NGINX Ingress VTS)"
msgstr ""
msgid "Response metrics (NGINX Ingress)" msgid "Response metrics (NGINX Ingress)"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment