--- Systemd::Timer::Job[codesearch-delete-zombie-locks].orig
+++ Systemd::Timer::Job[codesearch-delete-zombie-locks]
+ environment => {}
+ logfile_perms => all
+ syslog_force_stop => True
+ monitoring_enabled => False
+ interval => {'start': 'OnCalendar', 'interval': '*:0/10'}
+ logging_enabled => True
+ send_mail_only_on_error => True
+ command => /usr/local/bin/delete-hound-zombie-locks.sh
+ fixed_random_delay => False
+ syslog_match_startswith => True
+ description => Delete lock files when no process is running
+ require => ['File[/usr/local/bin/delete-hound-zombie-locks.sh]', 'File[/etc/hound-delete-zombie-locks.conf]']
+ send_mail_to => root@codesearch9.codesearch.eqiad1.wikimedia.cloud
+ ensure => present
+ logfile_name => syslog.log
+ monitoring_contact_groups => admins
+ private_tmp => False
+ logfile_basedir => /var/log
+ logfile_group => root
+ send_mail => False
+ user => root
+ success_exit_status => []
+ monitoring_notes_url => https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
+ ignore_errors => False
Class[Codesearch]
- Parameters differences:
--- Class[Codesearch].orig
+++ Class[Codesearch]
+ lock_file_min_age => 60
- Systemd::Service[codesearch-delete-zombie-locks]
- Parameters differences:
--- Systemd::Service[codesearch-delete-zombie-locks].orig
+++ Systemd::Service[codesearch-delete-zombie-locks]
+ service_params => {}
+ migration_task => T407130
+ restart => False
+ ensure => present
+ monitoring_enabled => False
+ override => False
+ monitoring_contact_group => admins
+ monitoring_critical => False
+ unit_type => timer
+ require => Systemd::Unit[codesearch-delete-zombie-locks.service]
- Systemd::Unit[codesearch-delete-zombie-locks.service]
- Parameters differences:
--- Systemd::Unit[codesearch-delete-zombie-locks.service].orig
+++ Systemd::Unit[codesearch-delete-zombie-locks.service]
+ restart => False
+ ensure => present
+ override_filename => puppet-override.conf
+ unit => codesearch-delete-zombie-locks.service
+ override => False
+ require => ['Class[Systemd]']
- File[/var/log/codesearch-delete-zombie-locks]
- Parameters differences:
--- File[/var/log/codesearch-delete-zombie-locks].orig
+++ File[/var/log/codesearch-delete-zombie-locks]
+ mode => 0755
+ ensure => directory
+ owner => root
+ group => root
+ force => True
+ backup => False
- File[/usr/local/bin/delete-hound-zombie-locks.sh]
- Parameters differences:
--- File[/usr/local/bin/delete-hound-zombie-locks.sh].orig
+++ File[/usr/local/bin/delete-hound-zombie-locks.sh]
+ mode => 0755
+ ensure => file
+ source => puppet:///modules/codesearch/delete-zombie-locks.sh
+ owner => root
+ group => root
- Rsyslog::Conf[codesearch-delete-zombie-locks]
- Parameters differences:
--- Rsyslog::Conf[codesearch-delete-zombie-locks].orig
+++ Rsyslog::Conf[codesearch-delete-zombie-locks]
+ require => File[/var/log/codesearch-delete-zombie-locks]
+ mode => 0444
+ ensure => present
+ priority => 40
- File[/etc/rsyslog.d/40-codesearch-delete-zombie-locks.conf]
- Parameters differences:
--- File[/etc/rsyslog.d/40-codesearch-delete-zombie-locks.conf].orig
+++ File[/etc/rsyslog.d/40-codesearch-delete-zombie-locks.conf]
+ mode => 0444
+ ensure => present
+ owner => root
+ group => root
+ notify => Service[rsyslog]
- Content differences:
--- /etc/rsyslog.d/40-codesearch-delete-zombie-locks.conf.orig
+++ /etc/rsyslog.d/40-codesearch-delete-zombie-locks.conf
@@ -0,0 +1,10 @@
+# rsyslog.conf(5) configuration file for services.
+# This file is managed by Puppet.
+if $programname startswith "codesearch-delete-zombie-locks" then {
+ action(
+ type="omfile" file="/var/log/codesearch-delete-zombie-locks/syslog.log"
+ fileOwner="root" fileGroup="root"
+ fileCreateMode="0644"
+ )
+ & stop
+}
- File[/lib/systemd/system/codesearch-delete-zombie-locks.timer]
- Parameters differences:
--- File[/lib/systemd/system/codesearch-delete-zombie-locks.timer].orig
+++ File[/lib/systemd/system/codesearch-delete-zombie-locks.timer]
+ mode => 0444
+ ensure => present
+ owner => root
+ group => root
+ notify => Exec[systemd daemon-reload for codesearch-delete-zombie-locks.timer (codesearch-delete-zombie-locks.timer)]
- Content differences:
--- /lib/systemd/system/codesearch-delete-zombie-locks.timer.orig
+++ /lib/systemd/system/codesearch-delete-zombie-locks.timer
@@ -0,0 +1,12 @@
+[Unit]
+Description=Periodic execution of codesearch-delete-zombie-locks.service
+
+[Timer]
+Unit=codesearch-delete-zombie-locks.service
+# Accuracy sets the maximum time interval around the execution time we want to allow
+AccuracySec=15sec
+OnCalendar=*:0/10
+RandomizedDelaySec=0
+
+[Install]
+WantedBy=multi-user.target
- File[/etc/hound-delete-zombie-locks.conf]
- Parameters differences:
--- File[/etc/hound-delete-zombie-locks.conf].orig
+++ File[/etc/hound-delete-zombie-locks.conf]
+ group => root
+ mode => 0644
+ ensure => file
+ owner => root
- Content differences:
--- /etc/hound-delete-zombie-locks.conf.orig
+++ /etc/hound-delete-zombie-locks.conf
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: Apache-2.0
+# This config file for delete-zombie-locks.sh
+# is managed by Puppet. (T421147)
+BASE_DIR="/srv/hound"
+MIN_AGE="60"
- Exec[systemd daemon-reload for codesearch-delete-zombie-locks.service (codesearch-delete-zombie-locks.service)]
- Parameters differences:
--- Exec[systemd daemon-reload for codesearch-delete-zombie-locks.service (codesearch-delete-zombie-locks.service)].orig
+++ Exec[systemd daemon-reload for codesearch-delete-zombie-locks.service (codesearch-delete-zombie-locks.service)]
+ command => /bin/systemctl daemon-reload
+ refreshonly => True
- Systemd::Unit[codesearch-delete-zombie-locks.timer]
- Parameters differences:
--- Systemd::Unit[codesearch-delete-zombie-locks.timer].orig
+++ Systemd::Unit[codesearch-delete-zombie-locks.timer]
+ restart => False
+ ensure => present
+ override_filename => puppet-override.conf
+ override => False
+ unit => codesearch-delete-zombie-locks.timer
+ require => ['Class[Systemd]']
- Systemd::Timer[codesearch-delete-zombie-locks]
- Parameters differences:
--- Systemd::Timer[codesearch-delete-zombie-locks].orig
+++ Systemd::Timer[codesearch-delete-zombie-locks]
+ timer_intervals => [{'start': 'OnCalendar', 'interval': '*:0/10'}]
+ fixed_random_delay => False
+ ensure => present
+ unit_name => codesearch-delete-zombie-locks.service
+ accuracy => 15sec
+ splay => 0
- Exec[systemd daemon-reload for codesearch-delete-zombie-locks.timer (codesearch-delete-zombie-locks.timer)]
- Parameters differences:
--- Exec[systemd daemon-reload for codesearch-delete-zombie-locks.timer (codesearch-delete-zombie-locks.timer)].orig
+++ Exec[systemd daemon-reload for codesearch-delete-zombie-locks.timer (codesearch-delete-zombie-locks.timer)]
+ before => ['Service[codesearch-delete-zombie-locks.timer]']
+ command => /bin/systemctl daemon-reload
+ refreshonly => True
- File[/lib/systemd/system/codesearch-delete-zombie-locks.service]
- Parameters differences:
--- File[/lib/systemd/system/codesearch-delete-zombie-locks.service].orig
+++ File[/lib/systemd/system/codesearch-delete-zombie-locks.service]
+ mode => 0444
+ ensure => present
+ owner => root
+ group => root
+ notify => Exec[systemd daemon-reload for codesearch-delete-zombie-locks.service (codesearch-delete-zombie-locks.service)]
- Content differences:
--- /lib/systemd/system/codesearch-delete-zombie-locks.service.orig
+++ /lib/systemd/system/codesearch-delete-zombie-locks.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Delete lock files when no process is running
+Documentation=https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
+
+[Service]
+Type=oneshot
+User=root
+ExecStart=/usr/local/bin/delete-hound-zombie-locks.sh
- Class[Profile::Codesearch]
- Parameters differences:
--- Class[Profile::Codesearch].orig
+++ Class[Profile::Codesearch]
+ lock_file_min_age => 60