honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add HttpClient to encapsulate HttpRequest from `WebhookAction` 

Create a `HttpClient` in alerts.support to handle http requests.
`HttpClient` is an injectable AbstractComponent.

Original commit: elastic/x-pack-elasticsearch@8e70962ddf
This commit is contained in:
Brian Murphy 2015-02-05 17:55:11 -05:00
parent f261d8aeaf
commit da1f446b49
3 changed files with 54 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/elasticsearch/alerts/actions/ActionModule.java
View File

@ -7,6 +7,7 @@ package org.elasticsearch.alerts.actions;
import org.elasticsearch.alerts.actions.email.EmailAction;
import org.elasticsearch.alerts.actions.index.IndexAction;
import org.elasticsearch.alerts.actions.webhook.HttpClient;
import org.elasticsearch.alerts.actions.webhook.WebhookAction;
import org.elasticsearch.common.inject.AbstractModule;
import org.elasticsearch.common.inject.multibindings.MapBinder;
@ -44,6 +45,7 @@ public class ActionModule extends AbstractModule {
}
bind(ActionRegistry.class).asEagerSingleton();
bind(HttpClient.class).asEagerSingleton();
}

43
src/main/java/org/elasticsearch/alerts/actions/webhook/HttpClient.java Normal file
View File

@ -0,0 +1,43 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
package org.elasticsearch.alerts.actions.webhook;
import org.elasticsearch.common.base.Charsets;
import org.elasticsearch.common.component.AbstractComponent;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.netty.handler.codec.http.HttpMethod;
import org.elasticsearch.common.settings.Settings;
import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
/**
* Client class to wrap http connections
*/
public class HttpClient extends AbstractComponent {
@Inject
public HttpClient(Settings settings) {
super(settings);
}
public int execute(HttpMethod method, String url, String body) throws IOException {
logger.debug("making [{}] request to [{}]", method.getName(), url);
if (logger.isTraceEnabled()) {
logger.trace("sending [{}] as body of request", body);
}
URL encodedUrl = new URL(URLEncoder.encode(url, Charsets.UTF_8.name()));
HttpURLConnection httpConnection = (HttpURLConnection) encodedUrl.openConnection();
httpConnection.setRequestMethod(method.getName());
httpConnection.setRequestProperty("Accept-Charset", Charsets.UTF_8.name());
httpConnection.setDoOutput(true);
httpConnection.setRequestProperty("Content-Length", Integer.toString(body.length()));
httpConnection.getOutputStream().write(body.getBytes(Charsets.UTF_8.name()));
return httpConnection.getResponseCode();
}
}

26
src/main/java/org/elasticsearch/alerts/actions/webhook/WebhookAction.java
View File

@ -11,7 +11,6 @@ import org.elasticsearch.alerts.actions.ActionException;
import org.elasticsearch.alerts.support.StringTemplateUtils;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.base.Charsets;
import org.elasticsearch.common.component.AbstractComponent;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.logging.ESLogger;
@ -22,9 +21,6 @@ import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.script.ScriptService;
import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
import java.util.HashMap;
import java.util.Map;
@ -35,6 +31,7 @@ public class WebhookAction extends Action<WebhookAction.Result> {
public static final String TYPE = "webhook";
private final StringTemplateUtils templateUtils;
private final HttpClient httpClient;
private final StringTemplateUtils.Template urlTemplate;
private final HttpMethod method;
@ -46,10 +43,12 @@ public class WebhookAction extends Action<WebhookAction.Result> {
"{ 'alertname' : '{{alert_name}}', 'request': {{request}}, 'response' : {{response}} }", null,
"mustache", ScriptService.ScriptType.INLINE );
protected WebhookAction(ESLogger logger, StringTemplateUtils templateUtils, @Nullable StringTemplateUtils.Template bodyTemplate,
protected WebhookAction(ESLogger logger, StringTemplateUtils templateUtils, HttpClient httpClient,
@Nullable StringTemplateUtils.Template bodyTemplate,
StringTemplateUtils.Template urlTemplate, HttpMethod method) {
super(logger);
this.templateUtils = templateUtils;
this.httpClient = httpClient;
this.bodyTemplate = bodyTemplate;
this.urlTemplate = urlTemplate;
this.method = method;
@ -65,17 +64,8 @@ public class WebhookAction extends Action<WebhookAction.Result> {
String renderedUrl = applyTemplate(urlTemplate, alert, data);
try {
URL urlToOpen = new URL(URLEncoder.encode(renderedUrl, Charsets.UTF_8.name()));
HttpURLConnection httpConnection = (HttpURLConnection) urlToOpen.openConnection();
httpConnection.setRequestMethod(method.getName());
httpConnection.setRequestProperty("Accept-Charset", Charsets.UTF_8.name());
httpConnection.setDoOutput(true);
String body = applyTemplate(bodyTemplate != null ? bodyTemplate : DEFAULT_BODY_TEMPLATE, alert, data);
httpConnection.setRequestProperty("Content-Length", Integer.toString(body.length()));
httpConnection.getOutputStream().write(body.getBytes(Charsets.UTF_8.name()));
int status = httpConnection.getResponseCode();
int status = httpClient.execute(method, renderedUrl, body);
if (status >= 400) {
logger.warn("got status [" + status + "] when connecting to [" + renderedUrl + "]");
} else {
@ -152,11 +142,13 @@ public class WebhookAction extends Action<WebhookAction.Result> {
public static final ParseField BODY_TEMPLATE_FIELD = new ParseField("body_template");
private final StringTemplateUtils templateUtils;
private final HttpClient httpClient;
@Inject
public Parser(Settings settings, StringTemplateUtils templateUtils) {
public Parser(Settings settings, StringTemplateUtils templateUtils, HttpClient httpClient) {
super(settings);
this.templateUtils = templateUtils;
this.httpClient = httpClient;
}
@Override
@ -199,7 +191,7 @@ public class WebhookAction extends Action<WebhookAction.Result> {
throw new ActionException("could not parse webhook action. [url_template] is required");
}
return new WebhookAction(logger, templateUtils, bodyTemplate, urlTemplate, method);
return new WebhookAction(logger, templateUtils, httpClient, bodyTemplate, urlTemplate, method);
}
}
}