Add rule owner account and domain to resource alert email and event bus messages

Author: Daman Arora

plugins/resource-alerts/src/main/java/org/apache/cloudstack/resourcealert/ResourceAlertManagerImpl.java

@@ -56,6 +56,7 @@
 
 import com.cloud.cluster.ManagementServerHostVO;
 import com.cloud.cluster.dao.ManagementServerHostDao;
+import com.cloud.domain.DomainVO;
 import com.cloud.domain.dao.DomainDao;
 import com.cloud.event.AlertGenerator;
 import com.cloud.host.Host;
@@ -72,6 +73,7 @@
 import com.cloud.storage.dao.VolumeDao;
 import com.cloud.tags.dao.ResourceTagDao;
 import com.cloud.user.Account;
+import com.cloud.user.AccountVO;
 import com.cloud.user.dao.AccountDao;
 import com.cloud.utils.Pair;
 import com.cloud.utils.component.ComponentContext;
@@ -547,6 +549,14 @@ private String buildSubject(ResourceAlertRuleVO rule, Pair<String, String> resou
     private String buildBody(ResourceAlertRuleVO rule, Pair<String, String> resource, double value) {
         StringBuilder sb = new StringBuilder();
         sb.append("Rule: ").append(rule.getName()).append('\n');
+        AccountVO owner = accountDao.findByIdIncludingRemoved(rule.getAccountId());
+        if (owner != null) {
+            sb.append("Account: ").append(owner.getAccountName()).append('\n');
+        }
+        DomainVO domain = domainDao.findByIdIncludingRemoved(rule.getDomainId());
+        if (domain != null) {
+            sb.append("Domain: ").append(domain.getPath()).append('\n');
+        }
         sb.append("Resource Type: ").append(rule.getResourceType().name()).append('\n');
         if (resource != null) {
             sb.append("Resource: ").append(StringUtils.defaultString(resource.second())).append('\n');

plugins/resource-alerts/src/test/java/org/apache/cloudstack/resourcealert/ResourceAlertManagerImplTest.java

@@ -66,6 +66,7 @@
 
 import com.cloud.cluster.ManagementServerHostVO;
 import com.cloud.cluster.dao.ManagementServerHostDao;
+import com.cloud.domain.DomainVO;
 import com.cloud.domain.dao.DomainDao;
 import com.cloud.host.HostStats;
 import com.cloud.host.HostVO;
@@ -478,6 +479,12 @@ public void testSubjectContainsKeyAlertFields() throws Exception {
         when(vm.getUuid()).thenReturn("vm-uuid");
         when(vm.getDisplayName()).thenReturn("web-01");
         when(userVmDao.findByIdIncludingRemoved(VM_ID)).thenReturn(vm);
+        AccountVO account = mock(AccountVO.class);
+        when(account.getAccountName()).thenReturn("acme");
+        when(accountDao.findByIdIncludingRemoved(1L)).thenReturn(account);
+        DomainVO domain = mock(DomainVO.class);
+        when(domain.getPath()).thenReturn("/acme/");
+        when(domainDao.findByIdIncludingRemoved(1L)).thenReturn(domain);
 
         manager.evaluateRules();
 
@@ -490,6 +497,8 @@ public void testSubjectContainsKeyAlertFields() throws Exception {
         assertTrue(subject.contains("VirtualMachine web-01"));
         assertTrue(body.contains("Resource: web-01"));
         assertTrue(body.contains("Resource ID: vm-uuid"));
+        assertTrue(body.contains("Account: acme"));
+        assertTrue(body.contains("Domain: /acme/"));
     }
 
     @Test