Elukey has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/366830 )
Change subject: role::prometheus::apache_exporter: move to profiles ...................................................................... role::prometheus::apache_exporter: move to profiles Change-Id: I92c9ae7b6abf4f5c1e2af187158b3302d1d93059 --- M modules/profile/manifests/otrs.pp M modules/profile/manifests/piwik/webserver.pp R modules/profile/manifests/prometheus/apache_exporter.pp M modules/role/manifests/mediawiki/appserver.pp M modules/role/manifests/mediawiki/appserver/api.pp M modules/role/manifests/mediawiki/imagescaler.pp M modules/role/manifests/mediawiki/jobrunner.pp M modules/role/manifests/mediawiki/videoscaler.pp 8 files changed, 13 insertions(+), 34 deletions(-) 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/otrs.pp b/modules/profile/manifests/otrs.pp index 21b206f..2cb00ca 100644 --- a/modules/profile/manifests/otrs.pp +++ b/modules/profile/manifests/otrs.pp @@ -12,8 +12,8 @@ $prometheus_nodes = hiera('prometheus_nodes'), ){ include ::base::firewall - include network::constants + include ::profile::prometheus::apache_exporter class { '::otrs': otrs_database_host => $otrs_database_host, @@ -63,17 +63,6 @@ nrpe::monitor_service{ 'freshclam': description => 'freshclam running', nrpe_command => '/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u clamav -C freshclam' - } - - 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, } # can conflict with ferm module diff --git a/modules/profile/manifests/piwik/webserver.pp b/modules/profile/manifests/piwik/webserver.pp index 86700ff..60293f3 100644 --- a/modules/profile/manifests/piwik/webserver.pp +++ b/modules/profile/manifests/piwik/webserver.pp @@ -7,6 +7,8 @@ class profile::piwik::webserver( $prometheus_nodes = hiera('prometheus_nodes') ){ + include ::profile::prometheus::apache_exporter + class { '::apache::mod::authnz_ldap': } class { '::apache::mod::headers': } class { '::apache::mod::php5': } @@ -55,17 +57,6 @@ match => '^;?memory_limit\s*\=', path => '/etc/php5/apache2/php.ini', 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': diff --git a/modules/role/manifests/prometheus/apache_exporter.pp b/modules/profile/manifests/prometheus/apache_exporter.pp similarity index 77% rename from modules/role/manifests/prometheus/apache_exporter.pp rename to modules/profile/manifests/prometheus/apache_exporter.pp index 3e8dffb..dd372ef 100644 --- a/modules/role/manifests/prometheus/apache_exporter.pp +++ b/modules/profile/manifests/prometheus/apache_exporter.pp @@ -1,7 +1,7 @@ -class role::prometheus::apache_exporter { +class profile::prometheus::apache_exporter ( + $prometheus_nodes = hiera('prometheus_nodes'), +) { prometheus::apache_exporter { 'default': } - - $prometheus_nodes = hiera('prometheus_nodes') $prometheus_ferm_nodes = join($prometheus_nodes, ' ') $ferm_srange = "(@resolve((${prometheus_ferm_nodes})) @resolve((${prometheus_ferm_nodes}), AAAA))" @@ -10,5 +10,4 @@ port => '9117', srange => $ferm_srange, } -} - +} \ No newline at end of file diff --git a/modules/role/manifests/mediawiki/appserver.pp b/modules/role/manifests/mediawiki/appserver.pp index d113a58..c2b4912 100644 --- a/modules/role/manifests/mediawiki/appserver.pp +++ b/modules/role/manifests/mediawiki/appserver.pp @@ -3,7 +3,7 @@ system::role { 'mediawiki::appserver': } include ::role::mediawiki::webserver - include ::role::prometheus::apache_exporter + include ::profile::prometheus::apache_exporter include ::role::prometheus::hhvm_exporter } diff --git a/modules/role/manifests/mediawiki/appserver/api.pp b/modules/role/manifests/mediawiki/appserver/api.pp index 763180a..cd7c161 100644 --- a/modules/role/manifests/mediawiki/appserver/api.pp +++ b/modules/role/manifests/mediawiki/appserver/api.pp @@ -2,7 +2,7 @@ system::role { 'mediawiki::appserver::api': } include ::role::mediawiki::webserver - include ::role::prometheus::apache_exporter + include ::profile::prometheus::apache_exporter include ::role::prometheus::hhvm_exporter # Using fastcgi we need more local ports diff --git a/modules/role/manifests/mediawiki/imagescaler.pp b/modules/role/manifests/mediawiki/imagescaler.pp index b2de4d3..c8a3ef1 100644 --- a/modules/role/manifests/mediawiki/imagescaler.pp +++ b/modules/role/manifests/mediawiki/imagescaler.pp @@ -3,7 +3,7 @@ include ::role::mediawiki::scaler include ::role::mediawiki::webserver - include ::role::prometheus::apache_exporter + include ::profile::prometheus::apache_exporter include ::role::prometheus::hhvm_exporter include ::base::firewall } diff --git a/modules/role/manifests/mediawiki/jobrunner.pp b/modules/role/manifests/mediawiki/jobrunner.pp index 2e39b7e..b00a50f 100644 --- a/modules/role/manifests/mediawiki/jobrunner.pp +++ b/modules/role/manifests/mediawiki/jobrunner.pp @@ -5,8 +5,8 @@ # Parent role (we don't use inheritance by choice) include ::role::mediawiki::common - # These should really be profiles - include ::role::prometheus::apache_exporter + include ::profile::prometheus::apache_exporter + # This should really be a profile include ::role::prometheus::hhvm_exporter include ::profile::mediawiki::jobrunner diff --git a/modules/role/manifests/mediawiki/videoscaler.pp b/modules/role/manifests/mediawiki/videoscaler.pp index 9dcc824..438cd09 100644 --- a/modules/role/manifests/mediawiki/videoscaler.pp +++ b/modules/role/manifests/mediawiki/videoscaler.pp @@ -6,7 +6,7 @@ include ::role::mediawiki::scaler # Profiles - include ::role::prometheus::apache_exporter + include ::profile::prometheus::apache_exporter include ::role::prometheus::hhvm_exporter include ::profile::mediawiki::jobrunner include ::base::firewall -- To view, visit https://gerrit.wikimedia.org/r/366830 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I92c9ae7b6abf4f5c1e2af187158b3302d1d93059 Gerrit-PatchSet: 5 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Elukey <ltosc...@wikimedia.org> Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org> Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits