Elukey has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404269 )
Change subject: role::prometheus::ops: add puppetdb metrics
......................................................................
role::prometheus::ops: add puppetdb metrics
Bug: T184796
Change-Id: If53cdce855e1550f5b142c2556ad995c678665e6
---
M modules/role/manifests/prometheus/ops.pp
1 file changed, 12 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/modules/role/manifests/prometheus/ops.pp
b/modules/role/manifests/prometheus/ops.pp
index 0976ddc..b24c3e8 100644
--- a/modules/role/manifests/prometheus/ops.pp
+++ b/modules/role/manifests/prometheus/ops.pp
@@ -578,10 +578,16 @@
$jmx_exporter_jobs = [
{
'job_name' => 'jmx_kafka',
- 'scrape_timeout' => '25s',
'scheme' => 'http',
'file_sd_configs' => [
{ 'files' => [ "${targets_path}/jmx_kafka_*.yaml" ]}
+ ],
+ },
+ {
+ 'job_name' => 'jmx_puppetdb',
+ 'scheme' => 'http',
+ 'file_sd_configs' => [
+ { 'files' => [ "${targets_path}/jmx_puppetdb_*.yaml" ]}
],
},
]
@@ -592,6 +598,11 @@
site => $::site,
}
+ prometheus::jmx_exporter_config{ "puppetdb_${::site}":
+ dest => "${targets_path}/jmx_puppetdb_${::site}.yaml",
+ class_name => 'role::puppetmaster::puppetdb',
+ site => $::site,
+ }
$etherpad_jobs = [
{
--
To view, visit https://gerrit.wikimedia.org/r/404269
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If53cdce855e1550f5b142c2556ad995c678665e6
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey <[email protected]>
Gerrit-Reviewer: Elukey <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
