Skip to content

Commit 1392aae

Browse files
jaydesljaydesl
committed
feat: update metrics in policies
1 parent 346a713 commit 1392aae

16 files changed

+64
-64
lines changed

‎demos/stressng/stressng_azure.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ policy_types:
7171
description: pre-define alerts for container CPU
7272
default:
7373
- alert: service_overloaded
74-
expr: 'avg(rate(container_cpu_usage_seconds_total{container_label_io_kubernetes_container_name="{{SERVICE_FULL_NAME}}"}[60s]))*100 > {{SERVICE_TH_MAX}}'
74+
expr: 'avg(rate(container_cpu_usage_seconds_total{image!~"docker.io/rancher.*", pod=~"{{SERVICE_FULL_NAME}}.*"}[60s]))*100 > {{SERVICE_TH_MAX}}'
7575
for: 30s
7676
- alert: service_underloaded
77-
expr: 'avg(rate(container_cpu_usage_seconds_total{container_label_io_kubernetes_container_name="{{SERVICE_FULL_NAME}}"}[60s]))*100 < {{SERVICE_TH_MIN}}'
77+
expr: 'avg(rate(container_cpu_usage_seconds_total{image!~"docker.io/rancher.*", pod=~"{{SERVICE_FULL_NAME}}.*"}[60s]))*100 < {{SERVICE_TH_MIN}}'
7878
for: 30s
7979
required: true
8080
scaling_rule:
@@ -99,10 +99,10 @@ policy_types:
9999
description: pre-define alerts for VM CPU
100100
default:
101101
- alert: node_overloaded
102-
expr: '(100-(avg(rate(node_cpu_seconds_total{node="{{ NODE_NAME }}", mode="idle"}[60s]))*100)) > {{NODE_TH_MAX}}'
102+
expr: 'avg(rate(container_cpu_usage_seconds_total{instance=~"{{ NODE_NAME }}.*", id="/"}[60s]))*100 > {{NODE_TH_MAX}}'
103103
for: 1m
104104
- alert: node_underloaded
105-
expr: '(100-(avg(rate(node_cpu_seconds_total{node="{{ NODE_NAME }}", mode="idle"}[60s]))*100)) < {{NODE_TH_MIN}}'
105+
expr: 'avg(rate(container_cpu_usage_seconds_total{instance=~"{{ NODE_NAME }}.*", id="/"}[60s]))*100 < {{NODE_TH_MIN}}'
106106
for: 1m
107107
required: true
108108
scaling_rule:

‎demos/stressng/stressng_cloudbroker.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ policy_types:
7070
description: pre-define alerts for container CPU
7171
default:
7272
- alert: service_overloaded
73-
expr: 'avg(rate(container_cpu_usage_seconds_total{container_label_io_kubernetes_container_name="{{SERVICE_FULL_NAME}}"}[60s]))*100 > {{SERVICE_TH_MAX}}'
73+
expr: 'avg(rate(container_cpu_usage_seconds_total{image!~"docker.io/rancher.*", pod=~"{{SERVICE_FULL_NAME}}.*"}[60s]))*100 > {{SERVICE_TH_MAX}}'
7474
for: 30s
7575
- alert: service_underloaded
76-
expr: 'avg(rate(container_cpu_usage_seconds_total{container_label_io_kubernetes_container_name="{{SERVICE_FULL_NAME}}"}[60s]))*100 < {{SERVICE_TH_MIN}}'
76+
expr: 'avg(rate(container_cpu_usage_seconds_total{image!~"docker.io/rancher.*", pod=~"{{SERVICE_FULL_NAME}}.*"}[60s]))*100 < {{SERVICE_TH_MIN}}'
7777
for: 30s
7878
required: true
7979
scaling_rule:
@@ -98,10 +98,10 @@ policy_types:
9898
description: pre-define alerts for VM CPU
9999
default:
100100
- alert: node_overloaded
101-
expr: '(100-(avg(rate(node_cpu_seconds_total{node="{{ NODE_NAME }}", mode="idle"}[60s]))*100)) > {{NODE_TH_MAX}}'
101+
expr: 'avg(rate(container_cpu_usage_seconds_total{instance=~"{{ NODE_NAME }}.*", id="/"}[60s]))*100 > {{NODE_TH_MAX}}'
102102
for: 1m
103103
- alert: node_underloaded
104-
expr: '(100-(avg(rate(node_cpu_seconds_total{node="{{ NODE_NAME }}", mode="idle"}[60s]))*100)) < {{NODE_TH_MIN}}'
104+
expr: 'avg(rate(container_cpu_usage_seconds_total{instance=~"{{ NODE_NAME }}.*", id="/"}[60s]))*100 < {{NODE_TH_MIN}}'
105105
for: 1m
106106
required: true
107107
scaling_rule:

