diff options
| -rw-r--r-- | container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java | 6 | ||||
| -rw-r--r-- | container-core/src/main/resources/configdefinitions/metrics.metrics-presentation.def | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java index fc13159663b..b14dc50edcb 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java @@ -63,11 +63,7 @@ public class StateHandler extends AbstractRequestHandler { static SnapshotProvider getSnapshotPreprocessor(ComponentRegistry<SnapshotProvider> preprocessors, MetricsPresentationConfig presentation) { List<SnapshotProvider> allPreprocessors = preprocessors.allComponents(); - if (presentation.slidingwindow() && allPreprocessors.size() > 0) { - return allPreprocessors.get(0); - } else { - return null; - } + return (allPreprocessors.size() > 0) ? allPreprocessors.get(0) : null; } @Override diff --git a/container-core/src/main/resources/configdefinitions/metrics.metrics-presentation.def b/container-core/src/main/resources/configdefinitions/metrics.metrics-presentation.def index b6c40993ef5..aeb597ed326 100644 --- a/container-core/src/main/resources/configdefinitions/metrics.metrics-presentation.def +++ b/container-core/src/main/resources/configdefinitions/metrics.metrics-presentation.def @@ -2,6 +2,5 @@ namespace=metrics -## Sliding window means present the last n minutes of data, as opposed to -## presenting the newest completed n minute interval. +## TODO Vespa 8: remove slidingwindow bool default=true |