Filippo Giunchedi has submitted this change and it was merged.

Change subject: site: add prometheus::node_exporter to more machines
......................................................................


site: add prometheus::node_exporter to more machines

Selected set of machines not serving production traffic.

Bug: T140646
Change-Id: I2768e5ad866f901d26808f12e5173a75bde50310
---
M manifests/site.pp
1 file changed, 10 insertions(+), 12 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved
  Eevans: Looks good to me, but someone else must approve
  Alexandros Kosiaris: Looks good to me, but someone else must approve



diff --git a/manifests/site.pp b/manifests/site.pp
index 95f37b3..7327ab3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -235,7 +235,7 @@
 
 # cerium, praseodymium and xenon are Cassandra test hosts
 node /^(cerium|praseodymium|xenon)\.eqiad\.wmnet$/ {
-    role restbase, cassandra
+    role restbase, cassandra, prometheus::node_exporter
     include standard
 }
 
@@ -1316,7 +1316,7 @@
 
 # graphite test machine, currently with SSD caching + spinning disks
 node 'graphite1002.eqiad.wmnet' {
-    role test::system
+    role test::system, prometheus::node_exporter
     include base::firewall
 }
 
@@ -1959,12 +1959,12 @@
 }
 
 node 'maps-test2001.codfw.wmnet' {
-    role maps::server, maps::master
+    role maps::server, maps::master, prometheus::node_exporter
     include base::firewall
 }
 
 node /^maps-test200[2-4]\.codfw\.wmnet/ {
-    role maps::server, maps::slave
+    role maps::server, maps::slave, prometheus::node_exporter
     include base::firewall
 }
 
@@ -2054,11 +2054,11 @@
 }
 
 node /^ms-fe300[1-2]\.esams\.wmnet$/ {
-    role swift::proxy
+    role swift::proxy, prometheus::node_exporter
 }
 
 node /^ms-be300[1-4]\.esams\.wmnet$/ {
-    role swift::storage
+    role swift::storage, prometheus::node_exporter
 }
 
 node /^ms-fe2001\.codfw\.wmnet$/ {
@@ -2486,24 +2486,22 @@
 }
 
 node /^prometheus200[12]\.codfw\.wmnet$/ {
-    role prometheus::ops
+    role prometheus::ops, prometheus::node_exporter
 
     include base::firewall
-    include role::prometheus::node_exporter
     include standard
 }
 
 node /^prometheus100[12]\.eqiad\.wmnet$/ {
-    role prometheus::ops
+    role prometheus::ops, prometheus::node_exporter
 
     include base::firewall
-    include role::prometheus::node_exporter
     include standard
 }
 
 # pybal-test200X VMs are used for pybal testing/development
 node /^pybal-test200[12]\.codfw\.wmnet$/ {
-    role pybaltest
+    role pybaltest, prometheus::node_exporter
     include standard
 }
 
@@ -2577,7 +2575,7 @@
 
 # cassandra multi-dc temporary test T111382
 node /^restbase-test200[1-3]\.codfw\.wmnet$/ {
-    role restbase, cassandra
+    role restbase, cassandra, prometheus::node_exporter
     include standard
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/299970
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2768e5ad866f901d26808f12e5173a75bde50310
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Eevans <eev...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: GWicke <gwi...@wikimedia.org>
Gerrit-Reviewer: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to