‎demos/stressng/stressng_cloudsigma.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ policy_types:
7373
description: pre-define alerts for container CPU
7474
default:
7575
- alert: service_overloaded
76-
expr: 'avg(rate(container_cpu_usage_seconds_total{container_label_io_kubernetes_container_name="{{SERVICE_FULL_NAME}}"}[60s]))*100 > {{SERVICE_TH_MAX}}'
76+
expr: 'avg(rate(container_cpu_usage_seconds_total{image!~"docker.io/rancher.*", pod=~"{{SERVICE_FULL_NAME}}.*"}[60s]))*100 > {{SERVICE_TH_MAX}}'
7777
for: 30s
7878
- alert: service_underloaded
79-
expr: 'avg(rate(container_cpu_usage_seconds_total{container_label_io_kubernetes_container_name="{{SERVICE_FULL_NAME}}"}[60s]))*100 < {{SERVICE_TH_MIN}}'
79+
expr: 'avg(rate(container_cpu_usage_seconds_total{image!~"docker.io/rancher.*", pod=~"{{SERVICE_FULL_NAME}}.*"}[60s]))*100 < {{SERVICE_TH_MIN}}'
8080
for: 30s
8181
required: true
8282
scaling_rule:
@@ -101,10 +101,10 @@ policy_types:
101101
description: pre-define alerts for VM CPU
102102
default:
103103
- alert: node_overloaded
104-
expr: '(100-(avg(rate(node_cpu_seconds_total{node="{{ NODE_NAME }}", mode="idle"}[60s]))*100)) > {{NODE_TH_MAX}}'
104+
expr: 'avg(rate(container_cpu_usage_seconds_total{instance=~"{{ NODE_NAME }}.*", id="/"}[60s]))*100 > {{NODE_TH_MAX}}'
105105
for: 1m
106106
- alert: node_underloaded
107-
expr: '(100-(avg(rate(node_cpu_seconds_total{node="{{ NODE_NAME }}", mode="idle"}[60s]))*100)) < {{NODE_TH_MIN}}'
107+
expr: 'avg(rate(container_cpu_usage_seconds_total{instance=~"{{ NODE_NAME }}.*", id="/"}[60s]))*100 < {{NODE_TH_MIN}}'
108108
for: 1m
109109
required: true
110110
scaling_rule:

