cleanup propriatery charts.d charts; proc_stat optimization; minor fixes for not updated dimensions in rrd.c

2 files changed, 0 insertions, 242 deletions

diff --git a/charts.d/airsearches.chart.sh b/charts.d/airsearches.chart.sh
deleted file mode 100755
index 449b14255a..0000000000
--- a/charts.d/airsearches.chart.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-
-airsearches_url=
-airsearches_cmds=
-airsearches_update_every=15
-
-airsearches_get() {
-	wget 2>/dev/null -O - "$airsearches_url" |\
-		sed -e "s|<br />|\n|g" -e "s|: |=|g" -e "s| \+|_|g" -e "s/^/airsearches_/g" |\
-		tr "[A-Z]\.\!@#\$%^&*()_+\-" "[a-z]_____________" |\
-		egrep "^airsearches_[a-z0-9_]+=[0-9]+$"
-}
-
-airsearches_check() {
-	# make sure we have all the commands we need
-	require_cmd wget || return 1
-
-	# make sure we are configured
-	if [ -z "$airsearches_url" ]
-		then
-		echo >&2 "$PROGRAM_NAME: airsearches: not configured. Please set airsearches_url='url' in $confd/airsearches.conf"
-		return 1
-	fi
-
-	# check once if the url works
-	wget 2>/dev/null -O /dev/null "$airsearches_url"
-	if [ ! $? -eq 0 ]
-	then
-		echo >&2 "$PROGRAM_NAME: airsearches: cannot fetch the url: $airsearches_url. Please set airsearches_url='url' in $confd/airsearches.conf"
-		return 1
-	fi
-
-	# if the admin did not give any commands
-	# find the available ones
-	if [ -z "$airsearches_cmds" ]
-	then
-		airsearches_cmds="$(airsearches_get | cut -d '=' -f 1 | sed "s/^airsearches_//g" | sort -u)"
-		echo
-	fi
-
-	# did we find any commands?
-	if [ -z "$airsearches_cmds" ]
-	then
-		echo >&2 "$PROGRAM_NAME: airsearches: cannot find command list automatically. Please set airsearches_cmds='...' in $confd/airsearches.conf"
-		return 1
-	fi
-
-	# ok we can do it
-	return 0
-}
-
-airsearches_create() {
-	[ -z "$airsearches_cmds" ] && return 1
-
-	# create the charts
-	local x=
-	echo "CHART airsearches.affiliates '' 'Air Searches per affiliate' 'requests / min' airsearches '' stacked 20000 $airsearches_update_every"
-	for x in $airsearches_cmds
-	do
-		echo "DIMENSION $x '' incremental 60 1"
-	done
-
-	return 0
-}
-
-airsearches_update() {
-	# the first argument to this function is the microseconds since last update
-	# pass this parameter to the BEGIN statement (see bellow).
-
-	# do all the work to collect / calculate the values
-	# for each dimension
-	# remember: KEEP IT SIMPLE AND SHORT
-
-	# get the values from airsearches
-	eval "$(airsearches_get)"
-
-	# write the result of the work.
-	local x=
-
-	echo "BEGIN airsearches.affiliates $1"
-	for x in $airsearches_cmds
-	do
-		eval "v=\$airsearches_$x"
-		echo "SET $x = $v"
-	done
-	echo "END"
-
-	airsearches_dt=0
-
-	return 0
-}
diff --git a/charts.d/crsproxy.chart.sh b/charts.d/crsproxy.chart.sh
deleted file mode 100755
index 9ad8b3382d..0000000000
--- a/charts.d/crsproxy.chart.sh
+++ /dev/null
@@ -1,151 +0,0 @@
-#!/bin/sh
-
-crsproxy_url=
-crsproxy_cmds=
-crsproxy_update_every=15
-
-crsproxy_get() {
-	wget 2>/dev/null -O - "$crsproxy_url" |\
-		sed \
-			-e "s/ \+/ /g" \
-			-e "s/\./_/g" \
-			-e "s/ =/=/g" \
-			-e "s/= /=/g" \
-			-e "s/^/crsproxy_/g" |\
-		egrep "^crsproxy_[a-zA-Z][a-zA-Z0-9_]*=[0-9]+$"
-}
-
-crsproxy_check() {
-	# make sure we have all the commands we need
-	require_cmd wget || return 1
-	
-	if [ -z "$crsproxy_url" ]
-		then
-		echo >&2 "$PROGRAM_NAME: crsproxy: not configured. Please set crsproxy_url='url' in $confd/crsproxy.conf"
-		return 1
-	fi
-
-	# check once if the url works
-	wget 2>/dev/null -O /dev/null "$crsproxy_url"
-	if [ ! $? -eq 0 ]
-	then
-		echo >&2 "$PROGRAM_NAME: crsproxy: cannot fetch the url: $crsproxy_url. Please set crsproxy_url='url' in $confd/crsproxy.conf"
-		return 1
-	fi
-
-	# if the user did not request specific commands
-	# find the commands available
-	if [ -z "$crsproxy_cmds" ]
-	then
-		crsproxy_cmds="$(crsproxy_get | cut -d '=' -f 1 | sed "s/^crsproxy_cmd_//g" | sort -u)"
-	fi
-
-	# if no commands are available
-	if [ -z "$crsproxy_cmds" ]
-	then
-		echo >&2 "$PROGRAM_NAME: crsproxy: cannot find command list automatically. Please set crsproxy_cmds='...' in $confd/crsproxy.conf"
-		return 1
-	fi
-	return 0
-}
-
-crsproxy_create() {
-	# create the charts
-	cat <<EOF
-CHART crsproxy.connected '' "CRS Proxy Connected Clients" "clients" crsproxy '' line 20000 $crsproxy_update_every
-DIMENSION web '' absolute 1 1
-DIMENSION native '' absolute 1 1
-DIMENSION virtual '' absolute 1 1
-CHART crsproxy.requests '' "CRS Proxy Requests Rate" "requests / min" crsproxy '' area 20001 $crsproxy_update_every
-DIMENSION web '' incremental 60 1
-DIMENSION native '' incremental -60 1
-CHART crsproxy.clients '' "CRS Proxy Clients Rate" "clients / min" crsproxy '' area 20010 $crsproxy_update_every
-DIMENSION web '' incremental 60 1
-DIMENSION native '' incremental -60 1
-DIMENSION virtual '' incremental 60 1
-CHART crsproxy.replies '' "CRS Replies Rate" "replies / min" crsproxy '' area 20020 $crsproxy_update_every
-DIMENSION ok '' incremental 60 1
-DIMENSION failed '' incremental -60 1
-CHART crsproxy.bconnections '' "Back-End Connections Rate" "connections / min" crsproxy '' area 20030 $crsproxy_update_every
-DIMENSION ok '' incremental 60 1
-DIMENSION failed '' incremental -60 1
-EOF
-
-	local x=
-	echo "CHART crsproxy.commands '' 'CRS Commands Requests' 'requests / min' crsproxy '' stacked 20100 $crsproxy_update_every"
-	for x in $crsproxy_cmds
-	do
-		echo "DIMENSION $x '' incremental 60 $crsproxy_update_every"
-	done
-
-	echo "CHART crsproxy.commands_failed '' 'CRS Failed Commands' 'replies / min' crsproxy '' stacked 20110 $crsproxy_update_every"
-	for x in $crsproxy_cmds
-	do
-		echo "DIMENSION $x '' incremental 60 $crsproxy_update_every"
-	done
-
-	return 0
-}
-
-
-crsproxy_update() {
-	# the first argument to this function is the microseconds since last update
-	# pass this parameter to the BEGIN statement (see bellow).
-
-	# do all the work to collect / calculate the values
-	# for each dimension
-	# remember: KEEP IT SIMPLE AND SHORT
-
-	# get the values from crsproxy
-	eval "$(crsproxy_get)"
-
-
-	# write the result of the work.
-	cat <<VALUESEOF
-BEGIN crsproxy.connected $1
-SET web = $((crsproxy_web_clients_opened - crsproxy_web_clients_closed))
-SET native = $((crsproxy_crs_clients_opened - crsproxy_crs_clients_closed))
-SET virtual = $((crsproxy_virtual_clients_opened - crsproxy_virtual_clients_closed))
-END
-BEGIN crsproxy.requests $1
-SET web = $crsproxy_web_requests
-SET native = $crsproxy_native_requests
-END
-BEGIN crsproxy.clients $1
-SET web = $crsproxy_web_clients_opened
-SET native = $crsproxy_crs_clients_opened
-SET virtual = $crsproxy_virtual_clients_opened
-END
-BEGIN crsproxy.replies $1
-SET ok = $crsproxy_replies_success
-SET failed = $crsproxy_replies_error
-END
-BEGIN crsproxy.bconnections $1
-SET ok = $crsproxy_connections_nonblocking_established
-SET failed = $crsproxy_connections_nonblocking_failed
-END
-VALUESEOF
-
-	local native_requests="_native_requests"
-	local web_requests="_web_requests"
-	local replies_error="_replies_error"
-	local x=
-
-	echo "BEGIN crsproxy.commands $1"
-	for x in $crsproxy_cmds
-	do
-		eval "v=\$(( crsproxy_cmd_$x$native_requests + crsproxy_cmd_$x$web_requests ))"
-		echo "SET $x = $v"
-	done
-	echo "END"
-
-	echo "BEGIN crsproxy.commands_failed $1"
-	for x in $crsproxy_cmds
-	do
-		eval "v=\$crsproxy_cmd_$x$replies_error"
-		echo "SET $x = $v"
-	done
-	echo "END"
-
-	return 0
-}