5.15 Release #1332
Merged
5.15 Release #1332
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sync: master to development
Signed-off-by: DL6ER <dl6er@dl6er.de>
Fix negative "others" in Upstream Servers pie chart
Signed-off-by: DL6ER <dl6er@dl6er.de>
Update SQLite to v3.38.0
Signed-off-by: DL6ER <dl6er@dl6er.de>
This hard-coded GCinterval value makes any change to the macro defining the GCinterval ineffective when the GC runs. For e.g., if I reduce the GC from once an hour to once every 3 minutes, the GC runs every 3 minutes, but the mintime is set to the start of the next hour, which wipes everything from the overTime data. I believe that this change is safe and can be merged and shipped to existing users because the GCinterval value is not configurable and users who don't build the PiHole version that they are running will not be affected by this change. Signed-off-by: Siddharth Kannan <mail@siddharthkannan.in>
Signed-off-by: Christian König <ckoenig@posteo.de>
Reload blocking mode independently of incoming queries
Compiling FTL on MIPS platform would fail with the following error: /home/git/FTL/src/database/../shmem.h:57:41: error: expected declaration specifiers or ‘...’ before numeric constant 57 | ASSERT_SIZEOF(countersStruct, 240, 240, 240); This error originates from static_assert.h, where there are no definition of ASSERT_SIZEOF and STATIC_ASSERT for the mips architecture. Support added in this commit.
Signed-off-by: abesnier <besnier_antoine@yahoo.fr>
Signed-off-by: abesnier <besnier_antoine@yahoo.fr>
Signed-off-by: DL6ER <dl6er@dl6er.de>
…interval Replace reference to hard-coded default GCinterval value
Signed-off-by: Christian König <ckoenig@posteo.de>
Be more precise about escaping invalid characters in queries
Adjust query type counters when importing from the database
Signed-off-by: DL6ER <dl6er@dl6er.de>
Update SQLite to 3.38.1
Added support for compilation on MIPS platform
…e we subtract from the previous reply counter when setting a new status Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Update SQLite to v3.38.2
initOverTime calculate's the last slot timestamp with the assumption that `OVERTIME_INTERVAL` will allow atleast `OVERTIME_SLOTS` number of slots between now and the last slot in the current hour. This leads it to calculate the timestamp of the last slot, and then assign timestamps to each slot counting down from that timestamp. This logic is not compatible with changes in the OVERTIME_INTERVAL and the MAXLOGAGE variables. Here is a demonstration of a case where this can be shown clearly: ``` OVERTIME_INTERVAL = 60s (Each slot stores 1 minute of data) MAXLOGAGE = 600s (Store date for only 10 minutes) OVERTIME_SLOTS = 11 (MAXLOGAGE/OVERTIME_INTERVAL) ``` - Current time: 10:35 - Last slot time: 10:59:30 - First slot time: 10:48:30 Note that this logic *does* work as expected with the default minimum of 1 hour for the MAXLOGAGE configuration variable. Signed-off-by: Siddharth Kannan <mail@siddharthkannan.in>
Fix initOverTime's calculation of last slot timestamp
Signed-off-by: DL6ER <dl6er@dl6er.de>
Fix query counts
Co-authored-by: yubiuser <ckoenig@posteo.de>
Add stale bot to FTL repo
Signed-off-by: DL6ER <dl6er@dl6er.de>
Fix overtime computation logic broken in PR #1312
|
Ignore this - I created the DIR |
yubiuser
approved these changes
Apr 20, 2022
dschaper
approved these changes
Apr 20, 2022
This was referenced Apr 20, 2022
1 task
1 task
This was referenced Apr 24, 2022
This was referenced Apr 26, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Release PR