10 files changed, 281 insertions, 2 deletions
diff --git a/src/go/collectors/go.d.plugin/modules/smartctl/testdata/config.json b/src/go/plugin/go.d/modules/smartctl/testdata/config.json
index ed26105ee..41c69da51 100644
--- a/src/go/collectors/go.d.plugin/modules/smartctl/testdata/config.json
+++ b/src/go/plugin/go.d/modules/smartctl/testdata/config.json
@@ -4,5 +4,11 @@
   "scan_every": 123.123,
   "poll_devices_every": 123.123,
   "no_check_power_mode": "ok",
-  "device_selector": "ok"
+  "device_selector": "ok",
+  "extra_devices": [
+    {
+      "name": "ok",
+      "type": "ok"
+    }
+  ]
 }
diff --git a/src/go/collectors/go.d.plugin/modules/smartctl/testdata/config.yaml b/src/go/plugin/go.d/modules/smartctl/testdata/config.yaml
index 94c9b0acd..b0b77d53d 100644
--- a/src/go/collectors/go.d.plugin/modules/smartctl/testdata/config.yaml
+++ b/src/go/plugin/go.d/modules/smartctl/testdata/config.yaml
@@ -3,4 +3,7 @@ timeout: 123.123
 scan_every: 123.123
 poll_devices_every: 123.123
 no_check_power_mode: "ok"
