collector: name instance labels after the entity they identify (#2744)

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
This commit is contained in:
Jan-Otto Kröpke
2026-10-16 11:07:04 +02:00
committed by GitHub
parent 3fb18521f6
commit 667200f757
67 changed files with 1960 additions and 751 deletions
+31 -31
View File
@@ -615,7 +615,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "count(label_replace(windows_diskdrive_status{job=~\"$job\", instance=\"$instance\", status!=\"OK\"}, \"disk\", \"$1\", \"name\", \"PHYSICALDRIVE(\\\\d+)\") == 1) or (0 * count(label_replace(windows_diskdrive_info{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"name\", \"PHYSICALDRIVE(\\\\d+)\")))",
"expr": "count(label_replace(windows_diskdrive_status{job=~\"$job\", instance=\"$instance\", status!=\"OK\"}, \"disk\", \"$1\", \"device_id\", \"PHYSICALDRIVE(\\\\d+)\") == 1) or (0 * count(label_replace(windows_diskdrive_info{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"device_id\", \"PHYSICALDRIVE(\\\\d+)\")))",
"instant": false,
"legendFormat": "__auto",
"range": true
@@ -703,7 +703,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "max by (disk, model) (label_replace(windows_diskdrive_info{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"name\", \"PHYSICALDRIVE(\\\\d+)\"))",
"expr": "max by (disk, model) (label_replace(windows_diskdrive_info{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"device_id\", \"PHYSICALDRIVE(\\\\d+)\"))",
"format": "table",
"instant": true,
"legendFormat": "__auto",
@@ -726,7 +726,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "max by (disk) (label_replace(windows_diskdrive_size_bytes{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"name\", \"PHYSICALDRIVE(\\\\d+)\"))",
"expr": "max by (disk) (label_replace(windows_diskdrive_size_bytes{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"device_id\", \"PHYSICALDRIVE(\\\\d+)\"))",
"format": "table",
"instant": true,
"legendFormat": "__auto",
@@ -749,7 +749,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "max by (disk) (label_replace(windows_diskdrive_partitions{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"name\", \"PHYSICALDRIVE(\\\\d+)\"))",
"expr": "max by (disk) (label_replace(windows_diskdrive_partitions{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"device_id\", \"PHYSICALDRIVE(\\\\d+)\"))",
"format": "table",
"instant": true,
"legendFormat": "__auto",
@@ -772,7 +772,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "max by (disk, status) (label_replace(windows_diskdrive_status{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"name\", \"PHYSICALDRIVE(\\\\d+)\") == 1)",
"expr": "max by (disk, status) (label_replace(windows_diskdrive_status{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"device_id\", \"PHYSICALDRIVE(\\\\d+)\") == 1)",
"format": "table",
"instant": true,
"legendFormat": "__auto",
@@ -957,7 +957,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "(1 - clamp_max(rate(windows_physical_disk_idle_seconds_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]), 1)) * on (disk) group_left (model) max by (disk, model) (label_replace(windows_diskdrive_info{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"name\", \"PHYSICALDRIVE(\\\\d+)\")) or on (disk) (1 - clamp_max(rate(windows_physical_disk_idle_seconds_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]), 1))",
"expr": "(1 - clamp_max(rate(windows_physical_disk_idle_seconds_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]), 1)) * on (disk) group_left (model) max by (disk, model) (label_replace(windows_diskdrive_info{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"device_id\", \"PHYSICALDRIVE(\\\\d+)\")) or on (disk) (1 - clamp_max(rate(windows_physical_disk_idle_seconds_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]), 1))",
"instant": false,
"legendFormat": "{{disk}} {{model}}",
"range": true
@@ -1073,7 +1073,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "(rate(windows_physical_disk_write_bytes_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval])) * on (disk) group_left (model) max by (disk, model) (label_replace(windows_diskdrive_info{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"name\", \"PHYSICALDRIVE(\\\\d+)\")) or on (disk) (rate(windows_physical_disk_write_bytes_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]))",
"expr": "(rate(windows_physical_disk_write_bytes_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval])) * on (disk) group_left (model) max by (disk, model) (label_replace(windows_diskdrive_info{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"device_id\", \"PHYSICALDRIVE(\\\\d+)\")) or on (disk) (rate(windows_physical_disk_write_bytes_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]))",
"instant": false,
"legendFormat": "{{disk}} {{model}} write",
"range": true
@@ -1095,7 +1095,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "(rate(windows_physical_disk_read_bytes_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval])) * on (disk) group_left (model) max by (disk, model) (label_replace(windows_diskdrive_info{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"name\", \"PHYSICALDRIVE(\\\\d+)\")) or on (disk) (rate(windows_physical_disk_read_bytes_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]))",
"expr": "(rate(windows_physical_disk_read_bytes_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval])) * on (disk) group_left (model) max by (disk, model) (label_replace(windows_diskdrive_info{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"device_id\", \"PHYSICALDRIVE(\\\\d+)\")) or on (disk) (rate(windows_physical_disk_read_bytes_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]))",
"instant": false,
"legendFormat": "{{disk}} {{model}} read",
"range": true
@@ -1222,7 +1222,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "(rate(windows_physical_disk_writes_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval])) * on (disk) group_left (model) max by (disk, model) (label_replace(windows_diskdrive_info{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"name\", \"PHYSICALDRIVE(\\\\d+)\")) or on (disk) (rate(windows_physical_disk_writes_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]))",
"expr": "(rate(windows_physical_disk_writes_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval])) * on (disk) group_left (model) max by (disk, model) (label_replace(windows_diskdrive_info{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"device_id\", \"PHYSICALDRIVE(\\\\d+)\")) or on (disk) (rate(windows_physical_disk_writes_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]))",
"instant": false,
"legendFormat": "{{disk}} {{model}} write",
"range": true
@@ -1244,7 +1244,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "(rate(windows_physical_disk_reads_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval])) * on (disk) group_left (model) max by (disk, model) (label_replace(windows_diskdrive_info{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"name\", \"PHYSICALDRIVE(\\\\d+)\")) or on (disk) (rate(windows_physical_disk_reads_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]))",
"expr": "(rate(windows_physical_disk_reads_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval])) * on (disk) group_left (model) max by (disk, model) (label_replace(windows_diskdrive_info{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"device_id\", \"PHYSICALDRIVE(\\\\d+)\")) or on (disk) (rate(windows_physical_disk_reads_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]))",
"instant": false,
"legendFormat": "{{disk}} {{model}} read",
"range": true
@@ -1371,7 +1371,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "(rate(windows_physical_disk_write_latency_seconds_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]) / (rate(windows_physical_disk_writes_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]) > 0)) * on (disk) group_left (model) max by (disk, model) (label_replace(windows_diskdrive_info{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"name\", \"PHYSICALDRIVE(\\\\d+)\")) or on (disk) (rate(windows_physical_disk_write_latency_seconds_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]) / (rate(windows_physical_disk_writes_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]) > 0))",
"expr": "(rate(windows_physical_disk_write_latency_seconds_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]) / (rate(windows_physical_disk_writes_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]) > 0)) * on (disk) group_left (model) max by (disk, model) (label_replace(windows_diskdrive_info{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"device_id\", \"PHYSICALDRIVE(\\\\d+)\")) or on (disk) (rate(windows_physical_disk_write_latency_seconds_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]) / (rate(windows_physical_disk_writes_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]) > 0))",
"instant": false,
"legendFormat": "{{disk}} {{model}} write",
"range": true
@@ -1393,7 +1393,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "(rate(windows_physical_disk_read_latency_seconds_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]) / (rate(windows_physical_disk_reads_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]) > 0)) * on (disk) group_left (model) max by (disk, model) (label_replace(windows_diskdrive_info{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"name\", \"PHYSICALDRIVE(\\\\d+)\")) or on (disk) (rate(windows_physical_disk_read_latency_seconds_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]) / (rate(windows_physical_disk_reads_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]) > 0))",
"expr": "(rate(windows_physical_disk_read_latency_seconds_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]) / (rate(windows_physical_disk_reads_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]) > 0)) * on (disk) group_left (model) max by (disk, model) (label_replace(windows_diskdrive_info{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"device_id\", \"PHYSICALDRIVE(\\\\d+)\")) or on (disk) (rate(windows_physical_disk_read_latency_seconds_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]) / (rate(windows_physical_disk_reads_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]) > 0))",
"instant": false,
"legendFormat": "{{disk}} {{model}} read",
"range": true
@@ -1520,7 +1520,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "(windows_physical_disk_requests_queued{job=~\"$job\", instance=\"$instance\"}) * on (disk) group_left (model) max by (disk, model) (label_replace(windows_diskdrive_info{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"name\", \"PHYSICALDRIVE(\\\\d+)\")) or on (disk) (windows_physical_disk_requests_queued{job=~\"$job\", instance=\"$instance\"})",
"expr": "(windows_physical_disk_requests_queued{job=~\"$job\", instance=\"$instance\"}) * on (disk) group_left (model) max by (disk, model) (label_replace(windows_diskdrive_info{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"device_id\", \"PHYSICALDRIVE(\\\\d+)\")) or on (disk) (windows_physical_disk_requests_queued{job=~\"$job\", instance=\"$instance\"})",
"instant": false,
"legendFormat": "{{disk}} {{model}}",
"range": true
@@ -1635,7 +1635,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "(rate(windows_physical_disk_split_ios_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval])) * on (disk) group_left (model) max by (disk, model) (label_replace(windows_diskdrive_info{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"name\", \"PHYSICALDRIVE(\\\\d+)\")) or on (disk) (rate(windows_physical_disk_split_ios_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]))",
"expr": "(rate(windows_physical_disk_split_ios_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval])) * on (disk) group_left (model) max by (disk, model) (label_replace(windows_diskdrive_info{job=~\"$job\", instance=\"$instance\"}, \"disk\", \"$1\", \"device_id\", \"PHYSICALDRIVE(\\\\d+)\")) or on (disk) (rate(windows_physical_disk_split_ios_total{job=~\"$job\", instance=\"$instance\"}[$__rate_interval]))",
"instant": false,
"legendFormat": "{{disk}} {{model}}",
"range": true
@@ -1926,7 +1926,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "max by (name) ((windows_storage_spaces_pool_health_status{job=~\"$job\", instance=\"$instance\"} * on (job, instance, unique_id) group_left () windows_storage_spaces_pool_info{job=~\"$job\", instance=\"$instance\", primordial=\"false\"}))",
"expr": "max by (pool) ((windows_storage_spaces_pool_health_status{job=~\"$job\", instance=\"$instance\"} * on (job, instance, unique_id) group_left () windows_storage_spaces_pool_info{job=~\"$job\", instance=\"$instance\", primordial=\"false\"}))",
"format": "table",
"instant": true,
"legendFormat": "__auto",
@@ -1949,7 +1949,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "max by (name) ((windows_storage_spaces_pool_size_bytes{job=~\"$job\", instance=\"$instance\"} * on (job, instance, unique_id) group_left () windows_storage_spaces_pool_info{job=~\"$job\", instance=\"$instance\", primordial=\"false\"}))",
"expr": "max by (pool) ((windows_storage_spaces_pool_size_bytes{job=~\"$job\", instance=\"$instance\"} * on (job, instance, unique_id) group_left () windows_storage_spaces_pool_info{job=~\"$job\", instance=\"$instance\", primordial=\"false\"}))",
"format": "table",
"instant": true,
"legendFormat": "__auto",
@@ -1972,7 +1972,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "max by (name) ((windows_storage_spaces_pool_allocated_size_bytes{job=~\"$job\", instance=\"$instance\"} * on (job, instance, unique_id) group_left () windows_storage_spaces_pool_info{job=~\"$job\", instance=\"$instance\", primordial=\"false\"}))",
"expr": "max by (pool) ((windows_storage_spaces_pool_allocated_size_bytes{job=~\"$job\", instance=\"$instance\"} * on (job, instance, unique_id) group_left () windows_storage_spaces_pool_info{job=~\"$job\", instance=\"$instance\", primordial=\"false\"}))",
"format": "table",
"instant": true,
"legendFormat": "__auto",
@@ -1995,7 +1995,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "max by (name) (100 * (windows_storage_spaces_pool_allocated_size_bytes{job=~\"$job\", instance=\"$instance\"} * on (job, instance, unique_id) group_left () windows_storage_spaces_pool_info{job=~\"$job\", instance=\"$instance\", primordial=\"false\"}) / (windows_storage_spaces_pool_size_bytes{job=~\"$job\", instance=\"$instance\"} * on (job, instance, unique_id) group_left () windows_storage_spaces_pool_info{job=~\"$job\", instance=\"$instance\", primordial=\"false\"}))",
"expr": "max by (pool) (100 * (windows_storage_spaces_pool_allocated_size_bytes{job=~\"$job\", instance=\"$instance\"} * on (job, instance, unique_id) group_left () windows_storage_spaces_pool_info{job=~\"$job\", instance=\"$instance\", primordial=\"false\"}) / (windows_storage_spaces_pool_size_bytes{job=~\"$job\", instance=\"$instance\"} * on (job, instance, unique_id) group_left () windows_storage_spaces_pool_info{job=~\"$job\", instance=\"$instance\", primordial=\"false\"}))",
"format": "table",
"instant": true,
"legendFormat": "__auto",
@@ -2014,7 +2014,7 @@
"kind": "Transformation",
"spec": {
"options": {
"byField": "name",
"byField": "pool",
"mode": "outer"
}
}
@@ -2037,14 +2037,14 @@
"Value #B": 2,
"Value #C": 3,
"Value #D": 4,
"name": 0
"pool": 0
},
"renameByName": {
"Value #A": "Health",
"Value #B": "Size",
"Value #C": "Allocated",
"Value #D": "Used",
"name": "Pool"
"pool": "Pool"
}
}
}
@@ -2257,7 +2257,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "max by (name) (windows_storage_spaces_virtual_disk_health_status{job=~\"$job\", instance=\"$instance\"})",
"expr": "max by (virtual_disk) (windows_storage_spaces_virtual_disk_health_status{job=~\"$job\", instance=\"$instance\"})",
"format": "table",
"instant": true,
"legendFormat": "__auto",
@@ -2280,7 +2280,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "max by (name) (windows_storage_spaces_virtual_disk_size_bytes{job=~\"$job\", instance=\"$instance\"})",
"expr": "max by (virtual_disk) (windows_storage_spaces_virtual_disk_size_bytes{job=~\"$job\", instance=\"$instance\"})",
"format": "table",
"instant": true,
"legendFormat": "__auto",
@@ -2303,7 +2303,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "max by (name) (windows_storage_spaces_virtual_disk_allocated_size_bytes{job=~\"$job\", instance=\"$instance\"})",
"expr": "max by (virtual_disk) (windows_storage_spaces_virtual_disk_allocated_size_bytes{job=~\"$job\", instance=\"$instance\"})",
"format": "table",
"instant": true,
"legendFormat": "__auto",
@@ -2326,7 +2326,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "max by (name) (windows_storage_spaces_virtual_disk_footprint_on_pool_bytes{job=~\"$job\", instance=\"$instance\"})",
"expr": "max by (virtual_disk) (windows_storage_spaces_virtual_disk_footprint_on_pool_bytes{job=~\"$job\", instance=\"$instance\"})",
"format": "table",
"instant": true,
"legendFormat": "__auto",
@@ -2349,7 +2349,7 @@
"kind": "DataQuery",
"spec": {
"editorMode": "code",
"expr": "max by (name) (windows_storage_spaces_virtual_disk_storage_efficiency_ratio{job=~\"$job\", instance=\"$instance\"})",
"expr": "max by (virtual_disk) (windows_storage_spaces_virtual_disk_storage_efficiency_ratio{job=~\"$job\", instance=\"$instance\"})",
"format": "table",
"instant": true,
"legendFormat": "__auto",
@@ -2368,7 +2368,7 @@
"kind": "Transformation",
"spec": {
"options": {
"byField": "name",
"byField": "virtual_disk",
"mode": "outer"
}
}
@@ -2393,7 +2393,7 @@
"Value #C": 3,
"Value #D": 4,
"Value #E": 5,
"name": 0
"virtual_disk": 0
},
"renameByName": {
"Value #A": "Health",
@@ -2401,7 +2401,7 @@
"Value #C": "Allocated",
"Value #D": "Footprint",
"Value #E": "Efficiency",
"name": "Virtual disk"
"virtual_disk": "Virtual disk"
}
}
}
@@ -2586,7 +2586,7 @@
"editorMode": "code",
"expr": "100 * (windows_storage_spaces_pool_allocated_size_bytes{job=~\"$job\", instance=\"$instance\"} * on (job, instance, unique_id) group_left () windows_storage_spaces_pool_info{job=~\"$job\", instance=\"$instance\", primordial=\"false\"}) / (windows_storage_spaces_pool_size_bytes{job=~\"$job\", instance=\"$instance\"} * on (job, instance, unique_id) group_left () windows_storage_spaces_pool_info{job=~\"$job\", instance=\"$instance\", primordial=\"false\"})",
"instant": false,
"legendFormat": "{{name}}",
"legendFormat": "{{pool}}",
"range": true
},
"version": "v0"
@@ -2710,7 +2710,7 @@
"editorMode": "code",
"expr": "windows_storage_spaces_virtual_disk_footprint_on_pool_bytes{job=~\"$job\", instance=\"$instance\"}",
"instant": false,
"legendFormat": "{{name}}",
"legendFormat": "{{virtual_disk}}",
"range": true
},
"version": "v0"