Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/402836 )
Change subject: site.pp: fixup for Icd70ef861dcadeeae7df0415a5c2779679c5e144
......................................................................
site.pp: fixup for Icd70ef861dcadeeae7df0415a5c2779679c5e144
Change-Id: I0094e1b007f5b9db0cce2db1c1e0b405d9989239
---
M hieradata/role/codfw/prometheus.yaml
A hieradata/role/common/prometheus.yaml
M modules/role/manifests/bastionhost/pop.pp
M modules/role/manifests/cluster/management.pp
4 files changed, 16 insertions(+), 10 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/codfw/prometheus.yaml
b/hieradata/role/codfw/prometheus.yaml
index b3e0545..d45f9e3 100644
--- a/hieradata/role/codfw/prometheus.yaml
+++ b/hieradata/role/codfw/prometheus.yaml
@@ -1,7 +1,6 @@
-profile::base::domain_search:
- - wikimedia.org
- - eqiad.wmnet
- - codfw.wmnet
- - esams.wmnet
- - ulsfo.wmnet
- - eqsin.wmnet
+prometheus::server::memory_chunks: '3145728'
+prometheus::server::max_chunks_to_persist: '1048576'
+lvs::realserver::realserver_ips:
+ - 10.2.1.25
+profile::base::remote_syslog_tls: ['syslog.eqiad.wmnet:6514',
'syslog.codfw.wmnet:6514']
+profile::base::remote_syslog: []
diff --git a/hieradata/role/common/prometheus.yaml
b/hieradata/role/common/prometheus.yaml
new file mode 100644
index 0000000..b3e0545
--- /dev/null
+++ b/hieradata/role/common/prometheus.yaml
@@ -0,0 +1,7 @@
+profile::base::domain_search:
+ - wikimedia.org
+ - eqiad.wmnet
+ - codfw.wmnet
+ - esams.wmnet
+ - ulsfo.wmnet
+ - eqsin.wmnet
diff --git a/modules/role/manifests/bastionhost/pop.pp
b/modules/role/manifests/bastionhost/pop.pp
index ade59e5..c568b03 100644
--- a/modules/role/manifests/bastionhost/pop.pp
+++ b/modules/role/manifests/bastionhost/pop.pp
@@ -6,5 +6,5 @@
require ::role::bastionhost::general
require ::role::installserver::tftp
require ::role::prometheus::ops
- require ::role::ipmi::mgmt
+ require ::profile::ipmi::mgmt
}
diff --git a/modules/role/manifests/cluster/management.pp
b/modules/role/manifests/cluster/management.pp
index f267542..ab6974c 100644
--- a/modules/role/manifests/cluster/management.pp
+++ b/modules/role/manifests/cluster/management.pp
@@ -11,8 +11,8 @@
include ::profile::mariadb::wmf_root_client
include ::role::cumin::master
- include ::role::ipmi::mgmt
- include ::role::access_new_install
+ include ::profile::ipmi::mgmt
+ include ::profile::access_new_install
include ::profile::conftool::client
include ::profile::switchdc
include ::profile::debdeploy
--
To view, visit https://gerrit.wikimedia.org/r/402836
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0094e1b007f5b9db0cce2db1c1e0b405d9989239
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
