Repository: EnMasseProject/enmasse
Pull request #2543 (2019-03-28 16:09:26)

Scrape router and broker metrics


Patch:
diff --git a/address-space-controller/pom.xml b/address-space-controller/pom.xml
index 6413303c7..b5a08b2e8 100644
--- a/address-space-controller/pom.xml
+++ b/address-space-controller/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>address-space-controller</artifactId>
diff --git a/address-space-controller/src/main/resources/templates/brokered-space-infra.yaml b/address-space-controller/src/main/resources/templates/brokered-space-infra.yaml
index ddd50f602..f1c6ae08d 100644
--- a/address-space-controller/src/main/resources/templates/brokered-space-infra.yaml
+++ b/address-space-controller/src/main/resources/templates/brokered-space-infra.yaml
@@ -220,6 +220,10 @@ objects:
     - name: amqps-normal
       port: 55671
       targetPort: amqps-normal
+    - name: health
+      port: 8080
+      protocol: TCP
+      targetPort: artemismetrics
     selector:
       role: broker
       infraUuid: ${INFRA_UUID}
diff --git a/address-space-controller/src/main/resources/templates/standard-space-infra.yaml b/address-space-controller/src/main/resources/templates/standard-space-infra.yaml
index 554e07c02..b9d31ff01 100644
--- a/address-space-controller/src/main/resources/templates/standard-space-infra.yaml
+++ b/address-space-controller/src/main/resources/templates/standard-space-infra.yaml
@@ -556,6 +556,10 @@ objects:
     - name: inter-router
       port: 55672
       targetPort: 55672
+    - name: health
+      port: 8080
+      protocol: TCP
+      targetPort: http
     selector:
       capability: router
       infraUuid: ${INFRA_UUID}
diff --git a/agent/pom.xml b/agent/pom.xml
index 8c943b2d5..bcb24928c 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.enmasse</groupId>
diff --git a/amqp-utils/pom.xml b/amqp-utils/pom.xml
index 234d96c44..cd88b1f9b 100644
--- a/amqp-utils/pom.xml
+++ b/amqp-utils/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>amqp-utils</artifactId>
diff --git a/api-common/pom.xml b/api-common/pom.xml
index 4ce6a1e61..e1f1b0839 100644
--- a/api-common/pom.xml
+++ b/api-common/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>api-common</artifactId>
diff --git a/api-model/pom.xml b/api-model/pom.xml
index 12d368ff4..e7815cfb2 100644
--- a/api-model/pom.xml
+++ b/api-model/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>api-model</artifactId>
diff --git a/api-server/pom.xml b/api-server/pom.xml
index 76b2c3ff8..1c34ab9eb 100644
--- a/api-server/pom.xml
+++ b/api-server/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>api-server</artifactId>
diff --git a/artemis/pom.xml b/artemis/pom.xml
index 566ed644f..1498110b8 100644
--- a/artemis/pom.xml
+++ b/artemis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
diff --git a/broker-plugin/amqp-connector/pom.xml b/broker-plugin/amqp-connector/pom.xml
index a7ece4a42..6d0732a49 100644
--- a/broker-plugin/amqp-connector/pom.xml
+++ b/broker-plugin/amqp-connector/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>broker-plugin</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>amqp-connector</artifactId>
diff --git a/broker-plugin/jmx_exporter/pom.xml b/broker-plugin/jmx_exporter/pom.xml
index 9cafbf12a..00ecdc388 100644
--- a/broker-plugin/jmx_exporter/pom.xml
+++ b/broker-plugin/jmx_exporter/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>broker-plugin</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jmx_exporter</artifactId>
diff --git a/broker-plugin/plugin/pom.xml b/broker-plugin/plugin/pom.xml
index 47495a705..d0d3e4323 100644
--- a/broker-plugin/plugin/pom.xml
+++ b/broker-plugin/plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>broker-plugin</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
diff --git a/broker-plugin/pom.xml b/broker-plugin/pom.xml
index c6588de05..c234a4358 100644
--- a/broker-plugin/pom.xml
+++ b/broker-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
diff --git a/broker-plugin/sasl-delegation/pom.xml b/broker-plugin/sasl-delegation/pom.xml
index f48b47e67..3aed018ef 100644
--- a/broker-plugin/sasl-delegation/pom.xml
+++ b/broker-plugin/sasl-delegation/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>broker-plugin</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>sasl-delegation</artifactId>
diff --git a/broker-plugin/tcnative/pom.xml b/broker-plugin/tcnative/pom.xml
index 547b34f0c..a153a7316 100644
--- a/broker-plugin/tcnative/pom.xml
+++ b/broker-plugin/tcnative/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>broker-plugin</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>tcnative</artifactId>
diff --git a/bundle/pom.xml b/bundle/pom.xml
index 8d4bfa787..ab9ef84e4 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>enmasse</artifactId>
         <groupId>io.enmasse</groupId>
