Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178405
Change subject: ganglia: drop the "gmond" Service index
......................................................................
ganglia: drop the "gmond" Service index
Now that gmond is ganglia-monitor everywhere, drop the alias => gmond
from both ganglia and ganglia_new and adjust all call sites to notify
Service['ganglia-monitor'] instead of Service['gmond'].
Change-Id: If5dff9bd3f2032998a4712cb6d11a8e061874fe7
---
M manifests/ganglia.pp
M manifests/misc/monitoring.pp
M manifests/misc/udp2log.pp
M manifests/role/ci.pp
M modules/apache/manifests/monitoring.pp
M modules/authdns/manifests/ganglia.pp
M modules/elasticsearch/manifests/ganglia.pp
M modules/eventlogging/manifests/monitoring.pp
M modules/ganglia_new/manifests/monitor/service.pp
M modules/hhvm/manifests/monitoring.pp
M modules/memcached/manifests/ganglia.pp
M modules/memcached/manifests/monitoring.pp
M modules/mysql_wmf/manifests/coredb/ganglia.pp
M modules/mysql_wmf/manifests/ganglia.pp
M modules/osm/manifests/ganglia.pp
M modules/postgresql/manifests/ganglia.pp
M modules/redis/manifests/ganglia.pp
M modules/varnish/manifests/monitoring/ganglia.pp
M modules/varnish/manifests/monitoring/ganglia/vhtcpd.pp
19 files changed, 38 insertions(+), 40 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/178405/1
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 1c96d60..0c624ee 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -201,7 +201,6 @@
subscribe => File['/etc/ganglia/gmond.conf'],
hasstatus => false,
pattern => 'gmond',
- alias => 'gmond',
}
group { 'gmetric':
diff --git a/manifests/misc/monitoring.pp b/manifests/misc/monitoring.pp
index 2b58bf4..bb3a3d5 100644
--- a/manifests/misc/monitoring.pp
+++ b/manifests/misc/monitoring.pp
@@ -5,7 +5,7 @@
File {
require => File['/usr/lib/ganglia/python_modules'],
- notify => Service['gmond']
+ notify => Service['ganglia-monitor']
}
# Ganglia
@@ -35,7 +35,7 @@
# owner => 'root',
# group => 'root',
# mode => '0444',
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
ensure => absent;
# require => File["/etc/ganglia/conf.d"],
# source => "puppet:///files/ganglia/plugins/htcpseqcheck.pyconf";
@@ -53,14 +53,14 @@
mode => '0444',
source => 'puppet:///files/ganglia/plugins/udp_stats.py',
require => File['/usr/lib/ganglia/python_modules'],
- notify => Service['gmond'];
+ notify => Service['ganglia-monitor'];
'/etc/ganglia/conf.d/udp_stats.pyconf':
owner => 'root',
group => 'root',
mode => '0444',
source => 'puppet:///files/ganglia/plugins/udp_stats.pyconf',
require => File['/usr/lib/ganglia/python_modules/udp_stats.py'],
- notify => Service['gmond'];
+ notify => Service['ganglia-monitor'];
}
}
diff --git a/manifests/misc/udp2log.pp b/manifests/misc/udp2log.pp
index 44b3f8b..052ef13 100644
--- a/manifests/misc/udp2log.pp
+++ b/manifests/misc/udp2log.pp
@@ -355,7 +355,7 @@
mode => '0444',
source => 'puppet:///files/ganglia/plugins/udp2log_socket.py',
require => File['/usr/lib/ganglia/python_modules'],
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
}
file { '/etc/ganglia/conf.d/udp2log_socket.pyconf':
@@ -364,7 +364,7 @@
mode => '0444',
source => 'puppet:///files/ganglia/plugins/udp2log_socket.pyconf',
require => File['/usr/lib/ganglia/python_modules/udp2log_socket.py'],
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
}
# include general UDP statistic monitoring.
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index 6492f15..2a742c9 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -96,7 +96,7 @@
owner => 'root',
group => 'root',
mode => '0444',
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
}
file { '/etc/ganglia/conf.d/jenkins.pyconf':
@@ -107,7 +107,7 @@
owner => 'root',
group => 'root',
mode => '0444',
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
}
}
diff --git a/modules/apache/manifests/monitoring.pp
b/modules/apache/manifests/monitoring.pp
index 65f7e50..ce7f5e9 100644
--- a/modules/apache/manifests/monitoring.pp
+++ b/modules/apache/manifests/monitoring.pp
@@ -35,7 +35,7 @@
group => 'root',
mode => '0444',
require => File['/usr/lib/ganglia/python_modules/apache_status.py'],
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
}
file { '/usr/local/bin/apache-status':
diff --git a/modules/authdns/manifests/ganglia.pp
b/modules/authdns/manifests/ganglia.pp
index 4a8ea73..bfe193f 100644
--- a/modules/authdns/manifests/ganglia.pp
+++ b/modules/authdns/manifests/ganglia.pp
@@ -10,7 +10,7 @@
group => 'root',
mode => '0444',
source => "puppet:///modules/${module_name}/ganglia/ganglia_gdnsd.py",
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
}
file { '/etc/ganglia/conf.d/gdnsd.pyconf':
@@ -19,6 +19,6 @@
group => 'root',
mode => '0444',
source => "puppet:///modules/${module_name}/ganglia/gdnsd.pyconf",
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
}
}
diff --git a/modules/elasticsearch/manifests/ganglia.pp
b/modules/elasticsearch/manifests/ganglia.pp
index 953a752..ad0ead1 100644
--- a/modules/elasticsearch/manifests/ganglia.pp
+++ b/modules/elasticsearch/manifests/ganglia.pp
@@ -4,13 +4,13 @@
group => root,
mode => '0444',
source =>
'puppet:///modules/elasticsearch/ganglia/elasticsearch.pyconf',
- notify => Service['gmond'];
+ notify => Service['ganglia-monitor'];
}
file { '/usr/lib/ganglia/python_modules/elasticsearch_monitoring.py':
owner => root,
group => root,
mode => '0444',
source =>
'puppet:///modules/elasticsearch/ganglia/elasticsearch_monitoring.py',
- notify => Service['gmond'];
+ notify => Service['ganglia-monitor'];
}
}
diff --git a/modules/eventlogging/manifests/monitoring.pp
b/modules/eventlogging/manifests/monitoring.pp
index 127be9b..ede297b 100644
--- a/modules/eventlogging/manifests/monitoring.pp
+++ b/modules/eventlogging/manifests/monitoring.pp
@@ -17,7 +17,7 @@
ensure => present,
source => 'puppet:///modules/eventlogging/eventlogging_mon.pyconf',
require => File['/usr/lib/ganglia/python_modules/eventlogging_mon.py'],
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
}
file { '/usr/lib/nagios/plugins/check_eventlogging_jobs':
@@ -29,9 +29,9 @@
# to determine which endpoints to monitor, so if the contents
# of that directory change, the module should be restarted.
- Eventlogging::Service::Multiplexer <| |> ~> Service['gmond']
- Eventlogging::Service::Processor <| |> ~> Service['gmond']
- Eventlogging::Service::Reporter <| |> ~> Service['gmond']
+ Eventlogging::Service::Multiplexer <| |> ~> Service['ganglia-monitor']
+ Eventlogging::Service::Processor <| |> ~> Service['ganglia-monitor']
+ Eventlogging::Service::Reporter <| |> ~> Service['ganglia-monitor']
}
diff --git a/modules/ganglia_new/manifests/monitor/service.pp
b/modules/ganglia_new/manifests/monitor/service.pp
index 77bebbb..96e79b5 100644
--- a/modules/ganglia_new/manifests/monitor/service.pp
+++ b/modules/ganglia_new/manifests/monitor/service.pp
@@ -13,7 +13,6 @@
service { 'ganglia-monitor':
ensure => running,
require => File['/etc/init/ganglia-monitor.conf'],
- alias => 'gmond',
provider => upstart,
}
}
diff --git a/modules/hhvm/manifests/monitoring.pp
b/modules/hhvm/manifests/monitoring.pp
index 8985ae4..f5ae0ea 100644
--- a/modules/hhvm/manifests/monitoring.pp
+++ b/modules/hhvm/manifests/monitoring.pp
@@ -21,7 +21,7 @@
group => 'root',
mode => '0444',
require => File['/usr/lib/ganglia/python_modules/hhvm_mem.py'],
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
}
@@ -41,6 +41,6 @@
group => 'root',
mode => '0444',
require => File['/usr/lib/ganglia/python_modules/hhvm_health.py'],
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
}
}
diff --git a/modules/memcached/manifests/ganglia.pp
b/modules/memcached/manifests/ganglia.pp
index 152e51c..82a6df2 100644
--- a/modules/memcached/manifests/ganglia.pp
+++ b/modules/memcached/manifests/ganglia.pp
@@ -13,7 +13,7 @@
mode => '0444',
source =>
"puppet:///modules/${module_name}/ganglia/gmond_memcached.py",
require => File['/usr/lib/ganglia/python_modules'],
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
}
file { '/usr/lib/ganglia/python_modules/memcached.pyconf':
ensure => absent,
@@ -24,6 +24,6 @@
mode => '0444',
source =>
"puppet:///modules/${module_name}/ganglia/gmond_memcached.pyconf",
require => File['/usr/lib/ganglia/python_modules/gmond_memcached.py'],
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
}
}
diff --git a/modules/memcached/manifests/monitoring.pp
b/modules/memcached/manifests/monitoring.pp
index d91b40d..ca2ce0d 100644
--- a/modules/memcached/manifests/monitoring.pp
+++ b/modules/memcached/manifests/monitoring.pp
@@ -12,7 +12,7 @@
mode => '0444',
before => File['/etc/ganglia/conf.d/memcached.pyconf'],
require => Package['ganglia-monitor'],
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
}
file { '/etc/ganglia/conf.d/memcached.pyconf':
@@ -21,6 +21,6 @@
group => 'root',
mode => '0444',
require => Package['ganglia-monitor'],
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
}
}
diff --git a/modules/mysql_wmf/manifests/coredb/ganglia.pp
b/modules/mysql_wmf/manifests/coredb/ganglia.pp
index de2918c..1bf83a7 100644
--- a/modules/mysql_wmf/manifests/coredb/ganglia.pp
+++ b/modules/mysql_wmf/manifests/coredb/ganglia.pp
@@ -17,7 +17,7 @@
file { '/usr/lib/ganglia/python_modules/DBUtil.py':
require => File['/usr/lib/ganglia/python_modules'],
source => 'puppet:///modules/mysql_wmf/ganglia/plugins/DBUtil.py',
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
owner => 'root',
group => 'root',
mode => '0644',
@@ -25,7 +25,7 @@
file { '/usr/lib/ganglia/python_modules/mysql.py':
require => File['/usr/lib/ganglia/python_modules'],
source => 'puppet:///modules/mysql_wmf/ganglia/plugins/mysql.py',
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
owner => 'root',
group => 'root',
mode => '0644',
@@ -33,7 +33,7 @@
file{ '/etc/ganglia/conf.d/mysql.pyconf':
require => File['/usr/lib/ganglia/python_modules'],
content => template('mysql_wmf/mysql.pyconf.erb'),
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
owner => 'root',
group => 'root',
mode => '0644',
diff --git a/modules/mysql_wmf/manifests/ganglia.pp
b/modules/mysql_wmf/manifests/ganglia.pp
index fa35494..326b5bf 100644
--- a/modules/mysql_wmf/manifests/ganglia.pp
+++ b/modules/mysql_wmf/manifests/ganglia.pp
@@ -38,7 +38,7 @@
file { '/usr/lib/ganglia/python_modules/DBUtil.py':
require => File['/usr/lib/ganglia/python_modules'],
source => 'puppet:///modules/mysql_wmf/ganglia/plugins/DBUtil.py',
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
owner => 'root',
group => 'root',
mode => '0644',
@@ -46,7 +46,7 @@
file { '/usr/lib/ganglia/python_modules/mysql.py':
require => File['/usr/lib/ganglia/python_modules'],
source => 'puppet:///modules/mysql_wmf/ganglia/plugins/mysql.py',
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
owner => 'root',
group => 'root',
mode => '0644',
@@ -54,7 +54,7 @@
file { '/etc/ganglia/conf.d/mysql.pyconf':
require => File['/usr/lib/ganglia/python_modules'],
content => template('mysql_wmf/mysql.pyconf.erb'),
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
owner => 'root',
group => 'root',
mode => '0644',
diff --git a/modules/osm/manifests/ganglia.pp b/modules/osm/manifests/ganglia.pp
index 8216d02..56c1aa8 100644
--- a/modules/osm/manifests/ganglia.pp
+++ b/modules/osm/manifests/ganglia.pp
@@ -12,7 +12,7 @@
group => 'root',
mode => '0444',
source => "puppet:///modules/${module_name}/ganglia/osm.py",
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
}
file { '/etc/ganglia/conf.d/osm.pyconf':
@@ -21,6 +21,6 @@
group => 'root',
mode => '0444',
content => template('osm/ganglia/osm.pyconf.erb'),
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
}
}
diff --git a/modules/postgresql/manifests/ganglia.pp
b/modules/postgresql/manifests/ganglia.pp
index 2326f83..00d0dc6 100644
--- a/modules/postgresql/manifests/ganglia.pp
+++ b/modules/postgresql/manifests/ganglia.pp
@@ -21,7 +21,7 @@
group => 'root',
mode => '0444',
source => "puppet:///modules/${module_name}/ganglia/postgresql.py",
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
}
file { '/etc/ganglia/conf.d/postgresql.pyconf':
@@ -30,6 +30,6 @@
group => 'root',
mode => '0444',
content => template('postgresql/ganglia/postgresql.pyconf.erb'),
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
}
}
diff --git a/modules/redis/manifests/ganglia.pp
b/modules/redis/manifests/ganglia.pp
index 367781e..b1e4192 100644
--- a/modules/redis/manifests/ganglia.pp
+++ b/modules/redis/manifests/ganglia.pp
@@ -8,13 +8,13 @@
group => 'root',
mode => '0444',
content => template('redis/redis.pyconf.erb'),
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
}
file { '/usr/lib/ganglia/python_modules/redis_monitoring.py':
owner => 'root',
group => 'root',
mode => '0444',
source => 'puppet:///modules/redis/ganglia/redis_monitoring.py',
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
}
}
diff --git a/modules/varnish/manifests/monitoring/ganglia.pp
b/modules/varnish/manifests/monitoring/ganglia.pp
index be07a6c..e474004 100644
--- a/modules/varnish/manifests/monitoring/ganglia.pp
+++ b/modules/varnish/manifests/monitoring/ganglia.pp
@@ -22,7 +22,7 @@
path => '/bin:/usr/bin',
unless => 'diff -q varnish.pyconf.new varnish.pyconf && rm
varnish.pyconf.new',
command => 'mv varnish.pyconf.new varnish.pyconf',
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
}
file { '/usr/local/sbin/check-gmond-restart':
diff --git a/modules/varnish/manifests/monitoring/ganglia/vhtcpd.pp
b/modules/varnish/manifests/monitoring/ganglia/vhtcpd.pp
index 4213430..8154651 100644
--- a/modules/varnish/manifests/monitoring/ganglia/vhtcpd.pp
+++ b/modules/varnish/manifests/monitoring/ganglia/vhtcpd.pp
@@ -4,13 +4,13 @@
owner => 'root',
group => 'root',
mode => '0444',
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
}
file { '/etc/ganglia/conf.d/vhtcpd.pyconf':
owner => 'root',
group => 'root',
mode => '0444',
content => template("${module_name}/ganglia/vhtcpd.pyconf.erb"),
- notify => Service['gmond'],
+ notify => Service['ganglia-monitor'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/178405
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If5dff9bd3f2032998a4712cb6d11a8e061874fe7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
