--- Class[Profile::Apt].orig
+++ Class[Profile::Apt]
@@
- 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[rsyslog]', 'Package[rsyslog-openssl]', 'Package[cadvisor]', '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[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[eject]', 'Package[openssh-client]', 'Package[openssh-server]', 'Package[debdeploy-client]', 'Package[python3-dateutil]', 'Package[sudo]', 'Package[golang-cfssl]', 'Package[debmonitor-client]', 'Package[nagios-nrpe-server]', 'Package[monitoring-plugins]', 'Package[monitoring-plugins-basic]', 'Package[monitoring-plugins-standard]', 'Package[liburiparser1]', 'Package[rsyslog-kafka]', 'Package[emacs-nox]', 'Package[libnet-dns-perl]', 'Package[iptables]', 'Package[ferm]', 'Package[nftables]', 'Package[conntrack]', 'Package[prometheus-blackbox-exporter]', 'Package[prometheus-swagger-exporter]', 'Package[rsync]', 'Package[apache2]', 'Package[links]', 'Package[envoyproxy]', 'Package[oauth2-proxy]', 'Package[prometheus-rsyslog-exporter]', 'Package[initramfs-tools]', 'Package[python3-click]', 'Package[python3-box]', 'Package[confd]', 'Package[python3-toml]', 'Package[prometheus]', 'Package[pint]', 'Package[otelcol-contrib]', 'Package[otel-cli]', 'Package[thanos]']
+ 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[rsyslog]', 'Package[rsyslog-openssl]', 'Package[cadvisor]', '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[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[eject]', 'Package[openssh-client]', 'Package[openssh-server]', 'Package[debdeploy-client]', 'Package[python3-dateutil]', 'Package[sudo]', 'Package[golang-cfssl]', 'Package[debmonitor-client]', 'Package[nagios-nrpe-server]', 'Package[monitoring-plugins]', 'Package[monitoring-plugins-basic]', 'Package[monitoring-plugins-standard]', 'Package[liburiparser1]', 'Package[rsyslog-kafka]', 'Package[emacs-nox]', 'Package[libnet-dns-perl]', 'Package[iptables]', 'Package[ferm]', 'Package[nftables]', 'Package[conntrack]', 'Package[prometheus-blackbox-exporter]', 'Package[prometheus-swagger-exporter]', 'Package[python3-scapy]', 'Package[rsync]', 'Package[apache2]', 'Package[links]', 'Package[envoyproxy]', 'Package[oauth2-proxy]', 'Package[prometheus-rsyslog-exporter]', 'Package[initramfs-tools]', 'Package[python3-click]', 'Package[python3-box]', 'Package[confd]', 'Package[python3-toml]', 'Package[prometheus]', 'Package[pint]', 'Package[otelcol-contrib]', 'Package[otel-cli]', 'Package[thanos]']
File[/usr/local/bin/prometheus-ipip-exporter]
- Parameters differences:
--- File[/usr/local/bin/prometheus-ipip-exporter].orig
+++ File[/usr/local/bin/prometheus-ipip-exporter]
+ group => root
+ source => puppet:///modules/prometheus/usr/local/bin/prometheus-ipip-exporter.py
+ ensure => file
+ mode => 0555
+ owner => root
- File[/lib/systemd/system/prometheus-ipip-exporter.timer]
- Parameters differences:
--- File[/lib/systemd/system/prometheus-ipip-exporter.timer].orig
+++ File[/lib/systemd/system/prometheus-ipip-exporter.timer]
+ group => root
+ ensure => present
+ notify => Exec[systemd daemon-reload for prometheus-ipip-exporter.timer (prometheus-ipip-exporter.timer)]
+ mode => 0444
+ owner => root
- Content differences:
--- /lib/systemd/system/prometheus-ipip-exporter.timer.orig
+++ /lib/systemd/system/prometheus-ipip-exporter.timer
@@ -0,0 +1,13 @@
+[Unit]
+Description=Periodic execution of prometheus-ipip-exporter.service
+
+[Timer]
+Unit=prometheus-ipip-exporter.service
+# Accuracy sets the maximum time interval around the execution time we want to allow
+AccuracySec=15sec
+OnCalendar=5m
+RandomizedDelaySec=300
+FixedRandomDelay=true
+
+[Install]
+WantedBy=multi-user.target
- Exec[systemd daemon-reload for prometheus-ipip-exporter.timer (prometheus-ipip-exporter.timer)]
- Parameters differences:
--- Exec[systemd daemon-reload for prometheus-ipip-exporter.timer (prometheus-ipip-exporter.timer)].orig
+++ Exec[systemd daemon-reload for prometheus-ipip-exporter.timer (prometheus-ipip-exporter.timer)]
+ command => /bin/systemctl daemon-reload
+ before => ['Service[prometheus-ipip-exporter.timer]']
+ refreshonly => True
- Rsyslog::Conf[prometheus-ipip-exporter]
- Parameters differences:
--- Rsyslog::Conf[prometheus-ipip-exporter].orig
+++ Rsyslog::Conf[prometheus-ipip-exporter]
+ require => File[/var/log/prometheus-ipip-exporter]
+ priority => 40
+ mode => 0444
+ ensure => present
- File[/etc/ipip-exporter.yaml]
- Parameters differences:
--- File[/etc/ipip-exporter.yaml].orig
+++ File[/etc/ipip-exporter.yaml]
+ group => root
+ mode => 0444
+ owner => root
+ ensure => file
- Content differences:
--- /etc/ipip-exporter.yaml.orig
+++ /etc/ipip-exporter.yaml
@@ -0,0 +1,249 @@
+---
+ncredir-v4:
+ vip: 185.15.59.226
+ port: 80
+ nodes:
+ - hostname: ncredir3005.esams.wmnet
+ ip: 10.80.2.3
+ - hostname: ncredir3006.esams.wmnet
+ ip: 10.80.2.7
+ncredir-v6:
+ vip: 2a02:ec80:300:ed1a::3
+ port: 80
+ nodes:
+ - hostname: ncredir3005.esams.wmnet
+ ip: 2a02:ec80:300:103:10:80:2:3
+ - hostname: ncredir3006.esams.wmnet
+ ip: 2a02:ec80:300:103:10:80:2:7
+ncredir-https-v4:
+ vip: 185.15.59.226
+ port: 443
+ nodes:
+ - hostname: ncredir3005.esams.wmnet
+ ip: 10.80.2.3
+ - hostname: ncredir3006.esams.wmnet
+ ip: 10.80.2.7
+ncredir-https-v6:
+ vip: 2a02:ec80:300:ed1a::3
+ port: 443
+ nodes:
+ - hostname: ncredir3005.esams.wmnet
+ ip: 2a02:ec80:300:103:10:80:2:3
+ - hostname: ncredir3006.esams.wmnet
+ ip: 2a02:ec80:300:103:10:80:2:7
+text-v4:
+ vip: 185.15.59.224
+ port: 80
+ nodes:
+ - hostname: cp3066.esams.wmnet
+ ip: 10.80.0.14
+ - hostname: cp3067.esams.wmnet
+ ip: 10.80.1.11
+ - hostname: cp3068.esams.wmnet
+ ip: 10.80.0.13
+ - hostname: cp3069.esams.wmnet
+ ip: 10.80.1.9
+ - hostname: cp3070.esams.wmnet
+ ip: 10.80.0.12
+ - hostname: cp3071.esams.wmnet
+ ip: 10.80.1.7
+ - hostname: cp3072.esams.wmnet
+ ip: 10.80.0.11
+ - hostname: cp3073.esams.wmnet
+ ip: 10.80.1.6
+text-v6:
+ vip: 2a02:ec80:300:ed1a::1
+ port: 80
+ nodes:
+ - hostname: cp3066.esams.wmnet
+ ip: 2a02:ec80:300:101:10:80:0:14
+ - hostname: cp3067.esams.wmnet
+ ip: 2a02:ec80:300:102:10:80:1:11
+ - hostname: cp3068.esams.wmnet
+ ip: 2a02:ec80:300:101:10:80:0:13
+ - hostname: cp3069.esams.wmnet
+ ip: 2a02:ec80:300:102:10:80:1:9
+ - hostname: cp3070.esams.wmnet
+ ip: 2a02:ec80:300:101:10:80:0:12
+ - hostname: cp3071.esams.wmnet
+ ip: 2a02:ec80:300:102:10:80:1:7
+ - hostname: cp3072.esams.wmnet
+ ip: 2a02:ec80:300:101:10:80:0:11
+ - hostname: cp3073.esams.wmnet
+ ip: 2a02:ec80:300:102:10:80:1:6
+text-https-v4:
+ vip: 185.15.59.224
+ port: 443
+ nodes:
+ - hostname: cp3066.esams.wmnet
+ ip: 10.80.0.14
+ - hostname: cp3067.esams.wmnet
+ ip: 10.80.1.11
+ - hostname: cp3068.esams.wmnet
+ ip: 10.80.0.13
+ - hostname: cp3069.esams.wmnet
+ ip: 10.80.1.9
+ - hostname: cp3070.esams.wmnet
+ ip: 10.80.0.12
+ - hostname: cp3071.esams.wmnet
+ ip: 10.80.1.7
+ - hostname: cp3072.esams.wmnet
+ ip: 10.80.0.11
+ - hostname: cp3073.esams.wmnet
+ ip: 10.80.1.6
+text-https-v6:
+ vip: 2a02:ec80:300:ed1a::1
+ port: 443
+ nodes:
+ - hostname: cp3066.esams.wmnet
+ ip: 2a02:ec80:300:101:10:80:0:14
+ - hostname: cp3067.esams.wmnet
+ ip: 2a02:ec80:300:102:10:80:1:11
+ - hostname: cp3068.esams.wmnet
+ ip: 2a02:ec80:300:101:10:80:0:13
+ - hostname: cp3069.esams.wmnet
+ ip: 2a02:ec80:300:102:10:80:1:9
+ - hostname: cp3070.esams.wmnet
+ ip: 2a02:ec80:300:101:10:80:0:12
+ - hostname: cp3071.esams.wmnet
+ ip: 2a02:ec80:300:102:10:80:1:7
+ - hostname: cp3072.esams.wmnet
+ ip: 2a02:ec80:300:101:10:80:0:11
+ - hostname: cp3073.esams.wmnet
+ ip: 2a02:ec80:300:102:10:80:1:6
+upload-v4:
+ vip: 185.15.59.240
+ port: 80
+ nodes:
+ - hostname: cp3074.esams.wmnet
+ ip: 10.80.0.10
+ - hostname: cp3075.esams.wmnet
+ ip: 10.80.1.5
+ - hostname: cp3076.esams.wmnet
+ ip: 10.80.0.8
+ - hostname: cp3077.esams.wmnet
+ ip: 10.80.1.4
+ - hostname: cp3078.esams.wmnet
+ ip: 10.80.0.7
+ - hostname: cp3079.esams.wmnet
+ ip: 10.80.1.3
+ - hostname: cp3080.esams.wmnet
+ ip: 10.80.0.6
+ - hostname: cp3081.esams.wmnet
+ ip: 10.80.1.2
+upload-v6:
+ vip: 2a02:ec80:300:ed1a::2:b
+ port: 80
+ nodes:
+ - hostname: cp3074.esams.wmnet
+ ip: 2a02:ec80:300:101:10:80:0:10
+ - hostname: cp3075.esams.wmnet
+ ip: 2a02:ec80:300:102:10:80:1:5
+ - hostname: cp3076.esams.wmnet
+ ip: 2a02:ec80:300:101:10:80:0:8
+ - hostname: cp3077.esams.wmnet
+ ip: 2a02:ec80:300:102:10:80:1:4
+ - hostname: cp3078.esams.wmnet
+ ip: 2a02:ec80:300:101:10:80:0:7
+ - hostname: cp3079.esams.wmnet
+ ip: 2a02:ec80:300:102:10:80:1:3
+ - hostname: cp3080.esams.wmnet
+ ip: 2a02:ec80:300:101:10:80:0:6
+ - hostname: cp3081.esams.wmnet
+ ip: 2a02:ec80:300:102:10:80:1:2
+upload-https-v4:
+ vip: 185.15.59.240
+ port: 443
+ nodes:
+ - hostname: cp3074.esams.wmnet
+ ip: 10.80.0.10
+ - hostname: cp3075.esams.wmnet
+ ip: 10.80.1.5
+ - hostname: cp3076.esams.wmnet
+ ip: 10.80.0.8
+ - hostname: cp3077.esams.wmnet
+ ip: 10.80.1.4
+ - hostname: cp3078.esams.wmnet
+ ip: 10.80.0.7
+ - hostname: cp3079.esams.wmnet
+ ip: 10.80.1.3
+ - hostname: cp3080.esams.wmnet
+ ip: 10.80.0.6
+ - hostname: cp3081.esams.wmnet
+ ip: 10.80.1.2
+upload-https-v6:
+ vip: 2a02:ec80:300:ed1a::2:b
+ port: 443
+ nodes:
+ - hostname: cp3074.esams.wmnet
+ ip: 2a02:ec80:300:101:10:80:0:10
+ - hostname: cp3075.esams.wmnet
+ ip: 2a02:ec80:300:102:10:80:1:5
+ - hostname: cp3076.esams.wmnet
+ ip: 2a02:ec80:300:101:10:80:0:8
+ - hostname: cp3077.esams.wmnet
+ ip: 2a02:ec80:300:102:10:80:1:4
+ - hostname: cp3078.esams.wmnet
+ ip: 2a02:ec80:300:101:10:80:0:7
+ - hostname: cp3079.esams.wmnet
+ ip: 2a02:ec80:300:102:10:80:1:3
+ - hostname: cp3080.esams.wmnet
+ ip: 2a02:ec80:300:101:10:80:0:6
+ - hostname: cp3081.esams.wmnet
+ ip: 2a02:ec80:300:102:10:80:1:2
+gerrit-https-v4:
+ vip: 185.15.59.225
+ port: 443
+ nodes:
+ - hostname: cp3066.esams.wmnet
+ ip: 10.80.0.14
+ - hostname: cp3067.esams.wmnet
+ ip: 10.80.1.11
+ - hostname: cp3068.esams.wmnet
+ ip: 10.80.0.13
+ - hostname: cp3069.esams.wmnet
+ ip: 10.80.1.9
+ - hostname: cp3070.esams.wmnet
+ ip: 10.80.0.12
+ - hostname: cp3071.esams.wmnet
+ ip: 10.80.1.7
+ - hostname: cp3072.esams.wmnet
+ ip: 10.80.0.11
+ - hostname: cp3073.esams.wmnet
+ ip: 10.80.1.6
+gerrit-https-v6:
+ vip: 2a02:ec80:300:ed1a::2
+ port: 443
+ nodes:
+ - hostname: cp3066.esams.wmnet
+ ip: 2a02:ec80:300:101:10:80:0:14
+ - hostname: cp3067.esams.wmnet
+ ip: 2a02:ec80:300:102:10:80:1:11
+ - hostname: cp3068.esams.wmnet
+ ip: 2a02:ec80:300:101:10:80:0:13
+ - hostname: cp3069.esams.wmnet
+ ip: 2a02:ec80:300:102:10:80:1:9
+ - hostname: cp3070.esams.wmnet
+ ip: 2a02:ec80:300:101:10:80:0:12
+ - hostname: cp3071.esams.wmnet
+ ip: 2a02:ec80:300:102:10:80:1:7
+ - hostname: cp3072.esams.wmnet
+ ip: 2a02:ec80:300:101:10:80:0:11
+ - hostname: cp3073.esams.wmnet
+ ip: 2a02:ec80:300:102:10:80:1:6
+gerrit-ssh-v4:
+ vip: 185.15.59.225
+ port: 29418
+ nodes:
+ - hostname: tcp-proxy3001.esams.wmnet
+ ip: 10.80.2.9
+ - hostname: tcp-proxy3002.esams.wmnet
+ ip: 10.80.2.10
+gerrit-ssh-v6:
+ vip: 2a02:ec80:300:ed1a::2
+ port: 29418
+ nodes:
+ - hostname: tcp-proxy3001.esams.wmnet
+ ip: 2a02:ec80:300:103:10:80:2:9
+ - hostname: tcp-proxy3002.esams.wmnet
+ ip: 2a02:ec80:300:103:10:80:2:10
- Exec[systemd daemon-reload for prometheus-ipip-exporter.service (prometheus-ipip-exporter.service)]
- Parameters differences:
--- Exec[systemd daemon-reload for prometheus-ipip-exporter.service (prometheus-ipip-exporter.service)].orig
+++ Exec[systemd daemon-reload for prometheus-ipip-exporter.service (prometheus-ipip-exporter.service)]
+ command => /bin/systemctl daemon-reload
+ refreshonly => True
- Systemd::Service[prometheus-ipip-exporter]
- Parameters differences:
--- Systemd::Service[prometheus-ipip-exporter].orig
+++ Systemd::Service[prometheus-ipip-exporter]
+ override => False
+ unit_type => timer
+ ensure => present
+ require => Systemd::Unit[prometheus-ipip-exporter.service]
+ service_params => {}
+ monitoring_contact_group => admins
+ migration_task => T407130
+ monitoring_enabled => False
+ monitoring_critical => False
+ restart => False
- Systemd::Timer[prometheus-ipip-exporter]
- Parameters differences:
--- Systemd::Timer[prometheus-ipip-exporter].orig
+++ Systemd::Timer[prometheus-ipip-exporter]
+ fixed_random_delay => True
+ ensure => present
+ splay => 300
+ unit_name => prometheus-ipip-exporter.service
+ timer_intervals => [{'start': 'OnCalendar', 'interval': '5m'}]
+ accuracy => 15sec
- Class[Prometheus::Ipip_exporter]
- Parameters differences:
--- Class[Prometheus::Ipip_exporter].orig
+++ Class[Prometheus::Ipip_exporter]
+ pushgateway_url => http://prometheus-pushgateway.discovery.wmnet
+ ensure => present
- Systemd::Syslog[prometheus-ipip-exporter]
- Parameters differences:
--- Systemd::Syslog[prometheus-ipip-exporter].orig
+++ Systemd::Syslog[prometheus-ipip-exporter]
+ group => root
+ ensure => present
+ owner => root
+ base_dir => /var/log
+ log_filename => syslog.log
+ readable_by => all
+ force_stop => True
+ programname_comparison => startswith
- File[/lib/systemd/system/prometheus-ipip-exporter.service]
- Parameters differences:
--- File[/lib/systemd/system/prometheus-ipip-exporter.service].orig
+++ File[/lib/systemd/system/prometheus-ipip-exporter.service]
+ group => root
+ ensure => present
+ notify => Exec[systemd daemon-reload for prometheus-ipip-exporter.service (prometheus-ipip-exporter.service)]
+ mode => 0444
+ owner => root
- Content differences:
--- /lib/systemd/system/prometheus-ipip-exporter.service.orig
+++ /lib/systemd/system/prometheus-ipip-exporter.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Check IPIP capabilities on realservers
+Documentation=https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
+
+[Service]
+Type=oneshot
+User=root
+ExecStart=/usr/local/bin/prometheus-ipip-exporter --config /etc/ipip-exporter.yaml --inner-src-ipv4 10.80.2.5 --inner-src-ipv6 2a02:ec80:300:103:10:80:2:5 --pushgateway http://prometheus-pushgateway.discovery.wmnet
- Class[Adduser]
- Parameters differences:
--- 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[rsyslog]', 'Package[rsyslog-openssl]', 'Package[cadvisor]', '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[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[eject]', 'Package[openssh-client]', 'Package[openssh-server]', 'Package[debdeploy-client]', 'Package[python3-dateutil]', 'Package[sudo]', 'Package[golang-cfssl]', 'Package[debmonitor-client]', 'Package[nagios-nrpe-server]', 'Package[monitoring-plugins]', 'Package[monitoring-plugins-basic]', 'Package[monitoring-plugins-standard]', 'Package[liburiparser1]', 'Package[rsyslog-kafka]', 'Package[emacs-nox]', 'Package[libnet-dns-perl]', 'Package[iptables]', 'Package[ferm]', 'Package[nftables]', 'Package[conntrack]', 'Package[prometheus-blackbox-exporter]', 'Package[prometheus-swagger-exporter]', 'Package[rsync]', 'Package[apache2]', 'Package[links]', 'Package[envoyproxy]', 'Package[oauth2-proxy]', 'Package[prometheus-rsyslog-exporter]', 'Package[initramfs-tools]', 'Package[python3-click]', 'Package[python3-box]', 'Package[confd]', 'Package[python3-toml]', 'Package[prometheus]', 'Package[pint]', 'Package[otelcol-contrib]', 'Package[otel-cli]', 'Package[thanos]']
+ 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[rsyslog]', 'Package[rsyslog-openssl]', 'Package[cadvisor]', '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[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[eject]', 'Package[openssh-client]', 'Package[openssh-server]', 'Package[debdeploy-client]', 'Package[python3-dateutil]', 'Package[sudo]', 'Package[golang-cfssl]', 'Package[debmonitor-client]', 'Package[nagios-nrpe-server]', 'Package[monitoring-plugins]', 'Package[monitoring-plugins-basic]', 'Package[monitoring-plugins-standard]', 'Package[liburiparser1]', 'Package[rsyslog-kafka]', 'Package[emacs-nox]', 'Package[libnet-dns-perl]', 'Package[iptables]', 'Package[ferm]', 'Package[nftables]', 'Package[conntrack]', 'Package[prometheus-blackbox-exporter]', 'Package[prometheus-swagger-exporter]', 'Package[python3-scapy]', 'Package[rsync]', 'Package[apache2]', 'Package[links]', 'Package[envoyproxy]', 'Package[oauth2-proxy]', 'Package[prometheus-rsyslog-exporter]', 'Package[initramfs-tools]', 'Package[python3-click]', 'Package[python3-box]', 'Package[confd]', 'Package[python3-toml]', 'Package[prometheus]', 'Package[pint]', 'Package[otelcol-contrib]', 'Package[otel-cli]', 'Package[thanos]']
- File[/var/log/prometheus-ipip-exporter]
- Parameters differences:
--- File[/var/log/prometheus-ipip-exporter].orig
+++ File[/var/log/prometheus-ipip-exporter]
+ group => root
+ force => True
+ ensure => directory
+ backup => False
+ mode => 0755
+ owner => root
- Systemd::Unit[prometheus-ipip-exporter.timer]
- Parameters differences:
--- Systemd::Unit[prometheus-ipip-exporter.timer].orig
+++ Systemd::Unit[prometheus-ipip-exporter.timer]
+ override => False
+ unit => prometheus-ipip-exporter.timer
+ ensure => present
+ restart => False
+ override_filename => puppet-override.conf
+ require => ['Class[Systemd]']
- File[/etc/logrotate.d/prometheus-ipip-exporter]
- Parameters differences:
--- File[/etc/logrotate.d/prometheus-ipip-exporter].orig
+++ File[/etc/logrotate.d/prometheus-ipip-exporter]
+ group => root
+ mode => 0444
+ owner => root
+ ensure => present
- Content differences:
--- /etc/logrotate.d/prometheus-ipip-exporter.orig
+++ /etc/logrotate.d/prometheus-ipip-exporter
@@ -0,0 +1,12 @@
+# logrotate(8) config for prometheus-ipip-exporter
+
+/var/log/prometheus-ipip-exporter/*.log {
+ daily
+ copytruncate
+ missingok
+ compress
+ delaycompress
+ notifempty
+ rotate 15
+ size 256M
+}
- Service[prometheus-ipip-exporter.timer]
- Parameters differences:
--- Service[prometheus-ipip-exporter.timer].orig
+++ Service[prometheus-ipip-exporter.timer]
+ enable => True
+ ensure => running
+ provider => systemd
- Package[python3-scapy]
- Parameters differences:
--- Package[python3-scapy].orig
+++ Package[python3-scapy]
+ ensure => installed
+ provider => apt
- Logrotate::Conf[prometheus-ipip-exporter]
- Parameters differences:
--- Logrotate::Conf[prometheus-ipip-exporter].orig
+++ Logrotate::Conf[prometheus-ipip-exporter]
+ ensure => present
- Systemd::Unit[prometheus-ipip-exporter.service]
- Parameters differences:
--- Systemd::Unit[prometheus-ipip-exporter.service].orig
+++ Systemd::Unit[prometheus-ipip-exporter.service]
+ override => False
+ unit => prometheus-ipip-exporter.service
+ ensure => present
+ restart => False
+ override_filename => puppet-override.conf
+ require => ['Class[Systemd]']
- File[/etc/rsyslog.d/40-prometheus-ipip-exporter.conf]
- Parameters differences:
--- File[/etc/rsyslog.d/40-prometheus-ipip-exporter.conf].orig
+++ File[/etc/rsyslog.d/40-prometheus-ipip-exporter.conf]
+ group => root
+ ensure => present
+ notify => Service[rsyslog]
+ mode => 0444
+ owner => root
- Content differences:
--- /etc/rsyslog.d/40-prometheus-ipip-exporter.conf.orig
+++ /etc/rsyslog.d/40-prometheus-ipip-exporter.conf
@@ -0,0 +1,10 @@
+# rsyslog.conf(5) configuration file for services.
+# This file is managed by Puppet.
+if $programname startswith "prometheus-ipip-exporter" then {
+ action(
+ type="omfile" file="/var/log/prometheus-ipip-exporter/syslog.log"
+ fileOwner="root" fileGroup="root"
+ fileCreateMode="0644"
+ )
+ & stop
+}
- Systemd::Timer::Job[prometheus-ipip-exporter]
- Parameters differences:
--- Systemd::Timer::Job[prometheus-ipip-exporter].orig
+++ Systemd::Timer::Job[prometheus-ipip-exporter]
+ description => Check IPIP capabilities on realservers
+ private_tmp => False
+ ensure => present
+ environment => {}
+ interval => [{'start': 'OnCalendar', 'interval': '5m'}]
+ logfile_perms => all
+ logfile_name => syslog.log
+ fixed_random_delay => True
+ monitoring_enabled => False
+ user => root
+ logging_enabled => True
+ syslog_match_startswith => True
+ success_exit_status => []
+ logfile_basedir => /var/log
+ syslog_force_stop => True
+ splay => 300
+ monitoring_contact_groups => admins
+ send_mail => False
+ send_mail_to => root@prometheus3004.esams.wmnet
+ logfile_group => root
+ send_mail_only_on_error => True
+ monitoring_notes_url => https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
+ command => /usr/local/bin/prometheus-ipip-exporter --config /etc/ipip-exporter.yaml --inner-src-ipv4 10.80.2.5 --inner-src-ipv6 2a02:ec80:300:103:10:80:2:5 --pushgateway http://prometheus-pushgateway.discovery.wmnet
+ ignore_errors => False