-"device_selector": "ok"
+device_selector: "ok"
+extra_devices:
+  - name: "ok"
+    type: "ok"
diff --git a/src/go/collectors/go.d.plugin/modules/smartctl/testdata/type-nvme/device-nvme0.json b/src/go/plugin/go.d/modules/smartctl/testdata/type-nvme/device-nvme0.json
index 1b31d322d..1b31d322d 100644
--- a/src/go/collectors/go.d.plugin/modules/smartctl/testdata/type-nvme/device-nvme0.json
+++ b/src/go/plugin/go.d/modules/smartctl/testdata/type-nvme/device-nvme0.json
diff --git a/src/go/plugin/go.d/modules/smartctl/testdata/type-nvme/device-nvme1.json b/src/go/plugin/go.d/modules/smartctl/testdata/type-nvme/device-nvme1.json
new file mode 100644
index 000000000..37faf7cfe
--- /dev/null
+++ b/src/go/plugin/go.d/modules/smartctl/testdata/type-nvme/device-nvme1.json
@@ -0,0 +1,113 @@
+{
+  "json_format_version": [
+    1,
+    0
+  ],
+  "smartctl": {
+    "version": [
+      7,
+      3
+    ],
+    "svn_revision": "5338",
+    "platform_info": "REDACTED",
+    "build_info": "(local build)",
+    "argv": [
+      "smartctl",
+      "--json",
+      "--all",
+      "/dev/nvme1",
+      "--device",
+      "nvme"
+    ],
+    "exit_status": 0
+  },
+  "local_time": {
+    "time_t": 1720897758,
+    "asctime": "Sat Jul 13 22:09:18 2024 EEST"
+  },
+  "device": {
+    "name": "/dev/nvme1",
+    "info_name": "/dev/nvme1",
+    "type": "nvme",
+    "protocol": "NVMe"
+  },
+  "model_name": "Seagate FireCuda 530 ZP4000GM30023",
+  "serial_number": "REDACTED",
+  "firmware_version": "REDACTED",
+  "nvme_pci_vendor": {
+    "id": 7089,
+    "subsystem_id": 7089
+  },
+  "nvme_ieee_oui_identifier": 6584743,
+  "nvme_total_capacity": 4000787030016,
+  "nvme_unallocated_capacity": 0,
+  "nvme_controller_id": 1,
+  "nvme_version": {
+    "string": "1.4",
+    "value": 66560
+  },
+  "nvme_number_of_namespaces": 1,
+  "nvme_namespaces": [
+    {
+      "id": 1,
+      "size": {
+        "blocks": 7814037168,
+        "bytes": 4000787030016
+      },
+      "capacity": {
+        "blocks": 7814037168,
+        "bytes": 4000787030016
+      },
+      "utilization": {
+        "blocks": 7814037168,
+        "bytes": 4000787030016
+      },
+      "formatted_lba_size": 512,
+      "eui64": {
+        "oui": 6584743,
+        "ext_id": 553497146765
+      }
+    }
+  ],
+  "user_capacity": {
+    "blocks": 7814037168,
+    "bytes": 4000787030016
+  },
+  "logical_block_size": 512,
+  "smart_support": {
+    "available": true,
+    "enabled": true
+  },
+  "smart_status": {
+    "passed": true,
+    "nvme": {
+      "value": 0
+    }
+  },
+  "nvme_smart_health_information_log": {
+    "critical_warning": 0,
+    "temperature": 36,
+    "available_spare": 100,
+    "available_spare_threshold": 5,
+    "percentage_used": 0,
+    "data_units_read": 202,
+    "data_units_written": 0,
+    "host_reads": 2509,
+    "host_writes": 0,
+    "controller_busy_time": 0,
+    "power_cycles": 5,
+    "power_on_hours": 4733,
+    "unsafe_shutdowns": 2,
+    "media_errors": 0,
+    "num_err_log_entries": 20,
+    "warning_temp_time": 0,
+    "critical_comp_time": 0
+  },
+  "temperature": {
+    "current": 36
+  },
+  "power_cycle_count": 5,
+  "power_on_time": {
+    "hours": 4733
+  }
+}
diff --git a/src/go/collectors/go.d.plugin/modules/smartctl/testdata/type-nvme/scan.json b/src/go/plugin/go.d/modules/smartctl/testdata/type-nvme/scan.json
index b9f716cbd..b9f716cbd 100644
--- a/src/go/collectors/go.d.plugin/modules/smartctl/testdata/type-nvme/scan.json
+++ b/src/go/plugin/go.d/modules/smartctl/testdata/type-nvme/scan.json
diff --git a/src/go/collectors/go.d.plugin/modules/smartctl/testdata/type-sat/device-hdd-sda.json b/src/go/plugin/go.d/modules/smartctl/testdata/type-sat/device-hdd-sda.json
index 55cfe15f5..55cfe15f5 100644
--- a/src/go/collectors/go.d.plugin/modules/smartctl/testdata/type-sat/device-hdd-sda.json
+++ b/src/go/plugin/go.d/modules/smartctl/testdata/type-sat/device-hdd-sda.json
diff --git a/src/go/collectors/go.d.plugin/modules/smartctl/testdata/type-sat/device-ssd-sdc.json b/src/go/plugin/go.d/modules/smartctl/testdata/type-sat/device-ssd-sdc.json
index a2d8f0aaf..a2d8f0aaf 100644
--- a/src/go/collectors/go.d.plugin/modules/smartctl/testdata/type-sat/device-ssd-sdc.json
+++ b/src/go/plugin/go.d/modules/smartctl/testdata/type-sat/device-ssd-sdc.json
diff --git a/src/go/collectors/go.d.plugin/modules/smartctl/testdata/type-sat/scan.json b/src/go/plugin/go.d/modules/smartctl/testdata/type-sat/scan.json
index c7a68ca8d..c7a68ca8d 100644
--- a/src/go/collectors/go.d.plugin/modules/smartctl/testdata/type-sat/scan.json
+++ b/src/go/plugin/go.d/modules/smartctl/testdata/type-sat/scan.json
diff --git a/src/go/plugin/go.d/modules/smartctl/testdata/type-scsi/device-sda.json b/src/go/plugin/go.d/modules/smartctl/testdata/type-scsi/device-sda.json
new file mode 100644
index 000000000..0ab55d2c9
--- /dev/null
+++ b/src/go/plugin/go.d/modules/smartctl/testdata/type-scsi/device-sda.json
@@ -0,0 +1,128 @@
+{
+  "json_format_version": [
+    1,
+    0
+  ],
+  "smartctl": {
+    "version": [
+      7,
+      3
+    ],
+    "svn_revision": "5338",
+    "platform_info": "REDACTED",
+    "build_info": "(local build)",
+    "argv": [
+      "smartctl",
+      "--json",
+      "--all",
+      "/dev/sda",
+      "--device",
+      "scsi"
+    ],
+    "exit_status": 0
+  },
+  "local_time": {
+    "time_t": 1720689199,
+    "asctime": "Thu Jul 11 09:13:19 2024 UTC"
+  },
+  "device": {
+    "name": "/dev/sda",
+    "info_name": "/dev/sda",
+    "type": "scsi",
+    "protocol": "SCSI"
+  },
+  "scsi_vendor": "HGST",
+  "scsi_product": "REDACTED",
+  "scsi_model_name": "REDACTED",
+  "scsi_revision": "REDACTED",
+  "scsi_version": "REDACTED",
+  "user_capacity": {
+    "blocks": 7814037168,
+    "bytes": 4000787030016
+  },
+  "logical_block_size": 512,
+  "scsi_lb_provisioning": {
+    "name": "fully provisioned",
+    "value": 0,
+    "management_enabled": {
+      "name": "LBPME",
+      "value": 0
+    },
+    "read_zeros": {
+      "name": "LBPRZ",
+      "value": 0
+    }
+  },
+  "rotation_rate": 7200,
+  "form_factor": {
+    "scsi_value": 2,
+    "name": "3.5 inches"
+  },
+  "logical_unit_id": "REDACTED",
+  "serial_number": "REDACTED",
+  "device_type": {
+    "scsi_terminology": "Peripheral Device Type [PDT]",
+    "scsi_value": 0,
+    "name": "disk"
+  },
+  "scsi_transport_protocol": {
+    "name": "SAS (SPL-4)",
+    "value": 6
+  },
+  "smart_support": {
+    "available": true,
+    "enabled": true
+  },
+  "temperature_warning": {
+    "enabled": true
+  },
+  "smart_status": {
+    "passed": true
+  },
+  "temperature": {
+    "current": 34,
+    "drive_trip": 85
+  },
+  "power_on_time": {
+    "hours": 1641,
+    "minutes": 22
+  },
+  "scsi_start_stop_cycle_counter": {
+    "year_of_manufacture": "2013",
+    "week_of_manufacture": "51",
+    "specified_cycle_count_over_device_lifetime": 50000,
+    "accumulated_start_stop_cycles": 4,
+    "specified_load_unload_count_over_device_lifetime": 600000,
+    "accumulated_load_unload_cycles": 119
+  },
+  "scsi_grown_defect_list": 0,
+  "scsi_error_counter_log": {
+    "read": {
+      "errors_corrected_by_eccfast": 647707,
+      "errors_corrected_by_eccdelayed": 29,
+      "errors_corrected_by_rereads_rewrites": 0,
+      "total_errors_corrected": 647736,
+      "correction_algorithm_invocations": 586730,
+      "gigabytes_processed": "36537.378",
+      "total_uncorrected_errors": 0
+    },
+    "write": {
+      "errors_corrected_by_eccfast": 0,
+      "errors_corrected_by_eccdelayed": 0,
+      "errors_corrected_by_rereads_rewrites": 0,
+      "total_errors_corrected": 0,
+      "correction_algorithm_invocations": 13549,
+      "gigabytes_processed": "2811.293",
+      "total_uncorrected_errors": 0
+    },
+    "verify": {
+      "errors_corrected_by_eccfast": 0,
+      "errors_corrected_by_eccdelayed": 0,
+      "errors_corrected_by_rereads_rewrites": 0,
+      "total_errors_corrected": 0,
+      "correction_algorithm_invocations": 2146,
+      "gigabytes_processed": "0.000",
+      "total_uncorrected_errors": 0
+    }
+  }
+}
diff --git a/src/go/plugin/go.d/modules/smartctl/testdata/type-scsi/scan.json b/src/go/plugin/go.d/modules/smartctl/testdata/type-scsi/scan.json
new file mode 100644
index 000000000..398f5f4af
--- /dev/null
+++ b/src/go/plugin/go.d/modules/smartctl/testdata/type-scsi/scan.json
@@ -0,0 +1,29 @@
+{
+  "json_format_version": [
+    1,
+    0
+  ],
+  "smartctl": {
+    "version": [
+      7,
+      3
+    ],
+    "svn_revision": "5338",
+    "platform_info": "REDACTED",
+    "build_info": "(local build)",
+    "argv": [
+      "smartctl",
+      "--scan",
+      "--json"
+    ],
+    "exit_status": 0
+  },
+  "devices": [
+    {
+      "name": "/dev/sda",
+      "info_name": "/dev/sda",
+      "type": "scsi",
+      "protocol": "SCSI"
+    }
+  ]
+}