Elukey has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/351636 )
Change subject: Add a Prometheus Apache exporter to Bohrium
......................................................................
Add a Prometheus Apache exporter to Bohrium
This commit also sets a generic Apache exporter
for Piwik deployments.
Bug: T163204
Change-Id: I73d69baec0677ced7202638294997f207220dd15
---
M modules/profile/manifests/piwik/webserver.pp
M modules/role/manifests/prometheus/ops.pp
2 files changed, 23 insertions(+), 1 deletion(-)
Approvals:
Elukey: Looks good to me, approved
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, but someone else must approve
diff --git a/modules/profile/manifests/piwik/webserver.pp
b/modules/profile/manifests/piwik/webserver.pp
index 264e154..86700ff 100644
--- a/modules/profile/manifests/piwik/webserver.pp
+++ b/modules/profile/manifests/piwik/webserver.pp
@@ -4,7 +4,9 @@
# This configuration should be improved with something more up to date like
# mpm-event and php-fpm/hhmv.
#
-class profile::piwik::webserver {
+class profile::piwik::webserver(
+ $prometheus_nodes = hiera('prometheus_nodes')
+){
class { '::apache::mod::authnz_ldap': }
class { '::apache::mod::headers': }
class { '::apache::mod::php5': }
@@ -55,6 +57,17 @@
notify => Class['::apache'],
}
+ prometheus::apache_exporter { 'default': }
+
+ $prometheus_ferm_nodes = join($prometheus_nodes, ' ')
+ $ferm_srange = "(@resolve((${prometheus_ferm_nodes}))
@resolve((${prometheus_ferm_nodes}), AAAA))"
+
+ ferm::service { 'prometheus-apache_exporter':
+ proto => 'tcp',
+ port => '9117',
+ srange => $ferm_srange,
+ }
+
ferm::service { 'piwik_http':
proto => 'tcp',
port => '80',
diff --git a/modules/role/manifests/prometheus/ops.pp
b/modules/role/manifests/prometheus/ops.pp
index 68153dc..ac5b519 100644
--- a/modules/role/manifests/prometheus/ops.pp
+++ b/modules/role/manifests/prometheus/ops.pp
@@ -231,6 +231,15 @@
'cluster' => 'videoscaler'
}
}
+
+ # Special config for Apache on Piwik deployments
+ prometheus::class_config{ "apache_piwik_${::site}":
+ dest => "${targets_path}/apache_piwik_${::site}.yaml",
+ site => $::site,
+ class_name => 'profile::piwik::webserver',
+ port => '9117',
+ }
+
# Job definition for etcd_exporter
$etcd_jobs = [
{
--
To view, visit https://gerrit.wikimedia.org/r/351636
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I73d69baec0677ced7202638294997f207220dd15
Gerrit-PatchSet: 4
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: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
