import ceph quincy 17.2.4

[ceph.git] / ceph / monitoring / ceph-mixin / tests_dashboards / features / osd-device-details.feature

diff --git a/ceph/monitoring/ceph-mixin/tests_dashboards/features/osd-device-details.feature b/ceph/monitoring/ceph-mixin/tests_dashboards/features/osd-device-details.feature
index 07af8692c8c1473963d181d6b0838b4838ac604e..0d6ca8b17154270944eb2ad077a7db47dd6b1460 100644 (file)
--- a/ceph/monitoring/ceph-mixin/tests_dashboards/features/osd-device-details.feature
+++ b/ceph/monitoring/ceph-mixin/tests_dashboards/features/osd-device-details.feature
@@ -7,8 +7,8 @@ Scenario: "Test Physical Device Latency for $osd - Reads"
     | node_disk_reads_completed_total{device="sdb",instance="localhost"} | 10 60 |
     | node_disk_read_time_seconds_total{device="sda",instance="localhost"} | 100 600 |
     | node_disk_read_time_seconds_total{device="sdb",instance="localhost"} | 100 600 |
-    | ceph_disk_occupation_human{ceph_daemon="osd.0",device="/dev/sda",instance="localhost:9283"} | 1.0 |
-    | ceph_disk_occupation_human{ceph_daemon="osd.1",device="/dev/sdb",instance="localhost:9283"} | 1.0 |
+    | ceph_disk_occupation_human{job="ceph",ceph_daemon="osd.0",device="/dev/sda",instance="localhost:9283"} | 1.0 |
+    | ceph_disk_occupation_human{job="ceph",ceph_daemon="osd.1",device="/dev/sdb",instance="localhost:9283"} | 1.0 |
   When variable `osd` is `osd.0`
   Then Grafana panel `Physical Device Latency for $osd` with legend `{{instance}}/{{device}} Reads` shows:
     | metrics | values |
@@ -21,8 +21,8 @@ Scenario: "Test Physical Device Latency for $osd - Writes"
     | node_disk_writes_completed_total{device="sdb",instance="localhost"} | 10 60 |
     | node_disk_write_time_seconds_total{device="sda",instance="localhost"} | 100 600 |
     | node_disk_write_time_seconds_total{device="sdb",instance="localhost"} | 100 600 |
-    | ceph_disk_occupation_human{ceph_daemon="osd.0",device="/dev/sda",instance="localhost:9283"} | 1.0 |
-    | ceph_disk_occupation_human{ceph_daemon="osd.1",device="/dev/sdb",instance="localhost:9283"} | 1.0 |
+    | ceph_disk_occupation_human{job="ceph",ceph_daemon="osd.0",device="/dev/sda",instance="localhost:9283"} | 1.0 |
+    | ceph_disk_occupation_human{job="ceph",ceph_daemon="osd.1",device="/dev/sdb",instance="localhost:9283"} | 1.0 |
   When variable `osd` is `osd.0`
   Then Grafana panel `Physical Device Latency for $osd` with legend `{{instance}}/{{device}} Writes` shows:
     | metrics | values |
@@ -33,8 +33,8 @@ Scenario: "Test Physical Device R/W IOPS for $osd - Writes"
     | metrics | values |
     | node_disk_writes_completed_total{device="sda",instance="localhost"} | 10 100 |
     | node_disk_writes_completed_total{device="sdb",instance="localhost"} | 10 100 |
-    | ceph_disk_occupation_human{ceph_daemon="osd.0",device="/dev/sda",instance="localhost:9283"} | 1.0 |
-    | ceph_disk_occupation_human{ceph_daemon="osd.1",device="/dev/sdb",instance="localhost:9283"} | 1.0 |
+    | ceph_disk_occupation_human{job="ceph",ceph_daemon="osd.0",device="/dev/sda",instance="localhost:9283"} | 1.0 |
+    | ceph_disk_occupation_human{job="ceph",ceph_daemon="osd.1",device="/dev/sdb",instance="localhost:9283"} | 1.0 |
   When variable `osd` is `osd.0`
   Then Grafana panel `Physical Device R/W IOPS for $osd` with legend `{{device}} on {{instance}} Writes` shows:
     | metrics | values |
