Ottomata has submitted this change and it was merged.
Change subject: Wrap ganglia::plugin::python { 'diskstat': } in if !defined in
hadoop and kafka roles
......................................................................
Wrap ganglia::plugin::python { 'diskstat': } in if !defined in hadoop and kafka
roles
Change-Id: I419a4ca0eda85d2619cbe79f84da82e8fa971039
---
M manifests/role/analytics/hadoop.pp
M manifests/role/analytics/kafka.pp
2 files changed, 5 insertions(+), 6 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/analytics/hadoop.pp
b/manifests/role/analytics/hadoop.pp
index 9faa2b8..bdfb95b 100644
--- a/manifests/role/analytics/hadoop.pp
+++ b/manifests/role/analytics/hadoop.pp
@@ -260,7 +260,9 @@
}
# monitor disk statistics
- ganglia::plugin::python { 'diskstat': }
+ if !defined(Ganglia::Plugin::Python['diskstat']) {
+ ganglia::plugin::python { 'diskstat': }
+ }
# FairScheduler is creating event logs in hadoop.log.dir/fairscheduler/
# It rotates them but does not delete old ones. Set up cronjob to
diff --git a/manifests/role/analytics/kafka.pp
b/manifests/role/analytics/kafka.pp
index 1612922..a47e849 100644
--- a/manifests/role/analytics/kafka.pp
+++ b/manifests/role/analytics/kafka.pp
@@ -233,10 +233,7 @@
}
# monitor disk statistics
- ganglia::plugin::python { 'diskstat':
- # oof, this did not do what I thought it would:
- # + value = 'sdcsddsdesdfsdgsdhsdisdjsdksdl'
- # TODO: FIX THIS!
- # opts => { 'devices' => $log_disks },
+ if !defined(Ganglia::Plugin::Python['diskstat']) {
+ ganglia::plugin::python { 'diskstat': }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/146905
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I419a4ca0eda85d2619cbe79f84da82e8fa971039
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