‎demos/stressng/stressng_ec2.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ policy_types:
7373
description: pre-define alerts for container CPU
7474
default:
7575
- alert: service_overloaded
76-
expr: 'avg(rate(container_cpu_usage_seconds_total{container_label_io_kubernetes_container_name="{{SERVICE_FULL_NAME}}"}[60s]))*100 > {{SERVICE_TH_MAX}}'
76+
expr: 'avg(rate(container_cpu_usage_seconds_total{image!~"docker.io/rancher.*", pod=~"{{SERVICE_FULL_NAME}}.*"}[60s]))*100 > {{SERVICE_TH_MAX}}'
7777
for: 30s
7878
- alert: service_underloaded
79-
expr: 'avg(rate(container_cpu_usage_seconds_total{container_label_io_kubernetes_container_name="{{SERVICE_FULL_NAME}}"}[60s]))*100 < {{SERVICE_TH_MIN}}'
79+
expr: 'avg(rate(container_cpu_usage_seconds_total{image!~"docker.io/rancher.*", pod=~"{{SERVICE_FULL_NAME}}.*"}[60s]))*100 < {{SERVICE_TH_MIN}}'
8080
for: 30s
8181
required: true
8282
scaling_rule:
@@ -101,10 +101,10 @@ policy_types:
101101
description: pre-define alerts for VM CPU
102102
default:
103103
- alert: node_overloaded
104-
expr: '(100-(avg(rate(node_cpu_seconds_total{node="{{ NODE_NAME }}", mode="idle"}[60s]))*100)) > {{NODE_TH_MAX}}'
104+
expr: 'avg(rate(container_cpu_usage_seconds_total{instance=~"{{ NODE_NAME }}.*", id="/"}[60s]))*100 > {{NODE_TH_MAX}}'
105105
for: 1m
106106
- alert: node_underloaded
107-
expr: '(100-(avg(rate(node_cpu_seconds_total{node="{{ NODE_NAME }}", mode="idle"}[60s]))*100)) < {{NODE_TH_MIN}}'
107+
expr: 'avg(rate(container_cpu_usage_seconds_total{instance=~"{{ NODE_NAME }}.*", id="/"}[60s]))*100 < {{NODE_TH_MIN}}'
108108
for: 1m
109109
required: true
110110
scaling_rule:

‎demos/stressng/stressng_egi.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ policy_types:
7373
description: pre-define alerts for container CPU
7474
default:
7575
- alert: service_overloaded
76-
expr: 'avg(rate(container_cpu_usage_seconds_total{container_label_io_kubernetes_container_name="{{SERVICE_FULL_NAME}}"}[60s]))*100 > {{SERVICE_TH_MAX}}'
76+
expr: 'avg(rate(container_cpu_usage_seconds_total{image!~"docker.io/rancher.*", pod=~"{{SERVICE_FULL_NAME}}.*"}[60s]))*100 > {{SERVICE_TH_MAX}}'
7777
for: 30s
7878
- alert: service_underloaded
79-
expr: 'avg(rate(container_cpu_usage_seconds_total{container_label_io_kubernetes_container_name="{{SERVICE_FULL_NAME}}"}[60s]))*100 < {{SERVICE_TH_MIN}}'
79+
expr: 'avg(rate(container_cpu_usage_seconds_total{image!~"docker.io/rancher.*", pod=~"{{SERVICE_FULL_NAME}}.*"}[60s]))*100 < {{SERVICE_TH_MIN}}'
8080
for: 30s
8181
required: true
8282
scaling_rule:
@@ -101,10 +101,10 @@ policy_types:
101101
description: pre-define alerts for VM CPU
102102
default:
103103
- alert: node_overloaded
104-
expr: '(100-(avg(rate(node_cpu_seconds_total{node="{{ NODE_NAME }}", mode="idle"}[60s]))*100)) > {{NODE_TH_MAX}}'
104+
expr: 'avg(rate(container_cpu_usage_seconds_total{instance=~"{{ NODE_NAME }}.*", id="/"}[60s]))*100 > {{NODE_TH_MAX}}'
105105
for: 1m
106106
- alert: node_underloaded
107-
expr: '(100-(avg(rate(node_cpu_seconds_total{node="{{ NODE_NAME }}", mode="idle"}[60s]))*100)) < {{NODE_TH_MIN}}'
107+
expr: 'avg(rate(container_cpu_usage_seconds_total{instance=~"{{ NODE_NAME }}.*", id="/"}[60s]))*100 < {{NODE_TH_MIN}}'
108108
for: 1m
109109
required: true
110110
scaling_rule:

