Corrections on user counter and analytics to the kst4contest page

website/ops/analytics/README.md

@@ -262,6 +262,12 @@ day, requested pages, countries, HTTP status codes and virtual hosts. Host,
 remote-user, referrer, keyphrase, operating-system, browser and other detailed
 panels are disabled.
 
+GoAccess 1.8.1 writes the Country panel under the JSON key `geolocation`.
+Combined jobs explicitly pass `--enable-panel=VIRTUAL_HOSTS` and require the
+resulting `vhosts` key. Site jobs do not enable that panel. The generator treats
+either missing key as an invalid report rather than publishing incomplete
+statistics.
+
 The Country database is provided through the registry at
 `/var/lib/GeoIP/GeoLite2-Country.mmdb`. A file whose name contains `City` is
 rejected. Do not replace it with a City database merely because one happens to

website/ops/analytics/generate-reports.js

@@ -450,9 +450,9 @@ function validateReport(report, combined) {
     if (!report || typeof report !== "object" || Array.isArray(report)) {
         throw new Error("GoAccess JSON report must be an object");
     }
-    const requiredPanels = ["visitors", "requests", "status_codes", "geo_location"];
+    const requiredPanels = ["visitors", "requests", "status_codes", "geolocation"];
     if (combined) {
-        requiredPanels.push("virtual_hosts");
+        requiredPanels.push("vhosts");
     }
     if (!report.general || typeof report.general !== "object") {
         throw new Error("GoAccess JSON report has no general summary");
@@ -682,10 +682,15 @@ function prepareReport(job, context) {
     const args = [
         ...job.logs,
         "--no-global-config",
-        "--config-file", runConfig,
+        "--config-file", runConfig
+    ];
+    if (job.combined) {
+        args.push("--enable-panel=VIRTUAL_HOSTS");
+    }
+    args.push(
         "--output", outputJson,
         "--output", outputHtml
-    ];
+    );
     context.runGoAccess({
         binary: context.goaccessBinary,
         args,

website/test/analytics-generator.test.js

@@ -7,7 +7,8 @@ const test = require("node:test");
 const {
     formatGoAccessCheck,
     generateReports,
-    parseGoAccessVersion
+    parseGoAccessVersion,
+    validateReport
 } = require("../ops/analytics/generate-reports");
 
 const GOACCESS_WITHOUT_ZLIB = {
@@ -28,10 +29,10 @@ function goAccessReport(dailyVisits, combined = false) {
         },
         requests: { data: [] },
         status_codes: { data: [] },
-        geo_location: { data: [] }
+        geolocation: { data: [] }
     };
     if (combined) {
-        report.virtual_hosts = { data: [] };
+        report.vhosts = { data: [] };
     }
     return report;
 }
@@ -230,6 +231,9 @@ test("processes subdomains separately and together without publishing disabled c
             calls[2].args.slice(0, 3),
             [...alphaLogs, ...bravoLogs]
         );
+        assert.equal(calls[0].args.includes("--enable-panel=VIRTUAL_HOSTS"), false);
+        assert.equal(calls[1].args.includes("--enable-panel=VIRTUAL_HOSTS"), false);
+        assert.equal(calls[2].args.includes("--enable-panel=VIRTUAL_HOSTS"), true);
         assert.equal(calls.some(call => call.args.some(argument => argument.endsWith(".gz"))), false);
         assert.equal(fs.existsSync(path.join(
             testFixture.registry.stateDirectory,
@@ -245,6 +249,30 @@ test("processes subdomains separately and together without publishing disabled c
     }
 });
 
+test("validates GoAccess 1.8.1 panel names strictly", () => {
+    const siteReport = goAccessReport({ "2026-09-11": 3 });
+    const combinedReport = goAccessReport({ "2026-09-11": 3 }, true);
+
+    assert.doesNotThrow(() => validateReport(siteReport, false));
+    assert.doesNotThrow(() => validateReport(combinedReport, true));
+
+    const missingGeolocation = goAccessReport({ "2026-09-11": 3 });
+    delete missingGeolocation.geolocation;
+    missingGeolocation.geo_location = { data: [] };
+    assert.throws(
+        () => validateReport(missingGeolocation, false),
+        /GoAccess JSON report has no geolocation panel/
+    );
+
+    const missingVhosts = goAccessReport({ "2026-09-11": 3 }, true);
+    delete missingVhosts.vhosts;
+    missingVhosts.virtual_hosts = { data: [] };
+    assert.throws(
+        () => validateReport(missingVhosts, true),
+        /GoAccess JSON report has no vhosts panel/
+    );
+});
+
 test("dry-run validates generated data without changing production paths", () => {
     const testFixture = fixture([{ id: "alpha", publicCounter: true }]);
     try {