From dfb9a7697a3ea16a8cbcfa13949b5ec93fbe3421 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Thu, 17 Mar 2022 09:24:17 +0100 Subject: [PATCH 1/2] alerrt message altered --- .../network/router/VirtualNetworkApplianceManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index c81f06d0ab99..7e856c6bb36d 100644 --- a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -1215,7 +1215,7 @@ private void handleFailingChecks(DomainRouterVO router, List failingChec return; } - String alertMessage = "Health checks failed: " + failingChecks.size() + " failing checks on router " + router.getUuid(); + String alertMessage = String.format("Health checks failed: %d failing checks on router %s (UUID:%s)", failingChecks.size(), router.getName(), router.getUuid()); _alertMgr.sendAlert(AlertType.ALERT_TYPE_DOMAIN_ROUTER, router.getDataCenterId(), router.getPodIdToDeployIn(), alertMessage, alertMessage); s_logger.warn(alertMessage + ". Checking failed health checks to see if router needs recreate"); From 483022ab169c0e07e56420d45aac4852e7d22320 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Thu, 17 Mar 2022 10:40:17 +0100 Subject: [PATCH 2/2] review feedback and format --- .../network/router/VirtualNetworkApplianceManagerImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index 7e856c6bb36d..8c9ba19294ce 100644 --- a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -1215,7 +1215,7 @@ private void handleFailingChecks(DomainRouterVO router, List failingChec return; } - String alertMessage = String.format("Health checks failed: %d failing checks on router %s (UUID:%s)", failingChecks.size(), router.getName(), router.getUuid()); + String alertMessage = String.format("Health checks failed: %d failing checks on router %s / %s", failingChecks.size(), router.getName(), router.getUuid()); _alertMgr.sendAlert(AlertType.ALERT_TYPE_DOMAIN_ROUTER, router.getDataCenterId(), router.getPodIdToDeployIn(), alertMessage, alertMessage); s_logger.warn(alertMessage + ". Checking failed health checks to see if router needs recreate"); @@ -1227,6 +1227,8 @@ private void handleFailingChecks(DomainRouterVO router, List failingChec String failedCheck = failingChecks.get(i); if (i == 0) { failingChecksEvent.append("Router ") + .append(router.getName()) + .append(" / ") .append(router.getUuid()) .append(" has failing checks: "); }