diff --git a/cookbooks/gitea/setup-go-mmproxy.rb b/cookbooks/gitea/setup-go-mmproxy.rb index f1c81e9..6803a71 100644 --- a/cookbooks/gitea/setup-go-mmproxy.rb +++ b/cookbooks/gitea/setup-go-mmproxy.rb @@ -17,7 +17,11 @@ remote_file '/etc/consul.d/service-go-mmproxy.json' do group 'root' mode '644' - notifies :restart, 'service[supervisor]' + notifies :reload, 'service[consul]' +end + +service 'consul' do + action :nothing end # Firewall settings here: diff --git a/cookbooks/gitea/setup.rb b/cookbooks/gitea/setup.rb index 6e4a6f7..283617a 100644 --- a/cookbooks/gitea/setup.rb +++ b/cookbooks/gitea/setup.rb @@ -74,7 +74,11 @@ remote_file '/etc/consul.d/service-gitea.json' do group 'root' mode '644' - notifies :restart, 'service[supervisor]' + notifies :reload, 'service[consul]' +end + +service 'consul' do + action :nothing end # Depoy `promtail` configuration for `gitea`: diff --git a/cookbooks/grafana/setup.rb b/cookbooks/grafana/setup.rb index 9b08928..8f5a6fa 100644 --- a/cookbooks/grafana/setup.rb +++ b/cookbooks/grafana/setup.rb @@ -46,7 +46,11 @@ remote_file '/etc/consul.d/service-grafana.json' do group 'root' mode '644' - notifies :restart, 'service[supervisor]' + notifies :reload, 'service[consul]' +end + +service 'consul' do + action :nothing end # Firewall settings here: diff --git a/cookbooks/loki/setup.rb b/cookbooks/loki/setup.rb index 575701f..9a335f7 100644 --- a/cookbooks/loki/setup.rb +++ b/cookbooks/loki/setup.rb @@ -38,7 +38,11 @@ template '/etc/consul.d/service-loki.json' do variables(ipaddr: node['consul']['ipaddr']) - notifies :restart, 'service[supervisor]' + notifies :reload, 'service[consul]' +end + +service 'consul' do + action :nothing end # Depoy `promtail` configuration for `loki`: diff --git a/cookbooks/prometheus-exporters/filestat_exporter_setup.rb b/cookbooks/prometheus-exporters/filestat_exporter_setup.rb index 693bfe2..3669e61 100644 --- a/cookbooks/prometheus-exporters/filestat_exporter_setup.rb +++ b/cookbooks/prometheus-exporters/filestat_exporter_setup.rb @@ -22,10 +22,9 @@ remote_file '/etc/consul.d/service-filestat_exporter.json' do group 'root' mode '644' - notifies :restart, 'service[supervisor]' + notifies :reload, 'service[consul]' end -service 'supervisor' do +service 'consul' do action :nothing end - diff --git a/cookbooks/prometheus-exporters/node_exporter_setup.rb b/cookbooks/prometheus-exporters/node_exporter_setup.rb index 9512cd4..c311f9f 100644 --- a/cookbooks/prometheus-exporters/node_exporter_setup.rb +++ b/cookbooks/prometheus-exporters/node_exporter_setup.rb @@ -13,10 +13,10 @@ remote_file '/etc/consul.d/service-node_exporter.json' do group 'root' mode '644' - notifies :restart, 'service[supervisor]' + notifies :reload, 'service[consul]' end -service 'supervisor' do +service 'consul' do action :nothing end diff --git a/cookbooks/prometheus/prometheus_setup.rb b/cookbooks/prometheus/prometheus_setup.rb index c99f40a..e918e2a 100644 --- a/cookbooks/prometheus/prometheus_setup.rb +++ b/cookbooks/prometheus/prometheus_setup.rb @@ -29,11 +29,11 @@ remote_file '/etc/consul.d/service-prometheus.json' do group 'root' mode '644' - notifies :restart, 'service[supervisor]' + notifies :reload, 'service[consul]' end -# Restart the `supervisor`: -service 'supervisor' do +# Restart the `consul`: +service 'consul' do action :nothing end diff --git a/cookbooks/prometheus/snmp_exporter_setup.rb b/cookbooks/prometheus/snmp_exporter_setup.rb index c0a246a..d8a4374 100644 --- a/cookbooks/prometheus/snmp_exporter_setup.rb +++ b/cookbooks/prometheus/snmp_exporter_setup.rb @@ -18,11 +18,11 @@ remote_file '/etc/consul.d/service-snmp_exporter.json' do group 'root' mode '644' - notifies :restart, 'service[supervisor]' + notifies :reload, 'service[consul]' end -# Restart the `supervisor`: -service 'supervisor' do +# Restart the `reload`: +service 'consul' do action :nothing end diff --git a/cookbooks/vector/syslog_setup.rb b/cookbooks/vector/syslog_setup.rb index 704e228..638d113 100644 --- a/cookbooks/vector/syslog_setup.rb +++ b/cookbooks/vector/syslog_setup.rb @@ -56,7 +56,11 @@ template '/etc/consul.d/service-vector-syslog.json' do variables(ipaddr: node['vector']['ipaddr']) - notifies :restart, 'service[supervisor]' + notifies :reload, 'service[consul]' +end + +service 'cosul' do + action :nothing end template '/etc/promtail/syslog.yaml' do