From c51c2a71c930df4ccbb87492f0450aa7db740ebe Mon Sep 17 00:00:00 2001 From: SrikanthN Date: Tue, 29 Jan 2019 00:37:36 +0530 Subject: VES 7.1 JAVA LIB-Agent Enhancements HB-Fault-Measurement-Syslog-2Collector enhancements Issue-ID: VNFSDK-362 Change-Id: I4db391ce8dbc763021ba15f6335d2df1e0b10e40 Signed-off-by: SrikanthN --- .../java/evel_javalibrary/att/com/EvelSyslog.java | 66 ++++++++++++++++++++-- 1 file changed, 60 insertions(+), 6 deletions(-) (limited to 'veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/EvelSyslog.java') diff --git a/veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/EvelSyslog.java b/veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/EvelSyslog.java index a1bd94b..847e7a0 100644 --- a/veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/EvelSyslog.java +++ b/veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/EvelSyslog.java @@ -38,6 +38,7 @@ import org.apache.log4j.Logger; import org.slf4j.helpers.MessageFormatter; import evel_javalibrary.att.com.EvelFault.EVEL_SEVERITIES; +import evel_javalibrary.att.com.EvelFault.EVEL_SOURCE_TYPES; public class EvelSyslog extends EvelHeader { @@ -45,6 +46,7 @@ public class EvelSyslog extends EvelHeader { int major_version = 3; int minor_version = 0; + /**************************************************************************//** * Alert types. * JSON equivalent fields: newState, oldState @@ -106,6 +108,8 @@ public class EvelSyslog extends EvelHeader { EvelOptionInt syslog_ver; EvelOptionString syslogmsg_host; + EvelOptionString syslogTs; + HashMap additional_inf; @@ -121,15 +125,15 @@ public class EvelSyslog extends EvelHeader { * *****************************************************************************/ public EvelSyslog(String evname, String evid, - EvelFault.EVEL_SOURCE_TYPES evt_source_type, + EvelFault.EVEL_SOURCE_TYPES evt_source_type, String syslg_msg, String syslg_tag) { super(evname,evid); event_domain = EvelHeader.DOMAINS.EVEL_DOMAIN_SYSLOG; - assert(EvelFault.EVEL_SOURCE_TYPES.EVEL_MAX_SOURCE_TYPES.compareTo(event_source_type) < 0); - assert(syslog_msg != null); - assert(syslog_tag != null); + assert(EvelFault.EVEL_SOURCE_TYPES.EVEL_MAX_SOURCE_TYPES.compareTo(evt_source_type) >= 0); + assert(syslg_msg != null); + assert(syslg_tag != null); event_source_type = evt_source_type; syslog_msg = syslg_msg; @@ -147,6 +151,9 @@ public class EvelSyslog extends EvelHeader { syslogmsg_host = new EvelOptionString(); + syslogTs = new EvelOptionString(); + + additional_inf =null; } @@ -464,8 +471,32 @@ public class EvelSyslog extends EvelHeader { EVEL_EXIT(); } - + /**************************************************************************//** + * Set the Structured SDID property of the SyslogTs. + * + * @note The property is treated as immutable: it is only valid to call + * the setter once. However, we don't assert if the caller tries to + * overwrite, just ignoring the update instead. + * + * + * @param sdid The Structured Data to be set. ASCIIZ string. name@number + * Caller does not need to preserve the value once the function + * returns. + *****************************************************************************/ + public void evel_syslogTs_set(String syslogT) + { + EVEL_ENTER(); + + /***************************************************************************/ + /* Check preconditions. */ + /***************************************************************************/ + assert(event_domain == EvelHeader.DOMAINS.EVEL_DOMAIN_SYSLOG); + assert(syslogT != null); + syslogTs.SetValuePr(syslogT, "SyslogTs"); + EVEL_EXIT(); + } + /**************************************************************************//** * Set the Structured SDID property of the Syslog. * @@ -526,6 +557,9 @@ public class EvelSyslog extends EvelHeader { } EVEL_EXIT(); } + + + /**************************************************************************//** @@ -545,7 +579,7 @@ public class EvelSyslog extends EvelHeader { /* Mandatory fields */ /***************************************************************************/ JsonObjectBuilder obj = Json.createObjectBuilder() - .add("eventSourceType", event_source_type.toString()) + .add("eventSourceType", EvelFault.evel_source_type(event_source_type)) .add("syslogMsg", syslog_msg) .add("syslogTag", syslog_tag) .add("syslogFieldsVersion",version); @@ -564,6 +598,8 @@ public class EvelSyslog extends EvelHeader { syslog_ver.encJsonValue(obj, "syslogVer"); syslogmsg_host.encJsonValue(obj, "syslogMsgHost"); + syslogTs.encJsonValue(obj, "syslogTs"); + if(additional_inf != null) { //JsonArrayBuilder builder = Json.createArrayBuilder(); @@ -608,6 +644,24 @@ public class EvelSyslog extends EvelHeader { return obj; } + + JsonObject evel_json_encode_event_batch() + { + EVEL_ENTER(); + + assert(event_domain == EvelHeader.DOMAINS.EVEL_DOMAIN_SYSLOG); + + JsonObject obj = Json.createObjectBuilder() + // .add("event", Json.createObjectBuilder() + .add( "commonEventHeader",eventHeaderObject() ) + .add( "syslogFields",evelSyslogObject() ) + .build(); + + EVEL_EXIT(); + + return obj; + + } -- cgit 1.2.3-korg