source a /etc/defaults script so you can specify extra chronograf options at service start

pull/10616/head
Luke Bigum 2017-11-07 17:52:45 +00:00
parent a0a30b0536
commit dd505ac587
3 changed files with 5 additions and 2 deletions

View File

@ -6,6 +6,8 @@
1. [#1077](https://github.com/influxdata/chronograf/pull/2087): Fix Chronograf requiring Telegraf's CPU and system plugins to ensure that all Apps appear on the HOST LIST page. 1. [#1077](https://github.com/influxdata/chronograf/pull/2087): Fix Chronograf requiring Telegraf's CPU and system plugins to ensure that all Apps appear on the HOST LIST page.
1. [#2222](https://github.com/influxdata/chronograf/pull/2222): Fix template variables in dashboard query building. 1. [#2222](https://github.com/influxdata/chronograf/pull/2222): Fix template variables in dashboard query building.
1. [#2291](https://github.com/influxdata/chronograf/pull/2291): Fix several kapacitor alert creation panics. 1. [#2291](https://github.com/influxdata/chronograf/pull/2291): Fix several kapacitor alert creation panics.
1. [#2292](https://github.com/influxdata/chronograf/pull/2292): Source extra command line options from defaults file
### Features ### Features
### UI Improvements ### UI Improvements

View File

@ -9,7 +9,7 @@ After=network-online.target
User=chronograf User=chronograf
Group=chronograf Group=chronograf
EnvironmentFile=-/etc/default/chronograf EnvironmentFile=-/etc/default/chronograf
ExecStart=/usr/bin/chronograf --host 0.0.0.0 --port 8888 -b /var/lib/chronograf/chronograf-v1.db -c /usr/share/chronograf/canned ExecStart=/usr/bin/chronograf --host 0.0.0.0 --port 8888 -b /var/lib/chronograf/chronograf-v1.db -c /usr/share/chronograf/canned $CHRONOGRAF_OPTS
KillMode=control-group KillMode=control-group
Restart=on-failure Restart=on-failure

View File

@ -13,7 +13,8 @@
# Script to execute when starting # Script to execute when starting
SCRIPT="/usr/bin/chronograf" SCRIPT="/usr/bin/chronograf"
# Options to pass to the script on startup # Options to pass to the script on startup
SCRIPT_OPTS="--host 0.0.0.0 --port 8888 -b /var/lib/chronograf/chronograf-v1.db -c /usr/share/chronograf/canned" . /etc/default/chronograf
SCRIPT_OPTS="--host 0.0.0.0 --port 8888 -b /var/lib/chronograf/chronograf-v1.db -c /usr/share/chronograf/canned ${CHRONOGRAF_OPTS}"
# User to run the process under # User to run the process under
RUNAS=chronograf RUNAS=chronograf