Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/179097
Change subject: ganglia_new: remove Labs support ...................................................................... ganglia_new: remove Labs support Strip Labs off ganglia_new, similar to the ganglia "module" changes. Change-Id: I2d7f45b5f9dd4560308a52db5325de8e471205ff --- M modules/ganglia_new/manifests/configuration.pp M modules/ganglia_new/manifests/monitor.pp M modules/ganglia_new/manifests/monitor/aggregator/instance.pp M modules/ganglia_new/templates/gmetad.conf.erb 4 files changed, 22 insertions(+), 64 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/97/179097/1 diff --git a/modules/ganglia_new/manifests/configuration.pp b/modules/ganglia_new/manifests/configuration.pp index 461ce20..73a3c85 100644 --- a/modules/ganglia_new/manifests/configuration.pp +++ b/modules/ganglia_new/manifests/configuration.pp @@ -121,38 +121,22 @@ # the site name will automatically be appended now, # and a different IP prefix will be used. - case $::realm { - 'production': { - $url = 'http://ganglia.wikimedia.org' - # 208.80.154.14 is neon (icinga). - # It is not actually a gmetad host, but it should - # be allowed to query gmond instances for use by - # neon/icinga. - $gmetad_hosts = [ '208.80.154.53', '208.80.154.150', '208.80.154.14' ] - $aggregator_hosts = { - 'eqiad' => [ '208.80.154.53', '208.80.154.150' ], - 'esams' => [ '91.198.174.113' ], - 'codfw' => [ '208.80.153.4' ], - } - $base_port = 8649 - $id_prefix = { - eqiad => 1000, - codfw => 2000, - esams => 3000, - } - $default_sites = ['eqiad','codfw'] - } - 'labs': { - $url = 'http://ganglia.wmflabs.org' - $gmetad_hosts = [ '10.68.16.101'] # aggregator.eqiad.wmflabs - $aggregator_hosts = { - 'eqiad' => [ '10.68.16.101' ], # aggregator.eqiad.wmflabs - } - $base_port = 8649 - $id_prefix = { - eqiad => 0, - } - $default_sites = ['eqiad','codfw'] - } + $url = 'http://ganglia.wikimedia.org' + # 208.80.154.14 is neon (icinga). + # It is not actually a gmetad host, but it should + # be allowed to query gmond instances for use by + # neon/icinga. + $gmetad_hosts = [ '208.80.154.53', '208.80.154.150', '208.80.154.14' ] + $aggregator_hosts = { + 'eqiad' => [ '208.80.154.53', '208.80.154.150' ], + 'esams' => [ '91.198.174.113' ], + 'codfw' => [ '208.80.153.4' ], } + $base_port = 8649 + $id_prefix = { + eqiad => 1000, + codfw => 2000, + esams => 3000, + } + $default_sites = ['eqiad','codfw'] } diff --git a/modules/ganglia_new/manifests/monitor.pp b/modules/ganglia_new/manifests/monitor.pp index f250e68..50ba51a 100644 --- a/modules/ganglia_new/manifests/monitor.pp +++ b/modules/ganglia_new/manifests/monitor.pp @@ -3,34 +3,16 @@ include service include ganglia_new::configuration - if $::realm == 'production' { - $id = $ganglia_new::configuration::clusters[$cluster]['id'] + $ganglia_new::configuration::id_prefix[$::site] - $desc = $ganglia_new::configuration::clusters[$cluster]['name'] - $portnr = $ganglia_new::configuration::base_port + $id - $gmond_port = $portnr - } else { - if $::project_gid { - $gmond_port = $::project_gid - } else { - # This is dumb, but will get resolved on the next pass. - $gmond_port = 'TBD' - } - } + $id = $ganglia_new::configuration::clusters[$cluster]['id'] + $ganglia_new::configuration::id_prefix[$::site] + $desc = $ganglia_new::configuration::clusters[$cluster]['name'] + $gmond_port = $ganglia_new::configuration::base_port + $id - $cname = $::realm ? { - production => "${desc} ${::site}", - labs => $::instanceproject - } + $cname = "${desc} ${::site}", $aggregator_hosts = $ganglia_new::configuration::aggregator_hosts[$::site] - $override_hostname = $::realm ? { - production => undef, - labs => $::instancename - } class { 'ganglia_new::monitor::config': gmond_port => $gmond_port, cname => $cname, aggregator_hosts => $aggregator_hosts, - override_hostname => $override_hostname } } diff --git a/modules/ganglia_new/manifests/monitor/aggregator/instance.pp b/modules/ganglia_new/manifests/monitor/aggregator/instance.pp index 5cf6d99..83746ea 100644 --- a/modules/ganglia_new/manifests/monitor/aggregator/instance.pp +++ b/modules/ganglia_new/manifests/monitor/aggregator/instance.pp @@ -15,11 +15,7 @@ } $id = $ganglia_new::configuration::clusters[$cluster]['id'] + $ganglia_new::configuration::id_prefix[$monitored_site] $desc = $ganglia_new::configuration::clusters[$cluster]['name'] - $portnr = $ganglia_new::configuration::base_port + $id - $gmond_port = $::realm ? { - production => $portnr, - labs => $::project_gid - } + $gmond_port = $ganglia_new::configuration::base_port + $id $cname = "${desc} ${::site}" if $monitored_site in $sites { $ensure = 'present' diff --git a/modules/ganglia_new/templates/gmetad.conf.erb b/modules/ganglia_new/templates/gmetad.conf.erb index 5792f9b..27abd13 100644 --- a/modules/ganglia_new/templates/gmetad.conf.erb +++ b/modules/ganglia_new/templates/gmetad.conf.erb @@ -3,10 +3,6 @@ # This file is managed by Puppet! # -<% if @realm == "labs" then %> -# BEGIN AUTOGEN FROM CRON -# END AUTOGEN FROM CRON -<% end %> <% if @data_sources %> <% @data_sources.keys.sort.each do |ds_key| -%> data_source "<%= ds_key %>" <%= @data_sources[ds_key] %> -- To view, visit https://gerrit.wikimedia.org/r/179097 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2d7f45b5f9dd4560308a52db5325de8e471205ff Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits