merge fixups, NBIO refactorings, UI stubs

This commit is contained in:
Jonathan Shook
2020-04-09 12:44:31 -05:00
83 changed files with 1269 additions and 817 deletions

View File

@@ -12,7 +12,7 @@ import com.github.dockerjava.api.model.ContainerNetworkSettings;
import com.github.dockerjava.api.model.Frame;
import com.github.dockerjava.core.async.ResultCallbackTemplate;
import com.github.dockerjava.core.command.LogContainerResultCallback;
import io.nosqlbench.nb.api.pathutil.NBPaths;
import io.nosqlbench.nb.api.content.NBIO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -147,7 +147,7 @@ public class DockerMetricsManager {
}
private void setupPromFiles(String ip) {
String datasource = NBPaths.readFile("docker/prometheus/prometheus.yml");
String datasource = NBIO.readCharBuffer("docker/prometheus/prometheus.yml").toString();
if (ip == null) {
logger.error("IP for graphite container not found");

View File

@@ -1,7 +1,7 @@
package io.nosqlbench.engine.docker;
import io.nosqlbench.nb.api.content.NBIO;
import io.nosqlbench.nb.api.errors.BasicError;
import io.nosqlbench.nb.api.pathutil.NBPaths;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,7 +36,7 @@ public class RestHelper {
if (path !=null) {
logger.debug("POSTing " + path + " to " + url);
String dashboard = NBPaths.readFile(path);
String dashboard = NBIO.readCharBuffer(path).toString();
logger.debug("length of content for " + path + " is " + dashboard.length());
builder = builder.POST(HttpRequest.BodyPublishers.ofString(dashboard));
builder.setHeader("Content-Type", "application/json");