Dzahn has submitted this change and it was merged.
Change subject: icinga/ores: add check command definition, use nagios_common
......................................................................
icinga/ores: add check command definition, use nagios_common
Bug:T122830
Change-Id: Ib1d08ff2fdfa0a19f651511cb623bcbdd5daab9c
---
M modules/icinga/manifests/monitor/ores.pp
M modules/nagios_common/manifests/commands.pp
2 files changed, 2 insertions(+), 10 deletions(-)
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 8e21a53..d2f172a 100644
--- a/modules/icinga/manifests/monitor/ores.pp
+++ b/modules/icinga/manifests/monitor/ores.pp
@@ -12,20 +12,11 @@
contact_group => 'team-ores',
}
- # T121656
+ # T121656, T122830
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',
- }
-
}
diff --git a/modules/nagios_common/manifests/commands.pp
b/modules/nagios_common/manifests/commands.pp
index 639f2f7..d346435 100644
--- a/modules/nagios_common/manifests/commands.pp
+++ b/modules/nagios_common/manifests/commands.pp
@@ -46,6 +46,7 @@
'check_to_check_nagios_paging',
'check_ifstatus_nomon',
'check_bgp',
+ 'check_ores_workers',
] :
require => File["${config_dir}/commands"],
config_dir => $config_dir,
--
To view, visit https://gerrit.wikimedia.org/r/262673
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1d08ff2fdfa0a19f651511cb623bcbdd5daab9c
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[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
