aboutsummaryrefslogtreecommitdiffstats
path: root/configserver/src
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorn.christian@seime.no>2018-11-01 09:20:32 +0100
committerGitHub <noreply@github.com>2018-11-01 09:20:32 +0100
commit66bf0e3bda9b631da1e0c8e4d7c2bb51a183fb64 (patch)
tree5ab83e26f824e1ae1653732c24eb7a63cc8ba0b9 /configserver/src
parent266414cf0ff6ddaf6c9c6102e937fa0c04698564 (diff)
parentc4c8676bd8b5b3ee74a04126af40a98e304c9fa9 (diff)
Merge pull request #7513 from vespa-engine/gjoranv/add-optional-metrics-handler
Add optional metrics-packets.xml file to configserver app.
Diffstat (limited to 'configserver/src')
-rw-r--r--configserver/src/main/resources/configserver-app/services.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml
index 8521ca8b31f..5f60be8c202 100644
--- a/configserver/src/main/resources/configserver-app/services.xml
+++ b/configserver/src/main/resources/configserver-app/services.xml
@@ -55,7 +55,11 @@
<preprocess:include file='config-models.xml' required='false' />
<preprocess:include file='node-repository.xml' required='false' />
<preprocess:include file='hosted-vespa/routing-status.xml' required='false' />
+
+ <!-- TODO Vespa 7: Remove scoreboard.xml, replaced by metrics-packets.xml -->
<preprocess:include file='hosted-vespa/scoreboard.xml' required='false' />
+
+ <preprocess:include file='hosted-vespa/metrics-packets.xml' required='false' />
<preprocess:include file='controller/container.xml' required='false' />
<component id="com.yahoo.vespa.service.monitor.internal.slobrok.SlobrokMonitorManagerImpl" bundle="service-monitor" />
<component id="com.yahoo.vespa.service.monitor.internal.health.HealthMonitorManager" bundle="service-monitor" />