@@ -45,8 +45,8 @@ Scenario: "Test Physical Device R/W IOPS for $osd - Reads"
     | metrics | values |
     | node_disk_reads_completed_total{device="sda",instance="localhost"} | 10 100 |
     | node_disk_reads_completed_total{device="sdb",instance="localhost"} | 10 100 |
-    | ceph_disk_occupation_human{ceph_daemon="osd.0",device="/dev/sda",instance="localhost:9283"} | 1.0 |
-    | ceph_disk_occupation_human{ceph_daemon="osd.1",device="/dev/sdb",instance="localhost:9283"} | 1.0 |
+    | ceph_disk_occupation_human{job="ceph",ceph_daemon="osd.0",device="/dev/sda",instance="localhost:9283"} | 1.0 |
+    | ceph_disk_occupation_human{job="ceph",ceph_daemon="osd.1",device="/dev/sdb",instance="localhost:9283"} | 1.0 |
   When variable `osd` is `osd.0`
   Then Grafana panel `Physical Device R/W IOPS for $osd` with legend `{{device}} on {{instance}} Reads` shows:
     | metrics | values |
@@ -57,8 +57,8 @@ Scenario: "Test Physical Device R/W Bytes for $osd - Reads"
     | metrics | values |
     | node_disk_reads_completed_total{device="sda",instance="localhost"} | 10 100 |
     | node_disk_reads_completed_total{device="sdb",instance="localhost"} | 10 100 |
-    | ceph_disk_occupation_human{ceph_daemon="osd.0",device="/dev/sda",instance="localhost:9283"} | 1.0 |
-    | ceph_disk_occupation_human{ceph_daemon="osd.1",device="/dev/sdb",instance="localhost:9283"} | 1.0 |
+    | ceph_disk_occupation_human{job="ceph",ceph_daemon="osd.0",device="/dev/sda",instance="localhost:9283"} | 1.0 |
+    | ceph_disk_occupation_human{job="ceph",ceph_daemon="osd.1",device="/dev/sdb",instance="localhost:9283"} | 1.0 |
   When variable `osd` is `osd.0`
   Then Grafana panel `Physical Device R/W IOPS for $osd` with legend `{{device}} on {{instance}} Reads` shows:
     | metrics | values |
@@ -69,8 +69,8 @@ Scenario: "Test Physical Device R/W Bytes for $osd - Writes"
     | metrics | values |
     | node_disk_writes_completed_total{device="sda",instance="localhost"} | 10 100 |
     | node_disk_writes_completed_total{device="sdb",instance="localhost"} | 10 100 |
-    | ceph_disk_occupation_human{ceph_daemon="osd.0",device="/dev/sda",instance="localhost:9283"} | 1.0 |
-    | ceph_disk_occupation_human{ceph_daemon="osd.1",device="/dev/sdb",instance="localhost:9283"} | 1.0 |
+    | ceph_disk_occupation_human{job="ceph",ceph_daemon="osd.0",device="/dev/sda",instance="localhost:9283"} | 1.0 |
+    | ceph_disk_occupation_human{job="ceph",ceph_daemon="osd.1",device="/dev/sdb",instance="localhost:9283"} | 1.0 |
   When variable `osd` is `osd.0`
   Then Grafana panel `Physical Device R/W IOPS for $osd` with legend `{{device}} on {{instance}} Writes` shows:
     | metrics | values |
@@ -80,8 +80,8 @@ Scenario: "Test Physical Device Util% for $osd"
   Given the following series:
     | metrics | values |
     | node_disk_io_time_seconds_total{device="sda",instance="localhost:9100"} | 10 100 |
-    | ceph_disk_occupation_human{ceph_daemon="osd.0",device="/dev/sda",instance="localhost:9283"} | 1.0 |
-    | ceph_disk_occupation_human{ceph_daemon="osd.1",device="/dev/sdb",instance="localhost:9283"} | 1.0 |
+    | ceph_disk_occupation_human{job="ceph",ceph_daemon="osd.0",device="/dev/sda",instance="localhost:9283"} | 1.0 |
+    | ceph_disk_occupation_human{job="ceph",ceph_daemon="osd.1",device="/dev/sdb",instance="localhost:9283"} | 1.0 |
   When variable `osd` is `osd.0`
   Then Grafana panel `Physical Device Util% for $osd` with legend `{{device}} on {{instance}}` shows:
     | metrics | values |