diff options
Diffstat (limited to 'container-core/src/main/resources/configdefinitions')
24 files changed, 30 insertions, 27 deletions
diff --git a/container-core/src/main/resources/configdefinitions/application-bundles.def b/container-core/src/main/resources/configdefinitions/application-bundles.def index a7bb11609ca..0136edbcd6d 100644 --- a/container-core/src/main/resources/configdefinitions/application-bundles.def +++ b/container-core/src/main/resources/configdefinitions/application-bundles.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package=com.yahoo.container.di.config # References to user bundles to install. diff --git a/container-core/src/main/resources/configdefinitions/container.components.def b/container-core/src/main/resources/configdefinitions/container.components.def index 265f9645e8f..1e30032b3ea 100644 --- a/container-core/src/main/resources/configdefinitions/container.components.def +++ b/container-core/src/main/resources/configdefinitions/container.components.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=container ## A list of components. Components depending on other components may use this to diff --git a/container-core/src/main/resources/configdefinitions/container.core.access-log.def b/container-core/src/main/resources/configdefinitions/container.core.access-log.def index 4ed4f4a468f..5fdb24f1129 100644 --- a/container-core/src/main/resources/configdefinitions/container.core.access-log.def +++ b/container-core/src/main/resources/configdefinitions/container.core.access-log.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=container.core # File name patterns supporting the expected time variables, e.g. ".%Y%m%d%H%M%S" diff --git a/container-core/src/main/resources/configdefinitions/container.core.application-metadata.def b/container-core/src/main/resources/configdefinitions/container.core.application-metadata.def index 4caa15e240a..46259c554a8 100644 --- a/container-core/src/main/resources/configdefinitions/container.core.application-metadata.def +++ b/container-core/src/main/resources/configdefinitions/container.core.application-metadata.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Contains meta info about one deployed application namespace=container.core diff --git a/container-core/src/main/resources/configdefinitions/container.core.chains.def b/container-core/src/main/resources/configdefinitions/container.core.chains.def index 8340a12ba94..20c02aa8c7b 100644 --- a/container-core/src/main/resources/configdefinitions/container.core.chains.def +++ b/container-core/src/main/resources/configdefinitions/container.core.chains.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # Chains configuration namespace=container.core diff --git a/container-core/src/main/resources/configdefinitions/container.core.container-http.def b/container-core/src/main/resources/configdefinitions/container.core.container-http.def index e1b83168117..1c885c49536 100644 --- a/container-core/src/main/resources/configdefinitions/container.core.container-http.def +++ b/container-core/src/main/resources/configdefinitions/container.core.container-http.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=container.core ## If non-empty, handlers should emit a header containing this string as key and the local host name as value diff --git a/container-core/src/main/resources/configdefinitions/container.core.document.container-document.def b/container-core/src/main/resources/configdefinitions/container.core.document.container-document.def index 255b179f6a2..29a7cc240ae 100644 --- a/container-core/src/main/resources/configdefinitions/container.core.document.container-document.def +++ b/container-core/src/main/resources/configdefinitions/container.core.document.container-document.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. # # Container settings for document type management # diff --git a/container-core/src/main/resources/configdefinitions/container.core.http.http-filter.def b/container-core/src/main/resources/configdefinitions/container.core.http.http-filter.def index 3116716ac3c..1f9afb9dd58 100644 --- a/container-core/src/main/resources/configdefinitions/container.core.http.http-filter.def +++ b/container-core/src/main/resources/configdefinitions/container.core.http.http-filter.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=container.core.http param[].name string diff --git a/container-core/src/main/resources/configdefinitions/container.core.identity.identity.def b/container-core/src/main/resources/configdefinitions/container.core.identity.identity.def index b63440baa12..97d4bd02c2d 100644 --- a/container-core/src/main/resources/configdefinitions/container.core.identity.identity.def +++ b/container-core/src/main/resources/configdefinitions/container.core.identity.identity.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=container.core.identity # Tenant identity domain name diff --git a/container-core/src/main/resources/configdefinitions/container.core.log-handler.def b/container-core/src/main/resources/configdefinitions/container.core.log-handler.def index ed8bf3afd5d..5d718b83823 100644 --- a/container-core/src/main/resources/configdefinitions/container.core.log-handler.def +++ b/container-core/src/main/resources/configdefinitions/container.core.log-handler.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=container.core ## Path to log directory, can be relative or absolute. diff --git a/container-core/src/main/resources/configdefinitions/container.core.vip-status.def b/container-core/src/main/resources/configdefinitions/container.core.vip-status.def index 44165bf14c3..c20a42e47ce 100644 --- a/container-core/src/main/resources/configdefinitions/container.core.vip-status.def +++ b/container-core/src/main/resources/configdefinitions/container.core.vip-status.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=container.core ## Whether to return hard-coded reply or serve "status.html" from disk diff --git a/container-core/src/main/resources/configdefinitions/container.handler.metrics.metrics-proxy-api.def b/container-core/src/main/resources/configdefinitions/container.handler.metrics.metrics-proxy-api.def index 63af0b519b8..69534a94e02 100644 --- a/container-core/src/main/resources/configdefinitions/container.handler.metrics.metrics-proxy-api.def +++ b/container-core/src/main/resources/configdefinitions/container.handler.metrics.metrics-proxy-api.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=container.handler.metrics diff --git a/container-core/src/main/resources/configdefinitions/container.handler.threadpool.container-threadpool.def b/container-core/src/main/resources/configdefinitions/container.handler.threadpool.container-threadpool.def index 9f98f7cdccb..732912c728d 100644 --- a/container-core/src/main/resources/configdefinitions/container.handler.threadpool.container-threadpool.def +++ b/container-core/src/main/resources/configdefinitions/container.handler.threadpool.container-threadpool.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=container.handler.threadpool diff --git a/container-core/src/main/resources/configdefinitions/container.handler.threadpool.def b/container-core/src/main/resources/configdefinitions/container.handler.threadpool.def index f2880e0413c..d87f6921bfa 100644 --- a/container-core/src/main/resources/configdefinitions/container.handler.threadpool.def +++ b/container-core/src/main/resources/configdefinitions/container.handler.threadpool.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=container.handler diff --git a/container-core/src/main/resources/configdefinitions/container.jdisc.config.health-monitor.def b/container-core/src/main/resources/configdefinitions/container.jdisc.config.health-monitor.def index ec161d7dde1..4faabcbc3e5 100644 --- a/container-core/src/main/resources/configdefinitions/container.jdisc.config.health-monitor.def +++ b/container-core/src/main/resources/configdefinitions/container.jdisc.config.health-monitor.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=container.jdisc.config diff --git a/container-core/src/main/resources/configdefinitions/container.jdisc.state.metrics-packets-handler.def b/container-core/src/main/resources/configdefinitions/container.jdisc.state.metrics-packets-handler.def index ab0362c3995..4d408f85f8c 100644 --- a/container-core/src/main/resources/configdefinitions/container.jdisc.state.metrics-packets-handler.def +++ b/container-core/src/main/resources/configdefinitions/container.jdisc.state.metrics-packets-handler.def @@ -1,8 +1,8 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=container.jdisc.state # The name of the application that is reporting metrics. application string # Optional hostname to add as dimension -hostname string default=""
\ No newline at end of file +hostname string default="" diff --git a/container-core/src/main/resources/configdefinitions/container.logging.connection-log.def b/container-core/src/main/resources/configdefinitions/container.logging.connection-log.def index 0d58684538a..35280847457 100644 --- a/container-core/src/main/resources/configdefinitions/container.logging.connection-log.def +++ b/container-core/src/main/resources/configdefinitions/container.logging.connection-log.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=container.logging # Name of the cluster @@ -14,4 +14,4 @@ queueSize int default=10000 bufferSize int default=262144 # In hosted Vespa we do not use the clusterId in file names for application containers -useClusterIdInFileName bool default=true
\ No newline at end of file +useClusterIdInFileName bool default=true diff --git a/container-core/src/main/resources/configdefinitions/container.qr-searchers.def b/container-core/src/main/resources/configdefinitions/container.qr-searchers.def index 034e7fc442b..96bd41483c6 100644 --- a/container-core/src/main/resources/configdefinitions/container.qr-searchers.def +++ b/container-core/src/main/resources/configdefinitions/container.qr-searchers.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=container # this file needs more comments diff --git a/container-core/src/main/resources/configdefinitions/container.qr.def b/container-core/src/main/resources/configdefinitions/container.qr.def index ea638a9310d..ba2207541e8 100644 --- a/container-core/src/main/resources/configdefinitions/container.qr.def +++ b/container-core/src/main/resources/configdefinitions/container.qr.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=container ### Changes to this config requires restart because it is used to initialize diff --git a/container-core/src/main/resources/configdefinitions/jdisc.http.client.jdisc.http.client.http-client.def b/container-core/src/main/resources/configdefinitions/jdisc.http.client.jdisc.http.client.http-client.def index 2a7f838c8c5..5ce90fce217 100644 --- a/container-core/src/main/resources/configdefinitions/jdisc.http.client.jdisc.http.client.http-client.def +++ b/container-core/src/main/resources/configdefinitions/jdisc.http.client.jdisc.http.client.http-client.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=jdisc.http.client userAgent string default = "JDisc/1.0" diff --git a/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def index 5a2bad63682..b4a513e0de8 100644 --- a/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def +++ b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=jdisc.http # The TCP port to listen to for this connector. @@ -131,7 +131,7 @@ http2Enabled bool default=true http2.streamIdleTimeout double default=600 -http2.maxConcurrentStreams int default=4096 +http2.maxConcurrentStreams int default=512 # Override the default server name when authority is missing from request. serverName.fallback string default="" @@ -139,6 +139,9 @@ serverName.fallback string default="" # The list of accepted server names. Empty list to accept any. Elements follows format of 'serverName.default'. serverName.allowed[] string +# The list of known server names. Used for e.g matching metric dimensions. +serverName.known[] string + # HTTP request headers that contain remote address accessLog.remoteAddressHeaders[] string diff --git a/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def index a85641f61e9..b43db0c5287 100644 --- a/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def +++ b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=jdisc.http # Whether to enable developer mode, where stack traces etc are visible in response bodies. diff --git a/container-core/src/main/resources/configdefinitions/metrics.manager.def b/container-core/src/main/resources/configdefinitions/metrics.manager.def index 2dc62b2c272..72793a5e85e 100644 --- a/container-core/src/main/resources/configdefinitions/metrics.manager.def +++ b/container-core/src/main/resources/configdefinitions/metrics.manager.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=metrics reportPeriodSeconds int default=60 diff --git a/container-core/src/main/resources/configdefinitions/platform-bundles.def b/container-core/src/main/resources/configdefinitions/platform-bundles.def index 4f2cf9e926b..090e6cf1c41 100644 --- a/container-core/src/main/resources/configdefinitions/platform-bundles.def +++ b/container-core/src/main/resources/configdefinitions/platform-bundles.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package=com.yahoo.container.di.config # Paths to platform bundles to install. |