From baf5340dc0aa9344216c1c8eba589ca15888a10d Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Wed, 12 Feb 2020 19:39:12 +0100
Subject: [PATCH 1/3] Show info table instead of counting domains to speed up
the debugging process on low-end hardware drastically.
Signed-off-by: DL6ER <dl6er@dl6er.de>
---
advanced/Scripts/piholeDebug.sh | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/advanced/Scripts/piholeDebug.sh b/advanced/Scripts/piholeDebug.sh
index 76a409f9..0a256a97 100755
--- a/advanced/Scripts/piholeDebug.sh
+++ b/advanced/Scripts/piholeDebug.sh
@@ -1134,16 +1134,14 @@ analyze_gravity_list() {
gravity_permissions=$(ls -ld "${PIHOLE_GRAVITY_DB_FILE}")
log_write "${COL_GREEN}${gravity_permissions}${COL_NC}"
- local gravity_size
- gravity_size=$(sqlite3 "${PIHOLE_GRAVITY_DB_FILE}" "SELECT COUNT(*) FROM vw_gravity")
- log_write " Size (excluding blacklist): ${COL_CYAN}${gravity_size}${COL_NC} entries"
+ show_db_entries "Info table" "SELECT property,value FROM info" "20 40"
log_write ""
OLD_IFS="$IFS"
IFS=$'\r\n'
local gravity_sample=()
mapfile -t gravity_sample < <(sqlite3 "${PIHOLE_GRAVITY_DB_FILE}" "SELECT domain FROM vw_gravity LIMIT 10")
- log_write " ${COL_CYAN}----- First 10 Domains -----${COL_NC}"
+ log_write " ${COL_CYAN}----- First 10 Gravity Domains -----${COL_NC}"
for line in "${gravity_sample[@]}"; do
log_write " ${line}"
From 50f6fffbdc31252ae25e494398134d02a79bb57d Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Wed, 12 Feb 2020 19:43:55 +0100
Subject: [PATCH 2/3] Migrate debugger to domainlist and add printing of client
table.
Signed-off-by: DL6ER <dl6er@dl6er.de>
---
advanced/Scripts/piholeDebug.sh | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/advanced/Scripts/piholeDebug.sh b/advanced/Scripts/piholeDebug.sh
index 0a256a97..c778995d 100755
--- a/advanced/Scripts/piholeDebug.sh
+++ b/advanced/Scripts/piholeDebug.sh
@@ -1113,18 +1113,14 @@ show_adlists() {
show_db_entries "Adlist groups" "SELECT * FROM adlist_by_group" "4 4"
}
-show_whitelist() {
- show_db_entries "Exact whitelist" "SELECT id,domain,enabled,datetime(date_added,'unixepoch','localtime') date_added,datetime(date_modified,'unixepoch','localtime') date_modified,comment FROM whitelist" "4 100 7 19 19 50"
- show_db_entries "Exact whitelist groups" "SELECT * FROM whitelist_by_group" "4 4"
- show_db_entries "Regex whitelist" "SELECT id,domain,enabled,datetime(date_added,'unixepoch','localtime') date_added,datetime(date_modified,'unixepoch','localtime') date_modified,comment FROM regex_whitelist" "4 100 7 19 19 50"
- show_db_entries "Regex whitelist groups" "SELECT * FROM regex_whitelist_by_group" "4 4"
+show_domainlist() {
+ show_db_entries "Domainlist (0/1 = exact/regex whitelist, 2/3 = exact/regex blacklist)" "SELECT id,type,domain,enabled,datetime(date_added,'unixepoch','localtime') date_added,datetime(date_modified,'unixepoch','localtime') date_modified,comment FROM domainlist" "4 4 100 7 19 19 50"
+ show_db_entries "Domainlist groups" "SELECT * FROM domainlist_by_group" "10 10"
}
-show_blacklist() {
- show_db_entries "Exact blacklist" "SELECT id,domain,enabled,datetime(date_added,'unixepoch','localtime') date_added,datetime(date_modified,'unixepoch','localtime') date_modified,comment FROM blacklist" "4 100 7 19 19 50"
- show_db_entries "Exact blacklist groups" "SELECT * FROM blacklist_by_group" "4 4"
- show_db_entries "Regex blacklist" "SELECT id,domain,enabled,datetime(date_added,'unixepoch','localtime') date_added,datetime(date_modified,'unixepoch','localtime') date_modified,comment FROM regex_blacklist" "4 100 7 19 19 50"
- show_db_entries "Regex blacklist groups" "SELECT * FROM regex_blacklist_by_group" "4 4"
+show_clients() {
+ show_db_entries "Clients" "SELECT id,ip,datetime(date_added,'unixepoch','localtime') date_added,datetime(date_modified,'unixepoch','localtime') date_modified,comment FROM client" "4 100 19 19 50"
+ show_db_entries "Client groups" "SELECT * FROM client_by_group" "10 10"
}
analyze_gravity_list() {
@@ -1299,9 +1295,9 @@ parse_setup_vars
check_x_headers
analyze_gravity_list
show_groups
+show_domainlist
+show_clients
show_adlists
-show_whitelist
-show_blacklist
show_content_of_pihole_files
parse_locale
analyze_pihole_log
From eadd82761c97c6e10ec327871d557dc76f67be59 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Wed, 12 Feb 2020 19:51:40 +0100
Subject: [PATCH 3/3] Add human-readable output of time of the last gravity
run.
Signed-off-by: DL6ER <dl6er@dl6er.de>
---
advanced/Scripts/piholeDebug.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/advanced/Scripts/piholeDebug.sh b/advanced/Scripts/piholeDebug.sh
index c778995d..b0af3a40 100755
--- a/advanced/Scripts/piholeDebug.sh
+++ b/advanced/Scripts/piholeDebug.sh
@@ -1131,6 +1131,9 @@ analyze_gravity_list() {
log_write "${COL_GREEN}${gravity_permissions}${COL_NC}"
show_db_entries "Info table" "SELECT property,value FROM info" "20 40"
+ gravity_updated_raw="$(sqlite3 "${PIHOLE_GRAVITY_DB_FILE}" "SELECT value FROM info where property = 'updated'")"
+ gravity_updated="$(date -d @${gravity_updated_raw})"
+ log_write " Last gravity run finished at: ${COL_CYAN}${gravity_updated}${COL_NC}"
log_write ""
OLD_IFS="$IFS"