--- Class[Profile::Lvs::Realserver::Ipip].orig
+++ Class[Profile::Lvs::Realserver::Ipip]
@@
- pools => {'cloudelastic-chi-https': {'services': ['opensearch_1@cloudelastic-chi-eqiad.service']}, 'cloudelastic-psi-https': {'services': ['opensearch_1@cloudelastic-psi-eqiad.service']}, 'cloudelastic-omega-https': {'services': ['opensearch_1@cloudelastic-omega-eqiad.service']}}
+ pools => {'search': {'services': ['opensearch_2@production-search-eqiad']}, 'search-https': {'services': ['nginx', 'opensearch_2@production-search-eqiad']}, 'search-omega-https': {'services': ['nginx', 'opensearch_2@production-search-omega-eqiad']}}
Class[Lvs::Realserver]
- Parameters differences:
--- Class[Lvs::Realserver].orig
+++ Class[Lvs::Realserver]
@@
- realserver_ips => ['208.80.154.241', '2620:0:861:ed1a::3:241']
+ realserver_ips => ['10.2.2.30']
- Systemd::Timer::Job[prometheus_lvs_realserver_mss]
- Parameters differences:
--- Systemd::Timer::Job[prometheus_lvs_realserver_mss].orig
+++ Systemd::Timer::Job[prometheus_lvs_realserver_mss]
@@
- command => /usr/local/bin/prometheus-lvs-realserver-mss -o /var/lib/prometheus/node.d/lvs-realserver-mss.prom -e 208.80.154.241:9243 -e 208.80.154.241:9443 -e 208.80.154.241:9643 -e [2620:0:861:ed1a::3:241]:9243 -e [2620:0:861:ed1a::3:241]:9443 -e [2620:0:861:ed1a::3:241]:9643
+ command => /usr/local/bin/prometheus-lvs-realserver-mss -o /var/lib/prometheus/node.d/lvs-realserver-mss.prom -e 10.2.2.30:9200 -e 10.2.2.30:9243 -e 10.2.2.30:9443
- File[/lib/systemd/system/prometheus_ferm_mss.service]
- Content differences:
--- /lib/systemd/system/prometheus_ferm_mss.service.orig
+++ /lib/systemd/system/prometheus_ferm_mss.service
@@ -5,4 +5,4 @@
[Service]
Type=oneshot
User=root
-ExecStart=/usr/local/bin/prometheus-ferm-mss -o /var/lib/prometheus/node.d/ferm-mss.prom -e 208.80.154.241:9243 -e 208.80.154.241:9443 -e 208.80.154.241:9643 -e [2620:0:861:ed1a::3:241]:9243 -e [2620:0:861:ed1a::3:241]:9443 -e [2620:0:861:ed1a::3:241]:9643
+ExecStart=/usr/local/bin/prometheus-ferm-mss -o /var/lib/prometheus/node.d/ferm-mss.prom -e 10.2.2.30:9200 -e 10.2.2.30:9243 -e 10.2.2.30:9443
- File[/etc/default/wikimedia-lvs-realserver]
- Content differences:
--- /etc/default/wikimedia-lvs-realserver.orig
+++ /etc/default/wikimedia-lvs-realserver
@@ -7,4 +7,4 @@
# LVS service IPs to be bound to the loopback interface,
# separate using spaces
-LVS_SERVICE_IPS="208.80.154.241 2620:0:861:ed1a::3:241"
+LVS_SERVICE_IPS="10.2.2.30"
- File[/lib/systemd/system/prometheus_lvs_realserver_mss.service]
- Content differences:
--- /lib/systemd/system/prometheus_lvs_realserver_mss.service.orig
+++ /lib/systemd/system/prometheus_lvs_realserver_mss.service
@@ -5,4 +5,4 @@
[Service]
Type=oneshot
User=root
-ExecStart=/usr/local/bin/prometheus-lvs-realserver-mss -o /var/lib/prometheus/node.d/lvs-realserver-mss.prom -e 208.80.154.241:9243 -e 208.80.154.241:9443 -e 208.80.154.241:9643 -e [2620:0:861:ed1a::3:241]:9243 -e [2620:0:861:ed1a::3:241]:9443 -e [2620:0:861:ed1a::3:241]:9643
+ExecStart=/usr/local/bin/prometheus-lvs-realserver-mss -o /var/lib/prometheus/node.d/lvs-realserver-mss.prom -e 10.2.2.30:9200 -e 10.2.2.30:9243 -e 10.2.2.30:9443
- File[/etc/conftool/local_services.yaml]
- Content differences:
--- /etc/conftool/local_services.yaml.orig
+++ /etc/conftool/local_services.yaml
@@ -1,19 +1,19 @@
---
-cloudelastic-chi-https:
- cluster: cloudelastic
- service: cloudelastic-chi-ssl
+search:
+ cluster: elasticsearch
+ service: elasticsearch
servers:
- - pybal-high-traffic2-eqiad.wikimedia.org
+ - pybal-low-traffic.svc.eqiad.wmnet
+ port: 9200
+search-https:
+ cluster: elasticsearch
+ service: elasticsearch-ssl
+ servers:
+ - pybal-low-traffic.svc.eqiad.wmnet
port: 9243
-cloudelastic-omega-https:
- cluster: cloudelastic
- service: cloudelastic-omega-ssl
+search-omega-https:
+ cluster: elasticsearch
+ service: elasticsearch-omega-ssl
servers:
- - pybal-high-traffic2-eqiad.wikimedia.org
+ - pybal-low-traffic.svc.eqiad.wmnet
port: 9443
-cloudelastic-psi-https:
- cluster: cloudelastic
- service: cloudelastic-psi-ssl
- servers:
- - pybal-high-traffic2-eqiad.wikimedia.org
- port: 9643
- File[/etc/ferm/conf.d/10_clamp-mss-ipv4]
- Content differences:
--- /etc/ferm/conf.d/10_clamp-mss-ipv4.orig
+++ /etc/ferm/conf.d/10_clamp-mss-ipv4
@@ -5,7 +5,7 @@
domain (ip) {
table filter {
chain OUTPUT {
- outerface (enp152s0f0np0 lo) saddr @ipfilter((208.80.154.241 2620:0:861:ed1a::3:241])) proto tcp sport (9243 9443 9643) tcp-flags (SYN) SYN TCPMSS set-mss 1440;
+ outerface (enp152s0f0np0 lo) saddr @ipfilter(10.2.2.30) proto tcp sport (9200 9243 9443) tcp-flags (SYN) SYN TCPMSS set-mss 1440;
}
}
}
- Ferm::Rule[clamp-mss-ipv4]
- Parameters differences:
--- Ferm::Rule[clamp-mss-ipv4].orig
+++ Ferm::Rule[clamp-mss-ipv4]
@@
- rule => outerface (enp152s0f0np0 lo) saddr @ipfilter((208.80.154.241 2620:0:861:ed1a::3:241])) proto tcp sport (9243 9443 9643) tcp-flags (SYN) SYN TCPMSS set-mss 1440;
+ rule => outerface (enp152s0f0np0 lo) saddr @ipfilter(10.2.2.30) proto tcp sport (9200 9243 9443) tcp-flags (SYN) SYN TCPMSS set-mss 1440;
- File[/lib/systemd/system/tcp-mss-clamper.service]
- Content differences:
--- /lib/systemd/system/tcp-mss-clamper.service.orig
+++ /lib/systemd/system/tcp-mss-clamper.service
@@ -7,5 +7,5 @@
[Service]
LimitMEMLOCK=infinity
-ExecStart=/usr/bin/tcp-mss-clamper --ipv4-mss 1440 --ipv6-mss 1400 -p :2200 -s "208.80.154.241:9243,208.80.154.241:9443,208.80.154.241:9643,[2620:0:861:ed1a::3:241]:9243,[2620:0:861:ed1a::3:241]:9443,[2620:0:861:ed1a::3:241]:9643" -i enp152s0f0np0,lo
+ExecStart=/usr/bin/tcp-mss-clamper --ipv4-mss 1440 --ipv6-mss 1400 -p :2200 -s "10.2.2.30:9200,10.2.2.30:9243,10.2.2.30:9443" -i enp152s0f0np0,lo
Restart=on-failure
- File[/etc/ferm/conf.d/10_clamp-mss-ipv6]
- Content differences:
--- /etc/ferm/conf.d/10_clamp-mss-ipv6.orig
+++ /etc/ferm/conf.d/10_clamp-mss-ipv6
@@ -5,7 +5,7 @@
domain (ip6) {
table filter {
chain OUTPUT {
- outerface (enp152s0f0np0 lo) saddr @ipfilter((208.80.154.241 2620:0:861:ed1a::3:241])) proto tcp sport (9243 9443 9643) tcp-flags (SYN) SYN TCPMSS set-mss 1400;
+ outerface (enp152s0f0np0 lo) saddr @ipfilter(10.2.2.30) proto tcp sport (9200 9243 9443) tcp-flags (SYN) SYN TCPMSS set-mss 1400;
}
}
}
- Systemd::Unit[prometheus_ferm_mss.service]
- Systemd::Unit[prometheus_lvs_realserver_mss.service]
- Class[Profile::Lvs::Realserver]
- Parameters differences:
--- Class[Profile::Lvs::Realserver].orig
+++ Class[Profile::Lvs::Realserver]
@@
- pools => {'cloudelastic-chi-https': {'services': ['opensearch_1@cloudelastic-chi-eqiad.service']}, 'cloudelastic-psi-https': {'services': ['opensearch_1@cloudelastic-psi-eqiad.service']}, 'cloudelastic-omega-https': {'services': ['opensearch_1@cloudelastic-omega-eqiad.service']}}
+ pools => {'search': {'services': ['opensearch_2@production-search-eqiad']}, 'search-https': {'services': ['nginx', 'opensearch_2@production-search-eqiad']}, 'search-omega-https': {'services': ['nginx', 'opensearch_2@production-search-omega-eqiad']}}
- Ferm::Rule[clamp-mss-ipv6]
- Parameters differences:
--- Ferm::Rule[clamp-mss-ipv6].orig
+++ Ferm::Rule[clamp-mss-ipv6]
@@
- rule => outerface (enp152s0f0np0 lo) saddr @ipfilter((208.80.154.241 2620:0:861:ed1a::3:241])) proto tcp sport (9243 9443 9643) tcp-flags (SYN) SYN TCPMSS set-mss 1400;
+ rule => outerface (enp152s0f0np0 lo) saddr @ipfilter(10.2.2.30) proto tcp sport (9200 9243 9443) tcp-flags (SYN) SYN TCPMSS set-mss 1400;
- Systemd::Unit[tcp-mss-clamper]
- 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]
@@
- clamped_ipport => ['208.80.154.241:9243', '208.80.154.241:9443', '208.80.154.241:9643', '[2620:0:861:ed1a::3:241]:9243', '[2620:0:861:ed1a::3:241]:9443', '[2620:0:861:ed1a::3:241]:9643']
+ clamped_ipport => ['10.2.2.30:9200', '10.2.2.30:9243', '10.2.2.30:9443']
- Systemd::Timer::Job[prometheus_ferm_mss]
- Parameters differences:
--- Systemd::Timer::Job[prometheus_ferm_mss].orig
+++ Systemd::Timer::Job[prometheus_ferm_mss]
@@
- command => /usr/local/bin/prometheus-ferm-mss -o /var/lib/prometheus/node.d/ferm-mss.prom -e 208.80.154.241:9243 -e 208.80.154.241:9443 -e 208.80.154.241:9643 -e [2620:0:861:ed1a::3:241]:9243 -e [2620:0:861:ed1a::3:241]:9443 -e [2620:0:861:ed1a::3:241]:9643
+ command => /usr/local/bin/prometheus-ferm-mss -o /var/lib/prometheus/node.d/ferm-mss.prom -e 10.2.2.30:9200 -e 10.2.2.30:9243 -e 10.2.2.30:9443
- Systemd::Service[tcp-mss-clamper]
- Prometheus::Node_ferm_mss[ferm_clamped_ipport]
- Parameters differences:
--- Prometheus::Node_ferm_mss[ferm_clamped_ipport].orig
+++ Prometheus::Node_ferm_mss[ferm_clamped_ipport]
@@
- clamped_ipport => ['208.80.154.241:9243', '208.80.154.241:9443', '208.80.154.241:9643', '[2620:0:861:ed1a::3:241]:9243', '[2620:0:861:ed1a::3:241]:9443', '[2620:0:861:ed1a::3:241]:9643']
+ clamped_ipport => ['10.2.2.30:9200', '10.2.2.30:9243', '10.2.2.30:9443']