diff options
author | Mayra Cabrera <mcabrera@gitlab.com> | 2019-07-26 15:35:11 +0000 |
---|---|---|
committer | Mayra Cabrera <mcabrera@gitlab.com> | 2019-07-26 15:35:11 +0000 |
commit | 24fc4495ac09af6142b408eff965afa861319e75 (patch) | |
tree | fe486ea21e8e4beef9f7eeb30cbccdd5ad3fd78f /config/prometheus/cluster_metrics.yml | |
parent | fc3d0595c48095450bc6495ab643e98c5661888f (diff) | |
parent | 5a96c0534355dab491a620d3b954d9424a43ae36 (diff) | |
download | gitlab-ce-24fc4495ac09af6142b408eff965afa861319e75.tar.gz |
Merge branch '59325-units-are-not-shown-on-the-performance-dashboard-2' into 'master'65188-this-is-my-test-issue-for-usability-testing
fix: updates labels to include units in metrics
Closes #59325
See merge request gitlab-org/gitlab-ce!30330
Diffstat (limited to 'config/prometheus/cluster_metrics.yml')
-rw-r--r-- | config/prometheus/cluster_metrics.yml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/config/prometheus/cluster_metrics.yml b/config/prometheus/cluster_metrics.yml index 3df76b0974f..f2a41e4c337 100644 --- a/config/prometheus/cluster_metrics.yml +++ b/config/prometheus/cluster_metrics.yml @@ -2,12 +2,12 @@ priority: 1 metrics: - title: "CPU Usage" - y_label: "CPU" + y_label: "CPU (cores)" required_metrics: ['container_cpu_usage_seconds_total'] weight: 1 queries: - query_range: 'avg(sum(rate(container_cpu_usage_seconds_total{id="/"}[15m])) by (job)) without (job)' - label: Usage + label: Usage (cores) unit: "cores" appearance: line: @@ -15,7 +15,7 @@ area: opacity: 0 - query_range: 'sum(kube_pod_container_resource_requests_cpu_cores{kubernetes_namespace="gitlab-managed-apps"})' - label: Requested + label: Requested (cores) unit: "cores" appearance: line: @@ -23,7 +23,7 @@ area: opacity: 0 - query_range: 'sum(kube_node_status_capacity_cpu_cores{kubernetes_namespace="gitlab-managed-apps"})' - label: Capacity + label: Capacity (cores) unit: "cores" appearance: line: @@ -32,12 +32,12 @@ area: opacity: 0 - title: "Memory usage" - y_label: "Memory" + y_label: "Memory (GiB)" required_metrics: ['container_memory_usage_bytes'] weight: 1 queries: - query_range: 'avg(sum(container_memory_usage_bytes{id="/"}) by (job)) without (job) / 2^30' - label: Usage + label: Usage (GiB) unit: "GiB" appearance: line: @@ -45,7 +45,7 @@ area: opacity: 0 - query_range: 'sum(kube_pod_container_resource_requests_memory_bytes{kubernetes_namespace="gitlab-managed-apps"})/2^30' - label: Requested + label: Requested (GiB) unit: "GiB" appearance: line: @@ -53,7 +53,7 @@ area: opacity: 0 - query_range: 'sum(kube_node_status_capacity_memory_bytes{kubernetes_namespace="gitlab-managed-apps"})/2^30' - label: Capacity + label: Capacity (GiB) unit: "GiB" appearance: line: |