Skip to content

Commit

Permalink
add 'nlf_01@48577' structured data containing 'eventType' param (#14)
Browse files Browse the repository at this point in the history
  • Loading branch information
@eemhu
eemhu authored Feb 13, 2025
1 parent bbde335 commit b35496f
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 15 deletions.
2 changes: 2 additions & 0 deletions src/main/java/com/teragrep/nlf_01/types/AppInsightType.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,8 @@ public Set<SDElement> sdElements() {
elems
.add(new SDElement("aer_02@48577").addSDParam("timestamp_source", time.isEmpty() ? "generated" : "timeEnqueued"));

elems.add(new SDElement("nlf_01@48577").addSDParam("eventType", this.getClass().getSimpleName()));

return elems;
}

Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/teragrep/nlf_01/types/CLType.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ public Set<SDElement> sdElements() throws PluginException {
final String resourceId = mainObject.getString("_ResourceId");

elems.add(new SDElement("origin@48577").addSDParam("_ResourceId", resourceId));
elems.add(new SDElement("nlf_01@48577").addSDParam("eventType", this.getClass().getSimpleName()));

return elems;
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/teragrep/nlf_01/types/ContainerType.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,8 @@ public Set<SDElement> sdElements() throws PluginException {
elems
.add(new SDElement("origin@48577").addSDParam("subscription", subscriptionId).addSDParam("clusterName", clusterName).addSDParam("namespace", podNamespace).addSDParam("pod", podName).addSDParam("containerId", containerId));

elems.add(new SDElement("nlf_01@48577").addSDParam("eventType", this.getClass().getSimpleName()));

return elems;
}

Expand Down
66 changes: 51 additions & 15 deletions src/test/java/com/teragrep/nlf_01/NLFPluginTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
import com.teragrep.akv_01.event.EventImpl;
import com.teragrep.akv_01.event.ParsedEvent;
import com.teragrep.nlf_01.fakes.FakeSourceable;
import com.teragrep.nlf_01.types.AppInsightType;
import com.teragrep.nlf_01.types.ContainerType;
import com.teragrep.rlo_14.SDElement;
import com.teragrep.rlo_14.SDParam;
import com.teragrep.rlo_14.SyslogMessage;
Expand Down Expand Up @@ -86,23 +88,21 @@ void containerType() {
Assertions.assertEquals("HOST-NAME", syslogMessage.getHostname());
Assertions.assertEquals("APP-NAME:o", syslogMessage.getAppName());
Assertions.assertEquals("2020-01-01T01:23:34.567Z", syslogMessage.getTimestamp());
final List<SDElement> origin = syslogMessage

final Map<String, Map<String, String>> sdElementMap = syslogMessage
.getSDElements()
.stream()
.filter(elem -> elem.getSdID().equals("origin@48577"))
.collect(Collectors.toList());
Assertions.assertEquals(1, origin.size());
final Map<String, String> params = origin
.get(0)
.getSdParams()
.stream()
.collect(Collectors.toMap(SDParam::getParamName, SDParam::getParamValue));
Assertions.assertEquals(5, params.size());
Assertions.assertEquals("{subscriptionId}", params.get("subscription"));
Assertions.assertEquals("{resourceName}", params.get("clusterName"));
Assertions.assertEquals("pod-namespace", params.get("namespace"));
Assertions.assertEquals("pod-name", params.get("pod"));
Assertions.assertEquals("container-id", params.get("containerId"));
.collect(Collectors.toMap((SDElement::getSdID), (sdElem) -> sdElem.getSdParams().stream().collect(Collectors.toMap(SDParam::getParamName, SDParam::getParamValue))));

Assertions.assertEquals(5, sdElementMap.get("origin@48577").size());
Assertions.assertEquals("{subscriptionId}", sdElementMap.get("origin@48577").get("subscription"));
Assertions.assertEquals("{resourceName}", sdElementMap.get("origin@48577").get("clusterName"));
Assertions.assertEquals("pod-namespace", sdElementMap.get("origin@48577").get("namespace"));
Assertions.assertEquals("pod-name", sdElementMap.get("origin@48577").get("pod"));
Assertions.assertEquals("container-id", sdElementMap.get("origin@48577").get("containerId"));

Assertions.assertEquals(1, sdElementMap.get("nlf_01@48577").size());
Assertions.assertEquals(ContainerType.class.getSimpleName(), sdElementMap.get("nlf_01@48577").get("eventType"));
}

@Test
Expand Down Expand Up @@ -132,6 +132,15 @@ void appInsightType() {
Assertions.assertEquals("md5-0ded52ef915af563e25778bf26b0f129-resourceName", syslogMessage.getHostname());
Assertions.assertEquals("app-role-name", syslogMessage.getAppName());
Assertions.assertEquals("2020-01-01T01:02:34.567Z", syslogMessage.getTimestamp());

final Map<String, Map<String, String>> sdElementMap = syslogMessage
.getSDElements()
.stream()
.collect(Collectors.toMap((SDElement::getSdID), (sdElem) -> sdElem.getSdParams().stream().collect(Collectors.toMap(SDParam::getParamName, SDParam::getParamValue))));

Assertions.assertEquals(1, sdElementMap.get("nlf_01@48577").size());
Assertions
.assertEquals(AppInsightType.class.getSimpleName(), sdElementMap.get("nlf_01@48577").get("eventType"));
}

@Test
Expand Down Expand Up @@ -162,6 +171,15 @@ void appInsightType_MultipleRecords() {
syslogMessage.getMsg()
);

final Map<String, Map<String, String>> sdElementMap = syslogMessage
.getSDElements()
.stream()
.collect(Collectors.toMap((SDElement::getSdID), (sdElem) -> sdElem.getSdParams().stream().collect(Collectors.toMap(SDParam::getParamName, SDParam::getParamValue))));

Assertions.assertEquals(1, sdElementMap.get("nlf_01@48577").size());
Assertions
.assertEquals(AppInsightType.class.getSimpleName(), sdElementMap.get("nlf_01@48577").get("eventType"));

final SyslogMessage syslogMessage2 = syslogMessages.get(1);
Assertions.assertEquals("md5-0ded52ef915af563e25778bf26b0f129-resourceName", syslogMessage2.getHostname());
Assertions.assertEquals("app-role-name2", syslogMessage2.getAppName());
Expand All @@ -172,6 +190,15 @@ void appInsightType_MultipleRecords() {
syslogMessage2.getMsg()
);

final Map<String, Map<String, String>> sdElementMap2 = syslogMessage2
.getSDElements()
.stream()
.collect(Collectors.toMap((SDElement::getSdID), (sdElem) -> sdElem.getSdParams().stream().collect(Collectors.toMap(SDParam::getParamName, SDParam::getParamValue))));

Assertions.assertEquals(1, sdElementMap2.get("nlf_01@48577").size());
Assertions
.assertEquals(AppInsightType.class.getSimpleName(), sdElementMap2.get("nlf_01@48577").get("eventType"));

final SyslogMessage syslogMessage3 = syslogMessages.get(2);
Assertions.assertEquals("md5-0ded52ef915af563e25778bf26b0f129-resourceName", syslogMessage3.getHostname());
Assertions.assertEquals("app-role-name3", syslogMessage3.getAppName());
Expand All @@ -181,6 +208,15 @@ void appInsightType_MultipleRecords() {
"{\"AppRoleInstance\":\"app-role-instance3\",\"AppRoleName\":\"app-role-name3\",\"ClientIP\":\"192.168.1.2\",\"ClientType\":\"client-type\",\"IKey\":\"i-key\",\"ItemCount\":1,\"Message\":\"message3\",\"OperationId\":\"123\",\"ParentId\":\"456\",\"Properties\":{\"ProcessId\":\"1234\",\"HostInstanceId\":\"123456\",\"prop__{OriginalFormat}\":\"abc\",\"prop__RouteName\":\"xyz\",\"LogLevel\":\"Debug\",\"EventId\":\"1\",\"prop__RouteTemplate\":\"route/template\",\"Category\":\"192.168.3.1\",\"EventName\":\"event-name3\"},\"ResourceGUID\":\"123456789\",\"SDKVersion\":\"12: 192.168.x.x\",\"SeverityLevel\":0,\"SourceSystem\":\"Azure\",\"TenantId\":\"12\",\"TimeGenerated\":\"2020-01-03T01:02:34.5678999Z\",\"Type\":\"AppTraces\",\"_BilledSize\":1,\"_ItemId\":\"12-34-56-78\",\"_Internal_WorkspaceResourceId\":\"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}\",\"_ResourceId\":\"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}\"}",
syslogMessage3.getMsg()
);

final Map<String, Map<String, String>> sdElementMap3 = syslogMessage3
.getSDElements()
.stream()
.collect(Collectors.toMap((SDElement::getSdID), (sdElem) -> sdElem.getSdParams().stream().collect(Collectors.toMap(SDParam::getParamName, SDParam::getParamValue))));

Assertions.assertEquals(1, sdElementMap3.get("nlf_01@48577").size());
Assertions
.assertEquals(AppInsightType.class.getSimpleName(), sdElementMap3.get("nlf_01@48577").get("eventType"));
}

@Test
Expand Down

0 comments on commit b35496f

Please sign in to comment.