From b8c9af6e71f93b68e1d7033cae65c5cb03183dd5 Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Mon, 16 Oct 2023 22:55:10 -0500 Subject: [PATCH] minor updates --- .../engine/api/scenarios/NBCLIScenarioParser.java | 8 -------- .../engine/core/lifecycle/session/NBSession.java | 6 +++--- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java b/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java index 24cadfd59..711d39169 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioParser.java @@ -192,14 +192,6 @@ public class NBCLIScenarioParser { // TODO: simplify this String alias = buildingCmd.get("alias"); - for (String token : new String[]{"STEP"}) { - if (!alias.contains(token)) { - logger.warn("Your alias template '" + alias + "' does not contain " + token + ", which will " + - "cause your metrics to be combined under the same name. It is strongly advised that you " + - "include them in a template like " + WORKLOAD_SCENARIO_STEP + "."); - } - } - String workloadToken = workloadContent.asPath().getFileName().toString(); alias = alias.replaceAll("WORKLOAD", sanitize(workloadToken)); diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBSession.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBSession.java index c708683cf..503282024 100644 --- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBSession.java +++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBSession.java @@ -71,9 +71,9 @@ public class NBSession extends NBBaseComponent implements Function, Ex this.clientMetricChecker = new ClientSystemMetricChecker(this, NBLabels.forKV(),10); registerLoadAvgMetrics(); registerMemInfoMetrics(); - registerDiskStatsMetrics(); +// registerDiskStatsMetrics(); registerNetworkInterfaceMetrics(); - registerStatMetrics(); + registerCpuStatMetrics(); clientMetricChecker.start(); } @@ -239,7 +239,7 @@ public class NBSession extends NBBaseComponent implements Function, Ex } } - private void registerStatMetrics() { + private void registerCpuStatMetrics() { StatReader reader = new StatReader(); if (!reader.fileExists()) return;