Skip to content

Commit 38deca0

Browse files
waitingsongwaitingsong
committed
refactor(prometheus): rename record name node:zfs:pool_metrics to node:ins:zfs_pool_metrics
1 parent e0e7fb0 commit 38deca0

File tree

3 files changed

+34
-34
lines changed

3 files changed

+34
-34
lines changed

‎files/grafana/node/node-overview.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5142,7 +5142,7 @@
51425142
},
51435143
"editorMode": "code",
51445144
"exemplar": false,
5145-
"expr": "last_over_time(node:zfs:pool_metrics{metric_type=\"size_gib\"}[$__range])",
5145+
"expr": "last_over_time(node:ins:zfs_pool_metrics{metric_type=\"size_gib\"}[$__range])",
51465146
"format": "time_series",
51475147
"hide": false,
51485148
"instant": true,
@@ -5157,7 +5157,7 @@
51575157
},
51585158
"editorMode": "code",
51595159
"exemplar": false,
5160-
"expr": "last_over_time(node:zfs:pool_metrics{metric_type=\"capacity\"}[$__range])",
5160+
"expr": "last_over_time(node:ins:zfs_pool_metrics{metric_type=\"capacity\"}[$__range])",
51615161
"format": "time_series",
51625162
"hide": false,
51635163
"instant": true,
@@ -5172,7 +5172,7 @@
51725172
},
51735173
"editorMode": "code",
51745174
"exemplar": false,
5175-
"expr": "last_over_time(node:zfs:pool_metrics{metric_type=\"free_mib\"}[$__range])",
5175+
"expr": "last_over_time(node:ins:zfs_pool_metrics{metric_type=\"free_mib\"}[$__range])",
51765176
"format": "time_series",
51775177
"hide": false,
51785178
"instant": true,
@@ -5187,7 +5187,7 @@
51875187
},
51885188
"editorMode": "code",
51895189
"exemplar": false,
5190-
"expr": "last_over_time(node:zfs:pool_metrics{metric_type=\"fragmentation_ratio\"}[$__range])",
5190+
"expr": "last_over_time(node:ins:zfs_pool_metrics{metric_type=\"fragmentation_ratio\"}[$__range])",
51915191
"format": "time_series",
51925192
"hide": false,
51935193
"instant": true,
@@ -5202,7 +5202,7 @@
52025202
},
52035203
"editorMode": "code",
52045204
"exemplar": false,
5205-
"expr": "last_over_time(node:zfs:pool_metrics{metric_type=\"leaked_kib\"}[$__range])",
5205+
"expr": "last_over_time(node:ins:zfs_pool_metrics{metric_type=\"leaked_kib\"}[$__range])",
52065206
"format": "time_series",
52075207
"hide": false,
52085208
"instant": true,
@@ -5217,7 +5217,7 @@
52175217
},
52185218
"editorMode": "code",
52195219
"exemplar": false,
5220-
"expr": "last_over_time(node:zfs:pool_metrics{metric_type=\"freeing_kib\"}[$__range])",
5220+
"expr": "last_over_time(node:ins:zfs_pool_metrics{metric_type=\"freeing_kib\"}[$__range])",
52215221
"format": "time_series",
52225222
"hide": false,
52235223
"instant": true,
@@ -5232,7 +5232,7 @@
52325232
},
52335233
"editorMode": "code",
52345234
"exemplar": false,
5235-
"expr": "last_over_time(node:zfs:pool_metrics{metric_type=\"readonly\"}[$__range])",
5235+
"expr": "last_over_time(node:ins:zfs_pool_metrics{metric_type=\"readonly\"}[$__range])",
52365236
"format": "time_series",
52375237
"hide": false,
52385238
"instant": true,
@@ -5247,7 +5247,7 @@
52475247
},
52485248
"editorMode": "code",
52495249
"exemplar": false,
5250-
"expr": "last_over_time(node:zfs:pool_metrics{metric_type=\"health\"}[$__range])",
5250+
"expr": "last_over_time(node:ins:zfs_pool_metrics{metric_type=\"health\"}[$__range])",
52515251
"format": "time_series",
52525252
"hide": false,
52535253
"instant": true,
@@ -5262,7 +5262,7 @@
52625262
},
52635263
"editorMode": "code",
52645264
"exemplar": false,
5265-
"expr": "last_over_time(node:zfs:pool_metrics{metric_type=\"autotrim\"}[$__range])",
5265+
"expr": "last_over_time(node:ins:zfs_pool_metrics{metric_type=\"autotrim\"}[$__range])",
52665266
"hide": false,
52675267
"instant": true,
52685268
"legendFormat": "__auto",
@@ -5276,7 +5276,7 @@
52765276
},
52775277
"editorMode": "code",
52785278
"exemplar": false,
5279-
"expr": "last_over_time(node:zfs:pool_metrics{metric_type=\"ashift\"}[$__range])",
5279+
"expr": "last_over_time(node:ins:zfs_pool_metrics{metric_type=\"ashift\"}[$__range])",
52805280
"hide": false,
52815281
"instant": true,
52825282
"legendFormat": "__auto",
@@ -5290,7 +5290,7 @@
52905290
},
52915291
"editorMode": "code",
52925292
"exemplar": false,
5293-
"expr": "last_over_time(node:zfs:pool_metrics{metric_type=\"dedupratio\"}[$__range])",
5293+
"expr": "last_over_time(node:ins:zfs_pool_metrics{metric_type=\"dedupratio\"}[$__range])",
52945294
"hide": false,
52955295
"instant": true,
52965296
"legendFormat": "__auto",