-        <version>0.27-SNAPSHOT</version>
+        <version>0.28-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
     <name>EnMasse Bundles</name>
diff --git a/discovery-lib/pom.xml b/discovery-lib/pom.xml
index 39ebe2c5d..976befff1 100644
--- a/discovery-lib/pom.xml
+++ b/discovery-lib/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>discovery-lib</artifactId>
diff --git a/enmasse-controller-manager/pom.xml b/enmasse-controller-manager/pom.xml
index 47209ba64..62c50f863 100644
--- a/enmasse-controller-manager/pom.xml
+++ b/enmasse-controller-manager/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
diff --git a/iot/iot-application-base/pom.xml b/iot/iot-application-base/pom.xml
index e08904e68..c01a20b28 100644
--- a/iot/iot-application-base/pom.xml
+++ b/iot/iot-application-base/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>iot</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
 
   <artifactId>iot-application-base</artifactId>
diff --git a/iot/iot-auth-service/pom.xml b/iot/iot-auth-service/pom.xml
index e33ee921b..7a9f06a32 100644
--- a/iot/iot-auth-service/pom.xml
+++ b/iot/iot-auth-service/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>iot-application-base</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
     <relativePath>../iot-application-base</relativePath>
   </parent>
 
diff --git a/iot/iot-device-registry/pom.xml b/iot/iot-device-registry/pom.xml
index aacccc3a4..ae658978e 100644
--- a/iot/iot-device-registry/pom.xml
+++ b/iot/iot-device-registry/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>iot-application-base</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
     <relativePath>../iot-application-base</relativePath>
   </parent>
 
diff --git a/iot/iot-gc/pom.xml b/iot/iot-gc/pom.xml
index 8c944a5e7..8bf2c623c 100644
--- a/iot/iot-gc/pom.xml
+++ b/iot/iot-gc/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>iot-application-base</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
     <relativePath>../iot-application-base</relativePath>
   </parent>
   <packaging>pom</packaging>
diff --git a/iot/iot-http-adapter/pom.xml b/iot/iot-http-adapter/pom.xml
index d96f9f5ac..4f6067efc 100644
--- a/iot/iot-http-adapter/pom.xml
+++ b/iot/iot-http-adapter/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>iot-application-base</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
     <relativePath>../iot-application-base</relativePath>
   </parent>
 
diff --git a/iot/iot-mqtt-adapter/pom.xml b/iot/iot-mqtt-adapter/pom.xml
index 4ba52f2a0..a33d28e35 100644
--- a/iot/iot-mqtt-adapter/pom.xml
+++ b/iot/iot-mqtt-adapter/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>iot-application-base</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
     <relativePath>../iot-application-base</relativePath>
   </parent>
 
diff --git a/iot/iot-tenant-service/pom.xml b/iot/iot-tenant-service/pom.xml
index aa3a18f6f..33118c73f 100644
--- a/iot/iot-tenant-service/pom.xml
+++ b/iot/iot-tenant-service/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>iot-application-base</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
     <relativePath>../iot-application-base</relativePath>
   </parent>
 
