Skip to content

DLPX-98733 Wire up config directory for drop-ins to delphix-telegraf.service #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
willguyette merged 1 commit into from
Sep 1, 2026
+26 −1
Merged

DLPX-98733 Wire up config directory for drop-ins to delphix-telegraf.service #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion telegraf/delphix-telegraf-service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ INFLUXDB_OUTPUT=/etc/telegraf/telegraf.outputs.influxdb
PLAYBOOK_FLAG=/etc/telegraf/PLAYBOOK_ENABLED
INFLUXDB_FLAG=/etc/telegraf/INFLUXDB_ENABLED
TELEGRAF_CONFIG=/etc/telegraf/telegraf.conf
TELEGRAF_CONFIG_DIR=/etc/telegraf/telegraf.d


function engine_is_dct() {
Expand Down Expand Up @@ -68,4 +69,24 @@ fi
# the InfluxDB write token is not world-readable when InfluxDB is enabled.
chmod 640 $TELEGRAF_CONFIG

/usr/bin/telegraf -config $TELEGRAF_CONFIG
# Extension point for outputs/inputs owned outside this package — drop a self-
# contained *.conf file here instead of editing this package's own config files.
#
# Telegraf runs as root and *.conf files here may contain plugins (inputs.exec,
# outputs.exec, etc.) that execute arbitrary commands as root, so lock this
# down to root-only.
#
# Currently, the product does not use this drop-in directory, so if we can't
# confirm these permissions, just run the service without the drop-in directory.
# If at any point the product configuration starts using the drop-in directory,
# this behavior should be updated to fail the service so that we know we are
# running with the correct configuration.
#
CONFIG_DIR_ARGS=()
if mkdir -p $TELEGRAF_CONFIG_DIR && chown root:root $TELEGRAF_CONFIG_DIR && chmod 700 $TELEGRAF_CONFIG_DIR; then
CONFIG_DIR_ARGS=(-config-directory "$TELEGRAF_CONFIG_DIR")
else
logger -t delphix-telegraf "ERROR: failed to lock down $TELEGRAF_CONFIG_DIR permissions — starting Telegraf without drop-in config support."
Comment thread
willguyette marked this conversation as resolved.
fi

/usr/bin/telegraf -config $TELEGRAF_CONFIG "${CONFIG_DIR_ARGS[@]}"
4 changes: 4 additions & 0 deletions telegraf/telegraf.base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
# delphix-influxdb-init to /etc/telegraf/telegraf.outputs.influxdb and
# appended here by delphix-telegraf-service when InfluxDB is enabled.
# Use 'perf_influxdb enable|disable' to toggle and restart Telegraf.
#
# Consumers outside this package (e.g. additional outputs) should not edit
# this file — drop a self-contained *.conf file into /etc/telegraf/telegraf.d
# instead, which delphix-telegraf-service loads via -config-directory.

###############################################################################
# INPUT PLUGINS #
Expand Down
Loading