‎files/grafana/node/node-zfs.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,7 +1119,7 @@
11191119
},
11201120
"editorMode": "code",
11211121
"exemplar": false,
1122-
"expr": "last_over_time(node:zfs:pool_metrics{metric_type=\"size_gib\", ip=~\"$ip\", pool=~\"$pool\"}[$__range])",
1122+
"expr": "last_over_time(node:ins:zfs_pool_metrics{metric_type=\"size_gib\", ip=~\"$ip\", pool=~\"$pool\"}[$__range])",
11231123
"format": "time_series",
11241124
"hide": false,
11251125
"instant": true,
@@ -1134,7 +1134,7 @@
11341134
},
11351135
"editorMode": "code",
11361136
"exemplar": false,
1137-
"expr": "last_over_time(node:zfs:pool_metrics{metric_type=\"capacity\", ip=~\"$ip\", pool=~\"$pool\"}[$__range])",
1137+
"expr": "last_over_time(node:ins:zfs_pool_metrics{metric_type=\"capacity\", ip=~\"$ip\", pool=~\"$pool\"}[$__range])",
11381138
"format": "time_series",
11391139
"hide": false,
11401140
"instant": true,
@@ -1149,7 +1149,7 @@
11491149
},
11501150
"editorMode": "code",
11511151
"exemplar": false,
1152-
"expr": "last_over_time(node:zfs:pool_metrics{metric_type=\"free_mib\", ip=~\"$ip\", pool=~\"$pool\"}[$__range])",
1152+
"expr": "last_over_time(node:ins:zfs_pool_metrics{metric_type=\"free_mib\", ip=~\"$ip\", pool=~\"$pool\"}[$__range])",
11531153
"format": "time_series",
11541154
"hide": false,
11551155
"instant": true,
@@ -1164,7 +1164,7 @@
11641164
},
11651165
"editorMode": "code",
11661166
"exemplar": false,
1167-
"expr": "last_over_time(node:zfs:pool_metrics{metric_type=\"fragmentation_ratio\", ip=~\"$ip\", pool=~\"$pool\"}[$__range])",
1167+
"expr": "last_over_time(node:ins:zfs_pool_metrics{metric_type=\"fragmentation_ratio\", ip=~\"$ip\", pool=~\"$pool\"}[$__range])",
11681168
"format": "time_series",
11691169
"hide": false,
11701170
"instant": true,
@@ -1179,7 +1179,7 @@
11791179
},
11801180
"editorMode": "code",
11811181
"exemplar": false,
1182-
"expr": "last_over_time(node:zfs:pool_metrics{metric_type=\"leaked_kib\", ip=~\"$ip\", pool=~\"$pool\"}[$__range])",
1182+
"expr": "last_over_time(node:ins:zfs_pool_metrics{metric_type=\"leaked_kib\", ip=~\"$ip\", pool=~\"$pool\"}[$__range])",
11831183
"format": "time_series",
11841184
"hide": false,
11851185
"instant": true,
@@ -1194,7 +1194,7 @@
11941194
},
11951195
"editorMode": "code",
11961196
"exemplar": false,
1197-
"expr": "last_over_time(node:zfs:pool_metrics{metric_type=\"freeing_kib\", ip=~\"$ip\", pool=~\"$pool\"}[$__range])",
1197+
"expr": "last_over_time(node:ins:zfs_pool_metrics{metric_type=\"freeing_kib\", ip=~\"$ip\", pool=~\"$pool\"}[$__range])",
11981198
"format": "time_series",
11991199
"hide": false,
12001200
"instant": true,
@@ -1209,7 +1209,7 @@
12091209
},
12101210
"editorMode": "code",
12111211
"exemplar": false,
1212-
"expr": "last_over_time(node:zfs:pool_metrics{metric_type=\"readonly\", ip=~\"$ip\", pool=~\"$pool\"}[$__range])",
1212+
"expr": "last_over_time(node:ins:zfs_pool_metrics{metric_type=\"readonly\", ip=~\"$ip\", pool=~\"$pool\"}[$__range])",
12131213
"format": "time_series",
12141214
"hide": false,
12151215
"instant": true,
@@ -1224,7 +1224,7 @@
12241224
},
12251225
"editorMode": "code",
12261226
"exemplar": false,
1227-
"expr": "last_over_time(node:zfs:pool_metrics{metric_type=\"health\", ip=~\"$ip\", pool=~\"$pool\"}[$__range])",
1227+
"expr": "last_over_time(node:ins:zfs_pool_metrics{metric_type=\"health\", ip=~\"$ip\", pool=~\"$pool\"}[$__range])",
12281228
"format": "time_series",
12291229
"hide": false,
12301230
"instant": true,
@@ -1239,7 +1239,7 @@
12391239
},
12401240
"editorMode": "code",
12411241
"exemplar": false,
1242-
"expr": "last_over_time(node:zfs:pool_metrics{metric_type=\"autotrim\", ip=~\"$ip\", pool=~\"$pool\"}[$__range])",
1242+
"expr": "last_over_time(node:ins:zfs_pool_metrics{metric_type=\"autotrim\", ip=~\"$ip\", pool=~\"$pool\"}[$__range])",
12431243
"hide": false,
12441244
"instant": true,
12451245
"legendFormat": "__auto",
@@ -1253,7 +1253,7 @@
12531253
},
12541254
"editorMode": "code",
12551255
"exemplar": false,
1256-
"expr": "last_over_time(node:zfs:pool_metrics{metric_type=\"ashift\", ip=~\"$ip\", pool=~\"$pool\"}[$__range])",
1256+
"expr": "last_over_time(node:ins:zfs_pool_metrics{metric_type=\"ashift\", ip=~\"$ip\", pool=~\"$pool\"}[$__range])",
12571257
"hide": false,
12581258
"instant": true,
12591259
"legendFormat": "__auto",
@@ -1267,7 +1267,7 @@
12671267
},
12681268
"editorMode": "code",
12691269
"exemplar": false,
1270-
"expr": "last_over_time(node:zfs:pool_metrics{metric_type=\"dedupratio\", ip=~\"$ip\", pool=~\"$pool\"}[$__range])",
1270+
"expr": "last_over_time(node:ins:zfs_pool_metrics{metric_type=\"dedupratio\", ip=~\"$ip\", pool=~\"$pool\"}[$__range])",
12711271
"hide": false,
12721272
"instant": true,
12731273
"legendFormat": "__auto",
@@ -3133,15 +3133,15 @@
31333133
"type": "prometheus",
31343134
"uid": "ds-prometheus"
31353135
},
3136-
"definition": "label_values(node:zfs:pool_metrics{metric_type=\"health\", pool=~\"$pool\"}, pool)",
3136+
"definition": "label_values(node:ins:zfs_pool_metrics{metric_type=\"health\", pool=~\"$pool\"}, pool)",
31373137
"description": "ZFS Pool",
31383138
"includeAll": true,
31393139
"label": "Pool",
31403140
"multi": true,
31413141
"name": "pool",
31423142
"options": [],
31433143
"query": {
3144-
"query": "label_values(node:zfs:pool_metrics{metric_type=\"health\", pool=~\"$pool\"}, pool)",
3144+
"query": "label_values(node:ins:zfs_pool_metrics{metric_type=\"health\", pool=~\"$pool\"}, pool)",
31453145
"refId": "StandardVariableQuery"
31463146
},
31473147
"refresh": 1,

