Merge pull request #30 from delirius325/jmeter-variables

Auth Header for XPack

Author: anthonygauthier

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.github.delirius325</groupId>
 	<artifactId>jmeter.backendlistener.elasticsearch</artifactId>
-	<version>2.4.0</version>
+	<version>2.4.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>jmeter.backendlistener.elasticsearch</name>

src/main/java/io/github/delirius325/jmeter/backendlistener/elasticsearch/ElasticSearchMetricSender.java

@@ -1,8 +1,10 @@
 package io.github.delirius325.jmeter.backendlistener.elasticsearch;
 
+import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpStatus;
 import org.apache.http.entity.ContentType;
+import org.apache.http.message.BasicHeader;
 import org.apache.http.nio.entity.NStringEntity;
 import org.elasticsearch.client.Response;
 import org.elasticsearch.client.RestClient;
@@ -19,11 +21,17 @@ public class ElasticSearchMetricSender {
     private RestClient client;
     private String esIndex;
     private List<String> metricList;
+    private String authUser;
+    private String authPwd;
+    private BasicHeader authHeader;
 
-    public ElasticSearchMetricSender(RestClient cli, String index) {
+    public ElasticSearchMetricSender(RestClient cli, String index, String user, String pwd) {
         this.client = cli;
         this.esIndex = index;
         this.metricList = new LinkedList<String>();
+        this.authUser = user.trim();
+        this.authPwd = pwd.trim();
+        this.authHeader = null;
     }
 
     /**
@@ -76,7 +84,16 @@ public void sendRequest() {
 
         HttpEntity entity = new NStringEntity(bulkRequestBody.toString(), ContentType.APPLICATION_JSON);
         try {
-            Response response = this.client.performRequest("POST", "/"+ this.esIndex +"/SampleResult/_bulk", Collections.emptyMap(), entity);
+            if(!this.authUser.equals("") && !this.authPwd.equals("")) {
+                String encodedCredentials = Base64.getEncoder().encodeToString((this.authUser + ":" + this.authPwd).getBytes());
+
+                this.authHeader = new BasicHeader("Authorization", "Basic " + encodedCredentials);
+            }
+
+            Response response = (this.authHeader != null)
+                ? this.client.performRequest("POST", "/"+ this.esIndex +"/SampleResult/_bulk", Collections.emptyMap(), entity, this.authHeader)
+                : this.client.performRequest("POST", "/"+ this.esIndex +"/SampleResult/_bulk", Collections.emptyMap(), entity);
+
             if(response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
                 if(logger.isErrorEnabled()) {
                     logger.error("ElasticSearch Backend Listener failed to write results for index {}", this.esIndex);

src/main/java/io/github/delirius325/jmeter/backendlistener/elasticsearch/ElasticsearchBackendClient.java

@@ -25,6 +25,8 @@ public class ElasticsearchBackendClient extends AbstractBackendListenerClient {
     private static final String ES_SAMPLE_FILTER    = "es.sample.filter";
     private static final String ES_TEST_MODE        = "es.test.mode";
     private static final String ES_INCLUDE_VARS     = "es.include.all.vars";
+    private static final String ES_AUTH_USER        = "es.xpack.user";
+    private static final String ES_AUTH_PWD         = "es.xpack.password";
     private static final long DEFAULT_TIMEOUT_MS = 200L;
     private static final Logger logger = LoggerFactory.getLogger(ElasticsearchBackendClient.class);
 
@@ -49,6 +51,8 @@ public Arguments getDefaultParameters() {
         parameters.addArgument(ES_SAMPLE_FILTER, null);
         parameters.addArgument(ES_TEST_MODE, "info");
         parameters.addArgument(ES_INCLUDE_VARS, "false");
+        parameters.addArgument(ES_AUTH_USER, "");
+        parameters.addArgument(ES_AUTH_PWD, "");
         return parameters;
     }
 
@@ -71,7 +75,8 @@ public void onFailure(HttpHost host) {
                     })
                     .setMaxRetryTimeoutMillis(60000)
                     .build();
-            this.sender = new ElasticSearchMetricSender(this.client, context.getParameter(ES_INDEX).toLowerCase());
+
+            this.sender = new ElasticSearchMetricSender(this.client, context.getParameter(ES_INDEX).toLowerCase() ,context.getParameter(ES_AUTH_USER), context.getParameter(ES_AUTH_PWD));
             this.sender.createIndex();
 
             checkTestMode(context.getParameter(ES_TEST_MODE));