Skip to content

Commit df0c929

Browse files
patapenka-alexeypatapenka-alexey
committed
cpu: update all influx queries
1 parent 35b1732 commit df0c929

File tree

1 file changed

+61
-33
lines changed

1 file changed

+61
-33
lines changed

‎dashboard/panels/cpu.libsonnet‎

Lines changed: 61 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ local prometheus = grafana.prometheus;
4444
metric_name='tnt_cpu_user_time',
4545
),
4646
// SELECT non_negative_derivative(mean("value"), 1s)
47-
// FROM "$policy"."$measurement" WHERE ("metric_name" = 'tnt_cpu_user_time' AND "label_pairs_alias" =~ /^$alias$/)
47+
// FROM "$policy"."$measurement" WHERE ("metric_name" = 'tnt_cpu_user_time' AND "label_pairs_alias" =~ /^$alias$/)
4848
// AND $timeFilter
4949
// GROUP BY time($__interval), "label_pairs_alias" fill(none)
5050
// alias='$tag_label_pairs_alias',
@@ -67,11 +67,12 @@ local prometheus = grafana.prometheus;
6767
metric_name='tnt_cpu_system_time',
6868
),
6969
// SELECT non_negative_derivative(mean("value"), 1s)
70-
// FROM "$policy"."$measurement" WHERE ("metric_name" = 'tnt_cpu_system_time' AND "label_pairs_alias" =~ /^$alias$/)
70+
// FROM "$policy"."$measurement" WHERE ("metric_name" = 'tnt_cpu_system_time' AND "label_pairs_alias" =~ /^$alias$/)
7171
// AND $timeFilter
7272
// GROUP BY time($__interval), "label_pairs_alias" fill(none)
7373
// alias='$tag_label_pairs_alias',
7474

75+
7576
// --------------------------------------------------------------------------
7677
local getrusage_cpu_total_percentage_graph(
7778
cfg, title, description,
@@ -99,7 +100,17 @@ local prometheus = grafana.prometheus;
99100
legendFormat='{{alias}}'
100101
)
101102
else if cfg.type == variable.datasource_type.influxdb then
102-
influxdb.target()
103+
influxdb.target(
104+
rawQuery=true,
105+
query=|||
106+
SELECT non_negative_derivative(sum("value"), 1s)
107+
FROM "$policy"."$measurement"
108+
WHERE (("metric_name" = 'tnt_cpu_user_time' OR "metric_name" = 'tnt_cpu_system_time') AND "label_pairs_alias" =~ /^$alias$/)
109+
AND $timeFilter
110+
GROUP BY time($__interval), "label_pairs_alias" fill(none)
111+
|||,
112+
alias='$tag_label_pairs_alias',
113+
)
103114
),
104115

105116
getrusage_cpu_instance_total_time(
@@ -116,16 +127,17 @@ local prometheus = grafana.prometheus;
116127
title=title,
117128
description=description,
118129
),
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',
130+
125131

126132
// --------------------------------------------------------------------------
127133
local getrusage_cpu_common_percentage_graph(
128-
cfg, title, description, expr, legend,
134+
cfg,
135+
title,
136+
description,
137+
prometheus_expr,
138+
prometheus_legend,
139+
influx_query,
140+
influx_alias,
129141
) = common.default_graph(
130142
cfg,
131143
title=title,
@@ -137,11 +149,15 @@ local prometheus = grafana.prometheus;
137149
).addTarget(
138150
if cfg.type == variable.datasource_type.prometheus then
139151
prometheus.target(
140-
expr=expr,
141-
legendFormat=legend,
152+
expr=prometheus_expr,
153+
legendFormat=prometheus_legend,
142154
)
143155
else if cfg.type == variable.datasource_type.influxdb then
144-
influxdb.target()
156+
influxdb.target(
157+
rawQuery=true,
158+
query=influx_query,
159+
alias=influx_alias,
160+
)
145161
),
146162

147163
getrusage_cpu_total_time(
@@ -157,7 +173,7 @@ local prometheus = grafana.prometheus;
157173
cfg=cfg,
158174
title=title,
159175
description=description,
160-
expr=std.format(
176+
prometheus_expr=std.format(
161177
|||
162178
sum(rate(%(metrics_prefix)stnt_cpu_user_time{%(filters)s}[$__rate_interval])) +
163179
sum(rate(%(metrics_prefix)stnt_cpu_system_time{%(filters)s}[$__rate_interval]))
@@ -167,12 +183,16 @@ local prometheus = grafana.prometheus;
167183
filters: common.prometheus_query_filters(cfg.filters),
168184
}
169185
),
170-
legend='CPU total time per cluster',
186+
prometheus_legend=title,
187+
influx_query=|||
188+
SELECT non_negative_derivative(SUM("value"), 1s) AS total_cpu_time_per_cluster
189+
FROM "$policy"."$measurement"
190+
WHERE ("metric_name" = 'tnt_cpu_user_time' OR "metric_name" = 'tnt_cpu_system_time')
191+
AND $timeFilter
192+
GROUP BY time($__interval)
193+
|||,
194+
influx_alias=title
171195
),
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)
176196

177197

178198
getrusage_cpu_total_user_time(
@@ -188,7 +208,7 @@ local prometheus = grafana.prometheus;
188208
cfg=cfg,
189209
title=title,
190210
description=description,
191-
expr=std.format(
211+
prometheus_expr=std.format(
192212
|||
193213
sum(rate(%(metrics_prefix)stnt_cpu_user_time{%(filters)s}[$__rate_interval]))
194214
|||,
@@ -197,13 +217,17 @@ local prometheus = grafana.prometheus;
197217
filters: common.prometheus_query_filters(cfg.filters),
198218
}
199219
),
200-
legend='CPU total user time per cluster',
220+
prometheus_legend=title,
221+
influx_query=|||
222+
SELECT non_negative_derivative(SUM("value"), 1s) AS total_cpu_user_time
223+
FROM "$policy"."$measurement"
224+
WHERE "metric_name" = 'tnt_cpu_user_time' AND "label_pairs_alias" =~ /^$alias$/
225+
AND $timeFilter
226+
GROUP BY time($__interval)
227+
|||,
228+
influx_alias=title
201229
),
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)
230+
207231

208232
getrusage_cpu_total_system_time(
209233
cfg,
@@ -218,7 +242,7 @@ local prometheus = grafana.prometheus;
218242
cfg=cfg,
219243
title=title,
220244
description=description,
221-
expr=std.format(
245+
prometheus_expr=std.format(
222246
|||
223247
sum(rate(%(metrics_prefix)stnt_cpu_system_time{%(filters)s}[$__rate_interval]))
224248
|||,
@@ -227,13 +251,17 @@ local prometheus = grafana.prometheus;
227251
filters: common.prometheus_query_filters(cfg.filters),
228252
}
229253
),
230-
legend='CPU total system time per cluster',
254+
prometheus_legend=title,
255+
influx_query=|||
256+
SELECT non_negative_derivative(SUM("value"), 1s) AS total_cpu_system_time
257+
FROM "$policy"."$measurement"
258+
WHERE ("metric_name" = 'tnt_cpu_system_time' AND "label_pairs_alias" =~ /^$alias$/)
259+
AND $timeFilter
260+
GROUP BY time($__interval)
261+
|||,
262+
influx_alias=title
231263
),
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)
264+
237265

238266
// --------------------------------------------------------------------------
239267
local procstat_thread_time_graph(

0 commit comments

Comments
 (0)