‎files/prometheus/rules/node.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ groups:
447447
# ZFS #
448448
#--------------------------------#
449449
# health [0: ONLINE, 1: DEGRADED, 2: FAULTED, 3: OFFLINE, 4: UNAVAIL, 5: REMOVED, 6: SUSPENDED].
450-
- record: node:zfs:pool_metrics
450+
- record: node:ins:zfs_pool_metrics
451451
expr: |
452452
label_replace(zfs_pool_ashift, "metric_type", "ashift", "", "") or
453453
label_replace(zfs_pool_allocated_bytes / 1048576, "metric_type", "allocated_mib", "", "") or
@@ -975,56 +975,56 @@ groups:
975975
#==============================================================#
976976
# 0: ONLINE, 1: DEGRADED, 2: FAULTED, 3: OFFLINE, 4: UNAVAIL, 5: REMOVED, 6: SUSPENDED
977977
- alert: ZPoolDegraded
978-
expr: node:zfs:pool_metrics{metric_type="health"} == 1
978+
expr: node:ins:zfs_pool_metrics{metric_type="health"} == 1
979979
labels: { level: 0, severity: CRIT, category: node }
980980
annotations:
981981
summary: "CRIT ZFS Pool Degraded {{ $labels.pool }} {{ $labels.ins }}@{{ $labels.instance }}"
982982