diff --git a/iot/pom.xml b/iot/pom.xml
index cc44b5687..308144904 100644
--- a/iot/pom.xml
+++ b/iot/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <artifactId>iot</artifactId>
   <packaging>pom</packaging>
diff --git a/iot/qdr-proxy-configurator/pom.xml b/iot/qdr-proxy-configurator/pom.xml
index 5230d6d26..2fcca69c2 100644
--- a/iot/qdr-proxy-configurator/pom.xml
+++ b/iot/qdr-proxy-configurator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>iot-application-base</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
     <relativePath>../iot-application-base</relativePath>
   </parent>
   <packaging>pom</packaging>
diff --git a/k8s-api/pom.xml b/k8s-api/pom.xml
index 45406e018..95390b8f8 100644
--- a/k8s-api/pom.xml
+++ b/k8s-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.enmasse</groupId>
diff --git a/keycloak-plugin/pom.xml b/keycloak-plugin/pom.xml
index 5eb650b0c..34895c70f 100644
--- a/keycloak-plugin/pom.xml
+++ b/keycloak-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
diff --git a/keycloak-plugin/sasl-plugin/pom.xml b/keycloak-plugin/sasl-plugin/pom.xml
index d28664aca..4fe757bcd 100644
--- a/keycloak-plugin/sasl-plugin/pom.xml
+++ b/keycloak-plugin/sasl-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>keycloak</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>sasl-plugin</artifactId>
diff --git a/keycloak-user-api/pom.xml b/keycloak-user-api/pom.xml
index 419146327..5346dc071 100644
--- a/keycloak-user-api/pom.xml
+++ b/keycloak-user-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.enmasse</groupId>
diff --git a/metrics-api/pom.xml b/metrics-api/pom.xml
index 141214491..afbdab5da 100644
--- a/metrics-api/pom.xml
+++ b/metrics-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.enmasse</groupId>
diff --git a/mqtt-gateway/pom.xml b/mqtt-gateway/pom.xml
index 02b7e4902..16a68e397 100644
--- a/mqtt-gateway/pom.xml
+++ b/mqtt-gateway/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>mqtt-gateway</artifactId>
diff --git a/mqtt-lwt/pom.xml b/mqtt-lwt/pom.xml
index 5b9320057..dcb3b0542 100644
--- a/mqtt-lwt/pom.xml
+++ b/mqtt-lwt/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>mqtt-lwt</artifactId>
diff --git a/none-authservice/pom.xml b/none-authservice/pom.xml
index 4ba277d08..003d99d3f 100644
--- a/none-authservice/pom.xml
+++ b/none-authservice/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>none-authservice</artifactId>
diff --git a/none-authservice/src/main/java/io/enmasse/authservice/none/HealthServer.java b/none-authservice/src/main/java/io/enmasse/authservice/none/HealthServer.java
new file mode 100644
index 000000000..3d8c77c51
--- /dev/null
+++ b/none-authservice/src/main/java/io/enmasse/authservice/none/HealthServer.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2019, EnMasse authors.
+ * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
+ */
+package io.enmasse.authservice.none;
+
+import io.vertx.core.AbstractVerticle;
+import io.vertx.core.Future;
+import io.vertx.core.http.HttpServer;
+import io.vertx.core.http.HttpServerOptions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class HealthServer extends AbstractVerticle  {
+    private static final Logger log = LoggerFactory.getLogger(HealthServer.class);
+    private final HttpServerOptions serverOptions;
+    public HealthServer(HttpServerOptions serverOptions) {
+        this.serverOptions = serverOptions;
+    }
+
+    @Override
+    public void start(Future<Void> startPromise) {
+        HttpServer httpServer = vertx.createHttpServer(serverOptions);
+        httpServer.requestHandler(httpServerRequest -> httpServerRequest.response().end("OK"));
+        httpServer.listen(result -> {
+            if (result.succeeded()) {
+                log.info("HealthServer started");
+                startPromise.complete();
+            } else {
+                log.error("Error starting HealthServer");
+                startPromise.fail(result.cause());
+            }
+        });
+
+    }
+}
diff --git a/none-authservice/src/main/java/io/enmasse/authservice/none/NoneAuthService.java b/none-authservice/src/main/java/io/enmasse/authservice/none/NoneAuthService.java
index 910e0464c..3d5bf060f 100644
--- a/none-authservice/src/main/java/io/enmasse/authservice/none/NoneAuthService.java
+++ b/none-authservice/src/main/java/io/enmasse/authservice/none/NoneAuthService.java
@@ -5,66 +5,41 @@
 package io.enmasse.authservice.none;
 
 import io.vertx.core.Vertx;
