diff --git a/cookbooks/prometheus-exporters/filestat_exporter_setup.rb b/cookbooks/prometheus-exporters/filestat_exporter_setup.rb index 780dfaa..dd35c9f 100644 --- a/cookbooks/prometheus-exporters/filestat_exporter_setup.rb +++ b/cookbooks/prometheus-exporters/filestat_exporter_setup.rb @@ -1,10 +1,8 @@ -# Deploy the `supervisord` configuration: +# Deploy the configuration: remote_file '/etc/prometheus_exporters.d/filestat.yml' do owner 'root' group 'root' mode '644' - - notifies :restart, 'service[supervisor]' end # Deploy the `systemd` configuration: diff --git a/cookbooks/prometheus/alertmanager_setup.rb b/cookbooks/prometheus/alertmanager_setup.rb index 5715c68..c40ad33 100644 --- a/cookbooks/prometheus/alertmanager_setup.rb +++ b/cookbooks/prometheus/alertmanager_setup.rb @@ -16,7 +16,7 @@ encrypted_remote_file '/etc/prometheus.d/alertmanager.yml' do source 'files/etc/prometheus.d/alertmanager.yml/' password ENV['ITAMAE_PASSWORD'] - notifies :restart, 'service[supervisor]' + notifies :restart, 'service[alertmanager]' end # Deploy alert setting file: @@ -26,7 +26,7 @@ end group 'root' mode '644' - notifies :restart, 'service[supervisor]' + notifies :restart, 'service[prometheus]' end end diff --git a/cookbooks/prometheus/alertmanager_webhook_setup.rb b/cookbooks/prometheus/alertmanager_webhook_setup.rb index 8dc8042..5b3b5a7 100644 --- a/cookbooks/prometheus/alertmanager_webhook_setup.rb +++ b/cookbooks/prometheus/alertmanager_webhook_setup.rb @@ -1,14 +1,13 @@ -# Deploy `supervisor` config for `Alert Manager Webhook Logger` -remote_file '/etc/supervisor/conf.d/alertmanager_webhook_logger.conf' do +# Deploy `systemd` config for `Alert Manager Webhook Logger` +remote_file '/etc/systemd/system.d/webhook.conf' do owner 'root' group 'root' mode '644' - notifies :restart, 'service[supervisor]' + notifies :restart, 'service[webhook]' end -# Restart the `supervisor`: -service 'supervisor' do - action :nothing +service 'webhook' do + action [:enable, :start] end diff --git a/cookbooks/prometheus/files/etc/supervisor/conf.d/alertmanager.conf b/cookbooks/prometheus/files/etc/supervisor/conf.d/alertmanager.conf deleted file mode 100644 index 394808c..0000000 --- a/cookbooks/prometheus/files/etc/supervisor/conf.d/alertmanager.conf +++ /dev/null @@ -1,8 +0,0 @@ -[program:alertmanager] -command=/usr/local/bin/alertmanager --config.file /etc/prometheus.d/alertmanager.yml -stdout_logfile=/var/log/supervisor/alertmanager.log -redirect_stderr=true -stdout_logfile_maxbytes=1MB -stdout_logfile_backups=5 -autorestart=true -stopsignal=HUP diff --git a/cookbooks/prometheus/files/etc/supervisor/conf.d/alertmanager_webhook_logger.conf b/cookbooks/prometheus/files/etc/supervisor/conf.d/alertmanager_webhook_logger.conf deleted file mode 100644 index 16d99ac..0000000 --- a/cookbooks/prometheus/files/etc/supervisor/conf.d/alertmanager_webhook_logger.conf +++ /dev/null @@ -1,7 +0,0 @@ -[program:alertmanager-webhook-logger] -command=/usr/local/bin/alertmanager-webhook-logger -stdout_logfile=/var/log/supervisor/alertmanager-webhook-logger.log -redirect_stderr=true -stdout_logfile_maxbytes=1MB -stdout_logfile_backups=5 -autorestart=true diff --git a/cookbooks/prometheus/files/etc/systemd/system/webhook.service b/cookbooks/prometheus/files/etc/systemd/system/webhook.service new file mode 100644 index 0000000..442b043 --- /dev/null +++ b/cookbooks/prometheus/files/etc/systemd/system/webhook.service @@ -0,0 +1,11 @@ +[Unit] +Description=AlertmanagerWebhook +Wants=network-online.target +After=network-online.target + +[Service] +Type=simple +ExecStart=/usr/local/bin/alertmanager-webhook-logger + +[Install] +WantedBy=multi-user.target diff --git a/cookbooks/supervisor/default.rb b/cookbooks/supervisor/default.rb deleted file mode 100644 index a5e440b..0000000 --- a/cookbooks/supervisor/default.rb +++ /dev/null @@ -1,5 +0,0 @@ -package 'supervisor' - -service 'supervisor' do - action [ :enable, :start] -end diff --git a/roles/base.rb b/roles/base.rb index fc33af1..9391abf 100644 --- a/roles/base.rb +++ b/roles/base.rb @@ -1,6 +1,5 @@ include_recipe '../cookbooks/base/default.rb' include_recipe '../cookbooks/kazu634/default.rb' -include_recipe '../cookbooks/supervisor/default.rb' include_recipe '../cookbooks/vault/default.rb' include_recipe '../cookbooks/consul-template/default.rb' include_recipe '../cookbooks/consul/default.rb'