@@ -39,7 +39,34 @@ 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='tnt_memory + tnt_memory_virt',
45+ expr=std.format (
46+ |||
47+ (%(metrics_prefix)stnt_memory{%(filters)s}) +
48+ (%(metrics_prefix)stnt_memory_virt{%(filters)s})
49+ ||| ,
50+ {
51+ metrics_prefix: cfg.metrics_prefix,
52+ filters: common.prometheus_query_filters(cfg.filters),
53+ }
54+ ),
55+ legendFormat=title,
56+ )
57+ else if cfg.type == variable.datasource_type.influxdb then
58+ influxdb.target(
59+ rawQuery=true ,
60+ query=|||
61+ SELECT sum("value")
62+ FROM "$policy"."$measurement"
63+ WHERE (("metric_name" = 'tnt_memory' OR "metric_name" = 'tnt_memory_virt') AND "label_pairs_alias" =~ /^$alias$/)
64+ AND $timeFilter
65+ GROUP BY time($__interval), "label_pairs_alias" fill(none)
66+ ||| ,
67+ alias='$tag_label_pairs_alias' ,
68+ )
69+ // common.target(cfg, 'tnt_memory + tnt_memory_virt')
4370 ),
4471
4572 resident_memory_per_instance(
@@ -103,7 +130,17 @@ local variable = import 'dashboard/variable.libsonnet';
103130 legendFormat=title,
104131 )
105132 else if cfg.type == variable.datasource_type.influxdb then
106- influxdb.target()
133+ influxdb.target(
134+ rawQuery=true ,
135+ query=|||
136+ SELECT SUM("value") AS total_memory_per_cluster
137+ FROM "$policy"."$measurement"
138+ WHERE ("metric_name" = 'tnt_memory' OR "metric_name" = 'tnt_memory_virt')
139+ AND $timeFilter
140+ GROUP BY time($__interval)
141+ ||| ,
142+ alias=title,
143+ )
107144 ),
108145
109146 total_resident_memory(
@@ -123,7 +160,17 @@ local variable = import 'dashboard/variable.libsonnet';
123160 if cfg.type == variable.datasource_type.prometheus then
124161 prometheus.target(expr=aggregate_expr(cfg, 'tnt_memory' ), legendFormat=title)
125162 else if cfg.type == variable.datasource_type.influxdb then
126- influxdb.target()
163+ influxdb.target(
164+ rawQuery=true ,
165+ query=|||
166+ SELECT SUM("value") AS total_resident_memory
167+ FROM "$policy"."$measurement"
168+ WHERE "metric_name" = 'tnt_memory' AND "label_pairs_alias" =~ /^$alias$/
169+ AND $timeFilter
170+ GROUP BY time($__interval)
171+ ||| ,
172+ alias=title,
173+ )
127174 ),
128175
129176 total_virtual_memory(
@@ -143,7 +190,17 @@ local variable = import 'dashboard/variable.libsonnet';
143190 if cfg.type == variable.datasource_type.prometheus then
144191 prometheus.target(expr=aggregate_expr(cfg, 'tnt_memory_virt' ), legendFormat=title)
145192 else if cfg.type == variable.datasource_type.influxdb then
146- influxdb.target()
193+ influxdb.target(
194+ rawQuery=true ,
195+ query=|||
196+ SELECT SUM("value") AS total_virt_memory
197+ FROM "$policy"."$measurement"
198+ WHERE "metric_name" = 'tnt_memory_virt' AND "label_pairs_alias" =~ /^$alias$/
199+ AND $timeFilter
200+ GROUP BY time($__interval)
201+ ||| ,
202+ alias=title,
203+ )
147204 ),
148205
149206 lua_memory(
0 commit comments