Added EMC VNX 5300 Std NFS; fixed some indentation

plugins/emc/emc_vnx_block_lun_perfdata

@@ -60,6 +60,7 @@
 	EMC VNX 5300 Non-Zero Request Count Arrivals
 	EMC VNX 5300 Trespasses
 	EMC VNX 5300 Counted Block Queue Length
+	EMC VNX 5300 Counted Load per SP
 
 
 =head1 CONFIGURATION

plugins/emc/emc_vnx_file_

@@ -71,6 +71,10 @@
 	EMC VNX 5300 NFS Client Ops/s
 	EMC VNX 5300 NFS Client B/s
 	EMC VNX 5300 NFS Client Avg uSec/call
+	EMC VNX 5300 Std NFS Ops/s
+	EMC VNX 5300 Std NFS B/s
+	EMC VNX 5300 Std NFS Average Size Bytes
+	EMC VNX 5300 Std NFS Active Threads
 
 =head1 COMPATIBILITY
 
@@ -135,9 +139,9 @@ export LANG=C
 . "$MUNIN_LIBDIR/plugins/plugin.sh"
 
 nas_server_ok=""
-: ${cs_addr:=""}
+cs_addr=${cs_addr:=""}
-: ${username:=""}
+username=${username:=""}
-: ${nas_servers:="server_2 server_3"}
+nas_servers=${nas_servers:="server_2 server_3"}
 
 # Prints "10" on stdout if found Primary Online control station. "11" - for Secondary Online control station. 
 ssh_check_cmd() {
@@ -202,9 +206,11 @@ run_remote () {
 echo "host_name ${TARGET}"
 
 if [ "$1" = "config" ] ; then
+# TODO: active/active
 	for server in $nas_servers; do
 		run_remote nas_server -i "$server" | grep -q 'type *= nas' || continue
 		nas_server_ok=TRUE
+		filtered_server="$(clean_fieldname "$server")"
 		
 		if [ "$STATSTYPE" = "BASICDM" ] ; then
 			cat <<-EOF 
@@ -427,6 +433,55 @@ if [ "$1" = "config" ] ; then
 				field="$(clean_fieldname "_$graph")"
 				echo "${server}${field}.label $server $graph Avg uSec/call"
 			done
+
+#nfs-std
+# Timestamp     NFS         Read      Read    Read Size     Write      Write   Write Size    Active  
+#              Ops/s       Ops/s      KiB/s     Bytes       Ops/s      KiB/s     Bytes      Threads  
+			cat <<-EOF
+
+			multigraph vnx_emc_nfs_std_nfs_ops
+			graph_title EMC VNX 5300 Std NFS Ops/s
+			graph_vlabel Ops/s
+			graph_category nfs
+			EOF
+			echo "graph_order ${filtered_server}_rops ${filtered_server}_wops ${filtered_server}_tops"
+			echo "${filtered_server}_rops.label $server Read Ops/s"
+			echo "${filtered_server}_wops.label $server Write Ops/s"
+			echo "${filtered_server}_wops.draw STACK"
+			echo "${filtered_server}_tops.label $server Total Ops/s"
+			
+			cat <<-EOF
+
+			multigraph vnx_emc_nfs_std_nfs_b_s
+			graph_title EMC VNX 5300 Std NFS B/s
+			graph_vlabel B/s
+			graph_category nfs
+			EOF
+			echo "graph_order ${filtered_server}_rbs ${filtered_server}_wbs ${filtered_server}_tbs"
+			echo "${filtered_server}_rbs.label $server Read B/s"
+			echo "${filtered_server}_wbs.label $server Write B/s"
+			echo "${filtered_server}_wbs.draw STACK"
+			echo "${filtered_server}_tbs.label $server Total B/s"
+			echo "${filtered_server}_tbs.cdef ${filtered_server}_rbs,${filtered_server}_wbs,+"
+			
+			cat <<-EOF
+
+			multigraph vnx_emc_nfs_std_nfs_avg
+			graph_title EMC VNX 5300 Std NFS Average Size Bytes
+			graph_vlabel Bytes
+			graph_category nfs
+			EOF
+			echo "${filtered_server}_avg_readsize.label $server Average Read Size Bytes"
+			echo "${filtered_server}_avg_writesize.label $server Average Write Size Bytes"
+
+			cat <<-EOF
+
+			multigraph vnx_emc_nfs_std_nfs_threads
+			graph_title EMC VNX 5300 Std NFS Active Threads
+			graph_vlabel Threads
+			graph_category nfs
+			EOF
+			echo "${filtered_server}_threads.label $server Active Threads"
 		fi
 	done
 	if [ -z "$nas_server_ok" ]; then
@@ -438,6 +493,8 @@ fi
 for server in $nas_servers; do
 	run_remote nas_server -i $server | grep -q 'type *= nas' || continue
 	nas_server_ok=TRUE
+	filtered_server="$(clean_fieldname "$server")"
+
 	if [ "$STATSTYPE" = "BASICDM" ] ; then
 #basicdm data
 # [nasadmin@mnemonic0 ~]$ server_stats server_2 -count 1 -terminationsummary no 
@@ -595,8 +652,8 @@ for server in $nas_servers; do
 #            id=192.168.1.235                             21        1        0           0        0        0        0     155839
 #            id=192.168.1.224                              5        0        5           0       20        0       20     704620
 
-	echo -e "\nmultigraph vnx_emc_nfs_client_ops_s"
 		member_elements_by_line=$(run_remote server_stats server_2 -monitor nfs.client -count 1 -terminationsummary no -titles never | sed -ne 's/^.*id=//p')
+		echo -e "\nmultigraph vnx_emc_nfs_client_ops_s"
 		NUMCOL=9
 		LINES=$(wc -l <<< "$member_elements_by_line")
 		while IFS=$'\n' read -ra graphs; do
@@ -625,6 +682,36 @@ for server in $nas_servers; do
 			client="$(clean_fieldname "_${elements_array[i*$NUMCOL]}")"
 			echo "${server}${client}".value "${elements_array[$i*$NUMCOL+8]}"
 		done
+
+#nfs-std
+# bash-3.2$  server_stats server_2 -monitor nfs-std
+# server_2     Total        NFS        NFS     NFS Avg       NFS        NFS     NFS Avg       NFS    
+# Timestamp     NFS         Read      Read    Read Size     Write      Write   Write Size    Active  
+#              Ops/s       Ops/s      KiB/s     Bytes       Ops/s      KiB/s     Bytes      Threads  
+# 18:14:52          688         105     6396       62652           1      137      174763           3
+		member_elements_by_line=$(run_remote server_stats "$server" -monitor nfs-std -count 1 -terminationsummary no -titles never | grep '^[^[:space:]]')
+		IFS=$' ' read -ra graphs <<< "$member_elements_by_line"
+#		echo "$member_elements_by_line"
+#		echo "${graphs[@]}"
+
+		echo -e "\nmultigraph vnx_emc_nfs_std_nfs_ops"
+		echo "${filtered_server}_rops.value ${graphs[2]}"
+		echo "${filtered_server}_wops.value ${graphs[5]}"
+		echo "${filtered_server}_tops.value ${graphs[1]}"
+				
+		echo -e "\nmultigraph vnx_emc_nfs_std_nfs_b_s"
+		echo "${filtered_server}_rbs.value $((${graphs[3]} * 1024))"
+		echo "${filtered_server}_wbs.value $((${graphs[6]} * 1024))"
+		echo "${filtered_server}_tbs.value 0"
+				
+
+		echo -e "\nmultigraph vnx_emc_nfs_std_nfs_avg"
+		echo "${filtered_server}_avg_readsize.value ${graphs[4]}"
+		echo "${filtered_server}_avg_writesize.value ${graphs[7]}"
+
+
+		echo -e "\nmultigraph vnx_emc_nfs_std_nfs_threads"
+		echo "${filtered_server}_threads.value ${graphs[8]}"
 	fi
 done
 if [ -z "$nas_server_ok" ]; then