From ebc375cd28908e05827c8519b04bff993f081549 Mon Sep 17 00:00:00 2001 From: Sean Reifschneider Date: Thu, 15 Oct 2015 11:16:17 -0600 Subject: [PATCH 1/6] Changes to move telegraf out of /etc/opt Issue #264: This attempts to fix the /etc/opt and put the binary linked into /bin Note: I can't seem to find the right combination of packages for getting package.sh to run, so I haven't been able to test this. --- scripts/init.sh | 4 ++-- scripts/package.sh | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/scripts/init.sh b/scripts/init.sh index d65639674..ee67b0c4e 100755 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -95,7 +95,7 @@ function log_success_msg() { name=telegraf # Daemon name, where is the actual executable -daemon=/opt/telegraf/telegraf +daemon=/bin/telegraf # pid file for the daemon pidfile=/var/run/telegraf/telegraf.pid @@ -107,7 +107,7 @@ if [ ! -d "$piddir" ]; then fi # Configuration file -config=/etc/opt/telegraf/telegraf.conf +config=/etc/telegraf/telegraf.conf # If the daemon is not there, then exit. [ -x $daemon ] || exit 5 diff --git a/scripts/package.sh b/scripts/package.sh index e88e52f9e..26f11574c 100755 --- a/scripts/package.sh +++ b/scripts/package.sh @@ -32,8 +32,9 @@ AWS_FILE=~/aws.conf INSTALL_ROOT_DIR=/opt/telegraf +INSTALL_BIN_DIR=/bin TELEGRAF_LOG_DIR=/var/log/telegraf -CONFIG_ROOT_DIR=/etc/opt/telegraf +CONFIG_ROOT_DIR=/etc/telegraf LOGROTATE_DIR=/etc/logrotate.d SAMPLE_CONFIGURATION=etc/config.sample.toml @@ -144,7 +145,6 @@ generate_postinstall_script() { #!/bin/sh rm -f $INSTALL_ROOT_DIR/telegraf rm -f $INSTALL_ROOT_DIR/init.sh -ln -sfn $INSTALL_ROOT_DIR/versions/$version/telegraf $INSTALL_ROOT_DIR/telegraf if ! id telegraf >/dev/null 2>&1; then useradd --help 2>&1| grep -- --system > /dev/null 2>&1 @@ -168,7 +168,8 @@ else ln -sfn $INSTALL_ROOT_DIR/versions/$version/scripts/init.sh \ $INSTALL_ROOT_DIR/init.sh rm -f /etc/init.d/telegraf - ln -sfn $INSTALL_ROOT_DIR/init.sh /etc/init.d/telegraf + ln -sfn $INSTALL_ROOT_DIR/versions/$version/scripts/init.sh \ + /etc/init.d/telegraf chmod +x /etc/init.d/telegraf # update-rc.d sysv service: if which update-rc.d > /dev/null 2>&1 ; then @@ -211,12 +212,18 @@ make_dir_tree $TMP_WORK_DIR $VERSION ########################################################################### # Copy the assets to the installation directories. +mkdir -p $TMP_WORK_DIR/$INSTALL_BIN_DIR for b in ${BINS[*]}; do cp $GOPATH_INSTALL/bin/$b $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/$VERSION if [ $? -ne 0 ]; then echo "Failed to copy binaries to packaging directory -- aborting." cleanup_exit 1 fi + ln -s /$INSTALL_ROOT_DIR/versions/$VERSION $TMP_WORK_DIR/$INSTALL_BIN_DIR + if [ $? -ne 0 ]; then + echo "Failed to link binaries to packaging directory -- aborting." + cleanup_exit 1 + fi done echo "${BINS[*]} copied to $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/$VERSION" From ea60f3459d14e6898593ed0c05198115a897db9c Mon Sep 17 00:00:00 2001 From: Sean Reifschneider Date: Thu, 15 Oct 2015 11:20:13 -0600 Subject: [PATCH 2/6] Moving link into /usr/bin instead of /bin --- scripts/package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/package.sh b/scripts/package.sh index 26f11574c..59c04d3d5 100755 --- a/scripts/package.sh +++ b/scripts/package.sh @@ -32,7 +32,7 @@ AWS_FILE=~/aws.conf INSTALL_ROOT_DIR=/opt/telegraf -INSTALL_BIN_DIR=/bin +INSTALL_BIN_DIR=/usr/bin TELEGRAF_LOG_DIR=/var/log/telegraf CONFIG_ROOT_DIR=/etc/telegraf LOGROTATE_DIR=/etc/logrotate.d From 0e902982ffa4d47a8fa7633d152869ff5b4fb42f Mon Sep 17 00:00:00 2001 From: Sean Reifschneider Date: Thu, 15 Oct 2015 14:23:15 -0600 Subject: [PATCH 3/6] Another /bin reference -> /usr/bin --- scripts/init.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/init.sh b/scripts/init.sh index ee67b0c4e..e43b30733 100755 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -95,7 +95,7 @@ function log_success_msg() { name=telegraf # Daemon name, where is the actual executable -daemon=/bin/telegraf +daemon=/usr/bin/telegraf # pid file for the daemon pidfile=/var/run/telegraf/telegraf.pid From 88f2704eaf7ececae6642963714461443f0d8303 Mon Sep 17 00:00:00 2001 From: Sean Reifschneider Date: Thu, 15 Oct 2015 16:20:23 -0600 Subject: [PATCH 4/6] Changing paths in README. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c3edbaeea..8654a3494 100644 --- a/README.md +++ b/README.md @@ -36,8 +36,8 @@ Latest: ##### Package instructions: -* Telegraf binary is installed in `/opt/telegraf/telegraf` -* Telegraf daemon configuration file is in `/etc/opt/telegraf/telegraf.conf` +* Telegraf binary is installed in `/usr/sbin/telegraf` +* Telegraf daemon configuration file is in `/etc/telegraf/telegraf.conf` * On sysv systems, the telegraf daemon can be controlled via `service telegraf [action]` * On systemd systems (such as Ubuntu 15+), the telegraf daemon can be From 18e9ab432c4e96e2c2946c7ed32b44191f598247 Mon Sep 17 00:00:00 2001 From: Sean Reifschneider Date: Thu, 15 Oct 2015 16:35:24 -0600 Subject: [PATCH 5/6] Typo of path, fixed. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8654a3494..7746261a0 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Latest: ##### Package instructions: -* Telegraf binary is installed in `/usr/sbin/telegraf` +* Telegraf binary is installed in `/usr/bin/telegraf` * Telegraf daemon configuration file is in `/etc/telegraf/telegraf.conf` * On sysv systems, the telegraf daemon can be controlled via `service telegraf [action]` From 868f4707bfc9120843ab163967c33334d77ecd0d Mon Sep 17 00:00:00 2001 From: Sean Reifschneider Date: Fri, 16 Oct 2015 11:20:49 -0600 Subject: [PATCH 6/6] Changing paths in scripts/telegraf.service --- scripts/telegraf.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/telegraf.service b/scripts/telegraf.service index 87fcd0f22..226bfb1c5 100644 --- a/scripts/telegraf.service +++ b/scripts/telegraf.service @@ -6,7 +6,7 @@ After=network.target [Service] EnvironmentFile=-/etc/default/telegraf User=telegraf -ExecStart=/opt/telegraf/telegraf -config /etc/opt/telegraf/telegraf.conf $TELEGRAF_OPTS +ExecStart=/usr/bin/telegraf -config /etc/telegraf/telegraf.conf $TELEGRAF_OPTS Restart=on-failure KillMode=process