HAWKULAR-1334 Expose default Prometheus endpoint (#489)

hawkular · Nov 17, 2017 · 2251cec · 2251cec
1 parent 3dcb8d5
commit 2251cec
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/.../deployments/hawkular-prometheus-alerter-standalone/src/main/webapp/WEB-INF/jboss-web.xml b/.../deployments/hawkular-prometheus-alerter-standalone/src/main/webapp/WEB-INF/jboss-web.xml
@@ -18,5 +18,5 @@
 
 -->
 <jboss-web>
-  <context-root>/hawkular/__alerter_prometheus</context-root>
+  <context-root>/hawkular/alerter/prometheus</context-root>
 </jboss-web>
diff --git a/...rometheus-alerter-lib/src/main/java/org/hawkular/alerter/prometheus/ConditionManager.java b/...rometheus-alerter-lib/src/main/java/org/hawkular/alerter/prometheus/ConditionManager.java
@@ -152,6 +152,10 @@ public void init() {
         }
     }
 
+    public String getPrometheusUrlDefault() {
+        return defaultProperties.get(URL);
+    }
+
     @PreDestroy
     public void stop() {
         log.infof("Stopping Hawkular Prometheus External Alerter");

diff --git a/...ar-prometheus-alerter-lib/src/main/java/org/hawkular/alerter/prometheus/rest/Handler.java b/...ar-prometheus-alerter-lib/src/main/java/org/hawkular/alerter/prometheus/rest/Handler.java
@@ -18,6 +18,7 @@
 
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
+import static javax.ws.rs.core.MediaType.TEXT_PLAIN;
 
 import static org.hawkular.alerter.prometheus.ServiceNames.Service.ALERTS_SERVICE;
 
@@ -26,6 +27,7 @@
 import java.util.Map;
 import java.util.UUID;
 
+import javax.ejb.EJB;
 import javax.naming.InitialContext;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
@@ -34,6 +36,7 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
 
+import org.hawkular.alerter.prometheus.ConditionManager;
 import org.hawkular.alerter.prometheus.ServiceNames;
 import org.hawkular.alerts.api.model.event.Event;
 import org.hawkular.alerts.api.services.AlertsService;
@@ -51,10 +54,20 @@
 public class Handler {
     private final Logger log = Logger.getLogger(Handler.class);
 
+    @EJB
+    ConditionManager conditionManager;
+
     public Handler() {
         log.debug("Creating instance.");
     }
 
+    @GET
+    @Path("/endpoint")
+    @Produces(TEXT_PLAIN)
+    public Response endpoint() {
+        return ok(conditionManager.getPrometheusUrlDefault());
+    }
+
     @GET
     @Path("/status")
     @Produces(APPLICATION_JSON)