DLPX-96312 Add nfs and iscsi data in influxDb

Author: dbshah12

influxdb/delphix-influxdb-init

@@ -184,7 +184,7 @@ cat >"$INFLUXDB_OUTPUT" <<EOF
   token = "$WRITE_TOKEN"
   organization = "$INFLUXDB_ORG"
   bucket = "$INFLUXDB_BUCKET"
-  namepass = ["cpu", "disk", "diskio", "mem", "net", "procstat", "processes", "swap", "system", "zfs"]
+  namepass = ["cpu", "disk", "diskio", "mem", "net", "procstat", "processes", "swap", "system", "zfs", "estat_nfs", "estat_iscsi"]
 EOF
 # Enforce restrictive permissions so the write token is not world-readable.
 chmod 640 "$INFLUXDB_OUTPUT"

telegraf/delphix-telegraf-service

@@ -3,6 +3,7 @@ BASE_CONFIG=/etc/telegraf/telegraf.base
 DOSE_INPUTS=/etc/telegraf/telegraf.inputs.dose
 DCT_INPUTS=/etc/telegraf/telegraf.inputs.dct
 PLAYBOOK_INPUTS=/etc/telegraf/telegraf.inputs.playbook
+NFS_ISCSI_INPUTS=/etc/telegraf/telegraf.inputs.nfs_iscsi
 INFLUXDB_OUTPUT=/etc/telegraf/telegraf.outputs.influxdb
 PLAYBOOK_FLAG=/etc/telegraf/PLAYBOOK_ENABLED
 INFLUXDB_FLAG=/etc/telegraf/INFLUXDB_ENABLED
@@ -49,6 +50,10 @@ else
 	fi
 fi
 
+if playbook_is_enabled || influxdb_is_enabled; then
+	cat $NFS_ISCSI_INPUTS >> $TELEGRAF_CONFIG
+fi
+
 if influxdb_is_enabled && [[ -f $INFLUXDB_OUTPUT ]]; then
 	cat $INFLUXDB_OUTPUT >> $TELEGRAF_CONFIG
 fi

telegraf/telegraf.inputs.nfs_iscsi

@@ -0,0 +1,36 @@
+##############################################################################
+# NFS server I/O and iSCSI target I/O — included when InfluxDB is enabled
+# but Performance Playbook is not (playbook already contains these inputs).
+
+[[inputs.execd]]
+  command = ["estat", "nfs", "-jm", "10"]
+  name_override = "estat_nfs"
+  signal = "none"
+  restart_delay = "30s"
+  data_format = "json"
+  tag_keys = [
+    "name",
+    "axis"
+  ]
+  json_string_fields = ["iops(/s)", "avg latency(us)", "stddev(us)", "throughput(k/s)", "microseconds"]
+
+[[inputs.execd]]
+  command = ["estat", "iscsi", "-jm", "10"]
+  name_override = "estat_iscsi"
+  signal = "none"
+  restart_delay = "30s"
+  data_format = "json"
+  tag_keys = [
+    "name",
+    "axis"
+  ]
+  json_string_fields = ["iops(/s)", "avg latency(us)", "stddev(us)", "throughput(k/s)", "microseconds"]
+
+# Convert estat string fields to integers so they are not dropped by Telegraf.
+[[processors.converter]]
+  namepass = ["estat_nfs", "estat_iscsi"]
+  [processors.converter.fields]
+    integer = ["iops(/s)", "avg latency(us)", "stddev(us)", "throughput(k/s)"]
+
+# End of NFS/iSCSI section
+##############################################################################

telegraf/telegraf.inputs.playbook

@@ -1,31 +1,7 @@
 ##############################################################################
-# Performance Playbook (estat, nfs_threads) collection 
-
-# Collect output from "estat nfs -jm 10"
-[[inputs.execd]]
-  command = ["estat", "nfs", "-jm", "10"]
-  name_override = "estat_nfs"
-  signal = "none"
-  restart_delay = "30s"
-  data_format = "json"
-  tag_keys = [
-    "name",
-    "axis"
-  ]
-  json_string_fields = ["iops(/s)", "avg latency(us)", "stddev(us)", "throughput(k/s)", "microseconds"]
-
-# Collect output from "estat iscsi -jm 10"
-[[inputs.execd]]
-  command = ["estat", "iscsi", "-jm", "10"]
-  name_override = "estat_iscsi"
-  signal = "none"
-  restart_delay = "30s"
-  data_format = "json"
-  tag_keys = [
-    "name",
-    "axis"
-  ]
-  json_string_fields = ["iops(/s)", "avg latency(us)", "stddev(us)", "throughput(k/s)", "microseconds"]
+# Performance Playbook (estat, nfs_threads) collection
+# Note: estat_nfs and estat_iscsi are in telegraf.inputs.nfs_iscsi so they
+# are also available when only InfluxDB is enabled (without the full playbook).
 
 # Collect output from "estat zpl -jm 10"
 [[inputs.execd]]