‎demos/stressng/stressng_gce.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ policy_types:
7171
description: pre-define alerts for container CPU
7272
default:
7373
- alert: service_overloaded
74-
expr: 'avg(rate(container_cpu_usage_seconds_total{container_label_io_kubernetes_container_name="{{SERVICE_FULL_NAME}}"}[60s]))*100 > {{SERVICE_TH_MAX}}'
74+
expr: 'avg(rate(container_cpu_usage_seconds_total{image!~"docker.io/rancher.*", pod=~"{{SERVICE_FULL_NAME}}.*"}[60s]))*100 > {{SERVICE_TH_MAX}}'
7575
for: 30s
7676
- alert: service_underloaded
77-
expr: 'avg(rate(container_cpu_usage_seconds_total{container_label_io_kubernetes_container_name="{{SERVICE_FULL_NAME}}"}[60s]))*100 < {{SERVICE_TH_MIN}}'
77+
expr: 'avg(rate(container_cpu_usage_seconds_total{image!~"docker.io/rancher.*", pod=~"{{SERVICE_FULL_NAME}}.*"}[60s]))*100 < {{SERVICE_TH_MIN}}'
7878
for: 30s
7979
required: true
8080
scaling_rule:
@@ -99,10 +99,10 @@ policy_types:
9999
description: pre-define alerts for VM CPU
100100
default:
101101
- alert: node_overloaded
102-
expr: '(100-(avg(rate(node_cpu_seconds_total{node="{{ NODE_NAME }}", mode="idle"}[60s]))*100)) > {{NODE_TH_MAX}}'
102+
expr: 'avg(rate(container_cpu_usage_seconds_total{instance=~"{{ NODE_NAME }}.*", id="/"}[60s]))*100 > {{NODE_TH_MAX}}'
103103
for: 1m
104104
- alert: node_underloaded
105-
expr: '(100-(avg(rate(node_cpu_seconds_total{node="{{ NODE_NAME }}", mode="idle"}[60s]))*100)) < {{NODE_TH_MIN}}'
105+
expr: 'avg(rate(container_cpu_usage_seconds_total{instance=~"{{ NODE_NAME }}.*", id="/"}[60s]))*100 < {{NODE_TH_MIN}}'
106106
for: 1m
107107
required: true
108108
scaling_rule:

‎demos/stressng/stressng_nova.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ policy_types:
7575
description: pre-define alerts for container CPU
7676
default:
7777
- alert: service_overloaded
78-
expr: 'avg(rate(container_cpu_usage_seconds_total{container_label_io_kubernetes_container_name="{{SERVICE_FULL_NAME}}"}[60s]))*100 > {{SERVICE_TH_MAX}}'
78+
expr: 'avg(rate(container_cpu_usage_seconds_total{image!~"docker.io/rancher.*", pod=~"{{SERVICE_FULL_NAME}}.*"}[60s]))*100 > {{SERVICE_TH_MAX}}'
7979
for: 30s
8080
- alert: service_underloaded
81-
expr: 'avg(rate(container_cpu_usage_seconds_total{container_label_io_kubernetes_container_name="{{SERVICE_FULL_NAME}}"}[60s]))*100 < {{SERVICE_TH_MIN}}'
81+
expr: 'avg(rate(container_cpu_usage_seconds_total{image!~"docker.io/rancher.*", pod=~"{{SERVICE_FULL_NAME}}.*"}[60s]))*100 < {{SERVICE_TH_MIN}}'
8282
for: 30s
8383
required: true
8484
scaling_rule:
@@ -103,10 +103,10 @@ policy_types:
103103
description: pre-define alerts for VM CPU
104104
default:
105105
- alert: node_overloaded
106-
expr: '(100-(avg(rate(node_cpu_seconds_total{node="{{ NODE_NAME }}", mode="idle"}[60s]))*100)) > {{NODE_TH_MAX}}'
106+
expr: 'avg(rate(container_cpu_usage_seconds_total{instance=~"{{ NODE_NAME }}.*", id="/"}[60s]))*100 > {{NODE_TH_MAX}}'
107107
for: 1m
108108
- alert: node_underloaded
109-
expr: '(100-(avg(rate(node_cpu_seconds_total{node="{{ NODE_NAME }}", mode="idle"}[60s]))*100)) < {{NODE_TH_MIN}}'
109+
expr: 'avg(rate(container_cpu_usage_seconds_total{instance=~"{{ NODE_NAME }}.*", id="/"}[60s]))*100 < {{NODE_TH_MIN}}'
110110
for: 1m
111111
required: true
112112
scaling_rule:

