[AMBARI-24009] - Logsearch: fix backend IT (#1440)

* AMBARI-24009 - Logsearch: fix backend IT

* AMBARI-24009 - Logsearch: fix backend IT
exclude jackson

* AMBARI-24009 - Logsearch: fix backend IT
update expected log level counts

* AMBARI-24009 - Logsearch: fix backend IT

4 files changed, 33 insertions, 18 deletions

diff --git a/ambari-logsearch/ambari-logsearch-it/pom.xml b/ambari-logsearch/ambari-logsearch-it/pom.xml
index 6a2fdf148e..cf8970e74c 100644
--- a/ambari-logsearch/ambari-logsearch-it/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-it/pom.xml
@@ -35,7 +35,7 @@
     <jbehave.version>4.0.5</jbehave.version>
     <jbehave-selenium>3.5.5</jbehave-selenium>
     <jersey.version>2.23.1</jersey.version>
-    <jackson-jaxrs.version>2.6.4</jackson-jaxrs.version>
+    <jackson-jaxrs.version>2.9.4</jackson-jaxrs.version>
     <failsafe-plugin.version>2.20</failsafe-plugin.version>
     <forkCount>1</forkCount>
     <docker.host>localhost</docker.host>
@@ -97,12 +97,22 @@
           <groupId>com.google.guava</groupId>
           <artifactId>guava</artifactId>
         </exclusion>
+        <exclusion>
+          <artifactId>jackson-core</artifactId>
+          <groupId>com.fasterxml.jackson.core</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.ambari</groupId>
       <artifactId>ambari-logsearch-server</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>jackson-core</artifactId>
+          <groupId>com.fasterxml.jackson.core</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.ambari</groupId>
@@ -113,6 +123,12 @@
       <groupId>org.apache.ambari</groupId>
       <artifactId>ambari-logsearch-logfeeder</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>jackson-core</artifactId>
+          <groupId>com.fasterxml.jackson.core</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
diff --git a/ambari-logsearch/ambari-logsearch-it/src/test/java/org/apache/ambari/logsearch/steps/AbstractLogSearchSteps.java b/ambari-logsearch/ambari-logsearch-it/src/test/java/org/apache/ambari/logsearch/steps/AbstractLogSearchSteps.java
index f92516f062..e986f6fe67 100644
--- a/ambari-logsearch/ambari-logsearch-it/src/test/java/org/apache/ambari/logsearch/steps/AbstractLogSearchSteps.java
+++ b/ambari-logsearch/ambari-logsearch-it/src/test/java/org/apache/ambari/logsearch/steps/AbstractLogSearchSteps.java
@@ -18,11 +18,18 @@
  */
 package org.apache.ambari.logsearch.steps;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.URL;
+
 import org.apache.ambari.logsearch.domain.StoryDataRegistry;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrQuery;
-import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.impl.LBHttpSolrClient;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.client.solrj.response.SolrPingResponse;
@@ -30,14 +37,6 @@ import org.apache.solr.common.SolrDocumentList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.URL;
-
 public class AbstractLogSearchSteps {
 
   private static final Logger LOG = LoggerFactory.getLogger(AbstractLogSearchSteps.class);
@@ -57,7 +56,7 @@ public class AbstractLogSearchSteps {
       LOG.info("Command output: {}", output);
       StoryDataRegistry.INSTANCE.setLogsearchContainerStarted(true);
 
-      String dockerHostFromUri = System.getProperty("docker.host") != null ? System.getProperty("docker.host") : "localhost";;
+      String dockerHostFromUri = System.getProperty("docker.host") != null ? System.getProperty("docker.host") : "localhost";
 
       StoryDataRegistry.INSTANCE.setDockerHost(dockerHostFromUri);
       checkHostAndPortReachable(dockerHostFromUri, StoryDataRegistry.INSTANCE.getLogsearchPort(), "LogSearch");
@@ -76,7 +75,7 @@ public class AbstractLogSearchSteps {
     for (int tries = 1; tries < maxTries; tries++) {
       try {
         SolrClient solrClient = new LBHttpSolrClient.Builder()
-          .withBaseSolrUrl(String.format("http://%s:%d/solr/%s_shard0_replica_n1",
+          .withBaseSolrUrl(String.format("http://%s:%d/solr/%s_shard1_replica_n1",
             StoryDataRegistry.INSTANCE.getDockerHost(),
             StoryDataRegistry.INSTANCE.getSolrPort(),
             StoryDataRegistry.INSTANCE.getServiceLogsCollection()))
@@ -103,7 +102,7 @@ public class AbstractLogSearchSteps {
     }
   }
 
-  protected void waitUntilSolrHasAnyData() throws IOException, SolrServerException, InterruptedException {
+  protected void waitUntilSolrHasAnyData() throws InterruptedException {
     boolean solrHasData = false;
     int maxTries = 60;
     String lastExceptionMessage = null;
diff --git a/ambari-logsearch/ambari-logsearch-it/src/test/resources/stories/backend/logfeeder_parsing_tests.story b/ambari-logsearch/ambari-logsearch-it/src/test/resources/stories/backend/logfeeder_parsing_tests.story
index 388e624c5b..63e5d4cd0a 100644
--- a/ambari-logsearch/ambari-logsearch-it/src/test/resources/stories/backend/logfeeder_parsing_tests.story
+++ b/ambari-logsearch/ambari-logsearch-it/src/test/resources/stories/backend/logfeeder_parsing_tests.story
@@ -16,5 +16,5 @@ Examples:
 |logsearch_app|1|
 |zookeeper|3|
 |hst_agent|4|
-|secure_log|11|
+|secure_log|8|
 |system_message|17|
diff --git a/ambari-logsearch/ambari-logsearch-it/src/test/resources/test-output/service-log-level-counts-values.json b/ambari-logsearch/ambari-logsearch-it/src/test/resources/test-output/service-log-level-counts-values.json
index 0ef05e8a5b..7a6fcd896a 100644
--- a/ambari-logsearch/ambari-logsearch-it/src/test/resources/test-output/service-log-level-counts-values.json
+++ b/ambari-logsearch/ambari-logsearch-it/src/test/resources/test-output/service-log-level-counts-values.json
@@ -6,15 +6,15 @@
     },
     {
       "name": "ERROR",
-      "value": "0"
+      "value": "1"
     },
     {
       "name": "WARN",
-      "value": "3"
+      "value": "7"
     },
     {
       "name": "INFO",
-      "value": "4"
+      "value": "8"
     },
     {
       "name": "DEBUG",
@@ -26,7 +26,7 @@
     },
     {
       "name": "UNKNOWN",
-      "value": "28"
+      "value": "25"
     }
   ],
   "listSize": 7