Treat 0.0 response as NULL. Also get the in-memory timetamp, and then use whichever of the two timestamps is smallest (and non-zero)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner
2025-11-11 17:45:04 +00:00
parent 0f76df92b9
commit 1b509593c9
2 changed files with 34 additions and 10 deletions

View File

@@ -64,6 +64,7 @@ mg.include('scripts/lua/header_authenticated.lp','r')
</div>
<input type="button" class="form-control pull-right" id="querytime" value="Click to select date and time range">
</div>
<small id="querytime-note" class="form-text text-muted" style="margin-top: 5px;"></small>
</div>
<div class="form-group col-md-6">
<div><input type="checkbox" id="disk"><label for="disk">Query on-disk data. This is <em>a lot</em> slower but necessary if you want to obtain queries older than 24 hours. This option disables live update.</label></div>

View File

@@ -12,7 +12,8 @@
// These values are provided by the API (/info/database).
// We initialize them as null and populate them during page init.
let beginningOfTime = null; // seconds since epoch (set from API: info/database.earliest_timestamp)
let endOfTime = null; // seconds since epoch (set to end of today)
// endOfTime should be the end of today (local), in seconds since epoch
const endOfTime = moment().endOf("day").unix();
let from = null;
let until = null;
@@ -47,24 +48,46 @@ function getDnssecConfig() {
function getDatabaseInfo() {
$.getJSON(document.body.dataset.apiurl + "/info/database", data => {
// earliest_timestamp is provided in seconds since epoch
beginningOfTime = Number(data.earliest_timestamp_disk);
// Round down to nearest 5-minute segment (300 seconds)
beginningOfTime = Math.floor(beginningOfTime / 300) * 300;
// We have two sources: earliest_timestamp_disk (on-disk) and earliest_timestamp (in-memory)
// Use whichever is smallest and non-zero
const diskTimestamp = Number(data.earliest_timestamp_disk);
const memoryTimestamp = Number(data.earliest_timestamp);
// endOfTime should be the end of today (local), in seconds since epoch
endOfTime = moment().endOf("day").unix();
// Filter out zero/invalid timestamps
const validTimestamps = [diskTimestamp, memoryTimestamp].filter(ts => ts > 0);
// Use the smallest valid timestamp, or null if none exist
beginningOfTime = validTimestamps.length > 0 ? Math.min(...validTimestamps) : null;
// Round down to nearest 5-minute segment (300 seconds) if valid
if (beginningOfTime !== null) {
beginningOfTime = Math.floor(beginningOfTime / 300) * 300;
}
// If from/until were not provided via GET, default them
from ??= beginningOfTime;
until ??= endOfTime;
// Only use defaults if beginningOfTime is valid
if (beginningOfTime !== null) {
from ??= beginningOfTime;
until ??= endOfTime;
}
initDateRangePicker();
});
}
function initDateRangePicker() {
// If there's no valid data in the database, disable the datepicker
if (beginningOfTime === null || endOfTime === null) {
$("#querytime").prop("disabled", true);
$("#querytime").addClass("disabled");
$("#querytime-note").text(" No data in the database");
return;
}
const minDateMoment = moment.unix(beginningOfTime);
const maxDateMoment = moment.unix(endOfTime);
const earliestDateStr = minDateMoment.format(dateformat);
$("#querytime-note").text(`Earliest date: ${earliestDateStr}`);
$("#querytime").daterangepicker(
{
@@ -84,12 +107,12 @@ function initDateRangePicker() {
],
"Last 7 Days": [moment().subtract(6, "days"), maxDateMoment],
"Last 30 Days": [moment().subtract(29, "days"), maxDateMoment],
"This Month": [moment().startOf("month"), moment().endOf("month")],
"This Month": [moment().startOf("month"), maxDateMoment],
"Last Month": [
moment().subtract(1, "month").startOf("month"),
moment().subtract(1, "month").endOf("month"),
],
"This Year": [moment().startOf("year"), moment().endOf("year")],
"This Year": [moment().startOf("year"), maxDateMoment],
"All Time": [minDateMoment, maxDateMoment],
},
// Don't allow selecting dates outside the database range