Commit graph

328 commits

Author SHA1 Message Date
Mcat12
bfb99c361c
Note that the gravity size does not include the blacklist entries
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-21 17:12:47 -07:00
Mcat12
5796054305
Increase ID column width to 4
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-20 21:59:18 -07:00
Mcat12
a3e1473ac1
Set explicit column widths to prevent text from getting cut off
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-20 21:33:09 -07:00
Mcat12
7b5fc60e00
Improve table formatting
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-20 21:20:38 -07:00
Mcat12
807ce0af4e
Show whitelist, blacklist, and regexlist details
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-20 21:15:22 -07:00
Mcat12
3f05efd60f
Add extra newline
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-20 21:02:31 -07:00
Mcat12
03d93aa19a
Update debug script with gravity DB changes
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-05-20 20:58:57 -07:00
Dan Schaper
5532df24e4
Pi-hole Debug - tricorder upload function calls
Fix tricorder upload function calls to use new curl function.
2019-05-03 02:46:27 -07:00
Dan Schaper
71cd6c137b Use curl instead of openssl for transmission of unmodified
log file. We want ansi color codes to be sent.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2019-02-23 04:13:44 -08:00
Adam Warner
a145f1d931
Be more verbose with debug script output
If output of `git status -s` is non-null display changes
if output of `git diff` is non-null, display diff

Signed-off-by: Adam Warner <adamw@rner.email>
2019-02-18 22:32:53 +00:00
Mcat12
26f2410fe6
Change /var/run/shm to /dev/shm
The /var directory may not exist (does not exist on Fedora 29), and is
simply a symlink to /dev/shm.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-02-02 10:37:12 -08:00
DL6ER
5ffc8c7443
List content of /var/run/shm in debugger
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-01-01 17:56:02 +01:00
Mcat12
9d59da8974
Remove dnsmasq checks from debugger
This also fixes an issue where the port checks weren't running
(`compare_port_to_service_assigned`).

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-11-08 21:51:21 -05:00
Mark Drobnak
bbb759c684
Merge pull request #2477 from bcambl/debug_init_service_check
fix debug service check via sysvinit
2018-11-07 17:50:32 -05:00
Adam Warner
d57f9906bd
read -r -a, not read -a -r
Signed-off-by: Adam Warner <adamw@rner.email>
2018-10-26 19:24:43 +01:00
bcambl
3ec84553ef fix debug service check via sysvinit
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-10-24 10:06:11 -06:00
mrmajik45
0f509f4a34
Update piholeDebug.sh 2018-09-28 17:22:31 -04:00
mrmajik45
00f98543ad
read without -r will mangle backslashes. 2018-09-26 10:32:22 -04:00
Mcat12
03e5a78d8f
Merge remote-tracking branch 'origin/FTLDNS' into development
# Conflicts:
#	advanced/Scripts/piholeDebug.sh
2018-07-22 15:18:26 -04:00
Dan Schaper
ba7782f867
Space/Tab piholeDebug.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-20 15:25:35 -07:00
Mcat12
868948509a
Split declaration and assignment of random_url
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-06-20 20:30:42 -04:00
Mark Drobnak
e71492a2b3
Update debug script for simple list format
Gravity is now just a list of domains, not IP addresses and domains separated by a space.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-06-20 20:29:32 -04:00
Mark Drobnak
9fd70cbdf9
Merge pull request #2057 from pi-hole/fix/debug-empty-ports
debug script: fix empty ports on some systems
2018-05-30 21:48:53 -04:00
Mark Drobnak
f568012b9d
Merge pull request #2070 from pi-hole/new/debug-locale
Get user locale when debugging
2018-05-14 16:43:05 -04:00
Adam Warner
6977f655e3
fix a typo
comment out some unused variables, but not deleting them in case there is a plan for them in future...

Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-15 22:08:55 +01:00
Adam Warner
e6fc9dc75d
disable 2016 in two places and declare local variables
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-15 22:00:14 +01:00
Adam Warner
b57b3f4588
Disable SC2001 for generation of the_os
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-15 21:36:50 +01:00
Adam Warner
776ae92416
fix some shellcheck/stickler compaints in debug script
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-15 21:33:10 +01:00
Mark Drobnak
d4870b3854
Merge pull request #2053 from pi-hole/tweak/debug-logs
Get head and tail of pihole-FTL.log during debug process
2018-04-15 14:23:25 -04:00
Jacob Salmela
5ffc3561ed
implement dschapers suggestions--better command, less subshells, and finer formatting
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
2018-04-11 20:35:51 -05:00
Dan Schaper
250b445eee
Split declaration and population for stickler.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-04-10 21:37:04 -07:00
Mark Drobnak
bb9a18ef08
Merge pull request #1987 from ryanknapper/patch-1
Proper output for debug CPU detection
2018-04-02 00:00:14 -04:00
Jacob Salmela
1a275ba184
debug user locale; improve function to parse variables and files
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
2018-04-01 06:40:48 -05:00
Jacob Salmela
68c27eb2a1
add label to x-header so you know which one is being evaluated
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
2018-03-25 21:27:40 -05:00
Jacob Salmela
143e75d213
fix empty ports on some systems
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
2018-03-25 09:39:29 -05:00
Jacob Salmela
d9d3caec22
new head tail function and get head tail of pihole-FTL.log instead of just head
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
2018-03-23 06:56:40 -05:00
Jacob Salmela
7159ecb632
reduce ping times for faster script completion
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
2018-03-23 00:11:21 -05:00
Ryan Knapper
c17d95bfed
Proper output for debug CPU detection
Inserted "log_write" to properly output CPU detection lines.

