Giuseppe Lavagetto has submitted this change and it was merged. Change subject: Don't include ::diamond in apache::monitoring ......................................................................
Don't include ::diamond in apache::monitoring It's not needed; the `diamond::collector` resource can be declared without it. Keeping it in leads to a duplicate definition error on labs. Change-Id: I6f9b7ab038aba09409f7cfe050142282fb3447e1 --- M modules/apache/manifests/monitoring.pp 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/apache/manifests/monitoring.pp b/modules/apache/manifests/monitoring.pp index 5185615..e9e1b56 100644 --- a/modules/apache/manifests/monitoring.pp +++ b/modules/apache/manifests/monitoring.pp @@ -7,7 +7,6 @@ # class apache::monitoring { include ::apache::mod::status - include ::diamond include ::ganglia diamond::collector { 'Httpd': } -- To view, visit https://gerrit.wikimedia.org/r/152943 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6f9b7ab038aba09409f7cfe050142282fb3447e1 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavis <bda...@wikimedia.org> Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org> Gerrit-Reviewer: Rush <r...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits