@@ -39,7 +39,32 @@ local variable = import 'dashboard/variable.libsonnet';
3939 labelY1='in bytes' ,
4040 panel_width=8 ,
4141 ).addTarget(
42- common.target(cfg, 'tnt_memory + tnt_memory_virt' )
42+ if cfg.type == variable.datasource_type.prometheus then
43+ prometheus.target(
44+ expr=std.format (
45+ |||
46+ (%(metrics_prefix)stnt_memory{%(filters)s}) +
47+ (%(metrics_prefix)stnt_memory_virt{%(filters)s})
48+ ||| ,
49+ {
50+ metrics_prefix: cfg.metrics_prefix,
51+ filters: common.prometheus_query_filters(cfg.filters),
52+ }
53+ ),
54+ legendFormat=title,
55+ )
56+ else if cfg.type == variable.datasource_type.influxdb then
57+ influxdb.target(
58+ rawQuery=true ,
59+ query=|||
60+ SELECT sum("value")
61+ FROM "$policy"."$measurement"
62+ WHERE (("metric_name" = 'tnt_memory' OR "metric_name" = 'tnt_memory_virt') AND "label_pairs_alias" =~ /^$alias$/)
63+ AND $timeFilter
64+ GROUP BY time($__interval), "label_pairs_alias" fill(none)
65+ ||| ,
66+ alias='$tag_label_pairs_alias' ,
67+ )
4368 ),
4469
4570 resident_memory_per_instance(
@@ -103,7 +128,17 @@ local variable = import 'dashboard/variable.libsonnet';
103128 legendFormat=title,
104129 )
105130 else if cfg.type == variable.datasource_type.influxdb then
106- influxdb.target()
131+ influxdb.target(
132+ rawQuery=true ,
133+ query=|||
134+ SELECT SUM("value") AS total_memory_per_cluster
135+ FROM "$policy"."$measurement"
136+ WHERE ("metric_name" = 'tnt_memory' OR "metric_name" = 'tnt_memory_virt')
137+ AND $timeFilter
138+ GROUP BY time($__interval)
139+ ||| ,
140+ alias=title,
141+ )
107142 ),
108143
109144 total_resident_memory(
@@ -123,7 +158,17 @@ local variable = import 'dashboard/variable.libsonnet';
123158 if cfg.type == variable.datasource_type.prometheus then
124159 prometheus.target(expr=aggregate_expr(cfg, 'tnt_memory' ), legendFormat=title)
125160 else if cfg.type == variable.datasource_type.influxdb then
126- influxdb.target()
161+ influxdb.target(
162+ rawQuery=true ,
163+ query=|||
164+ SELECT SUM("value") AS total_resident_memory
165+ FROM "$policy"."$measurement"
166+ WHERE "metric_name" = 'tnt_memory' AND "label_pairs_alias" =~ /^$alias$/
167+ AND $timeFilter
168+ GROUP BY time($__interval)
169+ ||| ,
170+ alias=title,
171+ )
127172 ),
128173
129174 total_virtual_memory(
@@ -143,7 +188,17 @@ local variable = import 'dashboard/variable.libsonnet';
143188 if cfg.type == variable.datasource_type.prometheus then
144189 prometheus.target(expr=aggregate_expr(cfg, 'tnt_memory_virt' ), legendFormat=title)
145190 else if cfg.type == variable.datasource_type.influxdb then
146- influxdb.target()
191+ influxdb.target(
192+ rawQuery=true ,
193+ query=|||
194+ SELECT SUM("value") AS total_virt_memory
195+ FROM "$policy"."$measurement"
196+ WHERE "metric_name" = 'tnt_memory_virt' AND "label_pairs_alias" =~ /^$alias$/
197+ AND $timeFilter
198+ GROUP BY time($__interval)
199+ ||| ,
200+ alias=title,
201+ )
147202 ),
148203
149204 lua_memory(
0 commit comments