983983
- alert: ZPoolFaulted
984-
expr: node:zfs:pool_metrics{metric_type="health"} == 2
984+
expr: node:ins:zfs_pool_metrics{metric_type="health"} == 2
985985
labels: { level: 0, severity: CRIT, category: node }
986986
annotations:
987987
summary: "CRIT ZFS Pool Faulted {{ $labels.pool }} {{ $labels.ins }}@{{ $labels.instance }}"
988988

989989
- alert: ZPoolOffline
990-
expr: node:zfs:pool_metrics{metric_type="health"} == 3
990+
expr: node:ins:zfs_pool_metrics{metric_type="health"} == 3
991991
labels: { level: 0, severity: CRIT, category: node }
992992
annotations:
993993
summary: "CRIT ZFS Pool Offline {{ $labels.pool }} {{ $labels.ins }}@{{ $labels.instance }}"
994994

995995
- alert: ZPoolUnavail
996-
expr: node:zfs:pool_metrics{metric_type="health"} == 4
996+
expr: node:ins:zfs_pool_metrics{metric_type="health"} == 4
997997
labels: { level: 0, severity: CRIT, category: node }
998998
annotations:
999999
summary: "CRIT ZFS Pool Unavail {{ $labels.pool }} {{ $labels.ins }}@{{ $labels.instance }}"
10001000

10011001
- alert: ZPoolRemoved
1002-
expr: node:zfs:pool_metrics{metric_type="health"} == 5
1002+
expr: node:ins:zfs_pool_metrics{metric_type="health"} == 5
10031003
labels: { level: 0, severity: WARN, category: node }
10041004
annotations:
10051005
summary: "CRIT ZFS Pool Removed {{ $labels.pool }} {{ $labels.ins }}@{{ $labels.instance }}"
10061006

10071007
- alert: ZPoolSuspended
1008-
expr: node:zfs:pool_metrics{metric_type="health"} == 6
1008+
expr: node:ins:zfs_pool_metrics{metric_type="health"} == 6
10091009
labels: { level: 0, severity: CRIT, category: node }
10101010
annotations:
10111011
summary: "CRIT ZFS Pool Suspended {{ $labels.pool }} {{ $labels.ins }}@{{ $labels.instance }}"
10121012

10131013
- alert: ZPoolReadonly
1014-
expr: node:zfs:pool_metrics{metric_type="readonly"} == 1
1014+
expr: node:ins:zfs_pool_metrics{metric_type="readonly"} == 1
10151015
labels: { level: 0, severity: CRIT, category: node }
10161016
annotations:
10171017
summary: "WARN ZPool Readonly {{ $labels.pool }} {{ $labels.ins }}@{{ $labels.instance }}"
10181018

10191019
# > 85% according to https://openzfs.github.io/openzfs-docs/Performance%20and%20Tuning/Workload%20Tuning.html#free-space
10201020
- alert: ZPoolSpaceFull
1021-
expr: node:zfs:pool_metrics{metric_type="capacity"} > 0.85
1021+
expr: node:ins:zfs_pool_metrics{metric_type="capacity"} > 0.85
10221022
for: 1m
10231023
labels: { level: 0, severity: CRIT, category: node }
10241024
annotations:
10251025
summary: 'WARN ZFS Pool SpaceFull {{ $labels.pool }} {{ $labels.ins }}@{{ $labels.instance }} {{ $value | printf "%.2f" }}'
10261026
description: |
1027-
node:zfs:pool_metrics[metric_type=capacity, pool={{ $labels.pool }}, ins={{ $labels.ins }}] = {{ $value | printf "%.2f" }} > 85%
1027+
node:ins:zfs_pool_metrics[metric_type=capacity, pool={{ $labels.pool }}, ins={{ $labels.ins }}] = {{ $value | printf "%.2f" }} > 85%
10281028
10291029
# > 85% according to https://openzfs.github.io/openzfs-docs/Performance%20and%20Tuning/Workload%20Tuning.html#free-space
10301030
- alert: ZDatasetSpaceFull

0 commit comments

Comments
 (0)