Filippo Giunchedi has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/327565 )
Change subject: prometheus: add job definition for apache_exporter
......................................................................
prometheus: add job definition for apache_exporter
Bug: T147316
Change-Id: If643a821cfda94faa047bdff6a12040ee94e5527
---
M modules/role/manifests/prometheus/ops.pp
1 file changed, 51 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/65/327565/1
diff --git a/modules/role/manifests/prometheus/ops.pp
b/modules/role/manifests/prometheus/ops.pp
index efe3270..e432944 100644
--- a/modules/role/manifests/prometheus/ops.pp
+++ b/modules/role/manifests/prometheus/ops.pp
@@ -160,12 +160,62 @@
}
}
+ # Job definition for apache_exporter
+ $apache_jobs = [
+ {
+ 'job_name' => 'apache',
+ 'file_sd_configs' => [
+ { 'files' => [ "${targets_path}/apache_*.yaml"] },
+ ]
+ },
+ ]
+
+ # Generate a list of hosts running apache from Ganglia cluster definition
+ # TODO(filippo): generate the configuration based on hosts with apache
class applied
+ prometheus::cluster_config{ "apache_jobrunner_${::site}":
+ dest => "${targets_path}/apache_jobrunner_${::site}.yaml",
+ site => $::site,
+ cluster => 'jobrunner',
+ port => '9192',
+ labels => {
+ 'cluster' => 'jobrunner'
+ }
+ }
+ prometheus::cluster_config{ "apache_appserver_${::site}":
+ dest => "${targets_path}/apache_appserver_${::site}.yaml",
+ site => $::site,
+ cluster => 'appserver',
+ port => '9192',
+ labels => {
+ 'cluster' => 'appserver'
+ }
+ }
+ prometheus::cluster_config{ "apache_api_appserver_${::site}":
+ dest => "${targets_path}/apache_api_appserver_${::site}.yaml",
+ site => $::site,
+ cluster => 'api_appserver',
+ port => '9192',
+ labels => {
+ 'cluster' => 'api_appserver'
+ }
+ }
+ prometheus::cluster_config{ "apache_imagescaler_${::site}":
+ dest => "${targets_path}/apache_imagescaler_${::site}.yaml",
+ site => $::site,
+ cluster => 'imagescaler',
+ port => '9192',
+ labels => {
+ 'cluster' => 'imagescaler'
+ }
+ }
+
prometheus::server { 'ops':
storage_encoding => '2',
listen_address => '127.0.0.1:9900',
storage_retention => $storage_retention,
scrape_configs_extra => array_concat(
- $mysql_jobs, $varnish_jobs, $memcached_jobs, $hhvm_jobs
+ $mysql_jobs, $varnish_jobs, $memcached_jobs, $hhvm_jobs,
+ $apache_jobs,
),
global_config_extra => $config_extra,
}
--
To view, visit https://gerrit.wikimedia.org/r/327565
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If643a821cfda94faa047bdff6a12040ee94e5527
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
