Stabilize the dashboard IT

Signed-off-by: Lantao Jin <ltjin@amazon.com>

Author: LantaoJin

integ-test/src/test/java/org/opensearch/sql/ppl/dashboard/NfwPplDashboardIT.java

@@ -436,7 +436,8 @@ public void testTopTCPFlowsByBytes() throws IOException {
   public void testTopTCPFlags() throws IOException {
     String query =
         String.format(
-            "source=%s | STATS count() as Count by `event.tcp.tcp_flags` | SORT - Count | HEAD 10",
+            "source=%s | STATS count() as Count by `event.tcp.tcp_flags` | SORT - Count,"
+                + " `event.tcp.tcp_flags` | HEAD 10",
             NFW_LOGS_INDEX);
     JSONObject response = executeQuery(query);
     verifySchema(response, schema("Count", "bigint"), schema("event.tcp.tcp_flags", "string"));

integ-test/src/test/java/org/opensearch/sql/ppl/dashboard/VpcFlowLogsPplDashboardIT.java

@@ -5,7 +5,6 @@
 
 package org.opensearch.sql.ppl.dashboard;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.opensearch.sql.util.MatcherUtils.rows;
 import static org.opensearch.sql.util.MatcherUtils.schema;
 import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
@@ -167,7 +166,8 @@ public void testTopTalkersByBytes() throws IOException {
   public void testTopTalkersByPackets() throws IOException {
     String query =
         String.format(
-            "source=%s | stats sum(packets) as Packets by srcaddr | sort - Packets | head 10",
+            "source=%s | stats sum(packets) as Packets by srcaddr | sort - Packets, srcaddr | head"
+                + " 10",
             VPC_FLOW_LOGS_INDEX);
     JSONObject response = executeQuery(query);
     verifySchema(response, schema("Packets", null, "bigint"), schema("srcaddr", null, "string"));
@@ -189,7 +189,8 @@ public void testTopTalkersByPackets() throws IOException {
   public void testTopDestinationsByPackets() throws IOException {
     String query =
         String.format(
-            "source=%s | stats sum(packets) as Packets by dstaddr | sort - Packets | head 10",
+            "source=%s | stats sum(packets) as Packets by dstaddr | sort - Packets, dstaddr | head"
+                + " 10",
             VPC_FLOW_LOGS_INDEX);
     JSONObject response = executeQuery(query);
     verifySchema(response, schema("Packets", null, "bigint"), schema("dstaddr", null, "string"));
@@ -211,7 +212,7 @@ public void testTopDestinationsByPackets() throws IOException {
   public void testTopTalkersByIPs() throws IOException {
     String query =
         String.format(
-            "source=%s | STATS count() as Count by srcaddr | SORT - Count | HEAD 10",
+            "source=%s | STATS count() as Count by srcaddr | SORT - Count, srcaddr | HEAD 10",
             VPC_FLOW_LOGS_INDEX);
     JSONObject response = executeQuery(query);
     verifySchema(response, schema("Count", null, "bigint"), schema("srcaddr", null, "string"));
@@ -233,7 +234,7 @@ public void testTopTalkersByIPs() throws IOException {
   public void testTopDestinationsByIPs() throws IOException {
     String query =
         String.format(
-            "source=%s | stats count() as Requests by dstaddr | sort - Requests | head 10",
+            "source=%s | stats count() as Requests by dstaddr | sort - Requests, dstaddr | head 10",
             VPC_FLOW_LOGS_INDEX);
     JSONObject response = executeQuery(query);
     verifySchema(response, schema("Requests", null, "bigint"), schema("dstaddr", null, "string"));

integ-test/src/test/java/org/opensearch/sql/ppl/dashboard/WafPplDashboardIT.java

@@ -144,7 +144,8 @@ public void testTopCountries() throws IOException {
   public void testTopTerminatingRules() throws IOException {
     String query =
         String.format(
-            "source=%s | stats count() as Count by `terminatingRuleId` | sort - Count | head 10",
+            "source=%s | stats count() as Count by `terminatingRuleId` | sort - Count,"
+                + " `terminatingRuleId` | head 10",
             WAF_LOGS_INDEX);
 
     JSONObject response = executeQuery(query);