Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226072
Change subject: misc::udp2log: use ganglia::plugins::python everywhere
......................................................................
misc::udp2log: use ganglia::plugins::python everywhere
Change-Id: I89e5c067904da1fd2eec2089a83fef176e3407b0
---
M manifests/misc/udp2log.pp
R modules/ganglia/templates/plugins/udp2log_socket.pyconf.erb
2 files changed, 1 insertion(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/72/226072/1
diff --git a/manifests/misc/udp2log.pp b/manifests/misc/udp2log.pp
index 5bfd9f7..4bd1722 100644
--- a/manifests/misc/udp2log.pp
+++ b/manifests/misc/udp2log.pp
@@ -377,26 +377,8 @@
}
# send udp2log socket stats to ganglia.
- file { '/usr/lib/ganglia/python_modules/udp2log_socket.py':
- owner => 'root',
- group => 'root',
- mode => '0444',
- source => 'puppet:///files/ganglia/plugins/udp2log_socket.py',
- require => File['/usr/lib/ganglia/python_modules'],
- notify => Service['ganglia-monitor'],
- }
-
- file { '/etc/ganglia/conf.d/udp2log_socket.pyconf':
- owner => 'root',
- group => 'root',
- mode => '0444',
- source => 'puppet:///files/ganglia/plugins/udp2log_socket.pyconf',
- require => File['/usr/lib/ganglia/python_modules/udp2log_socket.py'],
- notify => Service['ganglia-monitor'],
- }
-
# include general UDP statistic monitoring.
- ganglia::plugin::python{ 'udp_stats': }
+ ganglia::plugin::python{ ['udp_stats', 'udp2log_socket']: }
}
class misc::udp2log::firewall {
diff --git a/modules/ganglia/files/plugins/udp2log_socket.pyconf
b/modules/ganglia/templates/plugins/udp2log_socket.pyconf.erb
similarity index 100%
rename from modules/ganglia/files/plugins/udp2log_socket.pyconf
rename to modules/ganglia/templates/plugins/udp2log_socket.pyconf.erb
--
To view, visit https://gerrit.wikimedia.org/r/226072
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I89e5c067904da1fd2eec2089a83fef176e3407b0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