‎demos/stressng/stressng_oci.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ policy_types:
7878
description: pre-define alerts for container CPU
7979
default:
8080
- alert: service_overloaded
81-
expr: 'avg(rate(container_cpu_usage_seconds_total{container_label_io_kubernetes_container_name="{{SERVICE_FULL_NAME}}"}[60s]))*100 > {{SERVICE_TH_MAX}}'
81+
expr: 'avg(rate(container_cpu_usage_seconds_total{image!~"docker.io/rancher.*", pod=~"{{SERVICE_FULL_NAME}}.*"}[60s]))*100 > {{SERVICE_TH_MAX}}'
8282
for: 30s
8383
- alert: service_underloaded
84-
expr: 'avg(rate(container_cpu_usage_seconds_total{container_label_io_kubernetes_container_name="{{SERVICE_FULL_NAME}}"}[60s]))*100 < {{SERVICE_TH_MIN}}'
84+
expr: 'avg(rate(container_cpu_usage_seconds_total{image!~"docker.io/rancher.*", pod=~"{{SERVICE_FULL_NAME}}.*"}[60s]))*100 < {{SERVICE_TH_MIN}}'
8585
for: 30s
8686
required: true
8787
scaling_rule:
@@ -106,10 +106,10 @@ policy_types:
106106
description: pre-define alerts for VM CPU
107107
default:
108108
- alert: node_overloaded
109-
expr: '(100-(avg(rate(node_cpu_seconds_total{node="{{ NODE_NAME }}", mode="idle"}[60s]))*100)) > {{NODE_TH_MAX}}'
109+
expr: 'avg(rate(container_cpu_usage_seconds_total{instance=~"{{ NODE_NAME }}.*", id="/"}[60s]))*100 > {{NODE_TH_MAX}}'
110110
for: 1m
111111
- alert: node_underloaded
112-
expr: '(100-(avg(rate(node_cpu_seconds_total{node="{{ NODE_NAME }}", mode="idle"}[60s]))*100)) < {{NODE_TH_MIN}}'
112+
expr: 'avg(rate(container_cpu_usage_seconds_total{instance=~"{{ NODE_NAME }}.*", id="/"}[60s]))*100 < {{NODE_TH_MIN}}'
113113
for: 1m
114114
required: true
115115
scaling_rule:

