Skip to content

Commit 87007ce

Browse files
dashboard: clarify expected Prometheus setup
Some panels dealing with cluster overview (supported only for Prometheus) expect to have each instance as a separate pull target since they rely on Prometheus target `up` healthcheck. They won't work properly when something like TCM is used to provide metrics for the whole cluster. This patch adds a note to clarify this. Part of #224
1 parent d8ef17d commit 87007ce

12 files changed

+30
-24
lines changed

dashboard/panels/cluster.libsonnet

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ local prometheus = grafana.prometheus;
1515
health_overview_table(
1616
cfg,
1717
title='Cluster status overview',
18-
description=|||
18+
description=common.prometheus_metrics_pull_note(|||
1919
Overview of Tarantool instances observed by Prometheus job.
2020
2121
If instance row is *red*, it means Prometheus can't reach
@@ -28,7 +28,7 @@ local prometheus = grafana.prometheus;
2828
2929
If Prometheus job filter is not specified, displays running instances
3030
and ignores unreachable instances (we have no specific source to fetch)
31-
|||,
31+
|||),
3232
):: tablePanel.new(
3333
title=title,
3434
description=description,
@@ -163,13 +163,13 @@ local prometheus = grafana.prometheus;
163163
health_overview_stat(
164164
cfg,
165165
title='',
166-
description=|||
166+
description=common.prometheus_metrics_pull_note(|||
167167
Count of running Tarantool instances observed by Prometheus job.
168168
If Prometheus can't reach URI specified in targets
169169
or ran into error, instance is not counted.
170170
171171
Instance alias filtering is disabled here.
172-
|||,
172+
|||),
173173
):: if cfg.type == variable.datasource_type.prometheus then
174174
overview_stat(
175175
cfg,

dashboard/panels/common.libsonnet

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,4 +123,10 @@ local influxdb_query_filters(filters) = std.join(' AND ', std.map(
123123

124124
remove_field(obj, key)::
125125
{ [item.key]: item.value for item in std.objectKeysValuesAll(obj) if item.key != key },
126+
127+
prometheus_metrics_pull_note(description)::
128+
std.join('\n', [description, |||
129+
This panel is designed to work with Prometheus client
130+
set up to have each Tarantool instance as a separate pull target.
131+
|||]),
126132
}

tests/Prometheus/dashboard_compiled.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
{
7070
"columns": [ ],
7171
"datasource": "$prometheus",
72-
"description": "Overview of Tarantool instances observed by Prometheus job.\n\nIf instance row is *red*, it means Prometheus can't reach\nURI specified in targets or ran into error.\nIf instance row is *green*, it means instance is up and running and\nPrometheus is successfully extracting metrics from it.\n\"Uptime\" column shows time since instant start.\n\nInstance alias filtering is disabled here.\n\nIf Prometheus job filter is not specified, displays running instances\nand ignores unreachable instances (we have no specific source to fetch)\n",
72+
"description": "Overview of Tarantool instances observed by Prometheus job.\n\nIf instance row is *red*, it means Prometheus can't reach\nURI specified in targets or ran into error.\nIf instance row is *green*, it means instance is up and running and\nPrometheus is successfully extracting metrics from it.\n\"Uptime\" column shows time since instant start.\n\nInstance alias filtering is disabled here.\n\nIf Prometheus job filter is not specified, displays running instances\nand ignores unreachable instances (we have no specific source to fetch)\n\nThis panel is designed to work with Prometheus client\nset up to have each Tarantool instance as a separate pull target.\n",
7373
"gridPos": {
7474
"h": 8,
7575
"w": 12,
@@ -144,7 +144,7 @@
144144
},
145145
{
146146
"datasource": "$prometheus",
147-
"description": "Count of running Tarantool instances observed by Prometheus job.\nIf Prometheus can't reach URI specified in targets\nor ran into error, instance is not counted.\n\nInstance alias filtering is disabled here.\n",
147+
"description": "Count of running Tarantool instances observed by Prometheus job.\nIf Prometheus can't reach URI specified in targets\nor ran into error, instance is not counted.\n\nInstance alias filtering is disabled here.\n\nThis panel is designed to work with Prometheus client\nset up to have each Tarantool instance as a separate pull target.\n",
148148
"gridPos": {
149149
"h": 3,
150150
"w": 6,

tests/Prometheus/dashboard_custom_compiled.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
{
7070
"columns": [ ],
7171
"datasource": "$prometheus",
72-
"description": "Overview of Tarantool instances observed by Prometheus job.\n\nIf instance row is *red*, it means Prometheus can't reach\nURI specified in targets or ran into error.\nIf instance row is *green*, it means instance is up and running and\nPrometheus is successfully extracting metrics from it.\n\"Uptime\" column shows time since instant start.\n\nInstance alias filtering is disabled here.\n\nIf Prometheus job filter is not specified, displays running instances\nand ignores unreachable instances (we have no specific source to fetch)\n",
72+
"description": "Overview of Tarantool instances observed by Prometheus job.\n\nIf instance row is *red*, it means Prometheus can't reach\nURI specified in targets or ran into error.\nIf instance row is *green*, it means instance is up and running and\nPrometheus is successfully extracting metrics from it.\n\"Uptime\" column shows time since instant start.\n\nInstance alias filtering is disabled here.\n\nIf Prometheus job filter is not specified, displays running instances\nand ignores unreachable instances (we have no specific source to fetch)\n\nThis panel is designed to work with Prometheus client\nset up to have each Tarantool instance as a separate pull target.\n",
7373
"gridPos": {
7474
"h": 8,
7575
"w": 12,
@@ -144,7 +144,7 @@
144144
},
145145
{
146146
"datasource": "$prometheus",
147-
"description": "Count of running Tarantool instances observed by Prometheus job.\nIf Prometheus can't reach URI specified in targets\nor ran into error, instance is not counted.\n\nInstance alias filtering is disabled here.\n",
147+
"description": "Count of running Tarantool instances observed by Prometheus job.\nIf Prometheus can't reach URI specified in targets\nor ran into error, instance is not counted.\n\nInstance alias filtering is disabled here.\n\nThis panel is designed to work with Prometheus client\nset up to have each Tarantool instance as a separate pull target.\n",
148148
"gridPos": {
149149
"h": 3,
150150
"w": 6,

tests/Prometheus/dashboard_static_compiled.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
{
7070
"columns": [ ],
7171
"datasource": "Prometheus",
72-
"description": "Overview of Tarantool instances observed by Prometheus job.\n\nIf instance row is *red*, it means Prometheus can't reach\nURI specified in targets or ran into error.\nIf instance row is *green*, it means instance is up and running and\nPrometheus is successfully extracting metrics from it.\n\"Uptime\" column shows time since instant start.\n\nInstance alias filtering is disabled here.\n\nIf Prometheus job filter is not specified, displays running instances\nand ignores unreachable instances (we have no specific source to fetch)\n",
72+
"description": "Overview of Tarantool instances observed by Prometheus job.\n\nIf instance row is *red*, it means Prometheus can't reach\nURI specified in targets or ran into error.\nIf instance row is *green*, it means instance is up and running and\nPrometheus is successfully extracting metrics from it.\n\"Uptime\" column shows time since instant start.\n\nInstance alias filtering is disabled here.\n\nIf Prometheus job filter is not specified, displays running instances\nand ignores unreachable instances (we have no specific source to fetch)\n\nThis panel is designed to work with Prometheus client\nset up to have each Tarantool instance as a separate pull target.\n",
7373
"gridPos": {
7474
"h": 8,
7575
"w": 12,
@@ -144,7 +144,7 @@
144144
},
145145
{
146146
"datasource": "Prometheus",
147-
"description": "Count of running Tarantool instances observed by Prometheus job.\nIf Prometheus can't reach URI specified in targets\nor ran into error, instance is not counted.\n\nInstance alias filtering is disabled here.\n",
147+
"description": "Count of running Tarantool instances observed by Prometheus job.\nIf Prometheus can't reach URI specified in targets\nor ran into error, instance is not counted.\n\nInstance alias filtering is disabled here.\n\nThis panel is designed to work with Prometheus client\nset up to have each Tarantool instance as a separate pull target.\n",
148148
"gridPos": {
149149
"h": 3,
150150
"w": 6,

tests/Prometheus/dashboard_static_custom_title_compiled.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
{
7070
"columns": [ ],
7171
"datasource": "Prometheus",
72-
"description": "Overview of Tarantool instances observed by Prometheus job.\n\nIf instance row is *red*, it means Prometheus can't reach\nURI specified in targets or ran into error.\nIf instance row is *green*, it means instance is up and running and\nPrometheus is successfully extracting metrics from it.\n\"Uptime\" column shows time since instant start.\n\nInstance alias filtering is disabled here.\n\nIf Prometheus job filter is not specified, displays running instances\nand ignores unreachable instances (we have no specific source to fetch)\n",
72+
"description": "Overview of Tarantool instances observed by Prometheus job.\n\nIf instance row is *red*, it means Prometheus can't reach\nURI specified in targets or ran into error.\nIf instance row is *green*, it means instance is up and running and\nPrometheus is successfully extracting metrics from it.\n\"Uptime\" column shows time since instant start.\n\nInstance alias filtering is disabled here.\n\nIf Prometheus job filter is not specified, displays running instances\nand ignores unreachable instances (we have no specific source to fetch)\n\nThis panel is designed to work with Prometheus client\nset up to have each Tarantool instance as a separate pull target.\n",
7373
"gridPos": {
7474
"h": 8,
7575
"w": 12,
@@ -144,7 +144,7 @@
144144
},
145145
{
146146
"datasource": "Prometheus",
147-
"description": "Count of running Tarantool instances observed by Prometheus job.\nIf Prometheus can't reach URI specified in targets\nor ran into error, instance is not counted.\n\nInstance alias filtering is disabled here.\n",
147+
"description": "Count of running Tarantool instances observed by Prometheus job.\nIf Prometheus can't reach URI specified in targets\nor ran into error, instance is not counted.\n\nInstance alias filtering is disabled here.\n\nThis panel is designed to work with Prometheus client\nset up to have each Tarantool instance as a separate pull target.\n",
148148
"gridPos": {
149149
"h": 3,
150150
"w": 6,

tests/Prometheus/dashboard_static_with_instance_variable_compiled.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
{
7070
"columns": [ ],
7171
"datasource": "Prometheus",
72-
"description": "Overview of Tarantool instances observed by Prometheus job.\n\nIf instance row is *red*, it means Prometheus can't reach\nURI specified in targets or ran into error.\nIf instance row is *green*, it means instance is up and running and\nPrometheus is successfully extracting metrics from it.\n\"Uptime\" column shows time since instant start.\n\nInstance alias filtering is disabled here.\n\nIf Prometheus job filter is not specified, displays running instances\nand ignores unreachable instances (we have no specific source to fetch)\n",
72+
"description": "Overview of Tarantool instances observed by Prometheus job.\n\nIf instance row is *red*, it means Prometheus can't reach\nURI specified in targets or ran into error.\nIf instance row is *green*, it means instance is up and running and\nPrometheus is successfully extracting metrics from it.\n\"Uptime\" column shows time since instant start.\n\nInstance alias filtering is disabled here.\n\nIf Prometheus job filter is not specified, displays running instances\nand ignores unreachable instances (we have no specific source to fetch)\n\nThis panel is designed to work with Prometheus client\nset up to have each Tarantool instance as a separate pull target.\n",
7373
"gridPos": {
7474
"h": 8,
7575
"w": 12,
@@ -144,7 +144,7 @@
144144
},
145145
{
146146
"datasource": "Prometheus",
147-
"description": "Count of running Tarantool instances observed by Prometheus job.\nIf Prometheus can't reach URI specified in targets\nor ran into error, instance is not counted.\n\nInstance alias filtering is disabled here.\n",
147+
"description": "Count of running Tarantool instances observed by Prometheus job.\nIf Prometheus can't reach URI specified in targets\nor ran into error, instance is not counted.\n\nInstance alias filtering is disabled here.\n\nThis panel is designed to work with Prometheus client\nset up to have each Tarantool instance as a separate pull target.\n",
148148
"gridPos": {
149149
"h": 3,
150150
"w": 6,

tests/Prometheus/dashboard_tdg_compiled.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
{
7070
"columns": [ ],
7171
"datasource": "$prometheus",
72-
"description": "Overview of Tarantool instances observed by Prometheus job.\n\nIf instance row is *red*, it means Prometheus can't reach\nURI specified in targets or ran into error.\nIf instance row is *green*, it means instance is up and running and\nPrometheus is successfully extracting metrics from it.\n\"Uptime\" column shows time since instant start.\n\nInstance alias filtering is disabled here.\n\nIf Prometheus job filter is not specified, displays running instances\nand ignores unreachable instances (we have no specific source to fetch)\n",
72+
"description": "Overview of Tarantool instances observed by Prometheus job.\n\nIf instance row is *red*, it means Prometheus can't reach\nURI specified in targets or ran into error.\nIf instance row is *green*, it means instance is up and running and\nPrometheus is successfully extracting metrics from it.\n\"Uptime\" column shows time since instant start.\n\nInstance alias filtering is disabled here.\n\nIf Prometheus job filter is not specified, displays running instances\nand ignores unreachable instances (we have no specific source to fetch)\n\nThis panel is designed to work with Prometheus client\nset up to have each Tarantool instance as a separate pull target.\n",
7373
"gridPos": {
7474
"h": 8,
7575
"w": 12,
@@ -144,7 +144,7 @@
144144
},
145145
{
146146
"datasource": "$prometheus",
147-
"description": "Count of running Tarantool instances observed by Prometheus job.\nIf Prometheus can't reach URI specified in targets\nor ran into error, instance is not counted.\n\nInstance alias filtering is disabled here.\n",
147+
"description": "Count of running Tarantool instances observed by Prometheus job.\nIf Prometheus can't reach URI specified in targets\nor ran into error, instance is not counted.\n\nInstance alias filtering is disabled here.\n\nThis panel is designed to work with Prometheus client\nset up to have each Tarantool instance as a separate pull target.\n",
148148
"gridPos": {
149149
"h": 3,
150150
"w": 6,

tests/Prometheus/dashboard_tdg_static_compiled.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
{
7070
"columns": [ ],
7171
"datasource": "Prometheus",
72-
"description": "Overview of Tarantool instances observed by Prometheus job.\n\nIf instance row is *red*, it means Prometheus can't reach\nURI specified in targets or ran into error.\nIf instance row is *green*, it means instance is up and running and\nPrometheus is successfully extracting metrics from it.\n\"Uptime\" column shows time since instant start.\n\nInstance alias filtering is disabled here.\n\nIf Prometheus job filter is not specified, displays running instances\nand ignores unreachable instances (we have no specific source to fetch)\n",
72+
"description": "Overview of Tarantool instances observed by Prometheus job.\n\nIf instance row is *red*, it means Prometheus can't reach\nURI specified in targets or ran into error.\nIf instance row is *green*, it means instance is up and running and\nPrometheus is successfully extracting metrics from it.\n\"Uptime\" column shows time since instant start.\n\nInstance alias filtering is disabled here.\n\nIf Prometheus job filter is not specified, displays running instances\nand ignores unreachable instances (we have no specific source to fetch)\n\nThis panel is designed to work with Prometheus client\nset up to have each Tarantool instance as a separate pull target.\n",
7373
"gridPos": {
7474
"h": 8,
7575
"w": 12,
@@ -144,7 +144,7 @@
144144
},
145145
{
146146
"datasource": "Prometheus",
147-
"description": "Count of running Tarantool instances observed by Prometheus job.\nIf Prometheus can't reach URI specified in targets\nor ran into error, instance is not counted.\n\nInstance alias filtering is disabled here.\n",
147+
"description": "Count of running Tarantool instances observed by Prometheus job.\nIf Prometheus can't reach URI specified in targets\nor ran into error, instance is not counted.\n\nInstance alias filtering is disabled here.\n\nThis panel is designed to work with Prometheus client\nset up to have each Tarantool instance as a separate pull target.\n",
148148
"gridPos": {
149149
"h": 3,
150150
"w": 6,

tests/Prometheus/dashboard_tdg_static_custom_title_compiled.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
{
7070
"columns": [ ],
7171
"datasource": "Prometheus",
72-
"description": "Overview of Tarantool instances observed by Prometheus job.\n\nIf instance row is *red*, it means Prometheus can't reach\nURI specified in targets or ran into error.\nIf instance row is *green*, it means instance is up and running and\nPrometheus is successfully extracting metrics from it.\n\"Uptime\" column shows time since instant start.\n\nInstance alias filtering is disabled here.\n\nIf Prometheus job filter is not specified, displays running instances\nand ignores unreachable instances (we have no specific source to fetch)\n",
72+
"description": "Overview of Tarantool instances observed by Prometheus job.\n\nIf instance row is *red*, it means Prometheus can't reach\nURI specified in targets or ran into error.\nIf instance row is *green*, it means instance is up and running and\nPrometheus is successfully extracting metrics from it.\n\"Uptime\" column shows time since instant start.\n\nInstance alias filtering is disabled here.\n\nIf Prometheus job filter is not specified, displays running instances\nand ignores unreachable instances (we have no specific source to fetch)\n\nThis panel is designed to work with Prometheus client\nset up to have each Tarantool instance as a separate pull target.\n",
7373
"gridPos": {
7474
"h": 8,
7575
"w": 12,
@@ -144,7 +144,7 @@
144144
},
145145
{
146146
"datasource": "Prometheus",
147-
"description": "Count of running Tarantool instances observed by Prometheus job.\nIf Prometheus can't reach URI specified in targets\nor ran into error, instance is not counted.\n\nInstance alias filtering is disabled here.\n",
147+
"description": "Count of running Tarantool instances observed by Prometheus job.\nIf Prometheus can't reach URI specified in targets\nor ran into error, instance is not counted.\n\nInstance alias filtering is disabled here.\n\nThis panel is designed to work with Prometheus client\nset up to have each Tarantool instance as a separate pull target.\n",
148148
"gridPos": {
149149
"h": 3,
150150
"w": 6,

0 commit comments

Comments
 (0)