+import io.vertx.core.http.HttpServerOptions;
 import io.vertx.core.net.PemKeyCertOptions;
-import io.vertx.proton.ProtonConnection;
-import io.vertx.proton.ProtonServer;
 import io.vertx.proton.ProtonServerOptions;
-import org.apache.qpid.proton.amqp.Symbol;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
 
 public class NoneAuthService {
     private static final Logger log = LoggerFactory.getLogger(NoneAuthService.class);
-    private static final Symbol AUTHENTICATED_IDENTITY = Symbol.getSymbol("authenticated-identity");
-    private static final Symbol GROUPS = Symbol.getSymbol("groups");
 
     public static void main(String[] args) {
         Map<String, String> env = System.getenv();
         String certDir = env.getOrDefault("CERT_DIR", "/opt/none-authservice/cert");
         int listenPort = Integer.parseInt(env.getOrDefault("LISTENPORT", "5671"));
+        int healthPort = Integer.parseInt(env.getOrDefault("HEALTHPORT", "8080"));
 
         Vertx vertx = Vertx.vertx();
 
-        ProtonServerOptions options = new ProtonServerOptions();
-        options.setSsl(true);
-        options.setPemKeyCertOptions(new PemKeyCertOptions()
-                .setCertPath(new File(certDir, "tls.crt").getAbsolutePath())
-                .setKeyPath(new File(certDir, "tls.key").getAbsolutePath()));
-
-        ProtonServer server = ProtonServer.create(vertx, options);
-        server.connectHandler(NoneAuthService::connectHandler);
-        server.saslAuthenticatorFactory(NoneAuthServiceAuthenticator::new);
-        server.listen(listenPort, "0.0.0.0", result -> {
-            if (result.succeeded()) {
-                log.info("Listening on {}", listenPort);
-            } else {
-                log.error("Error listening on {}", listenPort, result.cause());
-            }
-        });
-    }
-
-    private static void connectHandler(ProtonConnection connection) {
-        connection.setContainer("none-authservice");
-        connection.openHandler(conn -> {
-            Map<Symbol, Object> properties = new HashMap<>();
-
-            properties.put(AUTHENTICATED_IDENTITY, Collections.singletonMap("sub", "anonymous"));
-            properties.put(GROUPS, Collections.singletonList("manage"));
-
-            connection.setProperties(properties);
-            connection.open();
-            connection.close();
-
-        }).closeHandler(conn -> {
-            connection.close();
-            connection.disconnect();
-        }).disconnectHandler(protonConnection -> {
-            connection.disconnect();
-        });
+        ProtonServerOptions protonServerOptions = new ProtonServerOptions()
+                .setSsl(true)
+                .setPort(listenPort)
+                .setHost("0.0.0.0")
+                .setPemKeyCertOptions(new PemKeyCertOptions()
+                        .setCertPath(new File(certDir, "tls.crt").getAbsolutePath())
+                        .setKeyPath(new File(certDir, "tls.key").getAbsolutePath()));
+        SaslServer saslServer = new SaslServer(protonServerOptions);
+
+        HttpServerOptions httpServerOptions = new HttpServerOptions()
+                .setHost("0.0.0.0")
+                .setPort(healthPort);
+        HealthServer healthServer = new HealthServer(httpServerOptions);
+
+        vertx.deployVerticle(saslServer);
+        vertx.deployVerticle(healthServer);
     }
 }