‎demos/wordpress/wordpress_azure.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@ policy_types:
150150
description: pre-define alerts for container Net
151151
default:
152152
- alert: service_overloaded
153-
expr: 'avg(rate(container_network_receive_bytes_total{container_label_io_kubernetes_pod_name=~"{{SERVICE_FULL_NAME}}-[^-]*-[^-]*"}[60s]))/1000 > {{SERVICE_TH_MAX}}'
153+
expr: 'avg(rate(container_network_receive_bytes_total{pod=~"{{SERVICE_FULL_NAME}}.*"}[60s]))/1000 > {{SERVICE_TH_MAX}}'
154154
for: 30s
155155
- alert: service_underloaded
156-
expr: 'avg(rate(container_network_receive_bytes_total{container_label_io_kubernetes_pod_name=~"{{SERVICE_FULL_NAME}}-[^-]*-[^-]*"}[60s]))/1000 < {{SERVICE_TH_MIN}}'
156+
expr: 'avg(rate(container_network_receive_bytes_total{pod=~"{{SERVICE_FULL_NAME}}.*"}[60s]))/1000 < {{SERVICE_TH_MIN}}'
157157
for: 30s
158158
required: true
159159
scaling_rule:
@@ -178,10 +178,10 @@ policy_types:
178178
description: pre-define alerts for node Net
179179
default:
180180
- alert: node_overloaded
181-
expr: 'avg(rate(container_network_receive_bytes_total{node="{{ NODE_NAME }}", container_label_io_kubernetes_pod_name=~"{{SERVICE_FULL_NAME}}-[^-]*-[^-]*"}[60s]))/1000 > {{SERVICE_TH_MAX}}'
181+
expr: 'avg(rate(container_network_receive_bytes_total{instance="{{ NODE_NAME }}"}[60s]))/1000 > {{SERVICE_TH_MAX}}'
182182
for: 1m
183183
- alert: node_underloaded
184-
expr: 'avg(rate(container_network_receive_bytes_total{node="{{ NODE_NAME }}", container_label_io_kubernetes_pod_name=~"{{SERVICE_FULL_NAME}}-[^-]*-[^-]*"}[60s]))/1000 < {{SERVICE_TH_MIN}}'
184+
expr: 'avg(rate(container_network_receive_bytes_total{instance="{{ NODE_NAME }}"}[60s]))/1000 < {{SERVICE_TH_MIN}}'
185185
for: 1m
186186
required: true
187187
scaling_rule:

‎demos/wordpress/wordpress_cloudbroker.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,10 @@ policy_types:
152152
description: pre-define alerts for container Net
153153
default:
154154
- alert: service_overloaded
155-
expr: 'avg(rate(container_network_receive_bytes_total{container_label_io_kubernetes_pod_name=~"{{SERVICE_FULL_NAME}}-[^-]*-[^-]*"}[60s]))/1000 > {{SERVICE_TH_MAX}}'
155+
expr: 'avg(rate(container_network_receive_bytes_total{pod=~"{{SERVICE_FULL_NAME}}.*"}[60s]))/1000 > {{SERVICE_TH_MAX}}'
156156
for: 30s
157157
- alert: service_underloaded
158-
expr: 'avg(rate(container_network_receive_bytes_total{container_label_io_kubernetes_pod_name=~"{{SERVICE_FULL_NAME}}-[^-]*-[^-]*"}[60s]))/1000 < {{SERVICE_TH_MIN}}'
158+
expr: 'avg(rate(container_network_receive_bytes_total{pod=~"{{SERVICE_FULL_NAME}}.*"}[60s]))/1000 < {{SERVICE_TH_MIN}}'
159159
for: 30s
160160
required: true
161161
scaling_rule:
@@ -180,10 +180,10 @@ policy_types:
180180
description: pre-define alerts for node Net
181181
default:
182182
- alert: node_overloaded
183-
expr: 'avg(rate(container_network_receive_bytes_total{node="{{ NODE_NAME }}", container_label_io_kubernetes_pod_name=~"{{SERVICE_FULL_NAME}}-[^-]*-[^-]*"}[60s]))/1000 > {{SERVICE_TH_MAX}}'
183+
expr: 'avg(rate(container_network_receive_bytes_total{instance="{{ NODE_NAME }}"}[60s]))/1000 > {{SERVICE_TH_MAX}}'
184184
for: 1m
185185
- alert: node_underloaded
186-
expr: 'avg(rate(container_network_receive_bytes_total{node="{{ NODE_NAME }}", container_label_io_kubernetes_pod_name=~"{{SERVICE_FULL_NAME}}-[^-]*-[^-]*"}[60s]))/1000 < {{SERVICE_TH_MIN}}'
186+
expr: 'avg(rate(container_network_receive_bytes_total{instance="{{ NODE_NAME }}"}[60s]))/1000 < {{SERVICE_TH_MIN}}'
187187
for: 1m
188188
required: true
189189
scaling_rule:

0 commit comments

Comments
 (0)