fix(prometheus): Fixed upstart config (#47)

spinnaker · Mar 20, 2017 · 19e0dc6 · 19e0dc6
1 parent 481f75e
commit 19e0dc6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/spinnaker-monitoring-third-party/third_party/prometheus/install.sh b/spinnaker-monitoring-third-party/third_party/prometheus/install.sh
@@ -356,6 +356,8 @@ function install_prometheus() {
   tar xzf /tmp/prometheus.gz -C $(dirname $OPT_DIR)
   rm /tmp/prometheus.gz
   cp "$SOURCE_DIR/prometheus.conf" /etc/init/prometheus.conf
+  sed "s/PROMETHEUS_VERSION/$PROMETHEUS_VERSION/g" -i /etc/init/prometheus.conf
+
   if [[ "$GCE_CONFIG" == "true" ]]; then
       sed "s/spinnaker-prometheus\.yml/gce-prometheus\.yml/" \
           -i /etc/init/prometheus.conf

diff --git a/spinnaker-monitoring-third-party/third_party/prometheus/prometheus.conf b/spinnaker-monitoring-third-party/third_party/prometheus/prometheus.conf
@@ -1,6 +1,6 @@
 start on filesystem or runlevel [2345]
 
-exec /opt/prometheus-1.5.0.linux-amd64/prometheus \
-  -config.file /opt/prometheus-1.5.0.linux-amd64/spinnaker-prometheus.yml \
-  -storage.local.path /opt/prometheus-1.5.0.linux-amd64/data \
+exec /opt/PROMETHEUS_VERSION/prometheus \
+  -config.file /opt/PROMETHEUS_VERSION/spinnaker-prometheus.yml \
+  -storage.local.path /opt/PROMETHEUS_VERSION/data \
   2>&1 > /var/log/prometheus.log