diff options
Diffstat (limited to 'configdefinitions')
| -rw-r--r-- | configdefinitions/.gitignore | 1 | ||||
| -rw-r--r-- | configdefinitions/pom.xml | 1 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | configdefinitions/src/vespa/elk.def | 24 |
4 files changed, 0 insertions, 28 deletions
diff --git a/configdefinitions/.gitignore b/configdefinitions/.gitignore index aa75679bac6..7f99529b963 100644 --- a/configdefinitions/.gitignore +++ b/configdefinitions/.gitignore @@ -2,4 +2,3 @@ configdefinitions.iml target /pom.xml.build Makefile -Testing diff --git a/configdefinitions/pom.xml b/configdefinitions/pom.xml index 8b50f7c8d3e..77ea6b55405 100644 --- a/configdefinitions/pom.xml +++ b/configdefinitions/pom.xml @@ -6,7 +6,6 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> </parent> <artifactId>configdefinitions</artifactId> <packaging>container-plugin</packaging> diff --git a/configdefinitions/src/vespa/CMakeLists.txt b/configdefinitions/src/vespa/CMakeLists.txt index 910c8da80ef..83e178bfa01 100644 --- a/configdefinitions/src/vespa/CMakeLists.txt +++ b/configdefinitions/src/vespa/CMakeLists.txt @@ -16,8 +16,6 @@ vespa_generate_config(configdefinitions configserver.def) install(FILES configserver.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(configdefinitions dispatch.def) install(FILES dispatch.def DESTINATION var/db/vespa/config_server/serverdb/classes) -vespa_generate_config(configdefinitions elk.def) -install(FILES elk.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(configdefinitions fleetcontroller.def) install(FILES fleetcontroller.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(configdefinitions ilscripts.def) diff --git a/configdefinitions/src/vespa/elk.def b/configdefinitions/src/vespa/elk.def deleted file mode 100644 index 0b144e84293..00000000000 --- a/configdefinitions/src/vespa/elk.def +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=cloud.config - -# elasticsearch: for future use -elasticsearch[].host string - -# Port 0 (default) means use the Defaults web service port -elasticsearch[].port int default=0 - -# logstash forwarder -logstash.network.servers[].host string -logstash.network.servers[].port int default=5043 -logstash.network.timeout int default=15 -logstash.files[].paths[] string -logstash.files[].fields{} string - -# A relative path will be prepended by vespa home. -# An absolute path will be used as-is. -logstash.config_file string default="conf/logstash-forwarder/config.json" - -logstash.source_field string default="index_source" -logstash.spool_size int default=100 -# Note: verbose=true actually means "not noisy" in the forwarder -logstash.forwarder_command_line_params string default = "-verbose=true" |