Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ability to query individual health checks #898

Closed
wants to merge 1 commit into from
Closed

ability to query individual health checks #898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
ability to query individual health checks
  • Loading branch information
@osigida
osigida committed Dec 14, 2015
commit 13905068a61e68aef8ad96fea2329f5942e2afad
5 changes: 4 additions & 1 deletion metrics-servlets/src/main/java/io/dropwizard/metrics/servlets/AdminServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public class AdminServlet extends HttpServlet {
public static final String PING_URI_PARAM_KEY = "ping-uri";
public static final String THREADS_URI_PARAM_KEY = "threads-uri";
public static final String HEALTHCHECK_URI_PARAM_KEY = "healthcheck-uri";
public static final String HEALTHCHECK_PARAM_ATTRIBUTE_KEY = "healthcheck-param";
public static final String SERVICE_NAME_PARAM_KEY= "service-name";

private static final String TEMPLATE = String.format(
Expand Down Expand Up @@ -97,7 +98,9 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws
final String uri = req.getPathInfo();
if (uri == null || uri.equals("/")) {
super.service(req, resp);
} else if (uri.equals(healthcheckUri)) {
} else if (uri.startsWith(healthcheckUri)) {
String healthCheckParam = uri.substring(healthcheckUri.length());
req.setAttribute(HEALTHCHECK_PARAM_ATTRIBUTE_KEY, healthCheckParam);
healthCheckServlet.service(req, resp);
} else if (uri.startsWith(metricsUri)) {
metricsServlet.service(req, resp);
Expand Down
26 changes: 21 additions & 5 deletions metrics-servlets/src/main/java/io/dropwizard/metrics/servlets/HealthCheckServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,17 @@

import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectWriter;

import io.dropwizard.metrics.json.HealthCheckModule;

import io.dropwizard.metrics.health.HealthCheck;
import io.dropwizard.metrics.health.HealthCheckRegistry;
import io.dropwizard.metrics.json.HealthCheckModule;

import javax.servlet.*;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import java.io.IOException;
import java.io.OutputStream;
import java.util.Collections;
import java.util.Map;
import java.util.SortedMap;
import java.util.concurrent.ExecutorService;
Expand Down Expand Up @@ -89,7 +87,13 @@ public void init(ServletConfig config) throws ServletException {
@Override
protected void doGet(HttpServletRequest req,
HttpServletResponse resp) throws ServletException, IOException {
final SortedMap<String, HealthCheck.Result> results = runHealthChecks();
final Map<String, HealthCheck.Result> results;
String name = getHealthCheckName(req);
if (name != null) {
results = Collections.singletonMap(name, registry.runHealthCheck(name));
} else {
results = runHealthChecks();
}
resp.setContentType(CONTENT_TYPE);
resp.setHeader("Cache-Control", "must-revalidate,no-cache,no-store");
if (results.isEmpty()) {
Expand All @@ -110,6 +114,18 @@ protected void doGet(HttpServletRequest req,
}
}

private String getHealthCheckName(HttpServletRequest request) {
String param = (String) request.getAttribute(AdminServlet.HEALTHCHECK_PARAM_ATTRIBUTE_KEY);
if (param != null) {
if (param.startsWith("/")) {
param = param.substring(1);
}
return param.isEmpty() ? null : param;
}

return null;
}

private ObjectWriter getWriter(HttpServletRequest request) {
final boolean prettyPrint = Boolean.parseBoolean(request.getParameter("pretty"));
if (prettyPrint) {
Expand Down