IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2024-12-27 09:11:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

docker-metrics improvements

Browse Source
This commit is contained in:
Jonathan Shook 2020-11-16 17:29:45 -06:00
parent 667fbdbae9
commit a88d03760d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,10 +87,11 @@ public class NBCLI {
String dockerMetricsAt = globalOptions.wantsDockerMetricsAt(); String dockerMetricsAt = globalOptions.wantsDockerMetricsAt();
String reportGraphiteTo = globalOptions.wantsReportGraphiteTo(); String reportGraphiteTo = globalOptions.wantsReportGraphiteTo();
int mOpts = (dockerMetrics ? 1 : 0) + (dockerMetricsAt != null ? 1 : 0) + (reportGraphiteTo != null ? 1 : 0); int mOpts = (dockerMetrics ? 1 : 0) + (dockerMetricsAt != null ? 1 : 0) + (reportGraphiteTo != null ? 1 : 0);
if (mOpts > 1) { if (mOpts > 1 && (reportGraphiteTo == null || annotatorsConfig == null)) {
throw new BasicError("You have multiple conflicting options which attempt to set\n" + throw new BasicError("You have multiple conflicting options which attempt to set\n" +
" the destination for metrics and annotations. Please select only one of\n" + " the destination for metrics and annotations. Please select only one of\n" +
" --docker-metrics, --docker-metrics-at <addr>, or --report-graphite-to <addr>\n" + " --docker-metrics, --docker-metrics-at <addr>, or other options like \n" +
" --report-graphite-to <addr> and --annotators <config>\n" +
" For more details, see run 'nb help docker-metrics'"); " For more details, see run 'nb help docker-metrics'");
} }
@ -114,7 +115,8 @@ public class NBCLI {
if (metricsAddr != null) { if (metricsAddr != null) {
reportGraphiteTo = metricsAddr + ":9109"; reportGraphiteTo = metricsAddr + ":9109";
Annotators.init("{type:'grafana',url:'http://" + metricsAddr + ":3000/'}"); annotatorsConfig = "[{type:'log'},{type:'grafana',baseurl:'http://" + metricsAddr + ":3000/'," +
"tags:'appname:nosqlbench',timeoutms:5000,onerror:'warn'}]";
} }
if (args.length > 0 && args[0].toLowerCase().equals("virtdata")) { if (args.length > 0 && args[0].toLowerCase().equals("virtdata")) {