HWKMETRICS-116 Allow ptrans to work behind an HTTP proxy

clients/ptranslator/ptrans.conf

@@ -42,6 +42,7 @@ collectd.port=25826
 
 # REST endpoint
 rest.url=http://localhost:8080/hawkular/metrics/gauges/data
+#http.proxy=http://proxyhost:8000
 tenant=default
 # Close connection to rest-server after this many requests
 rest.close-after=200

clients/ptranslator/src/assembly/dist/assets/ptrans.conf

@@ -42,6 +42,7 @@ collectd.port=25826
 
 # REST endpoint
 rest.url=http://localhost:8080/hawkular/metrics/gauges/data
+#http.proxy=http://proxyhost:8000
 tenant=default
 # Close connection to rest-server after this many requests
 rest.close-after=200

clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/Configuration.java

@@ -22,6 +22,7 @@
 import static org.hawkular.metrics.clients.ptrans.ConfigurationKey.GANGLIA_GROUP;
 import static org.hawkular.metrics.clients.ptrans.ConfigurationKey.GANGLIA_MULTICAST_INTERFACE;
 import static org.hawkular.metrics.clients.ptrans.ConfigurationKey.GANGLIA_PORT;
+import static org.hawkular.metrics.clients.ptrans.ConfigurationKey.HTTP_PROXY;
 import static org.hawkular.metrics.clients.ptrans.ConfigurationKey.REST_CLOSE_AFTER_REQUESTS;
 import static org.hawkular.metrics.clients.ptrans.ConfigurationKey.REST_URL;
 import static org.hawkular.metrics.clients.ptrans.ConfigurationKey.SERVICES;
@@ -60,6 +61,7 @@ public class Configuration {
     private final int minimumBatchSize;
     private final int maximumBatchDelay;
     private final URI restUrl;
+    private final URI httpProxy;
     private final String tenant;
     private final int restCloseAfterRequests;
     private final int spoolSize;
@@ -77,6 +79,7 @@ private Configuration(
             int minimumBatchSize,
             int maximumBatchDelay,
             URI restUrl,
+            URI httpProxy,
             String tenant,
             int restCloseAfterRequests,
             int spoolSize,
@@ -93,6 +96,7 @@ private Configuration(
         this.minimumBatchSize = minimumBatchSize;
         this.maximumBatchDelay = maximumBatchDelay;
         this.restUrl = restUrl;
+        this.httpProxy = httpProxy;
         this.tenant = tenant;
         this.restCloseAfterRequests = restCloseAfterRequests;
         this.spoolSize = spoolSize;
@@ -113,6 +117,11 @@ public static Configuration from(Properties properties) {
         int maximumBatchDelay = getIntProperty(properties, BATCH_DELAY, 1);
         URI restUrl = URI.create(properties.getProperty(REST_URL.toString(),
             "http://localhost:8080/hawkular/metrics/gauges/data"));
+        String proxyString = properties.getProperty(HTTP_PROXY.toString());
+        URI httpProxy = null;
+        if (proxyString != null && !proxyString.trim().isEmpty()) {
+            httpProxy = URI.create(proxyString);
+        }
         String tenant = properties.getProperty(TENANT.toString(), "default");
         int restCloseAfterRequests = getIntProperty(properties, REST_CLOSE_AFTER_REQUESTS, 200);
         int spoolSize = getIntProperty(properties, SPOOL_SIZE, 10000);
@@ -128,6 +137,7 @@ public static Configuration from(Properties properties) {
                 minimumBatchSize,
                 maximumBatchDelay,
                 restUrl,
+                httpProxy,
                 tenant,
                 restCloseAfterRequests,
                 spoolSize,
@@ -227,6 +237,10 @@ public URI getRestUrl() {
         return restUrl;
     }
 
+    public URI getHttpProxy() {
+        return httpProxy;
+    }
+
     public String getTenant() {
         return tenant;
     }

clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/ConfigurationKey.java

@@ -46,6 +46,10 @@ public enum ConfigurationKey {
     BATCH_DELAY("batch.delay"),
     /** REST endpoint **/
     REST_URL("rest.url"),
+    /**
+     * If present the HTTP proxy to use
+     **/
+    HTTP_PROXY("http.proxy"),
     /** Tenant **/
     TENANT("tenant"),
     /** Close connection to rest-server after this many requests **/

clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/backend/RestForwardingHandler.java

@@ -70,9 +70,10 @@ public class RestForwardingHandler extends ChannelInboundHandlerAdapter {
 
     public static final String TENANT_HEADER_NAME = "Hawkular-Tenant";
 
-    private final String restHost;
-    private final int restPort;
-    private final String restUri;
+    private final String host;
+    private final int port;
+    private final String postUri;
+    private final String hostHeader;
     private final String tenant;
     private final int restCloseAfterRequests;
 
@@ -93,9 +94,17 @@ public RestForwardingHandler(Configuration configuration) {
         LOG.debug("RestForwardingHandler init");
 
         URI restUrl = configuration.getRestUrl();
-        restHost = restUrl.getHost();
-        restPort = restUrl.getPort();
-        restUri = restUrl.getPath();
+        URI httpProxy = configuration.getHttpProxy();
+        if (httpProxy == null) {
+            host = restUrl.getHost();
+            port = restUrl.getPort();
+            postUri = restUrl.getPath();
+        } else {
+            host = httpProxy.getHost();
+            port = httpProxy.getPort();
+            postUri = restUrl.toString();
+        }
+        hostHeader = restUrl.getHost();
 
         tenant = configuration.getTenant();
 
@@ -162,10 +171,11 @@ private void sendToChannel(final Channel ch) {
 
         String payload = Batcher.metricListToJson(metricsToSend);
         ByteBuf content = Unpooled.copiedBuffer(payload, CharsetUtil.UTF_8);
-        FullHttpRequest request = new DefaultFullHttpRequest(HTTP_1_1, POST, restUri, content);
+        FullHttpRequest request = new DefaultFullHttpRequest(HTTP_1_1, POST, postUri, content);
         HttpHeaders.setHeader(request, CONTENT_TYPE, "application/json;charset=utf-8");
         HttpHeaders.setContentLength(request, content.readableBytes());
         HttpHeaders.setKeepAlive(request, true);
+        HttpHeaders.setHost(request, hostHeader);
         HttpHeaders.setHeader(request, TENANT_HEADER_NAME, tenant);
         // We need to send the list of metrics we are sending down the pipeline, so the status watcher
         // can later clean them out of the fifo
@@ -209,7 +219,7 @@ ChannelFuture connectRestServer(EventLoopGroup group) throws Exception {
         }
 
         Bootstrap clientBootstrap = new Bootstrap();
-        clientBootstrap.group(group).channel(NioSocketChannel.class).remoteAddress(restHost, restPort)
+        clientBootstrap.group(group).channel(NioSocketChannel.class).remoteAddress(host, port)
             .handler(new ChannelInitializer<SocketChannel>() {
                 @Override
                 protected void initChannel(SocketChannel ch) throws Exception {

clients/ptranslator/src/test/resources/ptrans.conf

@@ -42,6 +42,7 @@ collectd.port=25826
 
 # REST endpoint
 rest.url=http://localhost:8080/hawkular/metrics/gauges/data
+#http.proxy=http://proxyhost:8000
 tenant=default
 # Close connection to rest-server after this many requests
 rest.close-after=200