Skip to content

Commit 1093fa0

Browse files
MadLittleModsMadLittleMods
committed
Update process-level metrics to use instance_to_server_name_mapping ($server_name)
1 parent 7aecad8 commit 1093fa0

1 file changed

Lines changed: 21 additions & 21 deletions

File tree

‎contrib/grafana/synapse.json‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@
541541
"datasource": {
542542
"uid": "${DS_PROMETHEUS}"
543543
},
544-
"expr": "rate(process_cpu_seconds_total{instance=\"$instance\",job=~\"$job\",index=~\"$index\"}[$bucket_size])",
544+
"expr": "rate(process_cpu_seconds_total{job=~\"$job\",index=~\"$index\"}[$bucket_size]) * on(instance) group_left(server_name)\ninstance_to_server_name_mapping{server_name=\"$server_name\"}",
545545
"format": "time_series",
546546
"interval": "",
547547
"intervalFactor": 1,
@@ -651,7 +651,7 @@
651651
"datasource": {
652652
"uid": "${DS_PROMETHEUS}"
653653
},
654-
"expr": "process_resident_memory_bytes{instance=\"$instance\",job=~\"$job\",index=~\"$index\"}",
654+
"expr": "process_resident_memory_bytes{job=~\"$job\",index=~\"$index\"} * on(instance) group_left(server_name)\ninstance_to_server_name_mapping{server_name=\"$server_name\"}",
655655
"format": "time_series",
656656
"interval": "",
657657
"intervalFactor": 2,
@@ -664,7 +664,7 @@
664664
"datasource": {
665665
"uid": "${DS_PROMETHEUS}"
666666
},
667-
"expr": "sum(process_resident_memory_bytes{instance=\"$instance\",job=~\"$job\",index=~\"$index\"})",
667+
"expr": "sum(process_resident_memory_bytes{job=~\"$job\",index=~\"$index\"}) * on(instance) group_left(server_name)\ninstance_to_server_name_mapping{server_name=\"$server_name\"}",
668668
"hide": true,
669669
"interval": "",
670670
"legendFormat": "total",
@@ -785,7 +785,7 @@
785785
"uid": "${DS_PROMETHEUS}"
786786
},
787787
"editorMode": "code",
788-
"expr": "synapse_build_info{instance=\"$instance\", job=\"synapse\"} - 1",
788+
"expr": "(\n synapse_build_info{job=\"synapse\"} * on(instance) group_left(server_name)\n instance_to_server_name_mapping{server_name=\"my.docker.synapse.server\"}\n) - 1",
789789
"legendFormat": "version {{version}}",
790790
"range": true,
791791
"refId": "deployed_synapse_versions"
@@ -857,7 +857,7 @@
857857
"datasource": {
858858
"uid": "${DS_PROMETHEUS}"
859859
},
860-
"expr": "process_open_fds{instance=\"$instance\",job=~\"$job\",index=~\"$index\"}",
860+
"expr": "process_open_fds{job=~\"$job\",index=~\"$index\"} * on(instance) group_left(server_name)\ninstance_to_server_name_mapping{server_name=\"$server_name\"}",
861861
"format": "time_series",
862862
"hide": false,
863863
"interval": "",
@@ -870,7 +870,7 @@
870870
"datasource": {
871871
"uid": "${DS_PROMETHEUS}"
872872
},
873-
"expr": "process_max_fds{instance=\"$instance\",job=~\"$job\",index=~\"$index\"}",
873+
"expr": "process_max_fds{job=~\"$job\",index=~\"$index\"} * on(instance) group_left(server_name)\ninstance_to_server_name_mapping{server_name=\"$server_name\"}",
874874
"format": "time_series",
875875
"hide": true,
876876
"interval": "",
@@ -1000,7 +1000,7 @@
10001000
"uid": "${DS_PROMETHEUS}"
10011001
},
10021002
"editorMode": "code",
1003-
"expr": "rate(process_cpu_system_seconds_total{instance=\"$instance\",job=~\"$job\",index=~\"$index\"}[$bucket_size])",
1003+
"expr": "rate(process_cpu_system_seconds_total{job=~\"$job\",index=~\"$index\"}[$bucket_size]) * on(instance) group_left(server_name)\ninstance_to_server_name_mapping{server_name=\"$server_name\"}",
10041004
"format": "time_series",
10051005
"intervalFactor": 1,
10061006
"legendFormat": "{{job}}-{{index}} system ",
@@ -1013,7 +1013,7 @@
10131013
"datasource": {
10141014
"uid": "${DS_PROMETHEUS}"
10151015
},
1016-
"expr": "rate(process_cpu_user_seconds_total{instance=\"$instance\",job=~\"$job\",index=~\"$index\"}[$bucket_size])",
1016+
"expr": "rate(process_cpu_user_seconds_total{job=~\"$job\",index=~\"$index\"}[$bucket_size]) * on(instance) group_left(server_name)\ninstance_to_server_name_mapping{server_name=\"$server_name\"}",
10171017
"format": "time_series",
10181018
"hide": false,
10191019
"interval": "",
@@ -1176,7 +1176,7 @@
11761176
"uid": "${DS_PROMETHEUS}"
11771177
},
11781178
"exemplar": true,
1179-
"expr": "histogram_quantile(0.999, rate(python_twisted_reactor_tick_time_bucket{index=~\"$index\",instance=\"$instance\",job=~\"$job\"}[$bucket_size]))",
1179+
"expr": "histogram_quantile(0.999, rate(python_twisted_reactor_tick_time_bucket{index=~\"$index\",job=~\"$job\"}[$bucket_size])) * on(instance) group_left(server_name)\ninstance_to_server_name_mapping{server_name=\"$server_name\"}",
11801180
"hide": false,
11811181
"interval": "",
11821182
"legendFormat": "{{job}}-{{index}} 99.9%",
@@ -1188,7 +1188,7 @@
11881188
"uid": "${DS_PROMETHEUS}"
11891189
},
11901190
"exemplar": true,
1191-
"expr": "histogram_quantile(0.99, rate(python_twisted_reactor_tick_time_bucket{index=~\"$index\",instance=\"$instance\",job=~\"$job\"}[$bucket_size]))",
1191+
"expr": "histogram_quantile(0.99, rate(python_twisted_reactor_tick_time_bucket{index=~\"$index\",job=~\"$job\"}[$bucket_size])) * on(instance) group_left(server_name)\ninstance_to_server_name_mapping{server_name=\"$server_name\"}",
11921192
"format": "time_series",
11931193
"interval": "",
11941194
"intervalFactor": 2,
@@ -1202,7 +1202,7 @@
12021202
"uid": "${DS_PROMETHEUS}"
12031203
},
12041204
"exemplar": true,
1205-
"expr": "histogram_quantile(0.95, rate(python_twisted_reactor_tick_time_bucket{index=~\"$index\",instance=\"$instance\",job=~\"$job\"}[$bucket_size]))",
1205+
"expr": "histogram_quantile(0.95, rate(python_twisted_reactor_tick_time_bucket{index=~\"$index\",job=~\"$job\"}[$bucket_size])) * on(instance) group_left(server_name)\ninstance_to_server_name_mapping{server_name=\"$server_name\"}",
12061206
"format": "time_series",
12071207
"interval": "",
12081208
"intervalFactor": 1,
@@ -1214,7 +1214,7 @@
12141214
"type": "prometheus",
12151215
"uid": "${DS_PROMETHEUS}"
12161216
},
1217-
"expr": "histogram_quantile(0.90, rate(python_twisted_reactor_tick_time_bucket{index=~\"$index\",instance=\"$instance\",job=~\"$job\"}[$bucket_size]))",
1217+
"expr": "histogram_quantile(0.90, rate(python_twisted_reactor_tick_time_bucket{index=~\"$index\",job=~\"$job\"}[$bucket_size])) * on(instance) group_left(server_name)\ninstance_to_server_name_mapping{server_name=\"$server_name\"}",
12181218
"format": "time_series",
12191219
"intervalFactor": 1,
12201220
"legendFormat": "{{job}}-{{index}} 90%",
@@ -1225,7 +1225,7 @@
12251225
"type": "prometheus",
12261226
"uid": "${DS_PROMETHEUS}"
12271227
},
1228-
"expr": "rate(python_twisted_reactor_tick_time_sum{index=~\"$index\",instance=\"$instance\",job=~\"$job\"}[$bucket_size]) / rate(python_twisted_reactor_tick_time_count{index=~\"$index\",instance=\"$instance\",job=~\"$job\"}[$bucket_size])",
1228+
"expr": "rate(python_twisted_reactor_tick_time_sum{index=~\"$index\",job=~\"$job\"}[$bucket_size]) / rate(python_twisted_reactor_tick_time_count{index=~\"$index\",job=~\"$job\"}[$bucket_size]) * on(instance) group_left(server_name)\ninstance_to_server_name_mapping{server_name=\"$server_name\"}",
12291229
"format": "time_series",
12301230
"intervalFactor": 1,
12311231
"legendFormat": "{{job}}-{{index}} mean",
@@ -1293,7 +1293,7 @@
12931293
"datasource": {
12941294
"uid": "${DS_PROMETHEUS}"
12951295
},
1296-
"expr": "process_resident_memory_bytes{instance=\"$instance\",job=~\"$job\",index=~\"$index\"}",
1296+
"expr": "process_resident_memory_bytes{job=~\"$job\",index=~\"$index\"} * on(instance) group_left(server_name)\ninstance_to_server_name_mapping{server_name=\"$server_name\"}",
12971297
"format": "time_series",
12981298
"interval": "",
12991299
"intervalFactor": 2,
@@ -1306,7 +1306,7 @@
13061306
"datasource": {
13071307
"uid": "${DS_PROMETHEUS}"
13081308
},
1309-
"expr": "sum(process_resident_memory_bytes{instance=\"$instance\",job=~\"$job\",index=~\"$index\"})",
1309+
"expr": "sum by (server_name) (\n process_resident_memory_bytes{job=~\"$job\",index=~\"$index\"} * on(instance) group_left(server_name)\n instance_to_server_name_mapping{server_name=\"$server_name\"}\n)",
13101310
"interval": "",
13111311
"legendFormat": "total",
13121312
"refId": "B"
@@ -1405,7 +1405,7 @@
14051405
"datasource": {
14061406
"uid": "${DS_PROMETHEUS}"
14071407
},
1408-
"expr": "scrape_duration_seconds{instance=\"$instance\",job=~\"$job\",index=~\"$index\"}",
1408+
"expr": "scrape_duration_seconds{job=~\"$job\",index=~\"$index\"} * on(instance) group_left(server_name)\ninstance_to_server_name_mapping{server_name=\"$server_name\"}",
14091409
"format": "time_series",
14101410
"interval": "",
14111411
"intervalFactor": 2,
@@ -1514,7 +1514,7 @@
15141514
"uid": "${DS_PROMETHEUS}"
15151515
},
15161516
"editorMode": "code",
1517-
"expr": "min_over_time(up{instance=\"$instance\",job=~\"$job\",index=~\"$index\"}[$bucket_size])",
1517+
"expr": "min_over_time(up{job=~\"$job\",index=~\"$index\"}[$bucket_size]) * on(instance) group_left(server_name)\ninstance_to_server_name_mapping{server_name=\"$server_name\"}",
15181518
"format": "time_series",
15191519
"intervalFactor": 2,
15201520
"legendFormat": "{{job}}-{{index}}",
@@ -1527,7 +1527,7 @@
15271527
"uid": "${DS_PROMETHEUS}"
15281528
},
15291529
"editorMode": "code",
1530-
"expr": "synapse_build_info{instance=\"$instance\", job=\"synapse\"} - 1",
1530+
"expr": "(\n synapse_build_info{job=\"synapse\"} * on(instance) group_left(server_name)\n instance_to_server_name_mapping{server_name=\"my.docker.synapse.server\"}\n) - 1",
15311531
"hide": false,
15321532
"legendFormat": "version {{version}}",
15331533
"range": true,
@@ -9207,7 +9207,7 @@
92079207
"datasource": {
92089208
"uid": "${DS_PROMETHEUS}"
92099209
},
9210-
"expr": "rate(python_gc_time_sum{instance=\"$instance\",job=~\"$job\",index=~\"$index\"}[10m])",
9210+
"expr": "rate(python_gc_time_sum{job=~\"$job\",index=~\"$index\"}[10m]) * on(instance) group_left(server_name)\ninstance_to_server_name_mapping{server_name=\"$server_name\"}",
92119211
"format": "time_series",
92129212
"instant": false,
92139213
"intervalFactor": 1,
@@ -9306,7 +9306,7 @@
93069306
"datasource": {
93079307
"uid": "${DS_PROMETHEUS}"
93089308
},
9309-
"expr": "rate(python_gc_time_sum{instance=\"$instance\",job=~\"$job\",index=~\"$index\"}[$bucket_size])/rate(python_gc_time_count[$bucket_size])",
9309+
"expr": "rate(python_gc_time_sum{job=~\"$job\",index=~\"$index\"}[$bucket_size])/rate(python_gc_time_count{job=~\"$job\",index=~\"$index\"}[$bucket_size]) * on(instance) group_left(server_name)\ninstance_to_server_name_mapping{server_name=\"$server_name\"}",
93109310
"format": "time_series",
93119311
"intervalFactor": 2,
93129312
"legendFormat": "{{job}} {{index}} gen {{gen}} ",
@@ -9408,7 +9408,7 @@
94089408
"datasource": {
94099409
"uid": "${DS_PROMETHEUS}"
94109410
},
9411-
"expr": "python_gc_counts{job=~\"$job\",index=~\"$index\",instance=\"$instance\"}",
9411+
"expr": "python_gc_counts{job=~\"$job\",index=~\"$index\"} * on(instance) group_left(server_name)\ninstance_to_server_name_mapping{server_name=\"$server_name\"}",
94129412
"format": "time_series",
94139413
"intervalFactor": 1,
94149414
"legendFormat": "{{job}}-{{index}} gen {{gen}}",

0 commit comments

Comments
 (0)