diff options
| author | Bjørn Meland <bjormel@users.noreply.github.com> | 2020-02-26 09:03:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-26 09:03:10 +0100 |
| commit | 5b1e9dc11fda443de1c2686a072b26f26b2b0f28 (patch) | |
| tree | 0c231538d92d51bf7479c3c6943baab8403f7c89 /logforwarder | |
| parent | 27a13fccf35e1ec157b7e450e94d9c9404929dc9 (diff) | |
Splunk: Setting defaults in _meta, vespa_zone added (#12263)
Diffstat (limited to 'logforwarder')
| -rw-r--r-- | logforwarder/src/apps/vespa-logforwarder-start/cf-handler.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/logforwarder/src/apps/vespa-logforwarder-start/cf-handler.cpp b/logforwarder/src/apps/vespa-logforwarder-start/cf-handler.cpp index bf98bbd75ef..e37a6fb2dcb 100644 --- a/logforwarder/src/apps/vespa-logforwarder-start/cf-handler.cpp +++ b/logforwarder/src/apps/vespa-logforwarder-start/cf-handler.cpp @@ -80,7 +80,9 @@ CfHandler::doConfigure() if (getenv("VESPA_HOSTNAME") != NULL && getenv("VESPA_TENANT") != NULL && getenv("VESPA_APPLICATION")!= NULL && - getenv("VESPA_INSTANCE") != NULL ) + getenv("VESPA_INSTANCE") != NULL && + getenv("VESPA_ENVIRONMENT") != NULL && + getenv("VESPA_REGION") != NULL) { path = cfFilePath(config.splunkHome, "inputs.conf"); tmpPath = path + ".new"; @@ -88,7 +90,7 @@ CfHandler::doConfigure() if (fp != NULL) { fprintf(fp, "[default]\n"); fprintf(fp, "host = %s\n", getenv("VESPA_HOSTNAME")); - fprintf(fp, "_meta = vespa_tenant::%s vespa_app::%s.%s\n", getenv("VESPA_TENANT"), getenv("VESPA_APPLICATION"), getenv("VESPA_INSTANCE")); + fprintf(fp, "_meta = vespa_tenant::%s vespa_app::%s.%s vespa_zone::%s.%s\n", getenv("VESPA_TENANT"), getenv("VESPA_APPLICATION"), getenv("VESPA_INSTANCE"), getenv("VESPA_ENVIRONMENT"), getenv("VESPA_REGION")); fclose(fp); rename(tmpPath.c_str(), path.c_str()); } |