Merge pull request #92 from delphix/projects/merge-upstream/master

Merge remote-tracking branch '6.0/stage' into 'master'

Author: delphix-devops-bot

telegraf/perf_playbook

@@ -30,14 +30,14 @@ function usage() {
 
 function enable_playbook() {
 	date
-	echo "Enabling Performance Playbook Metrics"
+	echo "Enabling Performance Playbook Metric Collection"
 	touch $PLAYBOOK_FLAG
 	systemctl restart delphix-telegraf
 }
 
 function disable_playbook() {
 	date
-	echo "Disabling Performance Playbook Metrics"
+	echo "Disabling Performance Playbook Metric Collection"
 	rm -rf $PLAYBOOK_FLAG
 	systemctl restart delphix-telegraf
 }

telegraf/telegraf.base

@@ -44,7 +44,7 @@
   data_format = "json"
   namepass = ["agg_*"]
 
-# Enable Live Monitoring, intended for internal use:
+# Enable Live Monitoring, intended for internal Delphix use only:
 #[[outputs.influxdb]]
 #  urls = ["http://dbsvr.company.com:8086"]
 #  database = "live_metrics"

telegraf/telegraf.inputs.dose

@@ -3,6 +3,7 @@
   command = ["/etc/telegraf/zcache-stats.sh"]
   name_override = "zcache_stats"
   signal = "none"
+  restart_delay = "30s"
   data_format = "csv"
   csv_skip_columns = 1
   csv_column_names = ["cache_lookup_count","idx_access_pendch","idx_access_entry","idx_access_chunk",
@@ -21,6 +22,7 @@
   command = ["/etc/telegraf/zpool-iostat-o.sh"]
   name_override = "zpool_iostat-o"
   signal = "none"
+  restart_delay = "30s"
   data_format = "csv"
   csv_column_names = ["pool","agent_io_op_read","agent_io_op_write","agent_io_tput_read",
 			"agent_io_tput_write","store_data_op_get","store_data_op_put","store_data_tput_get",

telegraf/telegraf.inputs.playbook

@@ -6,6 +6,7 @@
   command = ["estat", "nfs", "-jm", "10"]
   name_override = "estat_nfs"
   signal = "none"
+  restart_delay = "30s"
   data_format = "json"
   tag_keys = [
     "name",
@@ -18,6 +19,7 @@
   command = ["estat", "iscsi", "-jm", "10"]
   name_override = "estat_iscsi"
   signal = "none"
+  restart_delay = "30s"
   data_format = "json"
   tag_keys = [
     "name",
@@ -30,6 +32,7 @@
   command = ["estat", "zpl", "-jm", "10"]
   name_override = "estat_zpl"
   signal = "none"
+  restart_delay = "30s"
   data_format = "json"
   tag_keys = [
     "name",
@@ -42,6 +45,7 @@
   command = ["estat", "backend-io", "-jm", "10"]
   name_override = "estat_backend-io"
   signal = "none"
+  restart_delay = "30s"
   data_format = "json"
   tag_keys = [
     "name",
@@ -54,6 +58,19 @@
   command = ["estat", "zvol", "-jm", "10"]
   name_override = "estat_zvol"
   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 zio-queue -jm 10"
+[[inputs.execd]]
+  command = ["estat", "zio-queue", "-jm", "10"]
+  name_override = "estat_zio-queue"
+  signal = "none"
   data_format = "json"
   tag_keys = [
     "name",
@@ -66,6 +83,7 @@
   command = ["estat", "zio", "-jm", "10"]
   name_override = "estat_zio"
   signal = "none"
+  restart_delay = "30s"
   data_format = "json"
   tag_keys = [
     "name",
@@ -74,22 +92,24 @@
   json_string_fields = ["iops(/s)", "avg latency(us)", "stddev(us)", "throughput(k/s)", "microseconds"]
 
 # Collect output from "estat metaslab-alloc -jm 10"
-#[[inputs.execd]]
-#  command = ["estat", "metaslab-alloc", "-jm", "10"]
-#  name_override = "estat_metaslab-alloc"
-#  signal = "none"
-#  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", "metaslab-alloc", "-jm", "10"]
+  name_override = "estat_metaslab-alloc"
+  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 "nfs_threads"
 [[inputs.execd]]
   command = ["/etc/telegraf/nfs-threads.sh"]
   name_override = "nfs_threads"
   signal = "none"
+  restart_delay = "30s"
   data_format = "csv"
   csv_skip_columns = 2
   csv_column_names = ["packets","sockets","woken","used","metadata","riops","rtput","wiops","wtput"]