diff --git a/activitytype-cql/pom.xml b/activitytype-cql/pom.xml
index f70e0719c..9195d51a5 100644
--- a/activitytype-cql/pom.xml
+++ b/activitytype-cql/pom.xml
@@ -4,7 +4,7 @@
io.nosqlbench
mvn-defaults
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
@@ -23,7 +23,7 @@
io.nosqlbench
engine-api
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
diff --git a/activitytype-cqlverify/pom.xml b/activitytype-cqlverify/pom.xml
index d2701db21..6206b17e7 100644
--- a/activitytype-cqlverify/pom.xml
+++ b/activitytype-cqlverify/pom.xml
@@ -4,7 +4,7 @@
io.nosqlbench
mvn-defaults
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
@@ -24,7 +24,7 @@
io.nosqlbench
activitytype-cql
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
diff --git a/activitytype-diag/pom.xml b/activitytype-diag/pom.xml
index 1ec6f8d99..24aa6587d 100644
--- a/activitytype-diag/pom.xml
+++ b/activitytype-diag/pom.xml
@@ -5,7 +5,7 @@
mvn-defaults
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
@@ -20,7 +20,7 @@
io.nosqlbench
engine-api
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
diff --git a/activitytype-http/pom.xml b/activitytype-http/pom.xml
index a85dea3b0..027b9ed6a 100644
--- a/activitytype-http/pom.xml
+++ b/activitytype-http/pom.xml
@@ -5,7 +5,7 @@
mvn-defaults
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
@@ -21,7 +21,7 @@
io.nosqlbench
engine-api
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
diff --git a/activitytype-stdout/pom.xml b/activitytype-stdout/pom.xml
index 2cff6634a..4f6cfcd87 100644
--- a/activitytype-stdout/pom.xml
+++ b/activitytype-stdout/pom.xml
@@ -7,7 +7,7 @@
mvn-defaults
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
@@ -21,7 +21,7 @@
io.nosqlbench
engine-api
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
diff --git a/activitytype-tcp/pom.xml b/activitytype-tcp/pom.xml
index 4f0276059..3b518d532 100644
--- a/activitytype-tcp/pom.xml
+++ b/activitytype-tcp/pom.xml
@@ -7,7 +7,7 @@
mvn-defaults
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
@@ -23,13 +23,13 @@
io.nosqlbench
engine-api
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
io.nosqlbench
activitytype-stdout
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
diff --git a/docsys/pom.xml b/docsys/pom.xml
index 10ac3cf7b..1aab4b104 100644
--- a/docsys/pom.xml
+++ b/docsys/pom.xml
@@ -9,7 +9,7 @@
mvn-defaults
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
@@ -18,7 +18,7 @@
io.nosqlbench
nb-api
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
@@ -112,7 +112,7 @@
io.nosqlbench
virtdata-api
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
diff --git a/driver-web/pom.xml b/driver-web/pom.xml
index 752a283f4..d6b8559f6 100644
--- a/driver-web/pom.xml
+++ b/driver-web/pom.xml
@@ -7,7 +7,7 @@
mvn-defaults
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
@@ -22,7 +22,7 @@
io.nosqlbench
engine-api
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
diff --git a/engine-api/pom.xml b/engine-api/pom.xml
index b47024ad2..845afc106 100644
--- a/engine-api/pom.xml
+++ b/engine-api/pom.xml
@@ -5,7 +5,7 @@
mvn-defaults
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
@@ -22,13 +22,13 @@
io.nosqlbench
nb-api
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
io.nosqlbench
virtdata-userlibs
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
diff --git a/engine-cli/pom.xml b/engine-cli/pom.xml
index 0d2a08ed3..e56f124a7 100644
--- a/engine-cli/pom.xml
+++ b/engine-cli/pom.xml
@@ -4,7 +4,7 @@
mvn-defaults
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
@@ -23,7 +23,7 @@
io.nosqlbench
engine-core
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
@@ -47,7 +47,7 @@
io.nosqlbench
engine-docker
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
index fab1b332f..26e027f62 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
@@ -186,11 +186,9 @@ public class NBCLI {
logger.info("Docker metrics is enabled. Docker must be installed for this to work");
DockerMetricsManager dmh = new DockerMetricsManager();
dmh.startMetrics();
- String info = "Docker Containers are started, for grafana and prometheus, hit" +
- "these urls in your browser: http://:3000 and http://:9090" +
- "the default grafana creds are admin/admin";
- logger.info(info);
- System.out.println(info);
+ String warn = "Docker Containers are started, for grafana and prometheus, hit" +
+ "these urls in your browser: http://:3000 and http://:9090";
+ logger.warn(warn);
if (reportGraphiteTo != null) {
logger.warn(String.format("Docker metrics are enabled (--docker-metrics)" +
" but graphite reporting (--report-graphite-to) is set to %s \n" +
diff --git a/engine-core/pom.xml b/engine-core/pom.xml
index 8edce6e7a..a78d5c87e 100644
--- a/engine-core/pom.xml
+++ b/engine-core/pom.xml
@@ -5,7 +5,7 @@
mvn-defaults
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
@@ -28,7 +28,7 @@
io.nosqlbench
engine-api
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml
index fd2dba3b8..5ea42a89d 100644
--- a/engine-docker/pom.xml
+++ b/engine-docker/pom.xml
@@ -4,7 +4,7 @@
mvn-defaults
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
@@ -77,7 +77,7 @@
io.nosqlbench
engine-api
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
diff --git a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java
index 98e261147..187ead0fc 100644
--- a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java
+++ b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerHelper.java
@@ -213,7 +213,11 @@ public class DockerHelper {
logger.info(String.format("Hupping config"));
if (reload != null) {
- post(reload, null, false, "reloading config");
+ try {
+ post(reload, null, false, "reloading config");
+ } catch (Exception e) {
+ logger.error(String.format("Unexpected config/state for docker container %s, consider removing the container", name));
+ }
}
return runningContainers.get(0);
diff --git a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java
index a81c61add..c7409898e 100644
--- a/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java
+++ b/engine-docker/src/main/java/io/nosqlbench/engine/docker/DockerMetricsManager.java
@@ -54,7 +54,10 @@ public class DockerMetricsManager {
String name = "grafana";
List port = Arrays.asList(3000);
- setupGrafanaFiles(ip);
+ boolean grafanaFilesExist = grafanaFilesExist();
+ if (!grafanaFilesExist) {
+ setupGrafanaFiles(ip);
+ }
List volumeDescList = Arrays.asList(
userHome + "/.nosqlbench/grafana:/var/lib/grafana:rw"
@@ -80,7 +83,9 @@ public class DockerMetricsManager {
logger.info("grafana container started, http listening");
- configureGrafana();
+ if (!grafanaFilesExist) {
+ configureGrafana();
+ }
}
private void startPrometheus(String ip) {
@@ -91,7 +96,9 @@ public class DockerMetricsManager {
String name = "prom";
List port = Arrays.asList(9090);
- setupPromFiles(ip);
+ if (!promFilesExist()) {
+ setupPromFiles(ip);
+ }
List volumeDescList = Arrays.asList(
//cwd+"/docker-metrics/prometheus:/prometheus",
@@ -170,6 +177,9 @@ public class DockerMetricsManager {
"/prometheus");
Set perms = new HashSet<>();
+ perms.add(PosixFilePermission.OWNER_READ);
+ perms.add(PosixFilePermission.OWNER_WRITE);
+ perms.add(PosixFilePermission.OWNER_EXECUTE);
perms.add(PosixFilePermission.OTHERS_READ);
perms.add(PosixFilePermission.OTHERS_WRITE);
perms.add(PosixFilePermission.OTHERS_EXECUTE);
@@ -215,6 +225,24 @@ public class DockerMetricsManager {
}
}
+ private boolean grafanaFilesExist() {
+ File nosqlbenchDir = new File(userHome, "/.nosqlbench/");
+ boolean exists = nosqlbenchDir.exists();
+ if (exists) {
+ File grafana = new File(userHome, "/.nosqlbench/grafana");
+ exists = grafana.exists();
+ }
+ return exists;
+ }
+ private boolean promFilesExist() {
+ File nosqlbenchDir = new File(userHome, "/.nosqlbench/");
+ boolean exists = nosqlbenchDir.exists();
+ if (exists) {
+ File prom = new File(userHome, "/.nosqlbench/grafana");
+ exists = prom.exists();
+ }
+ return exists;
+ }
private void setupGrafanaFiles(String ip) {
@@ -243,6 +271,7 @@ public class DockerMetricsManager {
private void configureGrafana() {
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 data source");
+ logger.warn("default grafana creds are admin/admin");
}
diff --git a/engine-docs/pom.xml b/engine-docs/pom.xml
index bd6f02115..7fe78aa45 100644
--- a/engine-docs/pom.xml
+++ b/engine-docs/pom.xml
@@ -4,7 +4,7 @@
mvn-defaults
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
@@ -28,7 +28,7 @@
io.nosqlbench
docsys
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
diff --git a/engine-extensions/pom.xml b/engine-extensions/pom.xml
index a9e6340d4..c95944221 100644
--- a/engine-extensions/pom.xml
+++ b/engine-extensions/pom.xml
@@ -4,7 +4,7 @@
mvn-defaults
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
@@ -22,7 +22,7 @@
io.nosqlbench
engine-api
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 8cf0750aa..3d6e77f48 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -3,7 +3,7 @@
io.nosqlbench
mvn-defaults
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
pom
diff --git a/nb-annotations/pom.xml b/nb-annotations/pom.xml
index 503549bb2..fb77cfa52 100644
--- a/nb-annotations/pom.xml
+++ b/nb-annotations/pom.xml
@@ -5,7 +5,7 @@
mvn-defaults
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
diff --git a/nb-api/pom.xml b/nb-api/pom.xml
index 5ca1aeabc..0984a6385 100644
--- a/nb-api/pom.xml
+++ b/nb-api/pom.xml
@@ -5,7 +5,7 @@
mvn-defaults
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
@@ -31,7 +31,7 @@
io.nosqlbench
nb-annotations
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
diff --git a/nb/pom.xml b/nb/pom.xml
index 8f69a0f8d..26f8b1dcd 100644
--- a/nb/pom.xml
+++ b/nb/pom.xml
@@ -5,7 +5,7 @@
mvn-defaults
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
@@ -24,31 +24,31 @@
io.nosqlbench
driver-web
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
io.nosqlbench
engine-cli
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
io.nosqlbench
engine-docs
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
io.nosqlbench
engine-core
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
io.nosqlbench
engine-extensions
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
@@ -60,37 +60,37 @@
io.nosqlbench
activitytype-stdout
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
io.nosqlbench
activitytype-diag
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
io.nosqlbench
activitytype-tcp
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
io.nosqlbench
activitytype-http
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
io.nosqlbench
activitytype-cql
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
io.nosqlbench
activitytype-cqlverify
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index 765dcc59d..63ba843ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
mvn-defaults
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
mvn-defaults
diff --git a/virtdata-api/pom.xml b/virtdata-api/pom.xml
index b7e6c5d39..97fe2ccf5 100644
--- a/virtdata-api/pom.xml
+++ b/virtdata-api/pom.xml
@@ -7,7 +7,7 @@
io.nosqlbench
mvn-defaults
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
@@ -23,14 +23,14 @@
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
nb-api
io.nosqlbench
virtdata-lang
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
diff --git a/virtdata-lang/pom.xml b/virtdata-lang/pom.xml
index 435376c5a..0dfe19f48 100644
--- a/virtdata-lang/pom.xml
+++ b/virtdata-lang/pom.xml
@@ -7,7 +7,7 @@
mvn-defaults
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
diff --git a/virtdata-lib-basics/pom.xml b/virtdata-lib-basics/pom.xml
index a12304fba..3888a1102 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/virtdata-lib-basics/pom.xml
@@ -7,7 +7,7 @@
mvn-defaults
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
@@ -20,7 +20,7 @@
io.nosqlbench
virtdata-api
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
diff --git a/virtdata-lib-curves4/pom.xml b/virtdata-lib-curves4/pom.xml
index be33630c4..91c78c8be 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/virtdata-lib-curves4/pom.xml
@@ -4,7 +4,7 @@
mvn-defaults
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
@@ -22,13 +22,13 @@
io.nosqlbench
virtdata-api
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
io.nosqlbench
virtdata-lib-basics
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
diff --git a/virtdata-lib-random/pom.xml b/virtdata-lib-random/pom.xml
index c63e7929d..25c89af8e 100644
--- a/virtdata-lib-random/pom.xml
+++ b/virtdata-lib-random/pom.xml
@@ -7,7 +7,7 @@
mvn-defaults
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
@@ -20,13 +20,13 @@
io.nosqlbench
virtdata-api
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
io.nosqlbench
virtdata-lib-basics
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
diff --git a/virtdata-lib-realer/pom.xml b/virtdata-lib-realer/pom.xml
index 17e54faaf..c802b9457 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/virtdata-lib-realer/pom.xml
@@ -4,7 +4,7 @@
mvn-defaults
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
@@ -24,7 +24,7 @@
io.nosqlbench
virtdata-lib-basics
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
diff --git a/virtdata-realdata/pom.xml b/virtdata-realdata/pom.xml
index d561d104f..fd5c20388 100644
--- a/virtdata-realdata/pom.xml
+++ b/virtdata-realdata/pom.xml
@@ -7,7 +7,7 @@
mvn-defaults
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
@@ -18,7 +18,7 @@
io.nosqlbench
virtdata-api
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
diff --git a/virtdata-userlibs/pom.xml b/virtdata-userlibs/pom.xml
index 619347567..f7feb6792 100644
--- a/virtdata-userlibs/pom.xml
+++ b/virtdata-userlibs/pom.xml
@@ -4,7 +4,7 @@
mvn-defaults
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
../mvn-defaults
@@ -17,32 +17,32 @@
io.nosqlbench
virtdata-realdata
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
io.nosqlbench
virtdata-lib-realer
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
io.nosqlbench
virtdata-api
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
io.nosqlbench
virtdata-lib-random
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
virtdata-lib-basics
io.nosqlbench
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT
virtdata-lib-curves4
@@ -50,7 +50,7 @@
io.nosqlbench
docsys
- 3.12.96-SNAPSHOT
+ 3.12.97-SNAPSHOT