Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/382932 )
Change subject: ganglia: delete ganglia-web classes and role
......................................................................
ganglia: delete ganglia-web classes and role
Bug: T177225
Change-Id: Ic0b0958cc1bb5966e56cee7198b17d8a8d573ae6
---
D modules/ganglia/manifests/web.pp
D modules/role/manifests/ganglia/views.pp
D modules/role/manifests/ganglia/web.pp
3 files changed, 0 insertions(+), 200 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/32/382932/1
diff --git a/modules/ganglia/manifests/web.pp b/modules/ganglia/manifests/web.pp
deleted file mode 100644
index 0cfa8ad..0000000
--- a/modules/ganglia/manifests/web.pp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Class for the ganglia frontend machine
-class ganglia::web(
- $rrdcached_socket,
- $gmetad_root,
- $ensure='present',
-) {
- include ::apache
- include ::apache::mod::php5
- include ::apache::mod::ssl
- include ::apache::mod::rewrite
- include ::apache::mod::headers
- include ::apache::mod::authnz_ldap
- include ::passwords::ldap::production
-
- $ganglia_servername = 'ganglia.wikimedia.org'
- $ganglia_serveralias = 'uranium.wikimedia.org'
- $ganglia_webdir = '/usr/share/ganglia-webfrontend'
- $ganglia_ssl_cert = '/etc/acme/cert/ganglia.crt'
- $ganglia_ssl_chain = '/etc/acme/cert/ganglia.chain.crt'
- $ganglia_ssl_key = '/etc/acme/key/ganglia.key'
- $ssl_settings = ssl_ciphersuite('apache', 'mid', true)
- # Apache's docroot. Used for populating robots.txt
- $doc_root = '/var/www'
-
- package { [ 'php5-gd',
- 'php5-mysql',
- 'rrdtool',
- 'librrds-perl',
- 'ganglia-webfrontend',
- ]:
- ensure => $ensure,
- }
-
- $proxypass = $passwords::ldap::production::proxypass
-
- apache::site { $ganglia_servername:
- content => template("ganglia/${ganglia_servername}.erb"),
- }
-
- file { '/var/cache/ganglia':
- ensure => ensure_directory($ensure),
- owner => 'www-data',
- group => 'www-data',
- mode => '0755',
- }
-
- file { '/etc/ganglia-webfrontend/conf.php':
- ensure => $ensure,
- mode => '0444',
- owner => 'root',
- group => 'root',
- content => template('ganglia/conf_production.php.erb'),
- require => Package['ganglia-webfrontend'],
- }
-
- file { "${doc_root}/robots.txt":
- ensure => $ensure,
- mode => '0444',
- owner => 'root',
- group => 'root',
- source => 'puppet:///modules/ganglia/robots.txt',
- require => Package['ganglia-webfrontend'],
- }
-
- # Increase the default memory limit
- file_line { 'php.ini-memory':
- line => 'memory_limit = 768M',
- match => '^memory_limit\s*=',
- path => '/etc/php5/apache2/php.ini',
- notify => Class['::apache'],
- }
- file_line { 'php.ini-opcache':
- line => 'opcache.enable=1',
- path => '/etc/php5/apache2/php.ini',
- notify => Class['::apache'],
- }
-
- # clean up after ganglia T97637
- tidy { 'cleanup_tmp_ganglia_graph':
- path => '/tmp',
- age => '1w',
- recurse => true,
- matches => ['ganglia-graph*'],
- type => 'mtime',
- }
-
- file { "${ganglia_webdir}/templates/default/user_header.tpl":
- ensure => $ensure,
- mode => '0444',
- owner => 'root',
- group => 'root',
- source => 'puppet:///modules/ganglia/user_header.tpl',
- require => Package['ganglia-webfrontend'],
- }
-}
diff --git a/modules/role/manifests/ganglia/views.pp
b/modules/role/manifests/ganglia/views.pp
deleted file mode 100644
index 02068d6..0000000
--- a/modules/role/manifests/ganglia/views.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class role::ganglia::views {
- include ganglia::views::dns
-}
diff --git a/modules/role/manifests/ganglia/web.pp
b/modules/role/manifests/ganglia/web.pp
deleted file mode 100644
index 76db02e..0000000
--- a/modules/role/manifests/ganglia/web.pp
+++ /dev/null
@@ -1,102 +0,0 @@
-# A role that includes all the needed stuff to run a ganglia web frontend
-class role::ganglia::web {
- include ::base::firewall
- include ::standard
- include role::ganglia::config
- include role::ganglia::views
-
- letsencrypt::cert::integrated { 'ganglia':
- subjects => 'ganglia.wikimedia.org',
- puppet_svc => 'apache2',
- system_svc => 'apache2',
- require => Class['apache::mod::ssl']
- }
-
- monitoring::service { 'https':
- description => 'HTTPS',
- check_command => 'check_ssl_http_letsencrypt!ganglia.wikimedia.org',
- }
-
- $gmetad_root = '/srv/ganglia'
- $rrd_rootdir = "${gmetad_root}/rrds"
- $gmetad_socket = '/var/run/rrdcached-gmetad.sock'
- $gweb_socket = '/var/run/rrdcached-gweb.sock'
-
- class { 'ganglia::gmetad::rrdcached':
- rrdpath => $rrd_rootdir,
- gmetad_socket => $gmetad_socket,
- # FIXME - top-scope var without namespace, will break in puppet 2.8
- # lint:ignore:variable_scope
- gweb_socket => $gwebsocket,
- # lint:endignore
- journal_dir => '/srv/rrdcached_journal',
- }
-
- # TODO: Automate the gmetad trusted hosts variable
- class { 'ganglia::gmetad':
- grid => 'Wikimedia',
- authority => 'http://ganglia.wikimedia.org',
- gmetad_root => $gmetad_root,
- rrd_rootdir => $rrd_rootdir,
- rrdcached_socket => $gmetad_socket,
- trusted_hosts => [
- '208.80.154.149', # bast1001
- '10.64.32.13', # terbium
- ],
- data_sources => $role::ganglia::config::data_sources,
- rra_sizes => $role::ganglia::config::rra_sizes,
- }
-
- class { '::ganglia::web':
- rrdcached_socket => $gweb_socket,
- gmetad_root => $gmetad_root,
- }
-
- ferm::service { 'ganglia_http':
- proto => 'tcp',
- port => '80',
- }
-
- ferm::service { 'ganglia_https':
- proto => 'tcp',
- port => '443',
- }
-
- ferm::service { 'gmond_udp':
- proto => 'udp',
- port => '8649',
- srange => '($PRODUCTION_NETWORKS $FRACK_NETWORKS)',
- }
-
- ferm::service { 'gmond_tcp':
- proto => 'tcp',
- port => '8649',
- srange => '($PRODUCTION_NETWORKS $FRACK_NETWORKS)',
- }
-
- ferm::service { 'gmetad_xml':
- proto => 'tcp',
- port => '8653',
- srange => '($PRODUCTION_NETWORKS $FRACK_NETWORKS)',
- }
-
- ferm::service { 'gmetad':
- proto => 'tcp',
- port => '8654',
- srange => '($PRODUCTION_NETWORKS $FRACK_NETWORKS)',
- }
-
- # Get better insight into how disks are faring
- ganglia::plugin::python { 'diskstat': }
-
- monitoring::service { 'ganglia_http':
- description => 'HTTP',
- check_command => 'check_http',
- }
- include ::profile::backup::host
- backup::set { 'var-lib-ganglia': }
- backup::set { 'srv-ganglia': }
-
- Class['ganglia::gmetad::rrdcached'] -> Class['::ganglia::gmetad']
- Class['ganglia::gmetad'] -> Class['::ganglia::web']
-}
--
To view, visit https://gerrit.wikimedia.org/r/382932
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0b0958cc1bb5966e56cee7198b17d8a8d573ae6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
