sort the daemon flags

voxpupuli · Feb 22, 2021 · f850f89 · f850f89
1 parent 7d53b4b
commit f850f89
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -163,7 +163,7 @@
       mode    => '0644',
       owner   => 'root',
       group   => '0', # Darwin uses wheel
-      content => "ARGS='${join($daemon_flags, ' ')}'\n",
+      content => "ARGS='${join(sort($daemon_flags), ' ')}'\n",
     }
   }
 
@@ -191,7 +191,7 @@
         content => epp("${module_name}/prometheus.systemd.epp", {
           'user'           => $prometheus::server::user,
           'group'          => $prometheus::server::group,
-          'daemon_flags'   => $daemon_flags,
+          'daemon_flags'   => $daemon_flags.sort,
           'max_open_files' => $max_open_files,
           'bin_dir'        => $prometheus::server::bin_dir,
           'env_file_path'  => $prometheus::server::env_file_path,

diff --git a/spec/fixtures/files/prometheus.default b/spec/fixtures/files/prometheus.default
@@ -1 +1 @@
-ARGS='--config.file=/etc/prometheus/prometheus.yaml --storage.tsdb.path=/var/lib/prometheus --storage.tsdb.retention=360h --web.console.templates=/usr/local/share/prometheus/consoles --web.console.libraries=/usr/local/share/prometheus/console_libraries'
+ARGS='--config.file=/etc/prometheus/prometheus.yaml --storage.tsdb.path=/var/lib/prometheus --storage.tsdb.retention=360h --web.console.libraries=/usr/local/share/prometheus/console_libraries --web.console.templates=/usr/local/share/prometheus/consoles'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ARGS='--config.file=/etc/prometheus/prometheus.yaml --storage.tsdb.path=/var/lib/prometheus --storage.tsdb.retention=360h --web.console.templates=/usr/local/share/prometheus/consoles --web.console.libraries=/usr/local/share/prometheus/console_libraries'
		ARGS='--config.file=/etc/prometheus/prometheus.yaml --storage.tsdb.path=/var/lib/prometheus --storage.tsdb.retention=360h --web.console.libraries=/usr/local/share/prometheus/console_libraries --web.console.templates=/usr/local/share/prometheus/consoles'