Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
telegraf-nftables
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Due to inactivity, this project is scheduled to be deleted on 2035-04-24.
Why is this scheduled?
Show more breadcrumbs
vqgroup
telegraf-nftables
Commits
23f2b475
Commit
23f2b475
authored
8 years ago
by
Cameron Sparr
Browse files
Options
Downloads
Patches
Plain Diff
Ignore errors in systemd
closes #1022
parent
194288c0
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+1
-0
1 addition, 0 deletions
CHANGELOG.md
scripts/post-install.sh
+14
-14
14 additions, 14 deletions
scripts/post-install.sh
with
15 additions
and
14 deletions
CHANGELOG.md
+
1
−
0
View file @
23f2b475
...
@@ -50,6 +50,7 @@ based on _prefix_ in addition to globs. This means that a filter like
...
@@ -50,6 +50,7 @@ based on _prefix_ in addition to globs. This means that a filter like
-
[
#1024
](
https://github.com/influxdata/telegraf/issues/1024
)
: Don't replace
`.`
with
`_`
in datadog output.
-
[
#1024
](
https://github.com/influxdata/telegraf/issues/1024
)
: Don't replace
`.`
with
`_`
in datadog output.
-
[
#1058
](
https://github.com/influxdata/telegraf/issues/1058
)
: Fix possible leaky TCP connections in influxdb output.
-
[
#1058
](
https://github.com/influxdata/telegraf/issues/1058
)
: Fix possible leaky TCP connections in influxdb output.
-
[
#1044
](
https://github.com/influxdata/telegraf/pull/1044
)
: Fix SNMP OID possible collisions. Thanks @relip
-
[
#1044
](
https://github.com/influxdata/telegraf/pull/1044
)
: Fix SNMP OID possible collisions. Thanks @relip
-
[
#1022
](
https://github.com/influxdata/telegraf/issues/1022
)
: Dont error deb/rpm install on systemd errors.
## v0.12.1 [2016-04-14]
## v0.12.1 [2016-04-14]
...
...
This diff is collapsed.
Click to expand it.
scripts/post-install.sh
+
14
−
14
View file @
23f2b475
...
@@ -12,7 +12,7 @@ function install_init {
...
@@ -12,7 +12,7 @@ function install_init {
function
install_systemd
{
function
install_systemd
{
cp
-f
$SCRIPT_DIR
/telegraf.service /lib/systemd/system/telegraf.service
cp
-f
$SCRIPT_DIR
/telegraf.service /lib/systemd/system/telegraf.service
systemctl
enable
telegraf
systemctl
enable
telegraf
||
true
systemctl daemon-reload
||
true
systemctl daemon-reload
||
true
}
}
...
@@ -53,29 +53,29 @@ if [[ -f /etc/redhat-release ]]; then
...
@@ -53,29 +53,29 @@ if [[ -f /etc/redhat-release ]]; then
# RHEL-variant logic
# RHEL-variant logic
which systemctl &>/dev/null
which systemctl &>/dev/null
if
[[
$?
-eq
0
]]
;
then
if
[[
$?
-eq
0
]]
;
then
install_systemd
install_systemd
else
else
# Assuming sysv
# Assuming sysv
install_init
install_init
install_chkconfig
install_chkconfig
fi
fi
elif
[[
-f
/etc/debian_version
]]
;
then
elif
[[
-f
/etc/debian_version
]]
;
then
# Debian/Ubuntu logic
# Debian/Ubuntu logic
which systemctl &>/dev/null
which systemctl &>/dev/null
if
[[
$?
-eq
0
]]
;
then
if
[[
$?
-eq
0
]]
;
then
install_systemd
install_systemd
systemctl restart telegraf
systemctl restart telegraf
||
echo
"WARNING: systemd not running."
else
else
# Assuming sysv
# Assuming sysv
install_init
install_init
install_update_rcd
install_update_rcd
invoke-rc.d telegraf restart
invoke-rc.d telegraf restart
fi
fi
elif
[[
-f
/etc/os-release
]]
;
then
elif
[[
-f
/etc/os-release
]]
;
then
source
/etc/os-release
source
/etc/os-release
if
[[
$ID
=
"amzn"
]]
;
then
if
[[
$ID
=
"amzn"
]]
;
then
# Amazon Linux logic
# Amazon Linux logic
install_init
install_init
install_chkconfig
install_chkconfig
fi
fi
fi
fi
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment