From 23f8d403555a4eb13782f0ebc63eb7146ed9b201 Mon Sep 17 00:00:00 2001 From: Roberto Bruggemann Date: Tue, 6 Feb 2018 18:34:08 +0000 Subject: [PATCH] Replace service cpu/mem link to 'Monitor' The previous link to 'Monitor' contained a recording rule metric, and since not all Weave Clound instances have recording rules, the link would redirect to a 'Monitor' page without data points. The recording rule metric has been substituted with the underlying query. --- render/detailed/links.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/render/detailed/links.go b/render/detailed/links.go index 9dd175d5f..28fec9e29 100644 --- a/render/detailed/links.go +++ b/render/detailed/links.go @@ -71,8 +71,8 @@ var ( // NB: Pods need to be labeled and selected by their respective Service name, meaning: // - The Service's `spec.selector` needs to select on `name` // - The Service's `metadata.name` needs to be the same value as `spec.selector.name` - docker.CPUTotalUsage: `namespace_label_name:container_cpu_usage_seconds_total:sum_rate{label_name="{{label}}",namespace="{{namespace}}"}`, - docker.MemoryUsage: `namespace_label_name:container_memory_usage_bytes:sum{label_name="{{label}}",namespace="{{namespace}}"}`, + docker.CPUTotalUsage: `sum(rate(container_cpu_usage_seconds_total{image!="",namespace="{{namespace}}",_weave_pod_name="{{label}}",job="cadvisor",container_name!="POD"}[5m]))`, + docker.MemoryUsage: `sum(rate(container_memory_usage_bytes{image!="",namespace="{{namespace}}",_weave_pod_name="{{label}}",job="cadvisor",container_name!="POD"}[5m]))`, }, } )