Faidon has submitted this change and it was merged.
Change subject: Rename 'redis.py' to 'redis_monitoring.py' to avoid conflict
......................................................................
Rename 'redis.py' to 'redis_monitoring.py' to avoid conflict
Ganglia appends the metric module path ('/usr/lib/ganglia/python_modules') to
PYTHONPATH, meaning modules in the standard system location take precedence
over metric modules in cases where the names conflict. This patch renames the
metric module to 'redis_monitoring' to avoid conflict with pyredis.
Bug: 52540
Change-Id: I480198ce08043816ccfd187be7a2c1493ed34dce
---
R modules/redis/files/ganglia/redis_monitoring.py
M modules/redis/manifests/ganglia.pp
M modules/redis/templates/redis.pyconf.erb
3 files changed, 9 insertions(+), 3 deletions(-)
Approvals:
Ori.livneh: Looks good to me, but someone else must approve
Tim Landscheidt: Looks good to me, but someone else must approve
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/redis/files/ganglia/redis.py
b/modules/redis/files/ganglia/redis_monitoring.py
similarity index 100%
rename from modules/redis/files/ganglia/redis.py
rename to modules/redis/files/ganglia/redis_monitoring.py
diff --git a/modules/redis/manifests/ganglia.pp
b/modules/redis/manifests/ganglia.pp
index 9680dea..0af5c34 100644
--- a/modules/redis/manifests/ganglia.pp
+++ b/modules/redis/manifests/ganglia.pp
@@ -9,11 +9,17 @@
mode => 0444,
content => template('redis/redis.pyconf.erb'),
notify => Service[gmond];
- '/usr/lib/ganglia/python_modules/redis.py':
+ }
+ file { '/usr/lib/ganglia/python_modules/redis_monitoring.py':
owner => root,
group => root,
mode => 0444,
- source => 'puppet:///modules/redis/ganglia/redis.py',
+ source =>
'puppet:///modules/redis/ganglia/redis_monitoring.py',
notify => Service[gmond];
}
+
+ # redis_monitoring.py was called redis.py before, cleanup
+ file { '/usr/lib/ganglia/python_modules/redis.py':
+ ensure => absent,
+ }
}
diff --git a/modules/redis/templates/redis.pyconf.erb
b/modules/redis/templates/redis.pyconf.erb
index e105a7b..256c0bc 100644
--- a/modules/redis/templates/redis.pyconf.erb
+++ b/modules/redis/templates/redis.pyconf.erb
@@ -1,6 +1,6 @@
modules {
module {
- name = "redis"
+ name = "redis_monitoring"
language = "python"
param host { value = "127.0.0.1" }
param port { value = 6379 }
--
To view, visit https://gerrit.wikimedia.org/r/77657
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I480198ce08043816ccfd187be7a2c1493ed34dce
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Faidon <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Tim Landscheidt <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
