Filippo Giunchedi has submitted this change and it was merged.
Change subject: site: install prometheus server in esams and ulsfo
......................................................................
site: install prometheus server in esams and ulsfo
Expand coverage to esams and ulsfo too, access is restricted to
$prometheus_nodes.
Bug: T126785
Change-Id: Iaeddcb14543c5d470a1111febca28a337bf735ba
---
M hieradata/esams.yaml
M hieradata/ulsfo.yaml
M manifests/site.pp
3 files changed, 5 insertions(+), 6 deletions(-)
Approvals:
Filippo Giunchedi: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/esams.yaml b/hieradata/esams.yaml
index f51be63..5df8cae 100644
--- a/hieradata/esams.yaml
+++ b/hieradata/esams.yaml
@@ -1,4 +1,3 @@
ganglia_aggregators: bast3001.wikimedia.org:11649
prometheus_nodes:
- - prometheus1001.eqiad.wmnet
- - prometheus1002.eqiad.wmnet
+ - bast3001.wikimedia.org
diff --git a/hieradata/ulsfo.yaml b/hieradata/ulsfo.yaml
index e5d2ae7..9be716c 100644
--- a/hieradata/ulsfo.yaml
+++ b/hieradata/ulsfo.yaml
@@ -1,4 +1,3 @@
ganglia_aggregators: bast4001.wikimedia.org:12649
prometheus_nodes:
- - prometheus2001.codfw.wmnet
- - prometheus2002.codfw.wmnet
+ - bast4001.wikimedia.org
diff --git a/manifests/site.pp b/manifests/site.pp
index caea273..7f06b3f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -185,7 +185,7 @@
interface::add_ip6_mapped { 'main':
interface => 'eth0',
}
- role(bastionhost::general, installserver::tftp_server)
+ role(bastionhost::general, installserver::tftp_server, prometheus::ops)
class { 'ganglia::monitor::aggregator':
sites => 'esams',
@@ -198,7 +198,8 @@
interface => 'eth0',
}
- role(bastionhost::general, ipmi::mgmt, installserver::tftp_server)
+ role(bastionhost::general, ipmi::mgmt, installserver::tftp_server,
+ prometheus::ops)
class { 'ganglia::monitor::aggregator':
sites => 'ulsfo',
--
To view, visit https://gerrit.wikimedia.org/r/309996
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaeddcb14543c5d470a1111febca28a337bf735ba
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Ema <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: Volans <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
