2 files changed, 37 insertions, 2 deletions
diff --git a/app-metrics/prometheus/files/prometheus.confd b/app-metrics/prometheus/files/prometheus.confd
index 93b41b31624c..19a286f5677a 100644
--- a/app-metrics/prometheus/files/prometheus.confd
+++ b/app-metrics/prometheus/files/prometheus.confd
@@ -1,2 +1,26 @@
-# arguments for Prometheus
-command_args=""
+# additional arguments for Prometheus
+#
+# command_args should not be set in this file. Instead, you should set
+# prometheus_args.
+#
+# The default settings are listed below.
+# If you are not changing these settings, you do
+# not need to include them in prometheus_args.
+#
+# To migrate from using command_args to prometheus_args, drop any of the
+# default settings below that you have set the same way then switch to
+# prometheus_args.
+# 
+# The new behavior is that prometheus_args will be appended to these
+# defaults allowing anything you add to override them.
+#
+#The default settings are:
+#
+# --web.enable-lifecycle
+# --config.file=/etc/prometheus/prometheus.yml
+# --storage.tsdb.path=/var/lib/prometheus/data
+# --web.console.templates=/etc/prometheus/consoles
+# --web.console.libraries=/etc/prometheus/console_libraries
+# --web.enable-admin-api 
+#
+prometheus_args=""
diff --git a/app-metrics/prometheus/files/prometheus.initd b/app-metrics/prometheus/files/prometheus.initd
index f7371f8ca060..00e3c25ebe84 100644
--- a/app-metrics/prometheus/files/prometheus.initd
+++ b/app-metrics/prometheus/files/prometheus.initd
@@ -9,7 +9,18 @@ group=${group:-${RC_SVCNAME}}
 command_user=${user}:${group}
 
 command="/usr/bin/prometheus"
+if [ -z "${command_args}" ]; then
+command_args="
+	--web.enable-lifecycle
+	--config.file=/etc/prometheus/prometheus.yml
+	--storage.tsdb.path=/var/lib/prometheus/data
+	--web.console.templates=/etc/prometheus/consoles
+	--web.console.libraries=/etc/prometheus/console_libraries
+	--web.enable-admin-api 
+	${prometheus_args}"
+else
 command_args="${command_args:---config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/var/lib/prometheus/data}"
+fi
 command_background="true"
 error_log=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
 output_log=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log