Merge pull request #861 from n888/master

povilasv · web-flow · commit acfbc1284901 · 2023-11-06T12:44:21.000+02:00
Add cluster label to CPUThrottling alert when showMultiCluster enabled
diff --git a/alerts/resource_alerts.libsonnet b/alerts/resource_alerts.libsonnet
@@ -199,9 +199,9 @@
           {
             alert: 'CPUThrottlingHigh',
             expr: |||
-              sum(increase(container_cpu_cfs_throttled_periods_total{container!="", %(cpuThrottlingSelector)s}[5m])) by (container, pod, namespace)
+              sum(increase(container_cpu_cfs_throttled_periods_total{container!="", %(cpuThrottlingSelector)s}[5m])) by (%(clusterLabel)s, container, pod, namespace)
                 /
-              sum(increase(container_cpu_cfs_periods_total{%(cpuThrottlingSelector)s}[5m])) by (container, pod, namespace)
+              sum(increase(container_cpu_cfs_periods_total{%(cpuThrottlingSelector)s}[5m])) by (%(clusterLabel)s, container, pod, namespace)
                 > ( %(cpuThrottlingPercent)s / 100 )
             ||| % $._config,
             'for': '15m',

Original file line number	Diff line number	Diff line change
`@@ -199,9 +199,9 @@`
`199`	`199`	`{`
`200`	`200`	`alert: 'CPUThrottlingHigh',`
`201`	`201`	`expr: \|\|\|`
`202`		`- sum(increase(container_cpu_cfs_throttled_periods_total{container!="", %(cpuThrottlingSelector)s}[5m])) by (container, pod, namespace)`
	`202`	`+ sum(increase(container_cpu_cfs_throttled_periods_total{container!="", %(cpuThrottlingSelector)s}[5m])) by (%(clusterLabel)s, container, pod, namespace)`
`203`	`203`	`/`
`204`		`- sum(increase(container_cpu_cfs_periods_total{%(cpuThrottlingSelector)s}[5m])) by (container, pod, namespace)`
	`204`	`+ sum(increase(container_cpu_cfs_periods_total{%(cpuThrottlingSelector)s}[5m])) by (%(clusterLabel)s, container, pod, namespace)`
`205`	`205`	`> ( %(cpuThrottlingPercent)s / 100 )`
`206`	`206`	`\|\|\| % $._config,`
`207`	`207`	`'for': '15m',`