Signed-off-by: Ryan Knapper (ryanknapper@gmail.com>
2018-02-19 10:22:28 -05:00
Vasilis Gerakaris
939806f021
piholeDebug.sh: Correct typo mistake
Signed-off-by: Vasilis Gerakaris <vgerak@gmail.com>

**By submitting this pull request, I confirm the following:** 
`{please fill any appropriate checkboxes, e.g: [X]}`

- [x] I have read and understood the [contributors guide](https://github.com/pi-hole/pi-hole/blob/master/CONTRIBUTING.md), as well as this entire template.
- [x] I have made only one major change in my proposed changes.
- [] I have commented my proposed changes within the code.
- [] I have tested my proposed changes, and have included unit tests where possible.
- [] I am willing to help maintain this change if there are issues with it later.
- [x] I give this submission freely and claim no ownership.
- [x] It is compatible with the [EUPL 1.2 license](https://opensource.org/licenses/EUPL-1.1)
- [x] I have squashed any insignificant commits. ([`git rebase`](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html))
2018-01-12 02:17:31 +02:00
Adam Warner
8e0d76b63b
initiated -> initialized
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-24 13:26:32 +00:00
Jacob Salmela
28bed0041e
remove comment
Signed-off-by: Jacob Salmela <github@decoy.email>
2017-12-08 18:29:28 -06:00
Jacob Salmela
6f03e30151
fixes #1537 by checking if systemctl is found
Signed-off-by: Jacob Salmela <github@decoy.email>
2017-12-08 18:23:55 -06:00
Adam Warner
a9a40ca46c
Useless cat. Consider 'cmd < file | ..' or 'cmd file | ..' instead.
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 23:27:40 +00:00
bcambl
0f868f7649 remove un-used DONE variable
(still available via sourced COL_TABLE on line 29)
2017-10-19 22:57:07 -06:00
bcambl
31730e7197 add missing colors to COL_TABLE fallback 2017-10-13 09:14:19 -06:00
bcambl
7d76db00ac update 'SELinux not detected' message 2017-10-13 08:58:35 -06:00
bcambl
8aceb8bf53 replace deprecated colors in debug script
- COL_LIGHT_GREEN  -> COL_GREEN
 - COL_LIGHT_RED    -> COL_RED
 - COL_LIGHT_PURPLE -> COL_PURPLE
2017-10-12 23:33:28 -06:00
bcambl
a17d1be7a4 simplify selinux debug variables 2017-10-12 23:24:02 -06:00
bcambl
1e6cc63abe add SELinux checking to debug script 2017-10-12 20:55:14 -06:00
Adam Warner
7d56e2a937
FTL has an L in it, innit?
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-14 20:54:41 +01:00
Jacob Salmela
e1f818ffb7 Tweak/debug improvements (#1585)
* check for CIDR notation when comparing IPv6 address to that found in setupVars.conf

* highlight bad address entries in pihole.log and reference a corresponding FAQ

* show header output if Pi-holes x-header does not match

* fix automated mode when running from the dashboard.  It would previously not automatically upload and generate a token.

* show disclaimer message

* undocumented feature for now: obfuscate domains in pihole.log so they are not visible when sent to the Pi-hole developers.  We need to make an additonal flag for this in the pihole command.  if the variable OBFUSCATE has a value, it will replace the domain in the log with a placeholder value

* fix small typo in the disclaimer
2017-07-14 16:53:45 +01:00
Jacob Salmela
05a724afae
codacy appeasement: remove useless cats 2017-06-29 11:49:28 -05:00
Jacob Salmela
1957b002bc
add comments about X-Headers and further explain the file descriptor cod. 2017-06-29 11:37:58 -05:00
Jacob Salmela
04cef25add
remove color character codes before uploading so the log is more readable on our plaintext tricorder server 2017-06-29 11:17:19 -05:00
Jacob Salmela
22fac5e1e0
additional shellcheck fixes 2017-06-26 22:03:45 -05:00
Jacob Salmela
b6a2a4ad5a
more shellcheck fixes 2017-06-26 21:51:41 -05:00
Jacob Salmela
5f00347019
appease shellcheck by removing two unneccesary functions and making some if/else blocks 2017-06-26 21:34:39 -05:00
Jacob Salmela
fc0440546f
add functions to parse head and tails of gravity.list and pihole.log 2017-06-10 23:20:27 -05:00
Jacob Salmela
172b8d2427
parse ftl log 2017-06-10 22:18:33 -05:00
Jacob Salmela
6d10a498a5
implement a limit on how many lines of a file we want to view 2017-06-10 21:57:17 -05:00
Jacob Salmela
881819ed5f
ignore big files we dont need to know about; also fix diagnosing pihole processes 2017-06-10 18:37:28 -05:00
Jacob Salmela
3275c5f710
more comments to help understand the script 2017-06-10 15:54:27 -05:00
Jacob Salmela
b0cc1a38c3
adjust minor formatting for better readability 2017-06-10 15:28:04 -05:00
Jacob Salmela
e10182c839
only parse files required by Pi-hole 2017-06-10 12:27:05 -05:00
Jacob Salmela
b4f1fe08f0
variablize all files and directories. also put required files and folders into an arry so we can compare them in later functions by parsing through them 2017-06-09 23:22:37 -05:00
Jacob Salmela
64171fa2a1
small color and formatting changes 2017-06-09 15:42:54 -05:00
Jacob Salmela
048eacd305
parse array in correct location 2017-06-07 12:31:08 -05:00
Jacob Salmela
24aa72c19d
condense repetative code into functions; parse the content of each file 2017-06-07 12:25:00 -05:00
Jacob Salmela
92b5fe4be4
check arch compatibility and add gateway faq url 2017-06-05 14:55:58 -05:00
Jacob Salmela
8b4c0b456b
exclude webpassword from being uploaded. also check that the IP addresses detected match those defined in setupVars.conf 2017-06-01 01:15:11 -05:00
Jacob Salmela
02a601deff
comment out dir checks for lighttpd, cronm and http as they have a lot of other files that need parsing through. May need to increase the logic there if this is information we really need to know. 2017-06-01 00:19:15 -05:00
Jacob Salmela
b207fadc04
check if os is supported based on pretty name 2017-06-01 00:18:06 -05:00
Jacob Salmela
d51c067e1b
change some verbiage; new function to compare the ports in use to the services assigned to them. 2017-05-27 21:21:18 -05:00
Jacob Salmela
2fea5d428d
condense repetitive code into functions 2017-05-27 15:47:15 -05:00
Jacob Salmela
d51e0c49b1
remove comments and blank lines when parsing files 2017-05-27 13:44:33 -05:00
Jacob Salmela
36907edd50
parse contents of each file in each dir, several log_writes 2017-05-27 00:04:42 -05:00
Jacob Salmela
7ec169ab10
more comments, fixed automated tricorder, variablizing echos, verify FTL version 2017-05-26 22:05:50 -05:00
Jacob Salmela
7873da1ae5
more colors. shortened dig timeouts 2017-05-26 15:17:26 -05:00
Jacob Salmela
ef5a6e7880
add faq urls to some functions, added more colors, also use a static url for remote digs 2017-05-26 14:26:02 -05:00
Jacob Salmela
96f01e670f
add functions to write to console and log at the same time 2017-05-26 12:16:22 -05:00
Jacob Salmela
5902be2a49
comments for every line 2017-05-24 22:07:15 -05:00
Jacob Salmela
cc946ce068
upload to tricorder functions 2017-05-24 21:11:15 -05:00
Jacob Salmela
1102fdc44b
append everything the user sees to the pihole_debug.log file 2017-05-24 20:24:23 -05:00
Jacob Salmela
c995c81fff
adjust some spacing 2017-05-24 19:36:06 -05:00
Jacob Salmela
6684af9938
add lighttpd list function and gravity analysis 2017-05-24 18:31:55 -05:00
Jacob Salmela
8bafd12f95
fix resolver functions and add x-header function 2017-05-24 16:10:14 -05:00
Jacob Salmela
76266cf31b
add resolver functions and check directory content functions 2017-05-24 15:29:31 -05:00
Jacob Salmela
1a87d3a659
add process check function 2017-05-23 22:57:22 -05:00
Jacob Salmela
085f2c6ca0
add port check function 2017-05-23 22:32:30 -05:00
Jacob Salmela
b74300f67c
add ping internet function and fix some spacing issues 2017-05-22 12:57:55 -05:00
Jacob Salmela
107babe8f4
add ping gateway function 2017-05-22 12:35:57 -05:00
Jacob Salmela
8fd9a22d18
add detect IP function 2017-05-22 12:05:42 -05:00
Jacob Salmela
8c5c1316dd
add php version and processor check functions 2017-05-22 08:48:56 -05:00
Jacob Salmela
daff5d8b5a
add critical dependencies version check functions 2017-05-22 03:05:51 -05:00
Jacob Salmela
6c4a7b626e
add pihole version check functions 2017-05-22 02:39:00 -05:00
Jacob Salmela
1aa5943e67
add if directory exists function 2017-05-22 01:06:15 -05:00
Jacob Salmela
69fe889f92
comments for all lines and small formatting changes 2017-05-21 23:25:53 -05:00
Jacob Salmela
5d7ef9281f
get just the OS pretty name for Dan 2017-05-20 02:01:56 -05:00
Jacob Salmela
6fa00e7cc8
first functions with pretty colors. check OS, setupVars, and contents of .d dirs 2017-05-20 01:34:13 -05:00
Dan Schaper
501b26decd Log and echo gateway responses 2017-05-10 22:08:06 -07:00
DL6ER
30dcf6ff47
Include pihole-FTL.log in debug report 2017-05-02 09:18:58 +02:00
Dan Schaper
2740c68a63 Merge pull request #1335 from pi-hole/tweak/debug_templog
Debugging tweaks for temporary logfiles
2017-03-16 23:35:15 -07:00
Dan Schaper
b1f769b671
Output cleaning, IP stack check headers.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-15 23:50:29 -07:00
Dan Schaper
77378da70a
Cat out temp files to final log.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-15 23:43:41 -07:00
Dan Schaper
160030b75f
Quiet systemctl output to just the current daemon status.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-15 23:27:18 -07:00
Dan Schaper
0a0c3a2fb7
Copy working temp to final location.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-15 23:20:12 -07:00
Dan Schaper
e9f1ca338f
Create temp files for working storage, log to working storage temps.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-15 22:49:47 -07:00
Adam Warner
cfaf1ac67c
add check on file_parse to not include WEBPASSWORD= in the debug log 2017-03-15 18:59:41 +00:00
Dan Schaper
d1e0f3ae18 Merge pull request #1294 from pi-hole/tweak/debugDNS
Tweak DNS debugging
2017-03-06 05:50:37 -08:00
Dan Schaper
512c650441
Shellchecking.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 19:07:55 -08:00
Dan Schaper
dc44fc9e27
Version check amalgamation and removal of && || logic.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 17:54:38 -08:00
Dan Schaper
6f2fb57c08
Protocol specific records checks.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 15:16:33 -08:00
Dan Schaper
2547cc4c8d
Only run IPv6 if enabled, split out Chaos TXT checks.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 15:06:34 -08:00
DL6ER
9f4ef66f41
Add IPv6 resolver test 2017-03-04 22:38:52 +01:00
DL6ER
086f0790fc
Add Google's IPv6 address for potential IPv6 resolver tests 2017-03-04 22:31:18 +01:00
Dan Schaper
709b44f736
IPv4 DNS tests
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 12:16:43 -08:00
Dan Schaper
6cd4ff6d68
Organize functions and function calls.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-04 12:16:32 -08:00
DL6ER
66b7d04b82
Merge branch 'development' into new/FTL-binary 2017-03-01 12:42:48 +01:00
Dan Schaper
83b0600863
Carriage return or newline based webcalls.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-27 11:03:57 -08:00
Dan Schaper
6c130b7960
Vebiage and highligh the token, also :::
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-27 10:27:11 -08:00
Dan Schaper
7244d44a1d
Notify user that log is being uploaded.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-27 10:02:00 -08:00
Dan Schaper
9b060aab34
Debug auto mode engaged
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-26 18:22:06 -08:00
Jacob Salmela
7a1a2dec67
update license to EUPL on core files 2017-02-22 11:55:20 -06:00
DL6ER
a64211123f
Some debug additions 2017-02-21 16:46:54 +01:00
Dan Schaper
053b38e0bd
Set up for IP matching in detection. 2017-02-16 19:45:44 -08:00
Dan Schaper
2aa3a109a0
Ping gateways and Internet. 2017-02-16 18:38:05 -08:00
Dan Schaper
472708376d
Split out IP checks. 2017-02-16 18:30:15 -08:00
Dan Schaper
cfed3d59e9
Begin fixing IP detection functions. 2017-02-16 16:49:14 -08:00
DL6ER
af8e629df4 Merge pull request #1239 from pi-hole/tweak/debug48h
Change description as we want to save the debug log for 48h instead of only 24h
2017-02-10 20:46:12 +01:00
DL6ER
01f980d49c
Change description as we want to save the debug log for 48h instead of only 24h 2017-02-10 17:45:20 +01:00
DL6ER
99fab7e52a
Scan whole dnsmasq.d directory for cofigurations files 2017-02-10 17:42:37 +01:00
Promofaux
fe8c365d17 codacy never lies 2017-01-22 20:53:30 +00:00
Promofaux
9acc3aac01 pipe du -h output to awk to ensure we only get the file size, and not the filename too. Yeah that's right Dom, pipe. 2017-01-22 20:44:07 +00:00
Promofaux
1ad23a065e switch out wc -l with grep -c ^ 2017-01-22 20:38:46 +00:00
Promofaux
de102fde5c Add line count and size check for pihole.log 2017-01-22 20:38:09 +00:00
DL6ER
74a4e62cc9
Codacy fix 2017-01-08 11:26:56 +01:00
DL6ER
63a414a544
Align outputs 2017-01-08 11:21:50 +01:00
DL6ER
7d1f5091a7
Fixed small typo 2017-01-08 11:21:10 +01:00
DL6ER
3b54cab3bc
Show branches and revisions (incl. possible dirty state) in debug log 2017-01-08 11:17:25 +01:00
Dan Schaper
68cb0782c0 Add countdown timer 2016-11-18 13:27:06 -08:00
Dan Schaper
0f4c8d4923 Set default timeout to 60 seconds 2016-11-17 11:00:11 -08:00
Dan Schaper
6d2c5b2312 Add debug timeoute 2016-11-17 10:58:58 -08:00
Dan Schaper
a95ce11ca6 Add debug timeoute 2016-11-17 10:39:51 -08:00
Adam Warner
b191cd73a7 Update piholeDebug.sh
wording
2016-11-15 13:28:18 +00:00
Dan Schaper
dcf6e6b14d Clarify user action required to end the scripts. 2016-10-29 12:24:22 -07:00
Dan Schaper
908697a963 User token instructions, and small bugfix for missing separator. 2016-10-29 12:04:18 -07:00
Dan Schaper
fad2d6b1d1 Return values start showin up now. Logic operators too... 2016-10-28 15:53:18 -07:00
Dan Schaper
9cd830b6aa Start to refine tests and clean up code. 2016-10-28 15:37:45 -07:00
Dan Schaper
d9a16b0ff4 Clear up bottom half of script with fewer redundenicies. 2016-10-28 15:25:06 -07:00
Dan Schaper
cb5c94ef5e Sorry, left that gravity.list parser in. Big debug files. Cleared that up. 2016-10-28 15:13:04 -07:00