Navigation Menu

Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add "Top Clients (blocked)" table #745

Merged
merged 5 commits into from May 11, 2018
Merged

Add "Top Clients (blocked)" table #745

merged 5 commits into from May 11, 2018

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented May 10, 2018

By submitting this pull request, I confirm the following:

  • I have read and understood the contributors guide, as well as this entire template.
  • 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.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)
  • I have Signed Off all commits. (git commit --signoff)

What does this PR aim to accomplish?:

Add a fourth table listing the number of blocked queries per client:
screenshot-2018-5-10 pi-hole admin console

Note that this is a feature request from Discourse.

How does this PR accomplish the above?:

  • Add new API endpoint api.php?topClientsBlocked
  • Add new table to dashboard
  • Extend existing "Top Clients" table JS code to also treat the new table (we get both datasets in one query). This is duplicating the functionality we already have for the other two tables (Top Domains/Top Ads) which basically follow the same logic.

What documentation changes (if any) are needed to support this PR?:

None

DL6ER added 2 commits May 10, 2018 15:05
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/top-blocked-domains-per-client/5055/6

@DL6ER DL6ER changed the title New/top clients blocked Add "Top Clients (blocked)" table May 10, 2018
Signed-off-by: DL6ER <dl6er@dl6er.de>
@pi-hole pi-hole deleted a comment May 10, 2018
Signed-off-by: DL6ER <dl6er@dl6er.de>
@pi-hole pi-hole deleted a comment May 10, 2018
…d not total number of queries

Signed-off-by: DL6ER <dl6er@dl6er.de>
@pi-hole pi-hole deleted a comment May 10, 2018
@pi-hole pi-hole deleted a comment May 10, 2018
@PromoFaux
Copy link
Member

PromoFaux commented May 10, 2018

This doesn't appear to be working for me... Do I need to the relevant version of FTL time to propogate the block counter?

Never mind, pihole-FTL process got stuck somehow on my pi. Could not stop or restart it. Reboot of pi sorted that out and now the tables look right:

image

Approved pending merge of pi-hole/FTL#275

@DL6ER DL6ER merged commit 9c4ee93 into devel May 11, 2018
@DL6ER DL6ER deleted the new/top_clients_blocked branch May 11, 2018 14:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants