Fixed install/remove of telegraf on non-systemd Debian/Ubuntu systems #2360
+81
−51
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,10 +24,8 @@ function install_chkconfig { | |
| chkconfig --add telegraf | ||
| } | ||
|
|
||
| if ! id telegraf &>/dev/null; then | ||
| if ! grep "^telegraf:" /etc/group &>/dev/null; then | ||
| useradd -r -K USERGROUPS_ENAB=yes -M telegraf -s /bin/false -d /etc/telegraf | ||
| else | ||
| useradd -r -K USERGROUPS_ENAB=yes -M telegraf -s /bin/false -d /etc/telegraf -g telegraf | ||
|
|
@@ -60,31 +58,44 @@ fi | |
| # Distribution-specific logic | ||
| if [[ -f /etc/redhat-release ]]; then | ||
| # RHEL-variant logic | ||
| if [[ "$(readlink /proc/1/exe)" == */systemd ]]; then | ||
| install_systemd | ||
| else | ||
| # Assuming SysVinit | ||
| install_init | ||
| # Run update-rc.d or fallback to chkconfig if not available | ||
| if which update-rc.d &>/dev/null; then | ||
| install_update_rcd | ||
| else | ||
| install_chkconfig | ||
| fi | ||
| fi | ||
| elif [[ -f /etc/debian_version ]]; then | ||
| # Debian/Ubuntu logic | ||
| if [[ "$(readlink /proc/1/exe)" == */systemd ]]; then | ||
| install_systemd | ||
| systemctl restart telegraf || echo "WARNING: systemd not running." | ||
| else | ||
| # Assuming SysVinit | ||
| install_init | ||
| # Run update-rc.d or fallback to chkconfig if not available | ||
| if which update-rc.d &>/dev/null; then | ||
| install_update_rcd | ||
| else | ||
| install_chkconfig | ||
|
There was a problem hiding this comment. Why would we try this on debian? It looks like debian does have chkconfig, but the last version it was packaged for was jessie. There was a problem hiding this comment. See above. You shouldn't depend on users only using Debian or Ubuntu. There are a ton of derivates which can use either update-rc.d or chkconfig, so this script should be as flexible as possible. what's you real problem here? i made it really flexible and tested it on several distributions (debian and non-debian) that it works. and it does perfectly. There was a problem hiding this comment. Okay, so if we want to add support for chkconfig here we should also support it in the post-remove script. There was a problem hiding this comment. You're totally right, it's missing there. I'll rework the script and add support for it. Should be an easy quick fix. There was a problem hiding this comment. @danielnelson chkconfig support for debian based systems in post-remove.sh has now been added |
||
| fi | ||
| invoke-rc.d telegraf restart | ||
| fi | ||
| elif [[ -f /etc/os-release ]]; then | ||
| source /etc/os-release | ||
| if [[ $ID = "amzn" ]]; then | ||
| # Amazon Linux logic | ||
| install_init | ||
| # Run update-rc.d or fallback to chkconfig if not available | ||
| if which update-rc.d &>/dev/null; then | ||
| install_update_rcd | ||
| else | ||
| install_chkconfig | ||
| fi | ||
| fi | ||
| fi | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,16 @@ | ||
| #!/bin/bash | ||
|
|
||
| if [[ -d /etc/opt/telegraf ]]; then | ||
| # Legacy configuration found | ||
| if [[ ! -d /etc/telegraf ]]; then | ||
| # New configuration does not exist, move legacy configuration to new location | ||
| echo -e "Please note, Telegraf's configuration is now located at '/etc/telegraf' (previously '/etc/opt/telegraf')." | ||
| mv -vn /etc/opt/telegraf /etc/telegraf | ||
|
|
||
| if [[ -f /etc/telegraf/telegraf.conf ]]; then | ||
| backup_name="telegraf.conf.$(date +%s).backup" | ||
| echo "A backup of your current configuration can be found at: /etc/telegraf/${backup_name}" | ||
| cp -a "/etc/telegraf/telegraf.conf" "/etc/telegraf/${backup_name}" | ||
| fi | ||
| fi | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do we try this? I expect redhat would never have these scripts.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because we don't know on which Debian-Derivate the .deb package is being executed on later and so you don't know if it uses update-rc.d or chkconfig in advance. this is why we need both (so this .deb package can be run on as most distros as possible!)