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

Acknowledge possible custom time interval #811

Merged
merged 1 commit into from Aug 8, 2018

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Aug 8, 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?:

We currently show a static text "Queries over last 24 hours". However, a user might use MAXLOGAGE to change the interval of shown data to 48 hours or even more. In this case, the title of the graph should be reflecting this.

How does this PR accomplish the above?:

We try to obtain the correct value from /etc/pihole-FTL.conf. If this is not possible (because it is not set), we default to show "24 hours" in agreement with the default setting FTL uses in this case.

…FTL.conf

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER requested a review from a team August 8, 2018 08:39
@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/regex-wildcard-blocking-nach-update-auf-4-0/11521/21

@DL6ER DL6ER merged commit 2db2d1f into devel Aug 8, 2018
@DL6ER DL6ER deleted the tweak/dashboard_displayed_time_interval branch August 8, 2018 19:04
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.

None yet

3 participants