X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=charts.d%2Fopensips.chart.sh;h=2a0249daed4d048082188e325c3894b81111f7d0;hb=9dccc16d3763392f0b13349de18c3a838a667653;hp=ce42ccdd70ced69aead6c873b51e54a086b8067b;hpb=3824a699715d85e0adf61570a4569d09922c7f5c;p=netdata.git

diff --git a/charts.d/opensips.chart.sh b/charts.d/opensips.chart.sh
old mode 100755
new mode 100644
index ce42ccdd..2a0249da
--- a/charts.d/opensips.chart.sh
+++ b/charts.d/opensips.chart.sh
@@ -1,5 +1,11 @@
 # no need for shebang - this file is loaded from charts.d.plugin
 
+# netdata
+# real-time performance and health monitoring, done right!
+# (C) 2016 Costa Tsaousis <costa@tsaousis.gr>
+# GPL v3+
+#
+
 opensips_opts="fifo get_statistics all"
 opensips_cmd=
 opensips_update_every=5
@@ -7,15 +13,11 @@ opensips_timeout=2
 opensips_priority=80000
 
 opensips_get_stats() {
-	timeout $opensips_timeout "$opensips_cmd" $opensips_opts |\
-		grep "^\(core\|dialog\|net\|registrar\|shmem\|siptrace\|sl\|tm\|uri\|usrloc\):[a-zA-Z0-9_ -]\+[[:space:]]*=[[:space:]]*[0-9]\+[[:space:]]*$" |\
+	run -t $opensips_timeout "$opensips_cmd" $opensips_opts |\
+		grep "^\(core\|dialog\|net\|registrar\|shmem\|siptrace\|sl\|tm\|uri\|usrloc\):[a-zA-Z0-9_-]\+[[:space:]]*[=:]\+[[:space:]]*[0-9]\+[[:space:]]*$" |\
 		sed \
-			-e "s|-|_|g" \
-			-e "s|:|_|g" \
-			-e "s|[[:space:]]\+=[[:space:]]\+|=|g" \
-			-e "s|[[:space:]]\+$||" \
-			-e "s|^[[:space:]]\+||" \
-			-e "s|[[:space:]]\+|_|" \
+			-e "s|[[:space:]]*[=:]\+[[:space:]]*\([0-9]\+\)[[:space:]]*$|=\1|g" \
+			-e "s|[[:space:]:-]\+|_|g" \
 			-e "s|^|opensips_|g"
 
 	local ret=$?
@@ -35,7 +37,7 @@ opensips_check() {
 	local x="$(opensips_get_stats | grep "^opensips_core_")"
 	if [ ! $? -eq 0 -o -z "$x" ]
 	then
-		echo >&2 "$PROGRAM_NAME: opensips: cannot get global status. Please set opensips_opts='options' whatever needed to get connected to opensips server, in $confd/opensips.conf"
+		error "cannot get global status. Please set opensips_opts='options' whatever needed to get connected to opensips server, in $confd/opensips.conf"
 		return 1
 	fi
 
@@ -218,7 +220,7 @@ opensips_update() {
 	eval "local $(opensips_get_stats)"
 	[ $? -ne 0 ] && return 1
 
-	[ $opensips_command_failed -eq 1 ] && echo >&2 "$PROGRAM_NAME: opensips: failed to get values, disabling." && return 1
+	[ $opensips_command_failed -eq 1 ] && error "failed to get values, disabling." && return 1
 
 	# write the result of the work.
 	cat <<VALUESEOF