Filippo Giunchedi has submitted this change and it was merged.
Change subject: prometheus: monitor hosts in the current site
......................................................................
prometheus: monitor hosts in the current site
Generate a list of hosts with their respective ganglia cluster for the current
site.
Bug: T126785
Change-Id: I1963f9c3dd36323ddd8a2e0ec21ed7ce4eb8cad4
---
M modules/puppetmaster/manifests/generators.pp
M modules/role/manifests/prometheus/ops.pp
2 files changed, 21 insertions(+), 0 deletions(-)
Approvals:
Filippo Giunchedi: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/puppetmaster/manifests/generators.pp
b/modules/puppetmaster/manifests/generators.pp
index 412b3bb..0f58af8 100644
--- a/modules/puppetmaster/manifests/generators.pp
+++ b/modules/puppetmaster/manifests/generators.pp
@@ -20,4 +20,13 @@
source => 'puppet:///modules/puppetmaster/sshknowngen',
require => Package[$packages]
}
+
+ file {'/usr/local/bin/prometheus-ganglia-gen':
+ ensure => 'present',
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/puppetmaster/prometheus-ganglia-gen',
+ require => Package[$packages]
+ }
}
diff --git a/modules/role/manifests/prometheus/ops.pp
b/modules/role/manifests/prometheus/ops.pp
index e8d4e17..698f4ba 100644
--- a/modules/role/manifests/prometheus/ops.pp
+++ b/modules/role/manifests/prometheus/ops.pp
@@ -14,4 +14,16 @@
port => '80',
srange => '$DOMAIN_NETWORKS',
}
+
+ # Query puppet exported resources and generate a list of hosts for
+ # prometheus to poll metrics from. Ganglia::Cluster is used to generate the
+ # mapping from cluster to a list of its members.
+ file { "/srv/prometheus/ops/targets/node_site_${::site}.yaml":
+ content => generate('/usr/local/bin/prometheus-ganglia-gen',
+ "--site=${::site}"),
+ backup => false,
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/299540
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1963f9c3dd36323ddd8a2e0ec21ed7ce4eb8cad4
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Jcrespo <jcre...@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