diff --git a/none-authservice/src/main/java/io/enmasse/authservice/none/SaslServer.java b/none-authservice/src/main/java/io/enmasse/authservice/none/SaslServer.java
new file mode 100644
index 000000000..076d16e53
--- /dev/null
+++ b/none-authservice/src/main/java/io/enmasse/authservice/none/SaslServer.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2019, EnMasse authors.
+ * License: Apache License 2.0 (see the file LICENSE or http://apache.org/licenses/LICENSE-2.0.html).
+ */
+package io.enmasse.authservice.none;
+
+import io.vertx.core.AbstractVerticle;
+import io.vertx.core.Future;
+import io.vertx.proton.ProtonConnection;
+import io.vertx.proton.ProtonServer;
+import io.vertx.proton.ProtonServerOptions;
+import org.apache.qpid.proton.amqp.Symbol;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public class SaslServer extends AbstractVerticle {
+    private static final Logger log = LoggerFactory.getLogger(SaslServer.class);
+    private static final Symbol AUTHENTICATED_IDENTITY = Symbol.getSymbol("authenticated-identity");
+    private static final Symbol GROUPS = Symbol.getSymbol("groups");
+    private final ProtonServerOptions options;
+    public SaslServer(ProtonServerOptions options) {
+        this.options  = options;
+    }
+
+    @Override
+    public void start(Future<Void> startPromise) {
+
+        ProtonServer server = ProtonServer.create(vertx, options);
+        server.connectHandler(SaslServer::connectHandler);
+        server.saslAuthenticatorFactory(NoneAuthServiceAuthenticator::new);
+        server.listen(result -> {
+            if (result.succeeded()) {
+                log.info("SaslServer started");
+                startPromise.complete();
+            } else {
+                log.error("Error starting SaslServer");
+                startPromise.fail(result.cause());
+            }
+        });
+    }
+
+    private static void connectHandler(ProtonConnection connection) {
+        connection.setContainer("none-authservice");
+        connection.openHandler(conn -> {
+            Map<Symbol, Object> properties = new HashMap<>();
+
+            properties.put(AUTHENTICATED_IDENTITY, Collections.singletonMap("sub", "anonymous"));
+            properties.put(GROUPS, Collections.singletonList("manage"));
+
+            connection.setProperties(properties);
+            connection.open();
+            connection.close();
+
+        }).closeHandler(conn -> {
+            connection.close();
+            connection.disconnect();
+        }).disconnectHandler(protonConnection -> {
+            connection.disconnect();
+        });
+    }
+}
diff --git a/pkg/controller/authenticationservice/none.go b/pkg/controller/authenticationservice/none.go
index f8253f9af..3857b5c66 100644
--- a/pkg/controller/authenticationservice/none.go
+++ b/pkg/controller/authenticationservice/none.go
@@ -47,21 +47,33 @@ func applyNoneAuthServiceDeployment(authservice *adminv1beta1.AuthenticationServ
 				Name:  "LISTENPORT",
 				Value: "5671",
 			},
+			{
+				Name:  "HEALTHPORT",
+				Value: "8080",
+			},
 		}
 
 		container.LivenessProbe = &corev1.Probe{
-			InitialDelaySeconds: 60,
+			InitialDelaySeconds: 30,
 			Handler: corev1.Handler{
-				TCPSocket: &corev1.TCPSocketAction{
-					Port: intstr.FromString("amqps"),
+				HTTPGet: &corev1.HTTPGetAction{
+					Port:   intstr.FromString("http"),
+					Path:   "/healthz",
+					Scheme: "HTTP",
 				},
 			},
 		}
 
-		container.Ports = []corev1.ContainerPort{{
-			ContainerPort: 5671,
-			Name:          "amqps",
-		}}
+		container.Ports = []corev1.ContainerPort{
+			{
+				ContainerPort: 5671,
+				Name:          "amqps",
+			},
+			{
+				ContainerPort: 8080,
+				Name:          "http",
+			},
+		}
 
 		install.ApplyVolumeMountSimple(container, "none-authservice-cert", "/opt/none-authservice/cert", true)
 	})
