Little refactor and typo fix

elastest · Feb 14, 2020 · b2fe402 · b2fe402
1 parent fd71bfc
commit b2fe402
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 16 deletions.
diff --git a/src/main/java/jenkins/plugins/elastest/action/ElasTestItemMenuAction.java b/src/main/java/jenkins/plugins/elastest/action/ElasTestItemMenuAction.java
@@ -51,7 +51,7 @@ public class ElasTestItemMenuAction extends Actionable implements Action {
     public ElasTestItemMenuAction(@SuppressWarnings("rawtypes") Run<?, ?> build,
             String elasTestLogAnalyzerUrl, String elasTestTJobExecutionUrl) {
         super();
-        LOG.debug("[elastest-plugin]: ElasTest Log Analayser URL: {}",
+        LOG.debug("[elastest-plugin]: ElasTest Log Analyzer URL: {}",
                 elasTestLogAnalyzerUrl);
         LOG.debug("[elastest-plugin]: ElasTest TJob execution URL: {}",
                 elasTestTJobExecutionUrl);

diff --git a/src/main/java/jenkins/plugins/elastest/pipeline/ElasTestStepExecutionImpl.java b/src/main/java/jenkins/plugins/elastest/pipeline/ElasTestStepExecutionImpl.java
@@ -183,32 +183,42 @@ private void startMonitoringContainers(EnvVars envVars, ElasTestBuild elasTestBu
         String fileBeatImage = "elastest/etm-filebeat:latest";
         String dockBeatImage = "elastest/etm-dockbeat:latest";
 
-        String logstashHost = "LOGSTASHHOST="
-                + (!envVars.get("ET_MON_LSBEATS_HOST").trim().equals("localhost")
-                        ? envVars.get("ET_MON_LSBEATS_HOST")
+        // Obtain values from Env vars
+        String etMonLsbeatsHost = envVars.get("ET_MON_LSBEATS_HOST");
+        String etMonInternalLsbeatsPort = envVars.get("ET_MON_INTERNAL_LSBEATS_PORT");
+        String etMonLsbeatsPort = envVars.get("ET_MON_LSBEATS_PORT");
+        String etSutContainerName = envVars.get("ET_SUT_CONTAINER_NAME");
+
+        // Init string env vars for monitoring services
+        String logstashHostEnv = "LOGSTASHHOST="
+                + (!etMonLsbeatsHost.trim().equals("localhost") ? etMonLsbeatsHost
                         : dockerService.getGatewayFromContainer(ETM_CONTAINER_NAME));
-        String logstashPort = "LOGSTASHPORT=" + envVars.get("ET_MON_INTERNAL_LSBEATS_PORT");
-        String etMonLsbeatsHost = "ET_MON_LSBEATS_HOST=" + envVars.get("ET_MON_LSBEATS_HOST");
-        String etMonLsbeatsPort = "ET_MON_LSBEATS_PORT=" + envVars.get("ET_MON_LSBEATS_PORT");
-        String etMonContainersName = "ET_MON_CONTAINERS_NAME=" + "^("
-                + envVars.get("ET_SUT_CONTAINER_NAME") + ")(_)?(\\d*)(.*)?";
+
+        String logstashPort = "LOGSTASHPORT=" + etMonInternalLsbeatsPort;
+        String etMonLsbeatsHostEnv = "ET_MON_LSBEATS_HOST=" + etMonLsbeatsHost;
+        String etMonLsbeatsPortEnv = "ET_MON_LSBEATS_PORT=" + etMonLsbeatsPort;
+        String etMonContainersNameEnv = "ET_MON_CONTAINERS_NAME=" + "^(" + etSutContainerName
+                + ")(_)?(\\d*)(.*)?";
+
+        String dockerSockVolume = "/var/run/docker.sock:/var/run/docker.sock";
+        String dockerContainersVolume = "/var/lib/docker/containers:/var/lib/docker/containers";
 
         if (isRemoteElasTest(channel)) {
+            // Start Filebeat
             dockerCommandExecutor.setCommand("docker", "run", "-d", "--name",
-                    "fileBeat_" + envVars.get("ET_SUT_CONTAINER_NAME"), "-e", etMonLsbeatsHost,
-                    "-e", etMonLsbeatsPort, "-e", etMonContainersName, "-v",
-                    "/var/run/docker.sock:/var/run/docker.sock", "-v",
-                    "/var/lib/docker/containers:/var/lib/docker/containers", fileBeatImage);
+                    "fileBeat_" + etSutContainerName, "-e", etMonLsbeatsHostEnv, "-e",
+                    etMonLsbeatsPortEnv, "-e", etMonContainersNameEnv, "-v", dockerSockVolume, "-v",
+                    dockerContainersVolume, fileBeatImage);
             LOG.info("[elastest-jenkins]: Built command to execute {}",
                     Arrays.toString(dockerCommandExecutor.getCommand()));
             elasTestBuild.getContainers()
                     .add(processDockeCommandOutput(channel.call(dockerCommandExecutor)));
         }
 
+        // Start Dockbeat
         dockerCommandExecutor.setCommand("docker", "run", "-d", "--name",
-                "dockBeat_" + envVars.get("ET_SUT_CONTAINER_NAME"), "-e", logstashHost, "-e",
-                logstashPort, "-v", "/var/run/docker.sock:/var/run/docker.sock", "-v",
-                "/var/lib/docker/containers:/var/lib/docker/containers", dockBeatImage);
+                "dockBeat_" + etSutContainerName, "-e", logstashHostEnv, "-e", logstashPort, "-v",
+                dockerSockVolume, "-v", dockerContainersVolume, dockBeatImage);
 
         LOG.info("[elastest-jenkins]: Built command to execute {}",
                 Arrays.toString(dockerCommandExecutor.getCommand()));