--- Class[Adduser].orig
+++ Class[Adduser]
@@
- before => ['Package[puppet]', 'Package[facter]', 'Package[augeas-tools]', 'Package[virt-what]', 'Package[puppet-module-puppetlabs-augeas-core]', 'Package[python3-prometheus-client]', 'Package[python3-yaml]', 'Package[ruby-net-ssh]', 'Package[openssl]', 'Package[ssl-cert]', 'Package[ca-certificates]', 'Package[wmf-certificates]', 'Package[ntp]', 'Package[systemd-timesyncd]', 'Package[exim4-config]', 'Package[exim4-daemon-light]', 'Package[logrotate]', 'Package[prometheus-node-exporter]', 'Package[bsdutils]', 'Package[smartmontools]', 'Package[rsyslog]', 'Package[rsyslog-openssl]', 'Package[cadvisor]', 'Package[prometheus-ethtool-exporter]', 'Package[acct]', 'Package[byobu]', 'Package[colordiff]', 'Package[curl]', 'Package[debian-goodies]', 'Package[ethtool]', 'Package[gdb]', 'Package[gdisk]', 'Package[git]', 'Package[htop]', 'Package[httpry]', 'Package[iotop]', 'Package[iperf]', 'Package[jq]', 'Package[libtemplate-perl]', 'Package[lldpd]', 'Package[lshw]', 'Package[molly-guard]', 'Package[moreutils]', 'Package[net-tools]', 'Package[numactl]', 'Package[ncdu]', 'Package[ngrep]', 'Package[pigz]', 'Package[psmisc]', 'Package[pv]', 'Package[python3]', 'Package[screen]', 'Package[strace]', 'Package[sysstat]', 'Package[tcpdump]', 'Package[tmux]', 'Package[tree]', 'Package[vim]', 'Package[vim-addon-manager]', 'Package[vim-scripts]', 'Package[wipe]', 'Package[xfsprogs]', 'Package[zsh]', 'Package[icdiff]', 'Package[linux-perf]', 'Package[bsd-mailx]', 'Package[ack]', 'Package[netcat-openbsd]', 'Package[tshark]', 'Package[fzf]', 'Package[ripgrep]', 'Package[fd-find]', 'Package[kitty-terminfo]', 'Package[mtr-tiny]', 'Package[bat]', 'Package[efibootmgr]', 'Package[bind9-dnsutils]', 'Package[tzdata]', 'Package[python3-wmflib]', 'Package[ruby-sorted-set]', 'Package[btop]', 'Package[dstat]', 'Package[apport]', 'Package[command-not-found]', 'Package[command-not-found-data]', 'Package[ecryptfs-utils]', 'Package[mlocate]', 'Package[os-prober]', 'Package[python3-apport]', 'Package[wpasupplicant]', 'Package[atop]', 'Package[apt-listchanges]', 'Package[isc-dhcp-client]', 'Package[rasdaemon]', 'Package[libicu67]', 'Package[libwsutil12]', 'Package[libwireshark14]', 'Package[libopencsd0]', 'Package[libwiretap11]', 'Package[ruby2.7]', 'Package[python3.9-minimal]', 'Package[python3.9]', 'Package[perl-modules-5.32]', 'Package[libpython3.9]', 'Package[libperl5.32]', 'Package[libpython3.9-minimal]', 'Package[libpython3.9-stdlib]', 'Package[libidn11]', 'Package[libldap-2.4-2]', 'Package[liburing1]', 'Package[libwebp6]', 'Package[libcbor0]', 'Package[libusb-0.1-4]', 'Package[telnet]', 'Package[libruby2.7]', 'Package[libdns-export1110]', 'Package[libisc-export1105]', 'Package[libbpf0]', 'Package[openssh-client]', 'Package[openssh-server]', 'Package[debdeploy-client]', 'Package[python3-dateutil]', 'Package[sudo]', 'Package[golang-cfssl]', 'Package[debmonitor-client]', 'Package[megacli]', 'Package[nagios-nrpe-server]', 'Package[monitoring-plugins]', 'Package[monitoring-plugins-basic]', 'Package[monitoring-plugins-standard]', 'Package[liburiparser1]', 'Package[python3-attr]', 'Package[iucode-tool]', 'Package[freeipmi-tools]', 'Package[freeipmi-ipmiseld]', 'Package[rsyslog-kafka]', 'Package[emacs-nox]', 'Package[prometheus-ipmi-exporter]', 'Package[libnet-dns-perl]', 'Package[iptables]', 'Package[ferm]', 'Package[ulogd2]', 'Package[conntrack]', 'Package[wmf-mariadb1011]', 'Package[percona-toolkit]', 'Package[grc]', 'Package[mariadb-backup]', 'Package[python3-wmfmariadbpy]', 'Package[wmfmariadbpy-common]', 'Package[monitoring-plugins-contrib]', 'Package[prometheus-rsyslog-exporter]', 'Package[initramfs-tools]', 'Package[python3-click]', 'Package[python3-box]', 'Package[confd]', 'Package[python3-toml]', 'Package[prometheus-mysqld-exporter]']
+ before => ['Package[puppet]', 'Package[facter]', 'Package[augeas-tools]', 'Package[virt-what]', 'Package[puppet-module-puppetlabs-augeas-core]', 'Package[python3-prometheus-client]', 'Package[python3-yaml]', 'Package[ruby-net-ssh]', 'Package[openssl]', 'Package[ssl-cert]', 'Package[ca-certificates]', 'Package[wmf-certificates]', 'Package[ntp]', 'Package[systemd-timesyncd]', 'Package[exim4-config]', 'Package[exim4-daemon-light]', 'Package[logrotate]', 'Package[prometheus-node-exporter]', 'Package[bsdutils]', 'Package[smartmontools]', 'Package[rsyslog]', 'Package[rsyslog-openssl]', 'Package[cadvisor]', 'Package[prometheus-ethtool-exporter]', 'Package[acct]', 'Package[byobu]', 'Package[colordiff]', 'Package[curl]', 'Package[debian-goodies]', 'Package[ethtool]', 'Package[gdb]', 'Package[gdisk]', 'Package[git]', 'Package[htop]', 'Package[httpry]', 'Package[iotop]', 'Package[iperf]', 'Package[jq]', 'Package[libtemplate-perl]', 'Package[lldpd]', 'Package[lshw]', 'Package[molly-guard]', 'Package[moreutils]', 'Package[net-tools]', 'Package[numactl]', 'Package[ncdu]', 'Package[ngrep]', 'Package[pigz]', 'Package[psmisc]', 'Package[pv]', 'Package[python3]', 'Package[screen]', 'Package[strace]', 'Package[sysstat]', 'Package[tcpdump]', 'Package[tmux]', 'Package[tree]', 'Package[vim]', 'Package[vim-addon-manager]', 'Package[vim-scripts]', 'Package[wipe]', 'Package[xfsprogs]', 'Package[zsh]', 'Package[icdiff]', 'Package[linux-perf]', 'Package[bsd-mailx]', 'Package[ack]', 'Package[netcat-openbsd]', 'Package[tshark]', 'Package[fzf]', 'Package[ripgrep]', 'Package[fd-find]', 'Package[kitty-terminfo]', 'Package[mtr-tiny]', 'Package[bat]', 'Package[efibootmgr]', 'Package[bind9-dnsutils]', 'Package[tzdata]', 'Package[python3-wmflib]', 'Package[ruby-sorted-set]', 'Package[btop]', 'Package[dstat]', 'Package[apport]', 'Package[command-not-found]', 'Package[command-not-found-data]', 'Package[ecryptfs-utils]', 'Package[mlocate]', 'Package[os-prober]', 'Package[python3-apport]', 'Package[wpasupplicant]', 'Package[atop]', 'Package[apt-listchanges]', 'Package[isc-dhcp-client]', 'Package[rasdaemon]', 'Package[libicu67]', 'Package[libwsutil12]', 'Package[libwireshark14]', 'Package[libopencsd0]', 'Package[libwiretap11]', 'Package[ruby2.7]', 'Package[python3.9-minimal]', 'Package[python3.9]', 'Package[perl-modules-5.32]', 'Package[libpython3.9]', 'Package[libperl5.32]', 'Package[libpython3.9-minimal]', 'Package[libpython3.9-stdlib]', 'Package[libidn11]', 'Package[libldap-2.4-2]', 'Package[liburing1]', 'Package[libwebp6]', 'Package[libcbor0]', 'Package[libusb-0.1-4]', 'Package[telnet]', 'Package[libruby2.7]', 'Package[libdns-export1110]', 'Package[libisc-export1105]', 'Package[libbpf0]', 'Package[openssh-client]', 'Package[openssh-server]', 'Package[debdeploy-client]', 'Package[python3-dateutil]', 'Package[sudo]', 'Package[golang-cfssl]', 'Package[debmonitor-client]', 'Package[megacli]', 'Package[nagios-nrpe-server]', 'Package[monitoring-plugins]', 'Package[monitoring-plugins-basic]', 'Package[monitoring-plugins-standard]', 'Package[liburiparser1]', 'Package[python3-attr]', 'Package[iucode-tool]', 'Package[freeipmi-tools]', 'Package[freeipmi-ipmiseld]', 'Package[rsyslog-kafka]', 'Package[emacs-nox]', 'Package[prometheus-ipmi-exporter]', 'Package[libnet-dns-perl]', 'Package[iptables]', 'Package[ferm]', 'Package[ulogd2]', 'Package[conntrack]', 'Package[prometheus-rsyslog-exporter]', 'Package[initramfs-tools]', 'Package[python3-click]', 'Package[python3-box]', 'Package[confd]', 'Package[python3-toml]']
File[/etc/sudoers.d/nrpe-check_mariadb_disk_space]
- Parameters differences:
--- File[/etc/sudoers.d/nrpe-check_mariadb_disk_space].orig
+++ File[/etc/sudoers.d/nrpe-check_mariadb_disk_space]
- group => root
- require => Package[nagios-nrpe-server]
- ensure => absent
- owner => root
- File[/usr/local/bin/mbstream]
- Parameters differences:
--- File[/usr/local/bin/mbstream].orig
+++ File[/usr/local/bin/mbstream]
- owner => root
- group => root
- require => Package[wmf-mariadb1011]
- ensure => link
- target => /opt/wmf-mariadb1011/bin/mbstream
- Prometheus::Alert::Rule[check_mariadb_replica_io_state_s1_0d5979f7abbb49256cfedd70a646784e]
- Parameters differences:
--- Prometheus::Alert::Rule[check_mariadb_replica_io_state_s1_0d5979f7abbb49256cfedd70a646784e].orig
+++ Prometheus::Alert::Rule[check_mariadb_replica_io_state_s1_0d5979f7abbb49256cfedd70a646784e]
- alert_name => nrpe_MariaDB_Replica_IO__s1
- description => NRPE CHECK: MariaDB Replica IO: s1
- instance => ops
- group => nrpechecks
- site => codfw
- team => observability
- def_label_whitelst => ['team', 'severity']
- expr => (nagios_nrpe_check_result{alert_rule_hash="0d5979f7abbb49256cfedd70a646784e",check_name="check_mariadb_replica_io_state_s1", status=~"(WARNING|CRITICAL)", severity=~"(warning|critical)"} > 0) * on (instance) group_left (team) role_owner
- runbook => https://wikitech.wikimedia.org/wiki/MariaDB/troubleshooting#Depooling_a_replica
- for => 3m
- summary => NRPE CHECK: MariaDB Replica IO: s1
- dashboard => TODO
- logs => https://logstash.wikimedia.org/app/dashboards#/view/2d343ac0-6df8-11f0-8e08-7fab0da52b33?_g=(filters:!((query:(match_phrase:(event.module:check_mariadb_replica_io_state_s1))),(query:(match_phrase:(host.name:{{$labels.instance|stripPort}})))))
- ensure => absent
- severity => info
- File[/etc/sudoers.d/nrpe-check_mariadb_replica_io_state_s1]
- Parameters differences:
--- File[/etc/sudoers.d/nrpe-check_mariadb_replica_io_state_s1].orig
+++ File[/etc/sudoers.d/nrpe-check_mariadb_replica_io_state_s1]
- group => root
- require => Package[nagios-nrpe-server]
- ensure => absent
- owner => root
- Systemd::Timer[nrpe2nodexp-mariadb_replica_sql_lag_s1]
- Parameters differences:
--- Systemd::Timer[nrpe2nodexp-mariadb_replica_sql_lag_s1].orig
+++ Systemd::Timer[nrpe2nodexp-mariadb_replica_sql_lag_s1]
- fixed_random_delay => True
- timer_intervals => [{'start': 'OnUnitInactiveSec', 'interval': '1min'}, {'interval': '1s', 'start': 'OnActiveSec'}]
- unit_name => nrpe2nodexp-mariadb_replica_sql_lag_s1.service
- ensure => absent
- accuracy => 15sec
- splay => 60
- Monitoring::Exported_nagios_service[db2141 ssh]
- Parameters differences:
--- Monitoring::Exported_nagios_service[db2141 ssh].orig
+++ Monitoring::Exported_nagios_service[db2141 ssh]
@@
- notifications_enabled => 1
+ notifications_enabled => 0
- Exec[systemctl try-restart prometheus-mysqld-exporter@s1]
- Parameters differences:
--- Exec[systemctl try-restart prometheus-mysqld-exporter@s1].orig
+++ Exec[systemctl try-restart prometheus-mysqld-exporter@s1]
- refreshonly => True
- path => /usr/bin
- File[/lib/systemd/system/nrpe2nodexp-mariadb_replica_io_state_s1.service]
- Parameters differences:
--- File[/lib/systemd/system/nrpe2nodexp-mariadb_replica_io_state_s1.service].orig
+++ File[/lib/systemd/system/nrpe2nodexp-mariadb_replica_io_state_s1.service]
- notify => Exec[systemd daemon-reload for nrpe2nodexp-mariadb_replica_io_state_s1.service (nrpe2nodexp-mariadb_replica_io_state_s1.service)]
- group => root
- ensure => absent
- mode => 0444
- owner => root
- Content differences:
--- /lib/systemd/system/nrpe2nodexp-mariadb_replica_io_state_s1.service.orig
+++ /lib/systemd/system/nrpe2nodexp-mariadb_replica_io_state_s1.service
@@ -1,11 +0,0 @@
-[Unit]
-Description=execution of nrpe2nodexp for the check_mariadb_replica_io_state_s1 command.
-Documentation=https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
-
-[Service]
-Type=oneshot
-User=nagios
-
-Group=prometheus-node-exporter
-SyslogIdentifier=nrpe2nodexp-mariadb_replica_io_state_s1
-ExecStart=-/usr/local/bin/nrpe2nodexp --alert-rule-hash "0d5979f7abbb49256cfedd70a646784e" --timeout 10 --check-command "check_mariadb_replica_io_state_s1"
- Systemd::Unit[nrpe2nodexp-mysqld.timer]
- Parameters differences:
--- Systemd::Unit[nrpe2nodexp-mysqld.timer].orig
+++ Systemd::Unit[nrpe2nodexp-mysqld.timer]
- restart => False
- override => False
- unit => nrpe2nodexp-mysqld.timer
- require => ['Class[Systemd]']
- ensure => absent
- override_filename => puppet-override.conf
- Class[Profile::Mariadb::Mysql_role]
- Parameters differences:
--- Class[Profile::Mariadb::Mysql_role].orig
+++ Class[Profile::Mariadb::Mysql_role]
- role => slave
- Mariadb::Monitor_replication[s1]
- Parameters differences:
--- Mariadb::Monitor_replication[s1].orig
+++ Mariadb::Monitor_replication[s1]
- socket => /run/mysqld/mysqld.s1.sock
- warn_stopped => True
- multisource => False
- source_dc => eqiad
- contact_group => admins
- lag_crit => 300
- is_critical => False
- lag_warn => 60
- Exec[systemd daemon-reload for nrpe2nodexp-mariadb_replica_io_state_s1.timer (nrpe2nodexp-mariadb_replica_io_state_s1.timer)]
- Parameters differences:
--- Exec[systemd daemon-reload for nrpe2nodexp-mariadb_replica_io_state_s1.timer (nrpe2nodexp-mariadb_replica_io_state_s1.timer)].orig
+++ Exec[systemd daemon-reload for nrpe2nodexp-mariadb_replica_io_state_s1.timer (nrpe2nodexp-mariadb_replica_io_state_s1.timer)]
- command => /bin/systemctl daemon-reload
- refreshonly => True
- Puppet::Expose_agent_certs[/etc/mysql]
- Parameters differences:
--- Puppet::Expose_agent_certs[/etc/mysql].orig
+++ Puppet::Expose_agent_certs[/etc/mysql]
- group => mysql
- provide_p12 => False
- provide_keypair => False
- provide_pem => True
- user => mysql
- ensure => present
- ssldir => /var/lib/puppet/ssl
- provide_private => True
- Prometheus::Alert::Rule[check_mariadb_replica_sql_state_s1_3f927914a18db09399b7fff42858d634]
- Parameters differences:
--- Prometheus::Alert::Rule[check_mariadb_replica_sql_state_s1_3f927914a18db09399b7fff42858d634].orig
+++ Prometheus::Alert::Rule[check_mariadb_replica_sql_state_s1_3f927914a18db09399b7fff42858d634]
- alert_name => nrpe_MariaDB_Replica_SQL__s1
- description => NRPE CHECK: MariaDB Replica SQL: s1
- instance => ops
- group => nrpechecks
- site => codfw
- team => observability
- def_label_whitelst => ['team', 'severity']
- expr => (nagios_nrpe_check_result{alert_rule_hash="3f927914a18db09399b7fff42858d634",check_name="check_mariadb_replica_sql_state_s1", status=~"(WARNING|CRITICAL)", severity=~"(warning|critical)"} > 0) * on (instance) group_left (team) role_owner
- runbook => https://wikitech.wikimedia.org/wiki/MariaDB/troubleshooting#Depooling_a_replica
- for => 3m
- summary => NRPE CHECK: MariaDB Replica SQL: s1
- dashboard => TODO
- logs => https://logstash.wikimedia.org/app/dashboards#/view/2d343ac0-6df8-11f0-8e08-7fab0da52b33?_g=(filters:!((query:(match_phrase:(event.module:check_mariadb_replica_sql_state_s1))),(query:(match_phrase:(host.name:{{$labels.instance|stripPort}})))))
- ensure => absent
- severity => info
- Monitoring::Exported_nagios_service[db2141 mariadb_replica_io_state_s1]
- Parameters differences:
--- Monitoring::Exported_nagios_service[db2141 mariadb_replica_io_state_s1].orig
+++ Monitoring::Exported_nagios_service[db2141 mariadb_replica_io_state_s1]
- check_command => nrpe_check!check_mariadb_replica_io_state_s1!10
- notifications_enabled => 1
- contact_groups => admins
- servicegroups => mysql_codfw
- is_volatile => 0
- retry_interval => 1
- active_checks_enabled => 1
- notification_period => 24x7
- service_description => MariaDB Replica IO: s1
- host_name => db2141
- max_check_attempts => 3
- notes_url => https://wikitech.wikimedia.org/wiki/MariaDB/troubleshooting#Depooling_a_replica
- notification_options => c,r,f
- check_interval => 1
- notification_interval => 0
- check_freshness => 0
- ensure => present
- check_period => 24x7
- passive_checks_enabled => 1
- Prometheus::Alert::Rule[check_mariadb_read_only_s1_42baf529e0f3bfca391aca0a24c880e9]
- Parameters differences:
--- Prometheus::Alert::Rule[check_mariadb_read_only_s1_42baf529e0f3bfca391aca0a24c880e9].orig
+++ Prometheus::Alert::Rule[check_mariadb_read_only_s1_42baf529e0f3bfca391aca0a24c880e9]
- alert_name => nrpe_MariaDB_read_only_s1
- description => NRPE CHECK: MariaDB read only s1
- instance => ops
- group => nrpechecks
- site => codfw
- team => observability
- def_label_whitelst => ['team', 'severity']
- expr => (nagios_nrpe_check_result{alert_rule_hash="42baf529e0f3bfca391aca0a24c880e9",check_name="check_mariadb_read_only_s1", status=~"(WARNING|CRITICAL)", severity=~"(warning|critical)"} > 0) * on (instance) group_left (team) role_owner
- runbook => https://wikitech.wikimedia.org/wiki/MariaDB/troubleshooting#Master_comes_back_in_read_only
- for => 3m
- summary => NRPE CHECK: MariaDB read only s1
- dashboard => TODO
- logs => https://logstash.wikimedia.org/app/dashboards#/view/2d343ac0-6df8-11f0-8e08-7fab0da52b33?_g=(filters:!((query:(match_phrase:(event.module:check_mariadb_read_only_s1))),(query:(match_phrase:(host.name:{{$labels.instance|stripPort}})))))
- ensure => absent
- severity => info
- Motd::Script[mariadb::backup_source]
- Parameters differences:
--- Motd::Script[mariadb::backup_source].orig
+++ Motd::Script[mariadb::backup_source]
- ensure => present
- priority => 5
- File[/etc/update-motd.d/06-db-section-s1]
- Parameters differences:
--- File[/etc/update-motd.d/06-db-section-s1].orig
+++ File[/etc/update-motd.d/06-db-section-s1]
- group => root
- ensure => present
- mode => 0555
- owner => root
- Content differences:
--- /etc/update-motd.d/06-db-section-s1.orig
+++ /etc/update-motd.d/06-db-section-s1
@@ -1,2 +0,0 @@
-#!/bin/sh
-echo 'DB section s1 (alias: mysql.s1)'
- File[/etc/rsyslog.d/25-nrpe2nodexp-mariadb-replica-sql-state-s1.conf]
- Parameters differences:
--- File[/etc/rsyslog.d/25-nrpe2nodexp-mariadb-replica-sql-state-s1.conf].orig
+++ File[/etc/rsyslog.d/25-nrpe2nodexp-mariadb-replica-sql-state-s1.conf]
- notify => Service[rsyslog]
- group => root
- ensure => absent
- mode => 0444
- owner => root
- Content differences:
--- /etc/rsyslog.d/25-nrpe2nodexp-mariadb-replica-sql-state-s1.conf.orig
+++ /etc/rsyslog.d/25-nrpe2nodexp-mariadb-replica-sql-state-s1.conf
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-if $programname contains "nrpe2nodexp-mariadb_replica_sql_state_s1" then {
- if ($msg contains "\"ecs.version\": \"1.7.0\"") then {
- # Send logs to kafka
- set $.log_outputs = "kafka ecs_170 local";
- } else {
- # Filter out non-relevant nrpe2nodexp messages
- stop
- }
-}
- Class[Wmfmariadbpy]
- Parameters differences:
--- Class[Wmfmariadbpy].orig
+++ Class[Wmfmariadbpy]
- section_ports => {'s1': 3311, 's2': 3312, 's3': 3313, 's4': 3314, 's5': 3315, 's6': 3316, 's7': 3317, 's8': 3318, 'x1': 3320, 'x3': 3363, 'm1': 3321, 'm2': 3322, 'm3': 3323, 'm5': 3325, 'staging': 3350, 'matomo': 3351, 'analytics_meta': 3352, 'backup1-eqiad': 3360, 'backup1-codfw': 3361}
- role => db
- File[/lib/systemd/system/nrpe2nodexp-mysqld.service]
- Parameters differences:
--- File[/lib/systemd/system/nrpe2nodexp-mysqld.service].orig
+++ File[/lib/systemd/system/nrpe2nodexp-mysqld.service]
- notify => Exec[systemd daemon-reload for nrpe2nodexp-mysqld.service (nrpe2nodexp-mysqld.service)]
- group => root
- ensure => absent
- mode => 0444
- owner => root
- Content differences:
--- /lib/systemd/system/nrpe2nodexp-mysqld.service.orig
+++ /lib/systemd/system/nrpe2nodexp-mysqld.service
@@ -1,11 +0,0 @@
-[Unit]
-Description=execution of nrpe2nodexp for the check_mysqld command.
-Documentation=https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
-
-[Service]
-Type=oneshot
-User=nagios
-
-Group=prometheus-node-exporter
-SyslogIdentifier=nrpe2nodexp-mysqld
-ExecStart=-/usr/local/bin/nrpe2nodexp --alert-rule-hash "ca81db2c9e98d408f9f65c79817da116" --timeout 10 --check-command "check_mysqld"
- Package[mariadb-backup]
- Parameters differences:
--- Package[mariadb-backup].orig
+++ Package[mariadb-backup]
- ensure => installed
- provider => apt
- File[/etc/ferm/conf.d/10_s1_mariadb_internal]
- Parameters differences:
--- File[/etc/ferm/conf.d/10_s1_mariadb_internal].orig
+++ File[/etc/ferm/conf.d/10_s1_mariadb_internal]
- notify => Service[ferm]
- group => root
- tag => ferm
- require => File[/etc/ferm/conf.d]
- ensure => present
- mode => 0400
- owner => root
- Content differences:
--- /etc/ferm/conf.d/10_s1_mariadb_internal.orig
+++ /etc/ferm/conf.d/10_s1_mariadb_internal
@@ -1,8 +0,0 @@
-# Autogenerated by puppet. DO NOT EDIT BY HAND!
-#
-#
-&R_SERVICE(tcp, 3311, $INTERNAL);
-
-
-
-&NO_TRACK(tcp, 3311);
- Rsyslog::Conf[wmf_auto_restart_prometheus-mysqld-exporter_s1]
- Parameters differences:
--- Rsyslog::Conf[wmf_auto_restart_prometheus-mysqld-exporter_s1].orig
+++ Rsyslog::Conf[wmf_auto_restart_prometheus-mysqld-exporter_s1]
- mode => 0444
- require => File[/var/log/wmf_auto_restart_prometheus-mysqld-exporter_s1]
- ensure => present
- priority => 40
- File[/lib/systemd/system/wmf_auto_restart_prometheus-mysqld-exporter@s1.service]
- Parameters differences:
--- File[/lib/systemd/system/wmf_auto_restart_prometheus-mysqld-exporter@s1.service].orig
+++ File[/lib/systemd/system/wmf_auto_restart_prometheus-mysqld-exporter@s1.service]
- notify => Exec[systemd daemon-reload for wmf_auto_restart_prometheus-mysqld-exporter@s1.service (wmf_auto_restart_prometheus-mysqld-exporter@s1.service)]
- group => root
- ensure => present
- mode => 0444
- owner => root
- Content differences:
--- /lib/systemd/system/wmf_auto_restart_prometheus-mysqld-exporter@s1.service.orig
+++ /lib/systemd/system/wmf_auto_restart_prometheus-mysqld-exporter@s1.service
@@ -1,8 +0,0 @@
-[Unit]
-Description=Auto restart job: prometheus-mysqld-exporter@s1
-Documentation=https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
-
-[Service]
-Type=oneshot
-User=root
-ExecStart=/usr/local/sbin/wmf-auto-restart -s prometheus-mysqld-exporter@s1
- Service[nrpe2nodexp-mariadb_replica_io_state_s1.timer]
- Parameters differences:
--- Service[nrpe2nodexp-mariadb_replica_io_state_s1.timer].orig
+++ Service[nrpe2nodexp-mariadb_replica_io_state_s1.timer]
- enable => False
- ensure => stopped
- provider => systemd
- before => ['Exec[systemd daemon-reload for nrpe2nodexp-mariadb_replica_io_state_s1.timer (nrpe2nodexp-mariadb_replica_io_state_s1.timer)]']
- File[/etc/mysql/ssl]
- Parameters differences:
--- File[/etc/mysql/ssl].orig
+++ File[/etc/mysql/ssl]
- group => mysql
- ensure => directory
- mode => 0555
- owner => mysql
- Exec[systemd daemon-reload for nrpe2nodexp-mariadb_replica_io_state_s1.service (nrpe2nodexp-mariadb_replica_io_state_s1.service)]
- Parameters differences:
--- Exec[systemd daemon-reload for nrpe2nodexp-mariadb_replica_io_state_s1.service (nrpe2nodexp-mariadb_replica_io_state_s1.service)].orig
+++ Exec[systemd daemon-reload for nrpe2nodexp-mariadb_replica_io_state_s1.service (nrpe2nodexp-mariadb_replica_io_state_s1.service)]
- command => /bin/systemctl daemon-reload
- refreshonly => True
- File[/lib/systemd/system/nrpe2nodexp-mariadb_read_only_s1.timer]
- Parameters differences:
--- File[/lib/systemd/system/nrpe2nodexp-mariadb_read_only_s1.timer].orig
+++ File[/lib/systemd/system/nrpe2nodexp-mariadb_read_only_s1.timer]
- notify => Exec[systemd daemon-reload for nrpe2nodexp-mariadb_read_only_s1.timer (nrpe2nodexp-mariadb_read_only_s1.timer)]
- group => root
- ensure => absent
- mode => 0444
- owner => root
- Content differences:
--- /lib/systemd/system/nrpe2nodexp-mariadb_read_only_s1.timer.orig
+++ /lib/systemd/system/nrpe2nodexp-mariadb_read_only_s1.timer
@@ -1,14 +0,0 @@
-[Unit]
-Description=Periodic execution of nrpe2nodexp-mariadb_read_only_s1.service
-
-[Timer]
-Unit=nrpe2nodexp-mariadb_read_only_s1.service
-# Accuracy sets the maximum time interval around the execution time we want to allow
-AccuracySec=15sec
-OnUnitInactiveSec=1min
-OnActiveSec=1s
-RandomizedDelaySec=60
-FixedRandomDelay=true
-
-[Install]
-WantedBy=multi-user.target
- File[/usr/lib/nagios/plugins/check_mariadb.pl]
- Parameters differences:
--- File[/usr/lib/nagios/plugins/check_mariadb.pl].orig
+++ File[/usr/lib/nagios/plugins/check_mariadb.pl]
- group => root
- ensure => absent
- owner => root
- File[/lib/systemd/system/nrpe2nodexp-mariadb_replica_sql_state_s1.timer]
- Parameters differences:
--- File[/lib/systemd/system/nrpe2nodexp-mariadb_replica_sql_state_s1.timer].orig
+++ File[/lib/systemd/system/nrpe2nodexp-mariadb_replica_sql_state_s1.timer]
- notify => Exec[systemd daemon-reload for nrpe2nodexp-mariadb_replica_sql_state_s1.timer (nrpe2nodexp-mariadb_replica_sql_state_s1.timer)]
- group => root
- ensure => absent
- mode => 0444
- owner => root
- Content differences:
--- /lib/systemd/system/nrpe2nodexp-mariadb_replica_sql_state_s1.timer.orig
+++ /lib/systemd/system/nrpe2nodexp-mariadb_replica_sql_state_s1.timer
@@ -1,14 +0,0 @@
-[Unit]
-Description=Periodic execution of nrpe2nodexp-mariadb_replica_sql_state_s1.service
-
-[Timer]
-Unit=nrpe2nodexp-mariadb_replica_sql_state_s1.service
-# Accuracy sets the maximum time interval around the execution time we want to allow
-AccuracySec=15sec
-OnUnitInactiveSec=1min
-OnActiveSec=1s
-RandomizedDelaySec=60
-FixedRandomDelay=true
-
-[Install]
-WantedBy=multi-user.target
- Prometheus::Alert::Rule[check_mariadb_replica_sql_lag_s1_8ec9d6c1155ae60699aaf9dfd1fa339b]
- Parameters differences:
--- Prometheus::Alert::Rule[check_mariadb_replica_sql_lag_s1_8ec9d6c1155ae60699aaf9dfd1fa339b].orig
+++ Prometheus::Alert::Rule[check_mariadb_replica_sql_lag_s1_8ec9d6c1155ae60699aaf9dfd1fa339b]
- alert_name => nrpe_MariaDB_Replica_Lag__s1
- description => NRPE CHECK: MariaDB Replica Lag: s1
- instance => ops
- group => nrpechecks
- site => codfw
- team => observability
- def_label_whitelst => ['team', 'severity']
- expr => (nagios_nrpe_check_result{alert_rule_hash="8ec9d6c1155ae60699aaf9dfd1fa339b",check_name="check_mariadb_replica_sql_lag_s1", status=~"(WARNING|CRITICAL)", severity=~"(warning|critical)"} > 0) * on (instance) group_left (team) role_owner
- runbook => https://wikitech.wikimedia.org/wiki/MariaDB/troubleshooting#Depooling_a_replica
- for => 10m
- summary => NRPE CHECK: MariaDB Replica Lag: s1
- dashboard => TODO
- logs => https://logstash.wikimedia.org/app/dashboards#/view/2d343ac0-6df8-11f0-8e08-7fab0da52b33?_g=(filters:!((query:(match_phrase:(event.module:check_mariadb_replica_sql_lag_s1))),(query:(match_phrase:(host.name:{{$labels.instance|stripPort}})))))
- ensure => absent
- severity => info
- Class[Monitoring]
- Parameters differences:
--- Class[Monitoring].orig
+++ Class[Monitoring]
@@
- notifications_enabled => True
+ notifications_enabled => False
- File[/etc/my.cnf]
- Parameters differences:
--- File[/etc/my.cnf].orig
+++ File[/etc/my.cnf]
- group => root
- mode => 0644
- owner => root
- Content differences:
--- /etc/my.cnf.orig
+++ /etc/my.cnf
@@ -1,128 +0,0 @@
-# replicas for backup sources and analytics
-
-# Please use separate .cnf templates for each type of server.
-
-[client]
-
-[mysqld]
-
-skip-external-locking
-skip-name-resolve
-temp-pool
-
-user = mysql
-basedir = /opt/wmf-mariadb1011
-server_id = 180363307
-report_host = db2141.codfw.wmnet
-wsrep_cluster_name = codfw # For orchestrator. T266635
-
-# gtid_domain_id flag is needed for multisource replication and GTID.
-# Strictly it is only needed on masters or servers that can potentially be
-# masters but for consistency it should be set in all of them.
-# https://mariadb.com/kb/en/mariadb/gtid/
-gtid_domain_id = 180363307
-
-read_only = 1
-key_buffer_size = 1048576
-
-secure_file_priv = /dev/null
-max_connections = 250
-max_allowed_packet = 32M
-connect_timeout = 3
-query_cache_size = 0
-query_cache_type = 0
-event_scheduler = 1
-
-table_open_cache = 50000
-table_definition_cache = 50000
-
-# binary log and replication options
-# We are temporarily enabling the binlogs on these servers to evaluate
-# CDC functionality with paimon/flink.
-#
-# We will revert this change once the evaluation is complete.
-# See #T258511 for a discussion about the long-term aim and #T358373.
-log-bin
-log-slave-updates
-binlog-format = ROW
-sync-binlog = 1
-binlog_cache_size = 10M
-max-binlog_size = 1000M
-expire-logs-days = 7
-
-# InnoDB file-per-table + TokuDB love those file descriptors
-open-files-limit = 200000
-
-character_set_server = binary
-character_set_filesystem = binary
-collation_server = binary
-
-innodb_file_per_table = 1
-# this can get overiden by per-instance configuration
-innodb_buffer_pool_size = 15G
-innodb_log_file_size = 4G
-innodb_flush_log_at_trx_commit = 0
-innodb_flush_method = O_DIRECT
-innodb_io_capacity = 1000
-innodb_stats_method = nulls_unequal
-innodb_purge_threads = 1
-# Changed because of https://jira.mariadb.org/browse/MDEV-22373
-innodb_change_buffering = none
-
-innodb_strict_mode = 1
-
-# T287244
-innodb_checksum_algorithm = full_crc32
-
-# T268869
-innodb_adaptive_hash_index=OFF
-
-# In 10.6 the default is 90%, 75% worked fine for us.
-innodb_max_dirty_pages_pct = 75
-
-# don't dump and load innodb buffer at start and stop
-# these servers will have the buffer pool in a bad state due to dumps
-# so not sure if these will be useful, but we leave them here for now
-innodb_buffer_pool_load_at_startup = 1
-innodb_buffer_pool_dump_at_shutdown = 1
-
-optimizer_switch='engine_condition_pushdown=on,optimize_join_buffer_size=on'
-join_cache_level = 8
-
-skip-slave-start
-slave_transaction_retries = 4294967295
-
-
-# ssl
-ssl-ca=/etc/ssl/certs/wmf-ca-certificates.crt
-ssl-cert=/etc/mysql/ssl/cert.pem
-ssl-key=/etc/mysql/ssl/server.key
-ssl-cipher=TLSv1.2
-
-
-# Enabling performance_schema (disabled by default in MariaDB10)
-performance_schema = 1
-# downsizing performance schema memory usage: T99485
-performance_schema_digests_size = -1
-performance_schema_max_thread_instances = 500
-performance_schema_max_cond_instances = 1000
-performance_schema_accounts_size = 300
-performance_schema_hosts_size = 300
-performance_schema_events_statements_history_size = 10
-performance_schema_events_statements_history_long_size = 1000
-performance_schema_events_waits_history_size = 10
-performance_schema_events_waits_history_long_size = 1000
-performance_schema_events_stages_history_size = 10
-performance_schema_events_stages_history_long_size = 1000
-performance_schema_max_mutex_instances = 5000
-performance_schema_max_rwlock_instances = 2000
-performance_schema_max_socket_instances = 500
-performance_schema_max_table_instances = 1000
-
-
-[mysqldump]
-
-quick
-max_allowed_packet = 32M
-
-!includedir /etc/mysql/mysqld.conf.d/
- File[/lib/systemd/system/nrpe2nodexp-mariadb_disk_space.timer]
- Parameters differences:
--- File[/lib/systemd/system/nrpe2nodexp-mariadb_disk_space.timer].orig
+++ File[/lib/systemd/system/nrpe2nodexp-mariadb_disk_space.timer]
- notify => Exec[systemd daemon-reload for nrpe2nodexp-mariadb_disk_space.timer (nrpe2nodexp-mariadb_disk_space.timer)]
- group => root
- ensure => absent
- mode => 0444
- owner => root
- Content differences:
--- /lib/systemd/system/nrpe2nodexp-mariadb_disk_space.timer.orig
+++ /lib/systemd/system/nrpe2nodexp-mariadb_disk_space.timer
@@ -1,14 +0,0 @@
-[Unit]
-Description=Periodic execution of nrpe2nodexp-mariadb_disk_space.service
-
-[Timer]
-Unit=nrpe2nodexp-mariadb_disk_space.service
-# Accuracy sets the maximum time interval around the execution time we want to allow
-AccuracySec=15sec
-OnUnitInactiveSec=1min
-OnActiveSec=1s
-RandomizedDelaySec=60
-FixedRandomDelay=true
-
-[Install]
-WantedBy=multi-user.target
- File[/lib/systemd/system/nrpe2nodexp-mariadb_memory.timer]
- Parameters differences:
--- File[/lib/systemd/system/nrpe2nodexp-mariadb_memory.timer].orig
+++ File[/lib/systemd/system/nrpe2nodexp-mariadb_memory.timer]
- notify => Exec[systemd daemon-reload for nrpe2nodexp-mariadb_memory.timer (nrpe2nodexp-mariadb_memory.timer)]
- group => root
- ensure => absent
- mode => 0444
- owner => root
- Content differences:
--- /lib/systemd/system/nrpe2nodexp-mariadb_memory.timer.orig
+++ /lib/systemd/system/nrpe2nodexp-mariadb_memory.timer
@@ -1,14 +0,0 @@
-[Unit]
-Description=Periodic execution of nrpe2nodexp-mariadb_memory.service
-
-[Timer]
-Unit=nrpe2nodexp-mariadb_memory.service
-# Accuracy sets the maximum time interval around the execution time we want to allow
-AccuracySec=15sec
-OnUnitInactiveSec=1min
-OnActiveSec=1s
-RandomizedDelaySec=60
-FixedRandomDelay=true
-
-[Install]
-WantedBy=multi-user.target
- Ferm::Service[s1_mariadb_internal]
- Parameters differences:
--- Ferm::Service[s1_mariadb_internal].orig
+++ Ferm::Service[s1_mariadb_internal]
- unrestricted_access => False
- srange => $INTERNAL
- notrack => True
- proto => tcp
- desc =>
- prio => 10
- port => 3311
- ensure => present
- File[/etc/sudoers.d/nrpe-check_mariadb_replica_sql_lag_s1]
- Parameters differences:
--- File[/etc/sudoers.d/nrpe-check_mariadb_replica_sql_lag_s1].orig
+++ File[/etc/sudoers.d/nrpe-check_mariadb_replica_sql_lag_s1]
- group => root
- require => Package[nagios-nrpe-server]
- ensure => absent
- owner => root
- File[/etc/mysql/ssl/server-keypair.pem]
- Parameters differences:
--- File[/etc/mysql/ssl/server-keypair.pem].orig
+++ File[/etc/mysql/ssl/server-keypair.pem]
- group => mysql
- ensure => absent
- mode => 0400
- owner => mysql
- File[/usr/local/etc/my.cnf]
- Parameters differences:
--- File[/usr/local/etc/my.cnf].orig
+++ File[/usr/local/etc/my.cnf]
- group => root
- ensure => absent
- owner => root
- Nrpe::Monitor_service[mariadb_memory]
- Parameters differences:
--- Nrpe::Monitor_service[mariadb_memory].orig
+++ Nrpe::Monitor_service[mariadb_memory]
- description => MariaDB memory
- retries => 3
- migration_task => T315866
- enable_icinga_check => True
- timeout => 10
- nrpe2nodexp_parse_perf_data => False
- retry_interval => 1
- require => Package[monitoring-plugins-contrib]
- nrpe_command => /usr/lib/nagios/plugins/pmp-check-unix-memory -c 95 -w 90
- critical => False
- alertmanager_team => observability
- enable_nrpe2nodexp => False
- notes_url => https://wikitech.wikimedia.org/wiki/MariaDB/troubleshooting
- contact_group => admins
- check_interval => 1
- ensure => present
- Class[Profile::Mariadb::Wmfmariadbpy]
- Parameters differences:
--- Class[Profile::Mariadb::Wmfmariadbpy].orig
+++ Class[Profile::Mariadb::Wmfmariadbpy]
- section_ports => {'s1': 3311, 's2': 3312, 's3': 3313, 's4': 3314, 's5': 3315, 's6': 3316, 's7': 3317, 's8': 3318, 'x1': 3320, 'x3': 3363, 'm1': 3321, 'm2': 3322, 'm3': 3323, 'm5': 3325, 'staging': 3350, 'matomo': 3351, 'analytics_meta': 3352, 'backup1-eqiad': 3360, 'backup1-codfw': 3361}
- role => db
- Systemd::Service[nrpe2nodexp-mysqld]
- Parameters differences:
--- Systemd::Service[nrpe2nodexp-mysqld].orig
+++ Systemd::Service[nrpe2nodexp-mysqld]
- restart => False
- migration_task => T407130
- monitoring_contact_group => admins
- unit_type => timer
- monitoring_critical => False
- monitoring_enabled => False
- override => False
- require => Systemd::Unit[nrpe2nodexp-mysqld.service]
- ensure => absent
- service_params => {}
- Systemd::Unit[wmf_auto_restart_prometheus-mysqld-exporter@s1.timer]
- Parameters differences:
--- Systemd::Unit[wmf_auto_restart_prometheus-mysqld-exporter@s1.timer].orig
+++ Systemd::Unit[wmf_auto_restart_prometheus-mysqld-exporter@s1.timer]
- restart => False
- override => False
- unit => wmf_auto_restart_prometheus-mysqld-exporter@s1.timer
- require => ['Class[Systemd]']
- ensure => present
- override_filename => puppet-override.conf
- Systemd::Timer::Job[nrpe2nodexp-mariadb_read_only_s1]
- Parameters differences:
--- Systemd::Timer::Job[nrpe2nodexp-mariadb_read_only_s1].orig
+++ Systemd::Timer::Job[nrpe2nodexp-mariadb_read_only_s1]
- fixed_random_delay => True
- monitoring_notes_url => https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
- ensure => absent
- description => execution of nrpe2nodexp for the check_mariadb_read_only_s1 command.
- private_tmp => False
- send_mail => False
- splay => 60
- monitoring_enabled => False
- monitoring_contact_groups => admins
- logfile_basedir => /var/log
- syslog_identifier => nrpe2nodexp-mariadb_read_only_s1
- logging_enabled => False
- send_mail_only_on_error => True
- success_exit_status => []
- logfile_group => root
- group => prometheus-node-exporter
- command => /usr/local/bin/nrpe2nodexp --alert-rule-hash "42baf529e0f3bfca391aca0a24c880e9" --timeout 10 --check-command "check_mariadb_read_only_s1"
- logfile_name => syslog.log
- send_mail_to => root@db2141.codfw.wmnet
- syslog_match_startswith => True
- interval => [{'start': 'OnUnitInactiveSec', 'interval': '1min'}]
- environment => {}
- logfile_perms => all
- syslog_force_stop => True
- user => nagios
- ignore_errors => True
- File[/etc/rsyslog.d/25-nrpe2nodexp-mariadb-disk-space.conf]
- Parameters differences:
--- File[/etc/rsyslog.d/25-nrpe2nodexp-mariadb-disk-space.conf].orig
+++ File[/etc/rsyslog.d/25-nrpe2nodexp-mariadb-disk-space.conf]
- notify => Service[rsyslog]
- group => root
- ensure => absent
- mode => 0444
- owner => root
- Content differences:
--- /etc/rsyslog.d/25-nrpe2nodexp-mariadb-disk-space.conf.orig
+++ /etc/rsyslog.d/25-nrpe2nodexp-mariadb-disk-space.conf
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-if $programname contains "nrpe2nodexp-mariadb_disk_space" then {
- if ($msg contains "\"ecs.version\": \"1.7.0\"") then {
- # Send logs to kafka
- set $.log_outputs = "kafka ecs_170 local";
- } else {
- # Filter out non-relevant nrpe2nodexp messages
- stop
- }
-}
- User[mysql]
- Parameters differences:
--- User[mysql].orig
+++ User[mysql]
- shell => /bin/false
- home => /nonexistent
- gid => mysql
- system => True
- ensure => present
- managehome => False
- File[/etc/nagios/nrpe.d/check_mariadb_replica_sql_state_s1.cfg]
- Parameters differences:
--- File[/etc/nagios/nrpe.d/check_mariadb_replica_sql_state_s1.cfg].orig
+++ File[/etc/nagios/nrpe.d/check_mariadb_replica_sql_state_s1.cfg]
- notify => Service[nagios-nrpe-server]
- group => root
- tag => nrpe::check
- require => Package[nagios-nrpe-server]
- ensure => present
- mode => 0444
- owner => root
- Content differences:
--- /etc/nagios/nrpe.d/check_mariadb_replica_sql_state_s1.cfg.orig
+++ /etc/nagios/nrpe.d/check_mariadb_replica_sql_state_s1.cfg
@@ -1,2 +0,0 @@
-# File generated by puppet. DO NOT edit by hand
-command[check_mariadb_replica_sql_state_s1]=/usr/local/lib/nagios/plugins/check_mariadb --sock=/run/mysqld/mysqld.s1.sock --user=nagios --pass= --warn-stopped --check=slave_sql_state
- Monitoring::Exported_nagios_service[db2141 mariadb_read_only_s1]