Projet

Général

Profil

Révision 5fb6d925

ID5fb6d92501695ebc1dc67e813396837397bae097
Parent f66edd28
Enfant d31e38b5

Ajouté par Diver il y a presque 9 ans

Shellcheck override
eval statement workaround
Local execution fix

Voir les différences:

plugins/emc/emc_vnx_block_lun_perfdata
184 184
		fi
185 185
		#Choosing Cotrol Station. Code have to be "10"
186 186
		for CS in $cs_addr; do
187
			# shellcheck disable=SC2086
187 188
			if [[ "10" = "$(ssh_check_cmd $CS)" ]]; then
188 189
				PRIMARY_CS=$CS
189 190
				SSH="ssh -q $username@$PRIMARY_CS "
......
209 210
	fi
210 211
	local probe_sp
211 212
	for probe_sp in $SPALL; do
213
		# shellcheck disable=SC2086
212 214
		if $SSH $NAVICLI -h "$probe_sp" >/dev/null 2>&1; then
213 215
			StorageProcessor="$probe_sp"
214 216
			break
......
234 236

  
235 237
run_remote() {
236 238
	if [ -z "$SSH" ]; then
237
		eval "$@"
239
		sh -c "$*"
238 240
	else
239
		eval "$SSH" "\"$@\""
241
		$SSH "$*"
240 242
	fi
241 243
}
242 244

  
243 245
run_navicli() {
244
	
245
	run_remote "$NAVICLI" "$@"
246
	run_remote "$NAVICLI" "$*"
246 247
}
247 248

  
248
run_navicli_both_sp() {
249
	for SP in $SPALL; do
250
		run_remote "$NAVICLI_NOSP $SP" "$@"
251
#		echo "$NAVICLI_NOSP $SP" "$@"
252
#		echo "$NAVICLI_NOSP $SP" $@
253
		
254
	done
255
}
256 249

  
257 250
# Get Lun List
258 251
LUNLIST=$(run_navicli lun -list -drivetype | sed -ne 's/^Name:\ *//p' | sort)
......
493 486
		' ;  "
494 487
done <<< "$LUNLIST"
495 488
ANSWER=$(run_remote "$BIGCMD")
496
#	BIGCMD="getcontrol -cbt | sed -ne '
497
#		s/Controller busy ticks\:\ */ spa_busyticks.value /p; 
498
#		s/Controller idle ticks\:\ */ spa_idleticks.value /p;'
499 489

  
500

  
501
BIGCMD="getcontrol -cbt | sed -ne '
502
	s/Controller busy ticks\:\ */\${SP}_total_busyticks.value /p;
503
	s/Controller idle ticks\:\ */\${SP}_total_idleticks.value /p;
504
	'
505
"
506
ANSWER+=$'\n'$(run_navicli_both_sp "$BIGCMD")
507
run_navicli_both_sp "$BIGCMD"
490
for SP in $SPALL; do
491
	FILTER_SP="$(clean_fieldname "$SP")"
492
	BIGCMD="getcontrol -cbt | sed -ne '
493
		s/Controller busy ticks\:\ */${FILTER_SP}_total_busyticks.value /p;
494
		s/Controller idle ticks\:\ */${FILTER_SP}_total_idleticks.value /p;
495
		'
496
	"
497
	ANSWER+=$'\n'$(run_remote "$NAVICLI_NOSP $SP" "$BIGCMD")
498
done
508 499

  
509 500
get_precise_answer_field() {
510 501
    echo "$ANSWER" | grep -F "_${1}."
511 502
}
512 503

  
513
# get_similar_answer_field() {
514
#     echo "$ANSWER" | grep -F "_${1}"
515
# }
516
#ANSWER=$BIGSSHCMD
517 504
echo "multigraph emc_vnx_block_blocks"
518 505
get_precise_answer_field "read"
519 506
get_precise_answer_field "write"

Formats disponibles : Unified diff