From 165e3b2b2ab39c1c0a79fdb103ee00b2b2dda47c Mon Sep 17 00:00:00 2001 From: Rakesh Venkatesh Date: Thu, 4 Nov 2021 12:40:30 +0100 Subject: [PATCH 1/2] alert: Send alert for ha'ed vm's When ha is performed on vm's send the alert for it so that its for admins to know which vm's got ha'ed else its time consuming to get those details from logs --- .../src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java index 82b378a26eae..5fb2dd354aac 100644 --- a/server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java +++ b/server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java @@ -608,7 +608,9 @@ protected Long restart(final HaWorkVO work) { VMInstanceVO started = _instanceDao.findById(vm.getId()); if (started != null && started.getState() == VirtualMachine.State.Running) { + String message = String.format("HA on VM: %s", started.getHostName()); s_logger.info("VM is now restarted: " + vmId + " on " + started.getHostId()); + _alertMgr.sendAlert(alertType, vm.getDataCenterId(), vm.getPodIdToDeployIn(), message, message); return null; } From b905d57547a32b3f4bfd647f58525090c50cc441 Mon Sep 17 00:00:00 2001 From: Rakesh Venkatesh Date: Wed, 9 Feb 2022 14:44:17 +0100 Subject: [PATCH 2/2] feedback change --- .../main/java/com/cloud/ha/HighAvailabilityManagerImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java index 5fb2dd354aac..1b9b512118d7 100644 --- a/server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java +++ b/server/src/main/java/com/cloud/ha/HighAvailabilityManagerImpl.java @@ -608,8 +608,9 @@ protected Long restart(final HaWorkVO work) { VMInstanceVO started = _instanceDao.findById(vm.getId()); if (started != null && started.getState() == VirtualMachine.State.Running) { - String message = String.format("HA on VM: %s", started.getHostName()); - s_logger.info("VM is now restarted: " + vmId + " on " + started.getHostId()); + String message = String.format("HA starting VM: %s (%s)", started.getHostName(), started.getInstanceName()); + HostVO hostVmHasStarted = _hostDao.findById(started.getHostId()); + s_logger.info(String.format("HA is now restarting %s on %s", started, hostVmHasStarted)); _alertMgr.sendAlert(alertType, vm.getDataCenterId(), vm.getPodIdToDeployIn(), message, message); return null; }