Merge pull request #619 from stackhpc/nvmemon-update

Add physical size to nvmemon metrics

Author: markgoddard

etc/kayobe/ansible/scripts/nvmemon.sh

@@ -44,14 +44,18 @@ format_output() {
 nvme_version="$(nvme version | awk '$1 == "nvme" {print $3}')"
 echo "nvmecli{version=\"${nvme_version}\"} 1" | format_output
 
-# Get devices
-device_list="$(nvme list -o json | jq -r '.Devices | .[].DevicePath')"
+# Get devices (DevicePath and PhysicalSize)
+device_info="$(nvme list -o json | jq -c '.Devices[] | {DevicePath: .DevicePath, PhysicalSize: .PhysicalSize}')"
 
 # Loop through the NVMe devices
-for device in ${device_list}; do
+echo "$device_info" | while read -r device_data; do
+  device=$(echo "$device_data" | jq -r '.DevicePath')
   json_check="$(nvme smart-log -o json "${device}")"
   disk="${device##*/}"
 
+  physical_size=$(echo "$device_data" | jq -r '.PhysicalSize')
+  echo "physical_size_bytes{device=\"${disk}\"} ${physical_size}"
+
   # The temperature value in JSON is in Kelvin, we want Celsius
   value_temperature="$(echo "$json_check" | jq '.temperature - 273')"
   echo "temperature_celsius{device=\"${disk}\"} ${value_temperature}"

releasenotes/notes/nvmemon-update-a326f1b46d95b037.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Nvmemon now reports physical size of the disk.