Dzahn has submitted this change and it was merged.

Change subject: icinga/ores: put homemade plugins into /usr/local/
......................................................................


icinga/ores: put homemade plugins into /usr/local/

Using the generic check command definition expects
commands to be put into the same place with commands from
the distro packages, which is not correct.

But then we have to use a file resource to add it explicitely.

tbh, the abstraction just makes it more complicated than before
in this case.

Change-Id: I7e2d374de21d6f3349ae6b960f8b556d2ec9b2bc
---
M modules/icinga/manifests/monitor/ores.pp
1 file changed, 9 insertions(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/icinga/manifests/monitor/ores.pp 
b/modules/icinga/manifests/monitor/ores.pp
index d2f172a..cd35537 100644
--- a/modules/icinga/manifests/monitor/ores.pp
+++ b/modules/icinga/manifests/monitor/ores.pp
@@ -12,11 +12,19 @@
         contact_group  => 'team-ores',
     }
 
-    # T121656, T122830
+    # T121656
     monitoring::service { 'ores_worker':
         description    => 'ORES worker',
         check_command  => 'check_ores_workers',
         host           => 'ores.wmflabs.org',
         contact_group  => 'team-ores',
     }
+
+    # T122830
+    file { '/usr/local/lib/nagios/plugins/check_ores_workers':
+        source => 
'puppet:///modules/nagios_common/check_commands/check_ores_workers',
+        owner  => 'icinga',
+        group  => 'icinga',
+        mode   => '0550',
+    }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/262677
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7e2d374de21d6f3349ae6b960f8b556d2ec9b2bc
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to