Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/364707 )
Change subject: monitoring: Simplify check_fqdn
......................................................................
monitoring: Simplify check_fqdn
We just want to make sure the FQDN matches the IP, which can be
translated to the HOSTNAME and HOSTADDRESS icinga macros instead of
being passed via parameters to icinga. Amend the code for that
Change-Id: I9d3b8957c65aa915fa070bb2875ac4773ce4fa91
---
M modules/monitoring/manifests/host.pp
M modules/nagios_common/files/checkcommands.cfg
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/modules/monitoring/manifests/host.pp
b/modules/monitoring/manifests/host.pp
index 4ff789b..2f76db3 100644
--- a/modules/monitoring/manifests/host.pp
+++ b/modules/monitoring/manifests/host.pp
@@ -122,7 +122,7 @@
monitoring::service { "dns_${title}.mgmt.${::site}.wmnet":
description => "DNS ${title}.mgmt.${::site}.wmnet",
host => "${title}.mgmt.${::site}.wmnet",
- check_command => "check_fqdn!${facts['ipmi_lan']['ipaddress']}",
+ check_command => 'check_fqdn',
group => 'mgmt',
check_interval => 60,
retry_interval => 60,
diff --git a/modules/nagios_common/files/checkcommands.cfg
b/modules/nagios_common/files/checkcommands.cfg
index f6ef2f6..a01fb98 100644
--- a/modules/nagios_common/files/checkcommands.cfg
+++ b/modules/nagios_common/files/checkcommands.cfg
@@ -62,7 +62,7 @@
define command {
command_name check_fqdn
- command_line $USER1$/check_dns -H $HOSTNAME$ -a $ARG1$
+ command_line $USER1$/check_dns -H $HOSTNAME$ -a $HOSTADDRESS$
}
# 'check_ftp' command definition
--
To view, visit https://gerrit.wikimedia.org/r/364707
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9d3b8957c65aa915fa070bb2875ac4773ce4fa91
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
