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 others section to upstream servers pie chart #1284

Merged
merged 3 commits into from
Jan 21, 2022

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Jan 19, 2022

By submitting this pull request, I confirm the following:

  • I have read and understood the contributors guide.
  • I have checked that another pull request for this purpose does not exist.
  • I have considered, and confirmed that this submission will be valuable to others.
  • I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  • I give this submission freely, and claim no ownership to its content.

How familiar are you with the codebase?:

10


There are queries which are neither sent upstream nor are they cached or blocked. These are incorrectly ignored in the upstream server pie chart leading to a mismatch of the blocked percentage compared to the value reported at the top. Even when both are correct (their difference is caused by different reference frames), this is confusing. To compensate, we add a new type other which summarizes all these queries, causing the two reference frames to be identical.

Signed-off-by: DL6ER <dl6er@dl6er.de>
Copy link
Member

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to add something here:

FTL/src/api/api.c

Lines 723 to 726 in 7387e81

if(strcmp(forwarddest, "cache") == 0)
forwarddestid = -1;
else if(strcmp(forwarddest, "blocklist") == 0)
forwarddestid = -2;

Clicking on the new upstream "other" opens the query log but no queries are found.

@yubiuser
Copy link
Member

If adding "-3" here: I promised Promo pi-hole/web#1594

@DL6ER
Copy link
Member Author

DL6ER commented Jan 19, 2022

This shouldn't make any difference, the order is not changed. Other will use the color the first upstream had before, the first upstream gets the color for the former seconds, etc.

@DL6ER DL6ER force-pushed the tweak/upstream_pie_others branch from 69cdfe9 to 36ffc48 Compare January 19, 2022 21:26
@DL6ER DL6ER requested a review from yubiuser January 20, 2022 18:16
src/api/api.c Outdated Show resolved Hide resolved
DL6ER added 2 commits January 21, 2022 04:39
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER force-pushed the tweak/upstream_pie_others branch from 4679459 to 6a11211 Compare January 21, 2022 03:43
@DL6ER DL6ER merged commit ae5247a into development Jan 21, 2022
@DL6ER DL6ER deleted the tweak/upstream_pie_others branch January 21, 2022 03:47
@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/pi-hole-ftl-v5-14-web-v5-11-and-core-v5-9-released/53529/1

@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/wrong-percent-calculation-in-pie-chart-v2/53599/5

@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/getting-other-on-upstream-server-list-after-update-to-the-latest-version/53753/4

@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/plotzlich-ein-unbekannter-upstream-server-im-dashboard/60623/2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants