updating email alert to include links to reingested alerts

.gitignore

@@ -0,0 +1 @@
+*.swp

alerts/email.ank

@@ -39,6 +39,7 @@ module emailAlert {
 	var throttleEv = ""
 	var throttleDur = 0
 	var thr = throttle
+	var ingestLinks = make(map[string]interface)
 
 	func SetServerPath(p) {
 		serverBase = p
@@ -49,7 +50,15 @@ module emailAlert {
 		throttleEv = evName
 		thr.SetMapName(evName)					
 		thr.SetInterval(dur)					
-	}									
+	}
+
+	func queryInfo() {
+		var m = make(map[string]interface)
+		m["Query"] = query
+		m["Start"] = start
+		m["End"] = end
+		return m
+	}
 
 	func SetQueryParams(q, s, e) {					
 		query = q
@@ -60,7 +69,7 @@ module emailAlert {
 			start = s
 			end = e 
 		}
-	}									
+	}
 
 	func SetEmailParams(frm, to, subj) {					
 		from = frm						
@@ -108,13 +117,25 @@ module emailAlert {
 		}
 		var re = reingest_json
 		if reingestName != "" {
-			re.SetHeaderValue("AlertName", reingestName)
+			re.SetAlertName(reingestName)
 		}
 		if reingestMsg != "" {
 			re.SetHeaderValue("AlertMsg", reingestMsg)
 		}
+		var emailSent = throttleEnt(ent)
+		re.SetHeaderValue("EmailSent", emailSent)
+		re.SetHeaderValue("AlertInfo", queryInfo())
 		re.SetTag(reingestTag)
-		return re.Ingest(ent, time.Now())
+		var t = time.Now()
+		if emailSent {
+			ev, err = getEntryEnum(ent, throttleEv)
+			if err == nil {
+				var id = re.IngestID()
+				var lnk = re.AlertLink(serverBase, start, t, id)
+				ingestLinks[toString(ev)] = lnk
+			}
+		}
+		return re.Ingest(ent, t)
 	}
 
 	func reingestEnts(ents) {
@@ -198,6 +219,12 @@ module emailAlert {
 		for el in extraLinks {
 			em.AddBodyData(el)
 		}
+		if len(ingestLinks) > 0 {
+			em.AddSubTitle("Query Links")
+			for k, v in ingestLinks {
+				em.AddBodyData(v)
+			}
+		}
 		err = em.SendEmail(from, to, subject)
 		if err == nil && throttleDur > 0 {
 			markEnts(ents)
@@ -223,6 +250,16 @@ module emailAlert {
 		for el in extraLinks {
 			em.AddBodyData(el)
 		}
+		if len(ingestLinks) > 0 {
+			ev, err = getEntryEnum(ent, throttleEv)
+			if err == nil {
+				lnk = ingestLinks[toString(ev)]
+				if lnk != nil {
+					em.AddSubTitle("Query Links")
+
+				}
+			}
+		}
 		err = em.SendEmail(from, to, subject)
 		if err == nil && throttleDur > 0 {
 			markEnt(ent)

utils/reingest-json.ank

@@ -13,10 +13,13 @@
 
 MinVer(3, 3, 1) #require at least 3.3.1
 
+require("utils/links.ank")
+
 module reingest_json {
 	var tag = ""
-	var name = ""
+	var name = nil
 	var msg  = ""
+	var id = nil
 	var m = make(map[string]interface)
 	var time = import("time")
 	var uuid = import("google/uuid")
@@ -29,6 +32,63 @@ module reingest_json {
 	func SetHeaderValue(k, v) {
 		m[toString(k)] = v
 	}
+
+	func IngestID() {
+		if id == nil {
+			id = uuid.New()
+		}
+		return id
+	}
+
+	func OverrideID(v) {
+		id = v
+	}
+
+	func SetAlertName(v) {
+		name = v
+		m["AlertName"] = v
+	}
+
+	func AlertLink(server, s, desc) {
+		q = ""
+		if tag != "" {
+			q += `tag=` + tag + ` `
+		}
+		q += `json AlertID==` + id
+		ln = make(link)
+		ln.Init(server + "/#/search/launch")
+		ln.AddParam("query", q)
+		ln.AddParam("start", s)
+		if e != nil {
+			ln.AddParam("end", e)
+		}
+		if desc == nil || len(desc) == "" {
+			desc = `LINK`
+		}
+		return ln.HtmlEncode(desc)
+	}
+
+	func CategoryLink(server, s, e, desc) {
+		q = ""
+		if tag != "" {
+			q += `tag=` + tag + ` `
+		}
+		if name != "" {
+			q += `json AlertName==` + name
+		}
+		ln = make(link)
+		ln.Init(server + "/#/search/launch")
+		ln.AddParam("query", q)
+		ln.AddParam("start", s)
+		if e != nil {
+			ln.AddParam("end", e)
+		}
+		if desc == nil || len(desc) == "" {
+			desc = `LINK`
+		}
+		return ln.HtmlEncode(desc)
+	}
+
 
 	func Ingest(ent, ts) {
 		if tag == "" {
@@ -42,7 +102,10 @@ module reingest_json {
 		for ep in ent.Enumerated {
 			pkg[ep.Name] = ep.Value.GetInterfaceValue()
 		}
-		m["AlertID"] = uuid.New()
+		if id == nil {
+			id = uuid.New()
+		}
+		m["AlertID"] = id
 		m["data"] = pkg
 		var data = nil
 		var err = ""