Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-04 20:13:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove unneeded functions

Browse source
This commit is contained in:
Tommy Huff 2016-10-21 20:15:24 -04:00
parent cb8bfa06e7
commit f1b8095f18
1 changed files with 5 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
advanced/Scripts/chronometer.sh
View file

@ -30,37 +30,11 @@ gravity="/etc/pihole/gravity.list"
today=$(date "+%b %e") today=$(date "+%b %e")
IPv4_address=$(echo "${IPv4_address}" | cut -d"/" -f1) IPv4_address=$(echo "${IPv4_address}" | cut -d"/" -f1)
CalcBlockedDomains() {
if [ -e "${gravity}" ]; then
blockedDomainsTotal=$(pihole stats list)
else
blockedDomainsTotal="Err."
fi
}
CalcQueriesToday() {
if [ -e "${piLog}" ];then
queriesToday=$(pihole stats hits)
else
queriesToday="Err."
fi
}
CalcblockedToday() {
if [ -e "${piLog}" ] && [ -e "${gravity}" ];then
blockedToday=$(pihole stats blocked)
else
blockedToday="Err."
fi
}
CalcPercentBlockedToday() { CalcPercentBlockedToday() {
if [ "${queriesToday}" != "Err." ] && [ "${blockedToday}" != "Err." ]; then if [ "${queriesToday}" != "Err." ] && [ "${blockedToday}" != "Err." ]; then
if [ "${queriesToday}" != 0 ]; then #Fixes divide by zero error :) if [ "${queriesToday}" != 0 ]; then #Fixes divide by zero error :)
#scale 2 rounds the number down, so we'll do scale 4 and then trim the last 2 zeros #scale 2 rounds the number down, so we'll do scale 4 and then trim the last 2 zeros
percentBlockedToday=$(echo "scale=4; ${blockedToday}/${queriesToday}*100" | bc) percentBlockedToday=$(echo "scale=4; $(pihole stats blocked)/$(pihole stats hits)*100" | bc)
percentBlockedToday=$(sed 's/.\{2\}$//' <<< "${percentBlockedToday}") percentBlockedToday=$(sed 's/.\{2\}$//' <<< "${percentBlockedToday}")
else else
percentBlockedToday=0 percentBlockedToday=0
@ -69,12 +43,8 @@ CalcPercentBlockedToday() {
} }
outputJSON() { outputJSON() {
CalcQueriesToday
CalcblockedToday
CalcPercentBlockedToday CalcPercentBlockedToday
CalcBlockedDomains printf '{"domains_being_blocked":"%s","dns_queries_today":"%s","ads_blocked_today":"%s","ads_percentage_today":"%s"}\n' "$(pihole stats list)" "$(pihole stats hits)" "$(pihole stats blocked)" "${percentBlockedToday}"
printf '{"domains_being_blocked":"%s","dns_queries_today":"%s","ads_blocked_today":"%s","ads_percentage_today":"%s"}\n' "${blockedDomainsTotal}" "${queriesToday}" "${blockedToday}" "${percentBlockedToday}"
} }
normalChrono() { normalChrono() {
@ -103,15 +73,11 @@ normalChrono() {
#todaysQueryCountV6=$(cat /var/log/pihole.log | grep "$today" | awk '/query/ && /\[AAAA\]/ {print $7}' | wc -l) #todaysQueryCountV6=$(cat /var/log/pihole.log | grep "$today" | awk '/query/ && /\[AAAA\]/ {print $7}' | wc -l)
CalcQueriesToday
CalcblockedToday
CalcPercentBlockedToday CalcPercentBlockedToday
CalcBlockedDomains echo "Blocking: $(pihole stats list)"
echo "Queries: $(pihole stats hits)" #same total calculation as dashboard
echo "Blocking: ${blockedDomainsTotal}" echo "Pi-holed: $(pihole stats blocked) ($percentBlockedToday%)"
echo "Queries: ${queriesToday}" #same total calculation as dashboard
echo "Pi-holed: $blockedToday ($percentBlockedToday%)"
sleep 5 sleep 5
done done