[MediaWiki-commits] [Gerrit] operations/puppet[production]: prometheus: add mtail/exim jobs
Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392039 )
Change subject: prometheus: add mtail/exim jobs
..
prometheus: add mtail/exim jobs
Bug: T179565
Change-Id: Icb84db51dea05a98cb4770068466db2d819a5cce
---
M modules/role/manifests/prometheus/ops.pp
1 file changed, 18 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 f2c9ed5..a887dce 100644
--- a/modules/role/manifests/prometheus/ops.pp
+++ b/modules/role/manifests/prometheus/ops.pp
@@ -549,6 +549,23 @@
site => $::site,
}
+$mtail_jobs = [
+ {
+'job_name'=> 'mtail',
+'scheme' => 'http',
+'file_sd_configs' => [
+ { 'files' => [ "${targets_path}/mtail_*.yaml" ]}
+],
+ },
+]
+
+prometheus::class_config{ "mtail_mx_${::site}":
+dest => "${targets_path}/mtail_mx_${::site}.yaml",
+site => $::site,
+class_name => 'role::mail::mx',
+port => '3903',
+}
+
prometheus::server { 'ops':
storage_encoding => '2',
listen_address=> '127.0.0.1:9900',
@@ -559,7 +576,7 @@
$mysql_jobs, $varnish_jobs, $memcached_jobs, $hhvm_jobs,
$apache_jobs, $etcd_jobs, $etcdmirror_jobs, $pdu_jobs,
$nginx_jobs, $pybal_jobs, $blackbox_jobs, $jmx_exporter_jobs,
-$redis_jobs,
+$redis_jobs, $mtail_jobs,
),
global_config_extra => $config_extra,
}
--
To view, visit https://gerrit.wikimedia.org/r/392039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icb84db51dea05a98cb4770068466db2d819a5cce
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi
Gerrit-Reviewer: Filippo Giunchedi
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: prometheus: add mtail/exim jobs
Filippo Giunchedi has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/392039 )
Change subject: prometheus: add mtail/exim jobs
..
prometheus: add mtail/exim jobs
Bug: T179565
Change-Id: Icb84db51dea05a98cb4770068466db2d819a5cce
---
M modules/role/manifests/prometheus/ops.pp
1 file changed, 18 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/39/392039/1
diff --git a/modules/role/manifests/prometheus/ops.pp
b/modules/role/manifests/prometheus/ops.pp
index f2c9ed5..a887dce 100644
--- a/modules/role/manifests/prometheus/ops.pp
+++ b/modules/role/manifests/prometheus/ops.pp
@@ -549,6 +549,23 @@
site => $::site,
}
+$mtail_jobs = [
+ {
+'job_name'=> 'mtail',
+'scheme' => 'http',
+'file_sd_configs' => [
+ { 'files' => [ "${targets_path}/mtail_*.yaml" ]}
+],
+ },
+]
+
+prometheus::class_config{ "mtail_mx_${::site}":
+dest => "${targets_path}/mtail_mx_${::site}.yaml",
+site => $::site,
+class_name => 'role::mail::mx',
+port => '3903',
+}
+
prometheus::server { 'ops':
storage_encoding => '2',
listen_address=> '127.0.0.1:9900',
@@ -559,7 +576,7 @@
$mysql_jobs, $varnish_jobs, $memcached_jobs, $hhvm_jobs,
$apache_jobs, $etcd_jobs, $etcdmirror_jobs, $pdu_jobs,
$nginx_jobs, $pybal_jobs, $blackbox_jobs, $jmx_exporter_jobs,
-$redis_jobs,
+$redis_jobs, $mtail_jobs,
),
global_config_extra => $config_extra,
}
--
To view, visit https://gerrit.wikimedia.org/r/392039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb84db51dea05a98cb4770068466db2d819a5cce
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
