From 18b2e1968e2c128a7447eb433bc30869616f0512 Mon Sep 17 00:00:00 2001 From: Ankush Jain Date: Sun, 12 Jan 2025 21:58:00 -0800 Subject: [PATCH 1/5] prioritize test templates job --- .../java/com/akto/listener/InitializerListener.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/dashboard/src/main/java/com/akto/listener/InitializerListener.java b/apps/dashboard/src/main/java/com/akto/listener/InitializerListener.java index 3bfc3eb7b3..19e0b82f7e 100644 --- a/apps/dashboard/src/main/java/com/akto/listener/InitializerListener.java +++ b/apps/dashboard/src/main/java/com/akto/listener/InitializerListener.java @@ -2297,6 +2297,7 @@ public void accept(Account account) { runInitializerFunctions(); } }, "context-initializer-secondary"); + setUpTestEditorTemplatesScheduler(); crons.trafficAlertsScheduler(); crons.insertHistoricalDataJob(); @@ -2315,7 +2316,6 @@ public void accept(Account account) { setUpWebhookScheduler(); cleanInventoryJobRunner(); setUpDefaultPayloadRemover(); - setUpTestEditorTemplatesScheduler(); setUpDependencyFlowScheduler(); tokenGeneratorCron.tokenGeneratorScheduler(); crons.deleteTestRunsScheduler(); @@ -3035,7 +3035,7 @@ public void runInitializerFunctions() { try { setBackwardCompatibilities(backwardCompatibility); loggerMaker.infoAndAddToDb("Backward compatibilities set for " + Context.accountId.get(), LogDb.DASHBOARD); - insertPiiSources(); + // insertPiiSources(); loggerMaker.infoAndAddToDb("PII sources inserted set for " + Context.accountId.get(), LogDb.DASHBOARD); // setUpPiiCleanerScheduler(); @@ -3043,11 +3043,11 @@ public void runInitializerFunctions() { // setUpWebhookScheduler(); // setUpPiiAndTestSourcesScheduler(); - AccountSettings accountSettings = AccountSettingsDao.instance.findOne(AccountSettingsDao.generateFilter()); - dropSampleDataIfEarlierNotDroped(accountSettings); + // AccountSettings accountSettings = AccountSettingsDao.instance.findOne(AccountSettingsDao.generateFilter()); + // dropSampleDataIfEarlierNotDroped(accountSettings); - backFillDiscovered(); - backFillStatusCodeType(); + // backFillDiscovered(); + // backFillStatusCodeType(); } catch (Exception e) { loggerMaker.errorAndAddToDb(e,"error while setting up dashboard: " + e.toString(), LogDb.DASHBOARD); } From 22d9c91ddd7dab684fe445c22d562d12ef70931d Mon Sep 17 00:00:00 2001 From: Ankush Jain Date: Mon, 13 Jan 2025 00:07:22 -0800 Subject: [PATCH 2/5] comment all funcs --- .../akto/listener/InitializerListener.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/dashboard/src/main/java/com/akto/listener/InitializerListener.java b/apps/dashboard/src/main/java/com/akto/listener/InitializerListener.java index 19e0b82f7e..369e8e2075 100644 --- a/apps/dashboard/src/main/java/com/akto/listener/InitializerListener.java +++ b/apps/dashboard/src/main/java/com/akto/listener/InitializerListener.java @@ -2280,7 +2280,7 @@ public void run() { public void accept(Account account) { AccountSettingsDao.instance.getStats(); Intercom.setToken(System.getenv("INTERCOM_TOKEN")); - setDashboardVersionForAccount(); + // setDashboardVersionForAccount(); } }, "context-initializer"); @@ -2291,12 +2291,12 @@ public void accept(Account account) { logger.info("Starting init functions and scheduling jobs at " + now); - AccountTask.instance.executeTask(new Consumer() { - @Override - public void accept(Account account) { - runInitializerFunctions(); - } - }, "context-initializer-secondary"); + // AccountTask.instance.executeTask(new Consumer() { + // @Override + // public void accept(Account account) { + // runInitializerFunctions(); + // } + // }, "context-initializer-secondary"); setUpTestEditorTemplatesScheduler(); crons.trafficAlertsScheduler(); @@ -3035,7 +3035,7 @@ public void runInitializerFunctions() { try { setBackwardCompatibilities(backwardCompatibility); loggerMaker.infoAndAddToDb("Backward compatibilities set for " + Context.accountId.get(), LogDb.DASHBOARD); - // insertPiiSources(); + insertPiiSources(); loggerMaker.infoAndAddToDb("PII sources inserted set for " + Context.accountId.get(), LogDb.DASHBOARD); // setUpPiiCleanerScheduler(); @@ -3043,11 +3043,11 @@ public void runInitializerFunctions() { // setUpWebhookScheduler(); // setUpPiiAndTestSourcesScheduler(); - // AccountSettings accountSettings = AccountSettingsDao.instance.findOne(AccountSettingsDao.generateFilter()); - // dropSampleDataIfEarlierNotDroped(accountSettings); + AccountSettings accountSettings = AccountSettingsDao.instance.findOne(AccountSettingsDao.generateFilter()); + dropSampleDataIfEarlierNotDroped(accountSettings); - // backFillDiscovered(); - // backFillStatusCodeType(); + backFillDiscovered(); + backFillStatusCodeType(); } catch (Exception e) { loggerMaker.errorAndAddToDb(e,"error while setting up dashboard: " + e.toString(), LogDb.DASHBOARD); } From b407855903a746df9b0210072c0af546563d2597 Mon Sep 17 00:00:00 2001 From: Ankush Jain Date: Mon, 13 Jan 2025 03:51:05 -0800 Subject: [PATCH 3/5] add logs --- .../main/java/com/akto/listener/InitializerListener.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/dashboard/src/main/java/com/akto/listener/InitializerListener.java b/apps/dashboard/src/main/java/com/akto/listener/InitializerListener.java index 369e8e2075..61a9f13998 100644 --- a/apps/dashboard/src/main/java/com/akto/listener/InitializerListener.java +++ b/apps/dashboard/src/main/java/com/akto/listener/InitializerListener.java @@ -3218,9 +3218,14 @@ public static void processTemplateFilesZip(byte[] zipFile, String author, String String testConfigId = testConfig.getId(); existingTemplatesInDb = mapIdToHash.get(testConfigId); - + loggerMaker.infoAndAddToDb("Trying to add test yaml: " + testConfigId + " existingTemplatesInDb: " + existingTemplatesInDb, LogDb.DASHBOARD); + if (existingTemplatesInDb != null && existingTemplatesInDb.size() == 1) { + loggerMaker.infoAndAddToDb("Trying to add test yaml: " + testConfigId + " existingTemplatesInDb size: " + existingTemplatesInDb.size(), LogDb.DASHBOARD); + int existingTemplateHash = existingTemplatesInDb.get(0).getHash(); + loggerMaker.infoAndAddToDb("Hashes: " + testConfigId + " hashDB: " + existingTemplateHash + " template: " + existingTemplateHash, LogDb.DASHBOARD); + if (existingTemplateHash == templateContent.hashCode()) { countUnchangedTemplates++; if(TestConfig.isTestMultiNode(testConfig)){ @@ -3231,6 +3236,7 @@ public static void processTemplateFilesZip(byte[] zipFile, String author, String loggerMaker.infoAndAddToDb("Updating test yaml: " + testConfigId, LogDb.DASHBOARD); } } + loggerMaker.infoAndAddToDb("Reached end: " + testConfigId, LogDb.DASHBOARD); } catch (Exception e) { loggerMaker.errorAndAddToDb(e, From 16422062da8985e03cbc7460ddac0c20022a7853 Mon Sep 17 00:00:00 2001 From: Ankush Jain Date: Mon, 13 Jan 2025 22:20:41 -0800 Subject: [PATCH 4/5] use Metered instead of Local --- .../src/main/java/com/akto/listener/InitializerListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dashboard/src/main/java/com/akto/listener/InitializerListener.java b/apps/dashboard/src/main/java/com/akto/listener/InitializerListener.java index 61a9f13998..35599acb74 100644 --- a/apps/dashboard/src/main/java/com/akto/listener/InitializerListener.java +++ b/apps/dashboard/src/main/java/com/akto/listener/InitializerListener.java @@ -3248,7 +3248,7 @@ public static void processTemplateFilesZip(byte[] zipFile, String author, String if (testConfig != null) { boolean hasSettings = testConfig.getAttributes() != null; - if (hasSettings && !testConfig.getAttributes().getPlan().equals(TemplatePlan.FREE) && DashboardMode.isLocalDeployment()) { + if (hasSettings && !testConfig.getAttributes().getPlan().equals(TemplatePlan.FREE) && !DashboardMode.isMetered()) { skipped++; continue; } From 268020bad04684f936cbccae2bb2a00718c654f2 Mon Sep 17 00:00:00 2001 From: Ankush Jain Date: Tue, 14 Jan 2025 19:35:02 -0800 Subject: [PATCH 5/5] print correct hash code --- .../src/main/java/com/akto/listener/InitializerListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dashboard/src/main/java/com/akto/listener/InitializerListener.java b/apps/dashboard/src/main/java/com/akto/listener/InitializerListener.java index 35599acb74..dd90b20d05 100644 --- a/apps/dashboard/src/main/java/com/akto/listener/InitializerListener.java +++ b/apps/dashboard/src/main/java/com/akto/listener/InitializerListener.java @@ -3224,7 +3224,7 @@ public static void processTemplateFilesZip(byte[] zipFile, String author, String loggerMaker.infoAndAddToDb("Trying to add test yaml: " + testConfigId + " existingTemplatesInDb size: " + existingTemplatesInDb.size(), LogDb.DASHBOARD); int existingTemplateHash = existingTemplatesInDb.get(0).getHash(); - loggerMaker.infoAndAddToDb("Hashes: " + testConfigId + " hashDB: " + existingTemplateHash + " template: " + existingTemplateHash, LogDb.DASHBOARD); + loggerMaker.infoAndAddToDb("Hashes: " + testConfigId + " hashDB: " + existingTemplateHash + " template: " + templateContent.hashCode(), LogDb.DASHBOARD); if (existingTemplateHash == templateContent.hashCode()) { countUnchangedTemplates++;