diff --git a/pom.properties b/pom.properties
index 045c65307..8f8f65c04 100644
--- a/pom.properties
+++ b/pom.properties
@@ -1,5 +1,5 @@
 application.display.name=EnMasse
 application.bundle.prefix=enmasse
 license.advice.text=EnMasse comprises the following components:
-release.version=0.27-SNAPSHOT
-maven.version=0.27-SNAPSHOT
+release.version=0.28-SNAPSHOT
+maven.version=0.28-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index ef15fa172..69a3fc079 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
     <packaging>pom</packaging>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
 
     <name>EnMasse</name>
     <url>http://enmasse.io/</url>
diff --git a/service-broker/pom.xml b/service-broker/pom.xml
index a608b394e..fdb1c80c1 100644
--- a/service-broker/pom.xml
+++ b/service-broker/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>service-broker</artifactId>
diff --git a/standard-controller/pom.xml b/standard-controller/pom.xml
index 20c50f25f..645e9872c 100644
--- a/standard-controller/pom.xml
+++ b/standard-controller/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>standard-controller</artifactId>
diff --git a/standard-controller/src/main/resources/templates/queue-persisted.yaml b/standard-controller/src/main/resources/templates/queue-persisted.yaml
index e95fcdba5..6a5cfaa90 100644
--- a/standard-controller/src/main/resources/templates/queue-persisted.yaml
+++ b/standard-controller/src/main/resources/templates/queue-persisted.yaml
@@ -17,6 +17,11 @@ objects:
       infraUuid: ${INFRA_UUID}
     name: ${NAME}
   spec:
+    ports:
+    - name: health
+      port: 8080
+      protocol: TCP
+      targetPort: artemismetrics
     clusterIP: None
     selector:
       name: ${NAME}
diff --git a/standard-controller/src/main/resources/templates/topic-persisted.yaml b/standard-controller/src/main/resources/templates/topic-persisted.yaml
index 894de8496..0f181c369 100644
--- a/standard-controller/src/main/resources/templates/topic-persisted.yaml
+++ b/standard-controller/src/main/resources/templates/topic-persisted.yaml
@@ -17,6 +17,11 @@ objects:
       infraUuid: ${INFRA_UUID}
     name: ${NAME}
   spec:
+    ports:
+    - name: health
+      port: 8080
+      protocol: TCP
+      targetPort: artemismetrics
     clusterIP: None
     selector:
       name: ${NAME}
diff --git a/topic-forwarder/pom.xml b/topic-forwarder/pom.xml
index db0c2bd83..6a6f7b889 100644
--- a/topic-forwarder/pom.xml
+++ b/topic-forwarder/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>topic-forwarder</artifactId>


Test patch:
diff --git a/k8s-api-testutil/pom.xml b/k8s-api-testutil/pom.xml
index 3d32e6458..fbf2e435c 100644
--- a/k8s-api-testutil/pom.xml
+++ b/k8s-api-testutil/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.enmasse</groupId>
     <artifactId>enmasse</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.28-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.enmasse</groupId>
diff --git a/systemtests/pom.xml b/systemtests/pom.xml
index 6388ab8fb..d01a15e0e 100644
--- a/systemtests/pom.xml
+++ b/systemtests/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.enmasse</groupId>
         <artifactId>enmasse</artifactId>
-        <version>0.27-SNAPSHOT</version>
+        <version>0.28-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>systemtests</artifactId>