diff options
author | Jesse Luehrs <doy@tozt.net> | 2021-07-01 23:03:34 -0400 |
---|---|---|
committer | Jesse Luehrs <doy@tozt.net> | 2021-07-01 23:03:34 -0400 |
commit | ceb4273084425de83c5aa6e6790470c4057aa16a (patch) | |
tree | 61624dc7704b74f3b38368156c4ee547045393df | |
parent | 3d7862efb9aeaa6e69eef61fc9f1f5281951efea (diff) | |
download | puppet-tozt-ceb4273084425de83c5aa6e6790470c4057aa16a.tar.gz puppet-tozt-ceb4273084425de83c5aa6e6790470c4057aa16a.zip |
need to override it in a different way
flags can't be repeated
-rw-r--r-- | modules/tozt/files/prometheus-override.service | 2 | ||||
-rw-r--r-- | modules/tozt/files/prometheus-service-conf | 1 | ||||
-rw-r--r-- | modules/tozt/manifests/prometheus.pp | 25 |
3 files changed, 14 insertions, 14 deletions
diff --git a/modules/tozt/files/prometheus-override.service b/modules/tozt/files/prometheus-override.service new file mode 100644 index 0000000..e2e2957 --- /dev/null +++ b/modules/tozt/files/prometheus-override.service @@ -0,0 +1,2 @@ +[Service] +ExecStart=/usr/bin/prometheus --config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/media/persistent/prometheus $PROMETHEUS_ARGS diff --git a/modules/tozt/files/prometheus-service-conf b/modules/tozt/files/prometheus-service-conf deleted file mode 100644 index 98d5047..0000000 --- a/modules/tozt/files/prometheus-service-conf +++ /dev/null @@ -1 +0,0 @@ -PROMETHEUS_ARGS="--storage.tsdb.path=/media/persistent/prometheus" diff --git a/modules/tozt/manifests/prometheus.pp b/modules/tozt/manifests/prometheus.pp index f842c86..444ac67 100644 --- a/modules/tozt/manifests/prometheus.pp +++ b/modules/tozt/manifests/prometheus.pp @@ -1,19 +1,18 @@ class tozt::prometheus { include prometheus - file { - "/media/persistent/prometheus": - ensure => directory, - owner => "prometheus", - group => "prometheus", - require => [ - File["/media/persistent"], - Package["prometheus"], - ]; - "/etc/conf.d/prometheus": - source => "puppet:///modules/tozt/prometheus-service-conf", - require => Package["prometheus"], - notify => Service["prometheus"]; + file { "/media/persistent/prometheus": + ensure => directory, + owner => "prometheus", + group => "prometheus", + require => [ + File["/media/persistent"], + Package["prometheus"], + ]; + } + + systemd::override { "prometheus": + source => 'puppet:///modules/tozt/prometheus-override.conf'; } nginx::site { |