IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

activate console logging early, fix grafana configs

Browse Source
This commit is contained in:
Jonathan Shook
2020-03-25 18:07:31 -05:00
parent 2218cf373a
commit 95c0232eca
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
View File

@@ -66,6 +66,8 @@ public class NBCLI {
}
NBCLIOptions options = new NBCLIOptions(args);
ConsoleLogging.enableConsoleLogging(options.wantsConsoleLogLevel(), options.getConsoleLoggingPattern());
if (options.wantsBasicHelp()) {
System.out.println(loadHelpFile("basic.md"));
@@ -183,7 +185,6 @@ public class NBCLI {
ActivityMetrics.addClassicHistos(sessionName, classicConfigs.pattern, classicConfigs.file, classicConfigs.interval);
}
ConsoleLogging.enableConsoleLogging(options.wantsConsoleLogLevel(), options.getConsoleLoggingPattern());
// intentionally not shown for warn-only
logger.info("console logging level is " + options.wantsConsoleLogLevel());

26
engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsHelper.java
View File

@@ -71,7 +71,7 @@ public class DockerMetricsHelper {
public void startMetrics() {
logger.info("preparing to startg graphite exporter container");
logger.info("preparing to start graphite exporter container...");
//docker run -d -p 9108:9108 -p 9109:9109 -p 9109:9109/udp prom/graphite-exporter
String GRAPHITE_EXPORTER_IMG = "prom/graphite-exporter";
@@ -269,8 +269,8 @@ public class DockerMetricsHelper {
private void configureGrafana() {
post("http://localhost:3000/api/dashboards/db", "docker/dashboards/analysis.json", true);
post("http://localhost:3000/api/datasources", "docker/datasources/prometheus-datasource.yaml", true);
post("http://localhost:3000/api/dashboards/db", "docker/dashboards/analysis.json", true, "load analysis dashboard");
post("http://localhost:3000/api/datasources", "docker/datasources/prometheus-datasource.yaml", true, "configure datasource");
}
private static String basicAuth(String username, String password) {
@@ -278,20 +278,27 @@ public class DockerMetricsHelper {
}
private HttpResponse<String> post(String url, String path, boolean auth) {
private HttpResponse<String> post(String url, String path, boolean auth, String taskname) {
logger.debug("posting to " + url + " with path:" + path +", auth: " + auth + " task:" + taskname);
HttpClient.Builder clientBuilder = HttpClient.newBuilder();
HttpClient httpClient = clientBuilder.build();
HttpRequest.Builder builder = HttpRequest.newBuilder();
builder = builder.uri(URI.create(url));
if (auth) {
builder = builder.header("Authorization", basicAuth("username", "password"));
// do not, DO NOT put authentication here that is not a well-known default already
// DO prompt the user to configure a new password on first authentication
builder = builder.header("Authorization", basicAuth("admin", "admin"));
}
if (path !=null) {
logger.debug("POSTing " + path + " to " + url);
String dashboard = NosqlBenchFiles.readFile(path);
logger.debug("length of content for " + path + " is " + dashboard.length());
builder = builder.POST(HttpRequest.BodyPublishers.ofString(dashboard));
builder.setHeader("Content-Type", "application/json");
} else {
logger.debug(("GETing " + url));
builder = builder.GET();
}
@@ -300,6 +307,13 @@ public class DockerMetricsHelper {
try {
HttpResponse<String> resp = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
logger.debug("http response for configuring grafana:\n" + resp);
logger.debug("response status code: " + resp.statusCode());
logger.debug("response body: " + resp.body());
if (resp.statusCode()<200 || resp.statusCode()>200) {
logger.error("while trying to " + taskname +", received status code " + resp.statusCode() + " while trying to auto-configure grafana, with body:");
logger.error(resp.body());
throw new RuntimeException("while trying to " + taskname + ", received status code " + resp.statusCode() + " response for " + url + " with body: " + resp.body());
}
return resp;
} catch (Exception e) {
throw new RuntimeException(e);
@@ -432,7 +446,7 @@ public class DockerMetricsHelper {
logger.info(String.format("Hupping config"));
if (reload != null) {
post(reload, null, false);
post(reload, null, false, "reloading config");
}
return runningContainers.get(0);