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

Fix webserver.api.maxHistory usage in API #2275

Merged
merged 2 commits into from
Feb 24, 2025
Merged

Fix webserver.api.maxHistory usage in API #2275

merged 2 commits into from
Feb 24, 2025

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Feb 24, 2025

What does this implement/fix?

Data returned by the API for over-time statistics should not return more than specified in webserver.api.maxHistory

Example: webserver.api.maxHistory = 3600

Before

Screenshot from 2025-02-24 19-35-16

Now

Screenshot from 2025-02-24 19-45-16


Related issue or feature (if applicable): pi-hole/web#3255

Pull request in docs with documentation (if applicable): N/A


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

…ore than specified in webserver.api.maxHistory

Signed-off-by: DL6ER <[email protected]>
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.

history.yaml L11 might need a change of wording.

'...needed to generate the "Query over last 24 hours" graph...'

@DL6ER DL6ER merged commit acec7a8 into development Feb 24, 2025
19 checks passed
@DL6ER DL6ER deleted the fix/maxHistory branch February 24, 2025 22:36
@DL6ER
Copy link
Member Author

DL6ER commented Feb 25, 2025

Oh yes, this PR got merged while I was asleep because of auto-merge. I did just push the change in wording.

@DL6ER DL6ER mentioned this pull request Feb 25, 2025
5 tasks
DL6ER added a commit that referenced this pull request Feb 25, 2025
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