--- Systemd::Timer[wmf_auto_restart_haproxy].orig
+++ Systemd::Timer[wmf_auto_restart_haproxy]
+ timer_intervals => [{'start': 'OnCalendar', 'interval': 'Mon,Tue,Wed,Thu,Fri *-*-* 2:50:00'}]
+ accuracy => 15sec
+ splay => 0
+ fixed_random_delay => False
+ ensure => present
+ unit_name => wmf_auto_restart_haproxy.service
Exec[ip addr add 127.0.0.42/32 dev ipip0]
- Parameters differences:
--- Exec[ip addr add 127.0.0.42/32 dev ipip0].orig
+++ Exec[ip addr add 127.0.0.42/32 dev ipip0]
+ returns => [0, 2]
+ path => /bin:/usr/bin
+ unless => ip address show ipip0 | grep -q 127.0.0.42/32
- Nrpe::Monitor_service[check_tcp-mss-clamper_status]
- Parameters differences:
--- Nrpe::Monitor_service[check_tcp-mss-clamper_status].orig
+++ Nrpe::Monitor_service[check_tcp-mss-clamper_status]
+ critical => False
+ timeout => 10
+ check_interval => 10
+ retry_interval => 1
+ contact_group => admins
+ nrpe2nodexp_parse_perf_data => False
+ enable_icinga_check => True
+ notes_url => https://wikitech.wikimedia.org/wiki/LVS#IPIP_encapsulation_experiments
+ retries => 2
+ description => Check unit status of tcp-mss-clamper
+ alertmanager_team => observability
+ ensure => absent
+ migration_task => T407130
+ enable_nrpe2nodexp => False
+ nrpe_command => /usr/local/lib/nagios/plugins/check_systemd_unit_status tcp-mss-clamper
- Systemd::Monitor[tcp-mss-clamper]
- Parameters differences:
--- Systemd::Monitor[tcp-mss-clamper].orig
+++ Systemd::Monitor[tcp-mss-clamper]
+ critical => False
+ check_interval => 10
+ notes_url => https://wikitech.wikimedia.org/wiki/LVS#IPIP_encapsulation_experiments
+ contact_group => admins
+ retries => 2
+ ensure => absent
+ migration_task => T407130
- Logrotate::Conf[prometheus_lvs_realserver_mss]
- Parameters differences:
--- Logrotate::Conf[prometheus_lvs_realserver_mss].orig
+++ Logrotate::Conf[prometheus_lvs_realserver_mss]
+ ensure => present
- Systemd::Service[prometheus_lvs_realserver_mss]
- Parameters differences:
--- Systemd::Service[prometheus_lvs_realserver_mss].orig
+++ Systemd::Service[prometheus_lvs_realserver_mss]
+ override => False
+ require => Systemd::Unit[prometheus_lvs_realserver_mss.service]
+ monitoring_contact_group => admins
+ monitoring_enabled => False
+ service_params => {}
+ unit_type => timer
+ monitoring_critical => False
+ ensure => present
+ migration_task => T407130
+ restart => False
- Class[Profile::Contacts]
- Parameters differences:
--- Class[Profile::Contacts].orig
+++ Class[Profile::Contacts]
@@
- role_contacts => ['Infrastructure Foundations']
+ role_contacts => []
@@
- cluster => insetup
+ cluster => misc
- Class[Monitoring]
- Parameters differences:
--- Class[Monitoring].orig
+++ Class[Monitoring]
@@
- notifications_enabled => False
+ notifications_enabled => True
@@
- nagios_group => insetup_eqsin
+ nagios_group => misc_eqsin
@@
- cluster => insetup
+ cluster => misc
- File[/lib/systemd/system/wmf_auto_restart_haproxy.timer]
- Parameters differences:
--- File[/lib/systemd/system/wmf_auto_restart_haproxy.timer].orig
+++ File[/lib/systemd/system/wmf_auto_restart_haproxy.timer]
+ owner => root
+ notify => Exec[systemd daemon-reload for wmf_auto_restart_haproxy.timer (wmf_auto_restart_haproxy.timer)]
+ ensure => present
+ group => root
+ mode => 0444
- Content differences:
--- /lib/systemd/system/wmf_auto_restart_haproxy.timer.orig
+++ /lib/systemd/system/wmf_auto_restart_haproxy.timer
@@ -0,0 +1,12 @@
+[Unit]
+Description=Periodic execution of wmf_auto_restart_haproxy.service
+
+[Timer]
+Unit=wmf_auto_restart_haproxy.service
+# Accuracy sets the maximum time interval around the execution time we want to allow
+AccuracySec=15sec
+OnCalendar=Mon,Tue,Wed,Thu,Fri *-*-* 2:50:00
+RandomizedDelaySec=0
+
+[Install]
+WantedBy=multi-user.target
- Interface::Post_up_command[clsact_ens13]
- Parameters differences:
--- Interface::Post_up_command[clsact_ens13].orig
+++ Interface::Post_up_command[clsact_ens13]
+ ensure => absent
+ interface => ens13
+ command => /usr/sbin/tc qdisc add dev ens13 clsact
- Motd::Message[tcpproxy]
- Parameters differences:
--- Motd::Message[tcpproxy].orig
+++ Motd::Message[tcpproxy]
+ ensure => present
+ priority => 5
+ message => tcp-proxy5004 is tcpproxy
- Augeas[ipip60_manual]
- Parameters differences:
--- Augeas[ipip60_manual].orig
+++ Augeas[ipip60_manual]
+ incl => /etc/network/interfaces
+ changes => ["set auto[./1 = 'ipip60']/1 'ipip60'", "set iface[. = 'ipip60'] 'ipip60'", "set iface[. = 'ipip60']/family 'inet6'", "set iface[. = 'ipip60']/method 'manual'"]
+ context => /files/etc/network/interfaces
+ lens => Interfaces.lns
- Systemd::Service[tcp-mss-clamper]
- Parameters differences:
--- Systemd::Service[tcp-mss-clamper].orig
+++ Systemd::Service[tcp-mss-clamper]
+ override => False
+ monitoring_contact_group => admins
+ monitoring_enabled => True
+ service_params => {}
+ monitoring_notes_url => https://wikitech.wikimedia.org/wiki/LVS#IPIP_encapsulation_experiments
+ unit_type => service
+ monitoring_critical => False
+ ensure => absent
+ migration_task => T407130
+ restart => False
- File[/etc/logrotate.d/wmf_auto_restart_haproxy]
- Parameters differences:
--- File[/etc/logrotate.d/wmf_auto_restart_haproxy].orig
+++ File[/etc/logrotate.d/wmf_auto_restart_haproxy]
+ ensure => present
+ group => root
+ owner => root
+ mode => 0444
- Content differences:
--- /etc/logrotate.d/wmf_auto_restart_haproxy.orig
+++ /etc/logrotate.d/wmf_auto_restart_haproxy
@@ -0,0 +1,12 @@
+# logrotate(8) config for wmf_auto_restart_haproxy
+
+/var/log/wmf_auto_restart_haproxy/*.log {
+ daily
+ copytruncate
+ missingok
+ compress
+ delaycompress
+ notifempty
+ rotate 15
+ size 256M
+}
- File[/usr/local/bin/pool-gerrit]
- Parameters differences:
--- File[/usr/local/bin/pool-gerrit].orig
+++ File[/usr/local/bin/pool-gerrit]
+ ensure => present
+ group => root
+ owner => root
+ mode => 0555
- Content differences:
--- /usr/local/bin/pool-gerrit.orig
+++ /usr/local/bin/pool-gerrit
@@ -0,0 +1,2 @@
+#!/bin/bash
+/usr/local/bin/safe-service-restart --pools gerrit-ssh --pool --retries 10 --wait 5
- File[/var/log/prometheus_lvs_realserver_mss]
- Parameters differences:
--- File[/var/log/prometheus_lvs_realserver_mss].orig
+++ File[/var/log/prometheus_lvs_realserver_mss]
+ owner => root
+ force => True
+ ensure => directory
+ group => root
+ backup => False
+ mode => 0755
- Systemd::Timer[prometheus_ferm_mss]
- Parameters differences:
--- Systemd::Timer[prometheus_ferm_mss].orig
+++ Systemd::Timer[prometheus_ferm_mss]
+ timer_intervals => [{'start': 'OnCalendar', 'interval': 'minutely'}]
+ accuracy => 15sec
+ splay => 0
+ fixed_random_delay => False
+ ensure => present
+ unit_name => prometheus_ferm_mss.service
- Prometheus::Node_lvs_realserver_mss[lvs_clamped_ipport]
- Parameters differences:
--- Prometheus::Node_lvs_realserver_mss[lvs_clamped_ipport].orig
+++ Prometheus::Node_lvs_realserver_mss[lvs_clamped_ipport]
+ ensure => present
+ outfile => /var/lib/prometheus/node.d/lvs-realserver-mss.prom
+ clamped_ipport => ['103.102.166.225:29418', '[2001:df2:e500:ed1a::2]:29418']
- Systemd::Unit[prometheus_lvs_realserver_mss.timer]
- Parameters differences:
--- Systemd::Unit[prometheus_lvs_realserver_mss.timer].orig
+++ Systemd::Unit[prometheus_lvs_realserver_mss.timer]
+ override_filename => puppet-override.conf
+ override => False
+ require => ['Class[Systemd]']
+ unit => prometheus_lvs_realserver_mss.timer
+ ensure => present
+ restart => False
- Concat::Fragment[main contacts]
- Etcd::Client::Config[/etc/etcd/etcdrc]
- Parameters differences:
--- Etcd::Client::Config[/etc/etcd/etcdrc].orig
+++ Etcd::Client::Config[/etc/etcd/etcdrc]
+ owner => root
+ ensure => present
+ group => root
+ settings => {'host': None, 'port': None, 'srv_domain': 'conftool.eqsin.wmnet', 'ca_cert': '/etc/ssl/certs/wmf-ca-certificates.crt', 'protocol': 'https', 'allow_reconnect': True}
+ world_readable => True
- File[/etc/default/wikimedia-lvs-realserver]
- Parameters differences:
--- File[/etc/default/wikimedia-lvs-realserver].orig
+++ File[/etc/default/wikimedia-lvs-realserver]
+ ensure => present
+ group => root
+ owner => root
+ mode => 0444
- Content differences:
--- /etc/default/wikimedia-lvs-realserver.orig
+++ /etc/default/wikimedia-lvs-realserver
@@ -0,0 +1,10 @@
+# This file is managed by puppet!
+
+
+
+# Location of the sysctl file containing LVS ARP settings
+SYSCTLFILE=/usr/share/wikimedia-lvs-realserver/sysctl.conf
+
+# LVS service IPs to be bound to the loopback interface,
+# separate using spaces
+LVS_SERVICE_IPS="103.102.166.225 2001:df2:e500:ed1a::2"
- File[/usr/local/bin/depool-gerrit]
- Parameters differences:
--- File[/usr/local/bin/depool-gerrit].orig
+++ File[/usr/local/bin/depool-gerrit]
+ ensure => present
+ group => root
+ owner => root
+ mode => 0555
- Content differences:
--- /usr/local/bin/depool-gerrit.orig
+++ /usr/local/bin/depool-gerrit
@@ -0,0 +1,2 @@
+#!/bin/bash
+/usr/local/bin/safe-service-restart --pools gerrit-ssh --depool --retries 10 --wait 5
- Systemd::Syslog[wmf_auto_restart_haproxy]
- Parameters differences:
--- Systemd::Syslog[wmf_auto_restart_haproxy].orig
+++ Systemd::Syslog[wmf_auto_restart_haproxy]
+ owner => root
+ force_stop => True
+ log_filename => syslog.log
+ readable_by => all
+ base_dir => /var/log
+ ensure => present
+ programname_comparison => startswith
+ group => root
- Systemd::Service[wmf_auto_restart_haproxy]
- Parameters differences:
--- Systemd::Service[wmf_auto_restart_haproxy].orig
+++ Systemd::Service[wmf_auto_restart_haproxy]
+ override => False
+ require => Systemd::Unit[wmf_auto_restart_haproxy.service]
+ monitoring_contact_group => admins
+ monitoring_enabled => False
+ service_params => {}
+ unit_type => timer
+ monitoring_critical => False
+ ensure => present
+ migration_task => T407130
+ restart => False
- File[/usr/local/bin/decommission]
- Parameters differences:
--- File[/usr/local/bin/decommission].orig
+++ File[/usr/local/bin/decommission]
+ owner => root
+ ensure => present
+ group => root
+ source => puppet:///modules/conftool/conftool-simple-command.sh
+ mode => 0555
- Systemd::Unit[prometheus_lvs_realserver_mss.service]
- Parameters differences:
--- Systemd::Unit[prometheus_lvs_realserver_mss.service].orig
+++ Systemd::Unit[prometheus_lvs_realserver_mss.service]
+ override_filename => puppet-override.conf
+ override => False
+ require => ['Class[Systemd]']
+ unit => prometheus_lvs_realserver_mss.service
+ ensure => present
+ restart => False
- File[/usr/local/lib/nagios/plugins/check_systemd_unit_status]
- Parameters differences:
--- File[/usr/local/lib/nagios/plugins/check_systemd_unit_status].orig
+++ File[/usr/local/lib/nagios/plugins/check_systemd_unit_status]
+ require => File[/usr/local/lib/nagios/plugins/]
+ owner => root
+ ensure => file
+ tag => nrpe::plugin
+ group => root
+ source => puppet:///modules/systemd/check_systemd_unit_status
+ mode => 0555
- Systemd::Timer[prometheus_lvs_realserver_mss]
- Parameters differences:
--- Systemd::Timer[prometheus_lvs_realserver_mss].orig
+++ Systemd::Timer[prometheus_lvs_realserver_mss]
+ timer_intervals => [{'start': 'OnCalendar', 'interval': 'minutely'}]
+ accuracy => 15sec
+ splay => 0
+ fixed_random_delay => False
+ ensure => present
+ unit_name => prometheus_lvs_realserver_mss.service
- Systemd::Syslog[prometheus_lvs_realserver_mss]
- Parameters differences:
--- Systemd::Syslog[prometheus_lvs_realserver_mss].orig
+++ Systemd::Syslog[prometheus_lvs_realserver_mss]
+ owner => root
+ force_stop => True
+ log_filename => syslog.log
+ readable_by => all
+ base_dir => /var/log
+ ensure => present
+ programname_comparison => startswith
+ group => root
- File[/usr/local/bin/pooler-loop]
- Parameters differences:
--- File[/usr/local/bin/pooler-loop].orig
+++ File[/usr/local/bin/pooler-loop]
+ owner => root
+ ensure => present
+ group => root
+ source => puppet:///modules/conftool/pooler_loop.rb
+ mode => 0555
- Interface::Post_up_command[clsact_lo]
- Parameters differences:
--- Interface::Post_up_command[clsact_lo].orig
+++ Interface::Post_up_command[clsact_lo]
+ ensure => absent
+ interface => lo
+ command => /usr/sbin/tc qdisc add dev lo clsact
- Exec[systemd daemon-reload for prometheus_lvs_realserver_mss.timer (prometheus_lvs_realserver_mss.timer)]
- Parameters differences:
--- Exec[systemd daemon-reload for prometheus_lvs_realserver_mss.timer (prometheus_lvs_realserver_mss.timer)].orig
+++ Exec[systemd daemon-reload for prometheus_lvs_realserver_mss.timer (prometheus_lvs_realserver_mss.timer)]
+ before => ['Service[prometheus_lvs_realserver_mss.timer]']
+ refreshonly => True
+ command => /bin/systemctl daemon-reload
- Augeas[ipip0_add_up]
- Parameters differences:
--- Augeas[ipip0_add_up].orig
+++ Augeas[ipip0_add_up]
+ require => Interface::Manual[ipip_ipv4]
+ context => /files/etc/network/interfaces/*[. = 'ipip0' and ./family = 'inet']
+ lens => Interfaces.lns
+ incl => /etc/network/interfaces
+ onlyif => match up[. = 'ip link add name ipip0 type ipip external'] size == 0
+ changes => set up[last()+1] 'ip link add name ipip0 type ipip external'
- File[/var/log/wmf_auto_restart_haproxy]
- Parameters differences:
--- File[/var/log/wmf_auto_restart_haproxy].orig
+++ File[/var/log/wmf_auto_restart_haproxy]
+ owner => root
+ force => True
+ ensure => directory
+ group => root
+ backup => False
+ mode => 0755
- Sudo::User[nrpe-check_check_tcp-mss-clamper_status]
- Parameters differences:
--- Sudo::User[nrpe-check_check_tcp-mss-clamper_status].orig
+++ Sudo::User[nrpe-check_check_tcp-mss-clamper_status]
+ require => ['Class[Sudo]']
+ privileges => []
+ ensure => absent
+ tag => nrpe::check
+ user => nagios
- File[/lib/systemd/system/prometheus_ferm_mss.service]
- Parameters differences:
--- File[/lib/systemd/system/prometheus_ferm_mss.service].orig
+++ File[/lib/systemd/system/prometheus_ferm_mss.service]
+ owner => root
+ notify => Exec[systemd daemon-reload for prometheus_ferm_mss.service (prometheus_ferm_mss.service)]
+ ensure => present
+ group => root
+ mode => 0444
- Content differences:
--- /lib/systemd/system/prometheus_ferm_mss.service.orig
+++ /lib/systemd/system/prometheus_ferm_mss.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Regular job to collect MSS values of ferm-based hosts
+Documentation=https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
+
+[Service]
+Type=oneshot
+User=root
+ExecStart=/usr/local/bin/prometheus-ferm-mss -o /var/lib/prometheus/node.d/ferm-mss.prom -e 103.102.166.225:29418 -e [2001:df2:e500:ed1a::2]:29418
- Exec[disable-rp-filter-ipip0]
- Parameters differences:
--- Exec[disable-rp-filter-ipip0].orig
+++ Exec[disable-rp-filter-ipip0]
+ require => Interface::Ipip[ipip_ipv4]
+ unless => /usr/sbin/sysctl -n net.ipv4.conf.ipip0.rp_filter |grep -- '0'
+ command => /usr/sbin/sysctl -q net.ipv4.conf.ipip0.rp_filter=0
- File[/root/.etcdrc]
- Parameters differences:
--- File[/root/.etcdrc].orig
+++ File[/root/.etcdrc]
+ show_diff => False
+ owner => root
+ ensure => present
+ group => root
+ mode => 0440
- Content differences:
--- /root/.etcdrc.orig
+++ /root/.etcdrc
@@ -0,0 +1,3 @@
+password: another_secret
+username: conftool
+
- Systemd::Syslog[prometheus_ferm_mss]
- Parameters differences:
--- Systemd::Syslog[prometheus_ferm_mss].orig
+++ Systemd::Syslog[prometheus_ferm_mss]
+ owner => root
+ force_stop => True
+ log_filename => syslog.log
+ readable_by => all
+ base_dir => /var/log
+ ensure => present
+ programname_comparison => startswith
+ group => root
- Monitoring::Exported_nagios_service[tcp-proxy5004 ferm_active]
- Parameters differences: