X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=charts.d%2Fnut.chart.sh;h=6137639f982621277caa6fe21fce46133ef400eb;hb=8a870a65d0afc49455b4b5ff2b0ce585e0bd8339;hp=551ee4074b582db7d90e30d6cc8a40170ba653c7;hpb=5aff09af4fd7cdd042661bb5330c905af85c4779;p=netdata.git

diff --git a/charts.d/nut.chart.sh b/charts.d/nut.chart.sh
old mode 100755
new mode 100644
index 551ee407..6137639f
--- a/charts.d/nut.chart.sh
+++ b/charts.d/nut.chart.sh
@@ -1,19 +1,70 @@
-#!/bin/sh
+# no need for shebang - this file is loaded from charts.d.plugin
 
+# netdata
+# real-time performance and health monitoring, done right!
+# (C) 2016-2017 Costa Tsaousis <costa@tsaousis.gr>
+# GPL v3+
+#
+
+# a space separated list of UPS names
+# if empty, the list returned by 'upsc -l' will be used
 nut_ups=
+
+# how frequently to collect UPS data
 nut_update_every=2
 
-nut_check() {
-	if [ -z "${nut_ups}" ]
+# how much time in seconds, to wait for nut to respond
+nut_timeout=2
+
+# set this to 1, to enable another chart showing the number
+# of UPS clients connected to upsd
+nut_clients_chart=0
+
+# the priority of nut related to other charts
+nut_priority=90000
+
+declare -A nut_ids=()
+
+nut_get_all() {
+	run -t $nut_timeout upsc -l
+}
+
+nut_get() {
+	run -t $nut_timeout upsc "$1"
+
+	if [ "${nut_clients_chart}" -eq "1" ]
 		then
-		echo >&2 "nut: Please set nut_ups='ups_name' in $confd/nut.conf"
-		return 1
+		printf "ups.connected_clients: "
+		run -t $nut_timeout upsc -c "$1" | wc -l
 	fi
+}
+
+nut_check() {
+
+	# this should return:
+	#  - 0 to enable the chart
+	#  - 1 to disable the chart
 
-	upsc "${nut_ups}" >/dev/null
-	if [ ! $? -eq 0 ]
-	then
-		echo >&2 "nut: failed to fetch info for ups '$nut_ups'. Please set nut_ups='ups_name' in $confd/nut.conf"
+	local x
+
+	require_cmd upsc || return 1
+
+	[ -z "$nut_ups" ] && nut_ups="$( nut_get_all )"
+
+	for x in $nut_ups
+	do
+		nut_get "$x" >/dev/null
+		if [ $? -eq 0 ]
+			then
+			nut_ids[$x]="$( fixid "$x" )"
+			continue
+		fi
+		error "cannot get information for NUT UPS '$x'."
+	done
+
+	if [ ${#nut_ids[@]} -eq 0 ]
+		then
+		error "Cannot find UPSes - please set nut_ups='ups_name' in $confd/nut.conf"
 		return 1
 	fi
 
@@ -22,38 +73,52 @@ nut_check() {
 
 nut_create() {
 	# create the charts
-	cat <<EOF
-CHART nut.charge '' "UPS Charge" "percentage" nut '' area 21001 $nut_update_every
+	local x
+
+	for x in "${nut_ids[@]}"
+	do
+		cat <<EOF
+CHART nut_$x.charge '' "UPS Charge" "percentage" ups nut.charge area $((nut_priority + 1)) $nut_update_every
 DIMENSION battery_charge charge absolute 1 100
 
-CHART nut.battery_voltage '' "UPS Battery Voltage" "Volts" nut '' line 21002 $nut_update_every
+CHART nut_$x.battery_voltage '' "UPS Battery Voltage" "Volts" ups nut.battery.voltage line $((nut_priority + 2)) $nut_update_every
 DIMENSION battery_voltage voltage absolute 1 100
 DIMENSION battery_voltage_high high absolute 1 100
 DIMENSION battery_voltage_low low absolute 1 100
 DIMENSION battery_voltage_nominal nominal absolute 1 100
 
-CHART nut.input_voltage '' "UPS Input Voltage" "Volts" nut '' line 21003 $nut_update_every
+CHART nut_$x.input_voltage '' "UPS Input Voltage" "Volts" input nut.input.voltage line $((nut_priority + 3)) $nut_update_every
 DIMENSION input_voltage voltage absolute 1 100
 DIMENSION input_voltage_fault fault absolute 1 100
 DIMENSION input_voltage_nominal nominal absolute 1 100
 
-CHART nut.input_current '' "UPS Input Current" "Ampere" nut '' line 21004 $nut_update_every
+CHART nut_$x.input_current '' "UPS Input Current" "Ampere" input nut.input.current line $((nut_priority + 4)) $nut_update_every
 DIMENSION input_current_nominal nominal absolute 1 100
 
-CHART nut.input_frequency '' "UPS Input Frequency" "Hz" nut '' line 21005 $nut_update_every
+CHART nut_$x.input_frequency '' "UPS Input Frequency" "Hz" input nut.input.frequency line $((nut_priority + 5)) $nut_update_every
 DIMENSION input_frequency frequency absolute 1 100
 DIMENSION input_frequency_nominal nominal absolute 1 100
 
-CHART nut.output_voltage '' "UPS Output Voltage" "Volts" nut '' line 21006 $nut_update_every
+CHART nut_$x.output_voltage '' "UPS Output Voltage" "Volts" output nut.output.voltage line $((nut_priority + 6)) $nut_update_every
 DIMENSION output_voltage voltage absolute 1 100
 
-CHART nut.load '' "UPS Load" "percentage" nut '' area 21000 $nut_update_every
+CHART nut_$x.load '' "UPS Load" "percentage" ups nut.load area $((nut_priority)) $nut_update_every
 DIMENSION load load absolute 1 100
 
-CHART nut.temp '' "UPS Temperature" "temperature" nut '' line 21007 $nut_update_every
+CHART nut_$x.temp '' "UPS Temperature" "temperature" ups nut.temperature line $((nut_priority + 7)) $nut_update_every
 DIMENSION temp temp absolute 1 100
 EOF
-	
+
+	if [ "${nut_clients_chart}" = "1" ]
+		then
+		cat <<EOF2
+CHART nut_$x.clients '' "UPS Connected Clients" "clients" ups nut.clients area $((nut_priority + 8)) $nut_update_every
+DIMENSION clients '' absolute 1 1
+EOF2
+	fi
+
+	done
+
 	return 0
 }
 
@@ -66,7 +131,11 @@ nut_update() {
 	# for each dimension
 	# remember: KEEP IT SIMPLE AND SHORT
 
-	upsc "${nut_ups}" | awk "
+	local i x
+	for i in "${!nut_ids[@]}"
+	do
+		x="${nut_ids[$i]}"
+		nut_get "$i" | awk "
 BEGIN {
 	battery_charge = 0;
 	battery_voltage = 0;
@@ -82,6 +151,8 @@ BEGIN {
 	output_voltage = 0;
 	load = 0;
 	temp = 0;
+	client = 0;
+	do_clients = ${nut_clients_chart};
 }
 /^battery.charge: .*/			{ battery_charge = \$2 * 100 };
 /^battery.voltage: .*/			{ battery_voltage = \$2 * 100 };
@@ -97,46 +168,55 @@ BEGIN {
 /^output.voltage: .*/			{ output_voltage = \$2 * 100 };
 /^ups.load: .*/					{ load = \$2 * 100 };
 /^ups.temperature: .*/			{ temp = \$2 * 100 };
+/^ups.connected_clients: .*/	{ clients = \$2 };
 END {
-	print \"BEGIN nut.charge $1\";
+	print \"BEGIN nut_$x.charge $1\";
 	print \"SET battery_charge = \" battery_charge;
 	print \"END\"
 
-	print \"BEGIN nut.battery_voltage $1\";
+	print \"BEGIN nut_$x.battery_voltage $1\";
 	print \"SET battery_voltage = \" battery_voltage;
 	print \"SET battery_voltage_high = \" battery_voltage_high;
 	print \"SET battery_voltage_low = \" battery_voltage_low;
 	print \"SET battery_voltage_nominal = \" battery_voltage_nominal;
 	print \"END\"
 
-	print \"BEGIN nut.input_voltage $1\";
+	print \"BEGIN nut_$x.input_voltage $1\";
 	print \"SET input_voltage = \" input_voltage;
 	print \"SET input_voltage_fault = \" input_voltage_fault;
 	print \"SET input_voltage_nominal = \" input_voltage_nominal;
 	print \"END\"
 
-	print \"BEGIN nut.input_current $1\";
+	print \"BEGIN nut_$x.input_current $1\";
 	print \"SET input_current_nominal = \" input_current_nominal;
 	print \"END\"
 
-	print \"BEGIN nut.input_frequency $1\";
+	print \"BEGIN nut_$x.input_frequency $1\";
 	print \"SET input_frequency = \" input_frequency;
 	print \"SET input_frequency_nominal = \" input_frequency_nominal;
 	print \"END\"
 
-	print \"BEGIN nut.output_voltage $1\";
+	print \"BEGIN nut_$x.output_voltage $1\";
 	print \"SET output_voltage = \" output_voltage;
 	print \"END\"
 
-	print \"BEGIN nut.load $1\";
+	print \"BEGIN nut_$x.load $1\";
 	print \"SET load = \" load;
 	print \"END\"
 
-	print \"BEGIN nut.temp $1\";
+	print \"BEGIN nut_$x.temp $1\";
 	print \"SET temp = \" temp;
 	print \"END\"
-}
-"
+
+	if(do_clients) {
+		print \"BEGIN nut_$x.clients $1\";
+		print \"SET clients = \" clients;
+		print \"END\"
+	}
+}"
+		[ $? -ne 0 ] && unset nut_ids[$i] && error "failed to get values for '$i', disabling it."
+	done
+
+	[ ${#nut_ids[@]} -eq 0 ] && error "no UPSes left active." && return 1
 	return 0
 }
-