Andrew Bogott has submitted this change and it was merged.
Change subject: Tune up installation behavior for
/usr/lib/nagios/plugins/check_elasticsearch
......................................................................
Tune up installation behavior for /usr/lib/nagios/plugins/check_elasticsearch
Previously we were relying on a dependency error to install this
file only when icinga was installed.
Now that's managed by a virtual file def which is realized by
icinga.
Change-Id: I710c34fd73a37a601fc654b28f3920b57bd10bce
---
M manifests/misc/icinga.pp
M modules/elasticsearch/manifests/nagios/plugin.pp
2 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
Akosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 498e793..1638e3f 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -534,6 +534,7 @@
group => 'root',
mode => '0644';
}
+ File <| tag == nagiosplugin |>
# WMF custom service checks
file {
diff --git a/modules/elasticsearch/manifests/nagios/plugin.pp
b/modules/elasticsearch/manifests/nagios/plugin.pp
index bae826a..e611857 100644
--- a/modules/elasticsearch/manifests/nagios/plugin.pp
+++ b/modules/elasticsearch/manifests/nagios/plugin.pp
@@ -3,11 +3,12 @@
# include this class on your Nagios/Icinga node.
#
class elasticsearch::nagios::plugin {
- file { '/usr/lib/nagios/plugins/check_elasticsearch':
+ @file { '/usr/lib/nagios/plugins/check_elasticsearch':
source => 'puppet:///modules/elasticsearch/nagios/check_elasticsearch',
owner => 'root',
group => 'root',
mode => '0755',
require => Package['icinga'],
+ tag => 'nagiosplugin'
}
}
--
To view, visit https://gerrit.wikimedia.org/r/88507
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I710c34fd73a37a601fc654b28f3920b57bd10bce
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Akosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Manybubbles <never...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
