aboutsummaryrefslogtreecommitdiffstats
path: root/logforwarder
diff options
context:
space:
mode:
authorArne Juul <arnej@yahoo-inc.com>2017-10-02 13:39:19 +0000
committerArne Juul <arnej@yahoo-inc.com>2017-10-05 06:25:33 +0000
commitdeb22c99216e4545610e08928490eba617b7b8b7 (patch)
treeca2a243d8a5893d36192d34041ea2c5d9bd5710b /logforwarder
parent3b2f3992cfe417e29ccd6e0dc52017664e3530b2 (diff)
update with new schema
Diffstat (limited to 'logforwarder')
-rw-r--r--logforwarder/src/apps/vespa-logforwarder-start/cf-handler.cpp9
-rw-r--r--logforwarder/src/apps/vespa-logforwarder-start/logforwarder.def9
-rw-r--r--logforwarder/src/main/resources/configdefinitions/logforwarder.def9
3 files changed, 11 insertions, 16 deletions
diff --git a/logforwarder/src/apps/vespa-logforwarder-start/cf-handler.cpp b/logforwarder/src/apps/vespa-logforwarder-start/cf-handler.cpp
index 479bf33ab59..573a23a373e 100644
--- a/logforwarder/src/apps/vespa-logforwarder-start/cf-handler.cpp
+++ b/logforwarder/src/apps/vespa-logforwarder-start/cf-handler.cpp
@@ -25,12 +25,9 @@ CfHandler::doConfigure()
std::unique_ptr<LogforwarderConfig> cfg(_handle->getConfig());
const LogforwarderConfig& config(*cfg);
- printf("logforwarder type: %s\n", config.type.c_str());
- for (unsigned int i = 0; i < config.sources.size(); ++i) {
- printf("source %d is: %s\n", i, config.sources[i].log.c_str());
- }
- printf("endpoint: %s\n", config.endpoint.c_str());
- printf("index: %s\n", config.index.c_str());
+ printf("logforwarder:\n");
+ printf(" deployment server: %s\n", config.deploymentServer.c_str());
+ printf(" client name: %s\n", config.clientName.c_str());
}
void
diff --git a/logforwarder/src/apps/vespa-logforwarder-start/logforwarder.def b/logforwarder/src/apps/vespa-logforwarder-start/logforwarder.def
index 66750a81af8..205e8ad3b8c 100644
--- a/logforwarder/src/apps/vespa-logforwarder-start/logforwarder.def
+++ b/logforwarder/src/apps/vespa-logforwarder-start/logforwarder.def
@@ -1,7 +1,6 @@
namespace=cloud.config
-# Forwarder that forwards onle or more types of log to an endpoint
-type string
-sources[].log string
-endpoint string
-index string
+# only splunk type config for now
+
+deploymentServer string default=""
+clientName string default=""
diff --git a/logforwarder/src/main/resources/configdefinitions/logforwarder.def b/logforwarder/src/main/resources/configdefinitions/logforwarder.def
index 66750a81af8..205e8ad3b8c 100644
--- a/logforwarder/src/main/resources/configdefinitions/logforwarder.def
+++ b/logforwarder/src/main/resources/configdefinitions/logforwarder.def
@@ -1,7 +1,6 @@
namespace=cloud.config
-# Forwarder that forwards onle or more types of log to an endpoint
-type string
-sources[].log string
-endpoint string
-index string
+# only splunk type config for now
+
+deploymentServer string default=""
+clientName string default=""