summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2021-01-26 11:59:02 +0100
committergjoranv <gv@verizonmedia.com>2021-01-26 11:59:02 +0100
commit8774ab19106167b266175286476be7c1b3dfbf4a (patch)
tree41ef607f2f219c7de2994502fbcfa7e66d77bfc6
parent8038fbd66c920b4847f356111f60aa9e4b44b0ba (diff)
Remove usage of MetricsPresentationConfig.slidingwindow
-rw-r--r--container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java6
-rw-r--r--container-core/src/main/resources/configdefinitions/metrics.metrics-presentation.def3
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