Add AlertActionLog's to Alert instances. Only non-system logs are inc…

…luded.
hyperic · Jul 15, 2009 · 18d8a5d · 18d8a5d
1 parent d9849bb
commit 18d8a5d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/hqu/hqapi1/app/AlertController.groovy b/hqu/hqapi1/app/AlertController.groovy
@@ -36,6 +36,14 @@ public class AlertController extends ApiController {
                                     escalationId: e.escalation.id,
                                     nextActionTime: e.nextActionTime)
                 }
+                for (l in a.actionLog) {
+                    if (l.subject) {
+                        // Ignore 'internal' logs.
+                        AlertActionLog(timestamp: l.timeStamp,
+                                       detail: l.detail,
+                                       user: l.subject?.name)
+                    }
+                }
             }
         }
     }

diff --git a/xsd/HQApi1.xsd b/xsd/HQApi1.xsd
@@ -904,10 +904,16 @@
         <xs:attribute name="nextActionTime" type="xs:long"   use="required"/>
     </xs:complexType>
 
+    <xs:complexType name="AlertActionLog">
+        <xs:attribute name="detail"    type="xs:string" use="required"/>
+        <xs:attribute name="user"      type="xs:string" use="required"/>
+        <xs:attribute name="timestamp" type="xs:long"   use="required"/>
+    </xs:complexType>
+
     <xs:complexType name="Alert">
         <xs:sequence>
             <xs:element name="EscalationState" type="EscalationState" minOccurs="1" maxOccurs="1" />
-            <!-- ActionLog -->
+            <xs:element name="AlertActionLog" type="AlertActionLog" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
 
         <xs:attribute name="reason"            type="xs:string"      use="required"/>