rename splunk_config_linux.yaml to gateway_config.yaml (open-telemetr…

…y#170)
hughesjj · Mar 18, 2021 · f55250c · f55250c
1 parent 885fcb1
commit f55250c
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/cmd/otelcol/Dockerfile b/cmd/otelcol/Dockerfile
@@ -10,7 +10,7 @@ RUN chmod 755 /otelcol
 FROM scratch
 COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=otelcol /otelcol /
-COPY config/collector/splunk_config_linux.yaml /etc/otel/collector/splunk_config_linux.yaml
+COPY config/collector/gateway_config.yaml /etc/otel/collector/gateway_config.yaml
 COPY config/collector/otlp_config_linux.yaml /etc/otel/collector/otlp_config_linux.yaml
 ENTRYPOINT ["/otelcol"]
 EXPOSE 13133 14250 14268 55680 4317 6060 7276 8888 9411 9443
diff --git a/...config/collector/splunk_config_linux.yaml → ...lcol/config/collector/gateway_config.yaml b/...config/collector/splunk_config_linux.yaml → ...lcol/config/collector/gateway_config.yaml
diff --git a/cmd/otelcol/main.go b/cmd/otelcol/main.go
@@ -39,9 +39,9 @@ const (
 	realmEnvVarName       = "SPLUNK_REALM"
 	tokenEnvVarName       = "SPLUNK_ACCESS_TOKEN"
 
-	defaultDockerSAPMConfig        = "/etc/otel/collector/splunk_config_linux.yaml"
+	defaultDockerSAPMConfig        = "/etc/otel/collector/gateway_config.yaml"
 	defaultDockerOTLPConfig        = "/etc/otel/collector/otlp_config_linux.yaml"
-	defaultLocalSAPMConfig         = "cmd/otelcol/config/collector/splunk_config_linux.yaml"
+	defaultLocalSAPMConfig         = "cmd/otelcol/config/collector/gateway_config.yaml"
 	defaultLocalOTLPConfig         = "cmd/otelcol/config/collector/otlp_config_linux.yaml"
 	defaultMemoryBallastPercentage = 33
 	defaultMemoryLimitPercentage   = 90

diff --git a/docs/getting-started/linux-standalone.md b/docs/getting-started/linux-standalone.md
@@ -51,7 +51,7 @@ EOH
 yum install -y splunk-otel-collector
 ```
 2. A default configuration file will be installed to
-   `/etc/otel/collector/splunk_config_linux.yaml` if it does not already exist.
+   `/etc/otel/collector/gateway_config.yaml` if it does not already exist.
 3. The `/etc/otel/collector/splunk_env` environment file is required to start
    the `splunk-otel-collector` systemd service.  A sample environment file will
    be installed to `/etc/otel/collector/splunk_env.example` that includes the
@@ -74,7 +74,7 @@ the Collector. The following environmental variables are required:
 Optional environment variables
 </summary>
 
-- `SPLUNK_CONFIG` (default = `/etc/otel/collector/splunk_config_linux.yaml`): Which configuration to load.
+- `SPLUNK_CONFIG` (default = `/etc/otel/collector/gateway_config.yaml`): Which configuration to load.
 - `SPLUNK_BALLAST_SIZE_MIB` (no default): How much memory to allocate to the ballast.
 - `SPLUNK_MEMORY_TOTAL_MIB` (default = `512`): Total memory allocated to the Collector.
 
@@ -164,5 +164,5 @@ configuration as shown above.
 If the custom configuration includes a `memory_limiter` processor then the
 `ballast_size_mib` parameter should be the same as the
 `SPLUNK_BALLAST_SIZE_MIB` environment variable. See
-[splunk_config_linux.yaml](cmd/otelcol/config/collector/splunk_config_linux.yaml)
+[gateway_config.yaml](cmd/otelcol/config/collector/gateway_config.yaml)
 as an example.
diff --git a/internal/buildscripts/packaging/fpm/common.sh b/internal/buildscripts/packaging/fpm/common.sh
@@ -16,7 +16,7 @@ SERVICE_GROUP="splunk-otel-collector"
 
 OTELCOL_INSTALL_PATH="/usr/bin/otelcol"
 CONFIG_REPO_PATH="$REPO_DIR/cmd/otelcol/config/collector/agent_config.yaml"
-CONFIG_INSTALL_PATH="/etc/otel/collector/splunk_config_linux.yaml"
+CONFIG_INSTALL_PATH="/etc/otel/collector/gateway_config.yaml"
 SERVICE_REPO_PATH="$FPM_DIR/$SERVICE_NAME.service"
 SERVICE_INSTALL_PATH="/lib/systemd/system/$SERVICE_NAME.service"
 

diff --git a/internal/buildscripts/packaging/fpm/deb/build.sh b/internal/buildscripts/packaging/fpm/deb/build.sh
@@ -34,7 +34,7 @@ sudo fpm -s dir -t deb -n "$PKG_NAME" -v "$VERSION" -f -p "$OUTPUT_DIR" \
     --after-install "$POSTINSTALL_PATH" \
     --before-remove "$PREUNINSTALL_PATH" \
     --deb-no-default-config-files \
-    --config-files /etc/otel/collector/splunk_config_linux.yaml \
+    --config-files /etc/otel/collector/gateway_config.yaml \
     --config-files /etc/otel/collector/fluentd \
     "$buildroot/"=/
 

diff --git a/internal/buildscripts/packaging/fpm/etc/otel/collector/fluentd/README b/internal/buildscripts/packaging/fpm/etc/otel/collector/fluentd/README
@@ -4,7 +4,7 @@ This directory contains a custom fluentd configuration to forward log events
 to the Splunk OpenTelemetry Collector.  By default, the collector will listen
 on 127.0.0.1:8006 for log events forwarded from fluentd.  See the
 "fluentforward" receiver in the default collector config at
-/etc/otel/collector/splunk_config_linux.yaml for details or to make any changes
+/etc/otel/collector/gateway_config.yaml for details or to make any changes
 to the collector.
 
 Directory contents:

diff --git a/internal/buildscripts/packaging/fpm/etc/otel/collector/splunk_env.example b/internal/buildscripts/packaging/fpm/etc/otel/collector/splunk_env.example
@@ -1,5 +1,5 @@
 # Sample environment file for passing variables to the splunk-otel-collector service.
-# See /etc/otel/collector/splunk_config_linux.yaml for how these variables will be consumed.
+# See /etc/otel/collector/gateway_config.yaml for how these variables will be consumed.
 
 # To use this file, update the values below appropriately,
 # and save the changes to "/etc/otel/collector/splunk_env".

diff --git a/internal/buildscripts/packaging/fpm/rpm/build.sh b/internal/buildscripts/packaging/fpm/rpm/build.sh
@@ -42,7 +42,7 @@ sudo fpm -s dir -t rpm -n "$PKG_NAME" -v "$VERSION" -f -p "$OUTPUT_DIR" \
     --before-install "$PREINSTALL_PATH" \
     --after-install "$POSTINSTALL_PATH" \
     --before-remove "$PREUNINSTALL_PATH" \
-    --config-files /etc/otel/collector/splunk_config_linux.yaml \
+    --config-files /etc/otel/collector/gateway_config.yaml \
     --config-files /etc/otel/collector/fluentd \
     "$buildroot/"=/
 

diff --git a/internal/buildscripts/packaging/installer/install.sh b/internal/buildscripts/packaging/installer/install.sh
@@ -56,7 +56,7 @@ get_distro_codename() {
 }
 
 collector_config_dir="/etc/otel/collector"
-collector_config_path="${collector_config_dir}/splunk_config_linux.yaml"
+collector_config_path="${collector_config_dir}/gateway_config.yaml"
 collector_env_path="${collector_config_dir}/splunk_env"
 distro="$( get_distro )"
 distro_codename="$( get_distro_codename )"