@@ -43,6 +43,12 @@ local prometheus = grafana.prometheus;
4343 description=description,
4444 metric_name='tnt_cpu_user_time' ,
4545 ),
46+ // SELECT non_negative_derivative(mean("value"), 1s)
47+ // FROM "$policy"."$measurement" WHERE ("metric_name" = 'tnt_cpu_user_time' AND "label_pairs_alias" =~ /^$alias$/)
48+ // AND $timeFilter
49+ // GROUP BY time($__interval), "label_pairs_alias" fill(none)
50+ // alias='$tag_label_pairs_alias',
51+
4652
4753 getrusage_cpu_instance_system_time(
4854 cfg,
@@ -60,6 +66,11 @@ local prometheus = grafana.prometheus;
6066 description=description,
6167 metric_name='tnt_cpu_system_time' ,
6268 ),
69+ // SELECT non_negative_derivative(mean("value"), 1s)
70+ // FROM "$policy"."$measurement" WHERE ("metric_name" = 'tnt_cpu_system_time' AND "label_pairs_alias" =~ /^$alias$/)
71+ // AND $timeFilter
72+ // GROUP BY time($__interval), "label_pairs_alias" fill(none)
73+ // alias='$tag_label_pairs_alias',
6374
6475 // --------------------------------------------------------------------------
6576 local getrusage_cpu_total_percentage_graph(
@@ -105,6 +116,12 @@ local prometheus = grafana.prometheus;
105116 title=title,
106117 description=description,
107118 ),
119+ // SELECT non_negative_derivative(sum("value"), 1s)
120+ // FROM "$policy"."$measurement"
121+ // WHERE (("metric_name" = 'tnt_cpu_user_time' OR "metric_name" = 'tnt_cpu_system_time') AND "label_pairs_alias" =~ /^$alias$/)
122+ // AND $timeFilter
123+ // GROUP BY time($__interval), "label_pairs_alias" fill(none)
124+ // alias='$tag_label_pairs_alias',
108125
109126 // --------------------------------------------------------------------------
110127 local getrusage_cpu_common_percentage_graph(
@@ -150,8 +167,13 @@ local prometheus = grafana.prometheus;
150167 filters: common.prometheus_query_filters(cfg.filters),
151168 }
152169 ),
153- legend='CPU total time' ,
170+ legend='CPU total time per cluster ' ,
154171 ),
172+ // SELECT non_negative_derivative(SUM("value"), 1s) AS total_cpu_time_per_cluster
173+ // FROM "$policy"."$measurement"
174+ // WHERE (("metric_name" = 'tnt_cpu_user_time' OR "metric_name" = 'tnt_cpu_system_time') AND $timeFilter)
175+ // GROUP BY time($__interval)
176+
155177
156178 getrusage_cpu_total_user_time(
157179 cfg,
@@ -175,8 +197,13 @@ local prometheus = grafana.prometheus;
175197 filters: common.prometheus_query_filters(cfg.filters),
176198 }
177199 ),
178- legend='CPU total user time' ,
200+ legend='CPU total user time per cluster ' ,
179201 ),
202+ // SELECT non_negative_derivative(SUM("value"), 1s) AS total_cpu_user_time
203+ // FROM "$policy"."$measurement"
204+ // WHERE ("metric_name" = 'tnt_cpu_user_time' AND "label_pairs_alias" =~ /^$alias$/)
205+ // AND $timeFilter
206+ // GROUP BY time($__interval)
180207
181208 getrusage_cpu_total_system_time(
182209 cfg,
@@ -200,8 +227,13 @@ local prometheus = grafana.prometheus;
200227 filters: common.prometheus_query_filters(cfg.filters),
201228 }
202229 ),
203- legend='CPU total system time' ,
230+ legend='CPU total system time per cluster ' ,
204231 ),
232+ // SELECT non_negative_derivative(SUM("value"), 1s) AS total_cpu_system_time
233+ // FROM "$policy"."$measurement"
234+ // WHERE ("metric_name" = 'tnt_cpu_system_time' AND "label_pairs_alias" =~ /^$alias$/)
235+ // AND $timeFilter
236+ // GROUP BY time($__interval)
205237
206238 // --------------------------------------------------------------------------
207239 local procstat_thread_time_graph(
0 commit comments