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

Limit MAXLOGAGE to 24h, just like FTL #2105

Merged
merged 2 commits into from Jan 31, 2022
Merged

Limit MAXLOGAGE to 24h, just like FTL #2105

merged 2 commits into from Jan 31, 2022

Conversation

rdwebdesign
Copy link
Member

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?:

Fix #1825.

If MAXLOGAGE is set inside pihole-FTL.conf to anything greater than 24, it is already limited by FTL (and the graphic is limited to 24 hours), but the graphic title shown on the dashboard is using the wrong (not limited) value.

How does this PR accomplish the above?:

Limiting the interval for the dashboard graphic title to a maximum of 24 hours, since FTL already limits this value.

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

I think this was already changed in the docs.

Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>
index.php Outdated Show resolved Hide resolved
Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>
@yubiuser yubiuser changed the title Limit MAXLOGAGE, just like FTL Limit MAXLOGAGE to 24h, just like FTL Jan 31, 2022
@yubiuser yubiuser merged commit 47c015d into devel Jan 31, 2022
@yubiuser yubiuser deleted the fix_MAXLOGAGE branch January 31, 2022 20:54
@yubiuser yubiuser linked an issue Jan 31, 2022 that may be closed by this pull request
@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

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.

Bar graphs on main admin page state 72 hours but each shows only 24
4 participants