Merge ffbd312f29 into 277d6fe0ce

db/knex_migrations/2024-11-27-1927-fix-info-json-data-type.js

@@ -0,0 +1,13 @@
+// Update info_json column to LONGTEXT mainly for MariaDB
+exports.up = function (knex) {
+    return knex.schema
+        .alterTable("monitor_tls_info", function (table) {
+            table.text("info_json", "longtext").alter();
+        });
+};
+
+exports.down = function (knex) {
+    return knex.schema.alterTable("monitor_tls_info", function (table) {
+        table.text("info_json", "text").alter();
+    });
+};

server/database.js

@@ -775,8 +775,6 @@ class Database {
             await migrationServer.start(port, hostname);
         }
 
-        await Settings.set("migrateAggregateTableState", "migrating");
-
         log.info("db", "Migrating Aggregate Table");
 
         log.info("db", "Getting list of unique monitors");
@@ -799,6 +797,8 @@ class Database {
             }
         }
 
+        await Settings.set("migrateAggregateTableState", "migrating");
+
         let progressPercent = 0;
         let part = 100 / monitors.length;
         let i = 1;

server/monitor-types/real-browser-monitor-type.js

@@ -240,10 +240,19 @@ class RealBrowserMonitorType extends MonitorType {
         const context = await browser.newContext();
         const page = await context.newPage();
 
-        const res = await page.goto(monitor.url, {
-            waitUntil: "networkidle",
-            timeout: monitor.interval * 1000 * 0.8,
-        });
+        let res;
+        const matches = monitor.name.match(/\[(.*?)\]/);
+        if (matches) {
+            res = await page.goto(monitor.url, {
+                timeout: monitor.interval * 1000 * 0.8,
+            });
+            await page.waitForSelector(matches[1], { timeout: monitor.interval * 1000 * 0.8 });
+        } else {
+            res = await page.goto(monitor.url, {
+                waitUntil: "networkidle",
+                timeout: monitor.interval * 1000 * 0.8,
+            });
+        }
 
         let filename = jwt.sign(monitor.id, server.jwtSecret) + ".png";