github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-05-06 01:08:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

scope/cortex: fix typo in query filter (#2815)

Browse Source 
* scope/cortex: fix typo in query

* Get rid of the "controllers" code

They do not all share the same queries.
This commit is contained in:
Roland Schilter
2017-08-16 10:46:49 +01:00
committed by GitHub
parent 0d381a34d6
commit b69ce340f8
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
render/detailed/links.go
View File

@@ -44,6 +44,10 @@ var (
},
}
// Queries on pod names of the format `name-<id>-<hash>`
// See also: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#pod-template-hash-label
podIDHashQueries = formatMetricQueries(`pod_name=~"^{{label}}-[^-]+-[^-]+$"`, []string{docker.MemoryUsage, docker.CPUTotalUsage})
// Prometheus queries for topologies
topologyQueries = map[string]map[string]string{
// Containers
@@ -57,23 +61,19 @@ var (
`pod_name="{{label}}"`,
[]string{docker.MemoryUsage, docker.CPUTotalUsage},
),
// Pod naming: // https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#pod-template-hash-label
"__k8s_controllers": formatMetricQueries(`pod_name=~"^{{label}}-[^-]+-[^-]+$"}`, []string{docker.MemoryUsage, docker.CPUTotalUsage}),
report.DaemonSet: formatMetricQueries(`pod_name=~"^{{label}}-[^-]+$"}`, []string{docker.MemoryUsage, docker.CPUTotalUsage}),
report.DaemonSet: formatMetricQueries(`pod_name=~"^{{label}}-[^-]+$"`, []string{docker.MemoryUsage, docker.CPUTotalUsage}),
report.Deployment: podIDHashQueries,
report.StatefulSet: podIDHashQueries,
report.CronJob: podIDHashQueries,
report.Service: {
// These recording rules must be defined in the prometheus config.
// 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}}"}/1024/1024`,
docker.MemoryUsage: `namespace_label_name:container_memory_usage_bytes:sum{label_name="{{label}}"}`,
docker.CPUTotalUsage: `namespace_label_name:container_cpu_usage_seconds_total:sum_rate{label_name="{{label}}"}`,
},
}
k8sControllers = map[string]struct{}{
report.Deployment: {},
report.StatefulSet: {},
report.CronJob: {},
}
)
func formatMetricQueries(filter string, ids []string) map[string]string {
@@ -155,11 +155,7 @@ func RenderMetricURLs(summary NodeSummary, n report.Node, metricsGraphURL string
// metricQuery returns the query for the given node and metric.
func metricQuery(summary NodeSummary, n report.Node, metricID string) string {
t := n.Topology
if _, ok := k8sControllers[n.Topology]; ok {
t = "__k8s_controllers"
}
queries := topologyQueries[t]
queries := topologyQueries[n.Topology]
if len(queries) == 0 {
return ""
}