Merge pull request #1203 from jsminem/jm-GRD-124860-main

[master] GRD-124860: [Couchbase over Filebeat] Logstash , two S-TAP entry in the report.

Author: AndychenIBM

filter-plugin/logstash-filter-couchbasedb-guardium/CHANGELOG.md

@@ -3,6 +3,9 @@ Notable changes will be documented in this file.
 
 ## [Unreleased]
 
+## [1.0.3] - 2026-05-06
+- GRD-124860: Fix two S-TAP entry in the report by setting server port to default server port `-1`
+
 ## [1.0.2] - 2025-05-30
 - Support different operations from UI
 

filter-plugin/logstash-filter-couchbasedb-guardium/CouchbasedbOverFilebeatPackage/CouchbaseDB/logstash-filter-couchbasedb_guardium_plugin_filter.zip

@@ -1 +1 @@
-1.0.2
+1.0.3

filter-plugin/logstash-filter-couchbasedb-guardium/VERSION

@@ -149,7 +149,6 @@ public static void setServerIPAndPort(final SessionLocator sessionLocator, final
 			if (!validator.isValid(serverIp)|| serverIp.equals(Constants.LOOPBACK_ADDRESS)) {
 				serverIp = data.get(Constants.SERVER_IP).getAsString();
 			}
-			serverPort = Integer.parseInt(nodeData[1]);
 
 		}else {
 			serverIp = data.get(Constants.SERVER_IP).getAsString();

filter-plugin/logstash-filter-couchbasedb-guardium/logstash-filter-couchbasedb_guardium_plugin_filter.zip

@@ -6,14 +6,14 @@
 
 import java.text.ParseException;
 
-import com.ibm.guardium.universalconnector.commons.structures.Accessor;
-import com.ibm.guardium.universalconnector.commons.structures.Construct;
-import com.ibm.guardium.universalconnector.commons.structures.Data;
-import com.ibm.guardium.universalconnector.commons.structures.ExceptionRecord;
-import com.ibm.guardium.universalconnector.commons.structures.Record;
-import com.ibm.guardium.universalconnector.commons.structures.Sentence;
-import com.ibm.guardium.universalconnector.commons.structures.SentenceObject;
-import com.ibm.guardium.universalconnector.commons.structures.SessionLocator;
+import com.ibm.guardium.universalconnector.commons.structures.Accessor;
+import com.ibm.guardium.universalconnector.commons.structures.Construct;
+import com.ibm.guardium.universalconnector.commons.structures.Data;
+import com.ibm.guardium.universalconnector.commons.structures.ExceptionRecord;
+import com.ibm.guardium.universalconnector.commons.structures.Record;
+import com.ibm.guardium.universalconnector.commons.structures.Sentence;
+import com.ibm.guardium.universalconnector.commons.structures.SentenceObject;
+import com.ibm.guardium.universalconnector.commons.structures.SessionLocator;
 import com.ibm.guardium.universalconnector.commons.structures.Time;
 import org.junit.Assert;
 import org.junit.Test;
@@ -85,7 +85,7 @@ public void testForSessionLocator() throws ParseException {
         SessionLocator sessionLocator = Parser.parseSessionLocator(couchbaseJson);
 
         Assert.assertEquals(40389, sessionLocator.getClientPort());
-        Assert.assertEquals(8091, sessionLocator.getServerPort());
+        Assert.assertEquals(Constants.DEFAULT_SERVER_PORT, sessionLocator.getServerPort());
         Assert.assertEquals(false, sessionLocator.isIpv6());
 
     }