Faidon Liambotis has submitted this change and it was merged.
Change subject: Revert "monitoring: add config class"
......................................................................
Revert "monitoring: add config class"
This reverts commit 6a79118623d15560ca58ecb1fac6ea2a41346a63.
The
Class['monitoring::configuration'] -> Monitoring::Host <| |>
Class['monitoring::configuration'] -> Monitoring::Service <| |>
Class['monitoring::configuration'] -> Monitoring::Group <| |>
syntax does not just create a dependency but also realizes all exported
resources.
As the class gets included on every host (via base::monitoring::host),
this means that every single host realizes exported resources and writes
Nagios configuration files to /etc/nagios.
Revert for now, until a better solution is found.
Change-Id: I5754ac714ee204e8f07d443ccd94ada5769120a6
---
M hieradata/hosts/analytics1009.yaml
M hieradata/hosts/analytics1026.yaml
M hieradata/hosts/analytics1027.yaml
M hieradata/hosts/searchidx1001.yaml
M hieradata/mainrole/analytics_hadoop_master.yaml
M hieradata/mainrole/analytics_hadoop_standby.yaml
M hieradata/mainrole/analytics_hadoop_worker.yaml
M hieradata/mainrole/analytics_kafka.yaml
M hieradata/mainrole/analytics_zookeeper.yaml
M hieradata/mainrole/swift_proxy_codfw.yaml
M hieradata/mainrole/swift_storage.yaml
M hieradata/regex.yaml
M modules/base/manifests/monitoring/host.pp
D modules/monitoring/manifests/configuration.pp
M modules/monitoring/manifests/group.pp
M modules/monitoring/manifests/host.pp
M modules/monitoring/manifests/service.pp
17 files changed, 22 insertions(+), 35 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/hosts/analytics1009.yaml
b/hieradata/hosts/analytics1009.yaml
index 8c884a3..2501ef9 100644
--- a/hieradata/hosts/analytics1009.yaml
+++ b/hieradata/hosts/analytics1009.yaml
@@ -1,2 +1,2 @@
-monitoring::configuration::group: analytics_eqiad
+nagios_group: analytics_eqiad
cluster: analytics
diff --git a/hieradata/hosts/analytics1026.yaml
b/hieradata/hosts/analytics1026.yaml
index 8c884a3..2501ef9 100644
--- a/hieradata/hosts/analytics1026.yaml
+++ b/hieradata/hosts/analytics1026.yaml
@@ -1,2 +1,2 @@
-monitoring::configuration::group: analytics_eqiad
+nagios_group: analytics_eqiad
cluster: analytics
diff --git a/hieradata/hosts/analytics1027.yaml
b/hieradata/hosts/analytics1027.yaml
index 8c884a3..2501ef9 100644
--- a/hieradata/hosts/analytics1027.yaml
+++ b/hieradata/hosts/analytics1027.yaml
@@ -1,2 +1,2 @@
-monitoring::configuration::group: analytics_eqiad
+nagios_group: analytics_eqiad
cluster: analytics
diff --git a/hieradata/hosts/searchidx1001.yaml
b/hieradata/hosts/searchidx1001.yaml
index f441268..465b455 100644
--- a/hieradata/hosts/searchidx1001.yaml
+++ b/hieradata/hosts/searchidx1001.yaml
@@ -1,2 +1,2 @@
-monitoring::configuration::group: lucene
+nagios_group: lucene
cluster: search
diff --git a/hieradata/mainrole/analytics_hadoop_master.yaml
b/hieradata/mainrole/analytics_hadoop_master.yaml
index 9558e10..288dde3 100644
--- a/hieradata/mainrole/analytics_hadoop_master.yaml
+++ b/hieradata/mainrole/analytics_hadoop_master.yaml
@@ -1,4 +1,4 @@
-monitoring::configuration::group: analytics_eqiad
+nagios_group: analytics_eqiad
cluster: analytics
diff --git a/hieradata/mainrole/analytics_hadoop_standby.yaml
b/hieradata/mainrole/analytics_hadoop_standby.yaml
index 9558e10..288dde3 100644
--- a/hieradata/mainrole/analytics_hadoop_standby.yaml
+++ b/hieradata/mainrole/analytics_hadoop_standby.yaml
@@ -1,4 +1,4 @@
-monitoring::configuration::group: analytics_eqiad
+nagios_group: analytics_eqiad
cluster: analytics
diff --git a/hieradata/mainrole/analytics_hadoop_worker.yaml
b/hieradata/mainrole/analytics_hadoop_worker.yaml
index 9558e10..288dde3 100644
--- a/hieradata/mainrole/analytics_hadoop_worker.yaml
+++ b/hieradata/mainrole/analytics_hadoop_worker.yaml
@@ -1,4 +1,4 @@
-monitoring::configuration::group: analytics_eqiad
+nagios_group: analytics_eqiad
cluster: analytics
diff --git a/hieradata/mainrole/analytics_kafka.yaml
b/hieradata/mainrole/analytics_kafka.yaml
index 49cb63b..d002fc6 100644
--- a/hieradata/mainrole/analytics_kafka.yaml
+++ b/hieradata/mainrole/analytics_kafka.yaml
@@ -1,2 +1,2 @@
cluster: analytics_kafka
-monitoring::configuration::group: analytics_eqiad
+nagios_group: analytics_eqiad
diff --git a/hieradata/mainrole/analytics_zookeeper.yaml
b/hieradata/mainrole/analytics_zookeeper.yaml
index a4d6bea..cf8dfea 100644
--- a/hieradata/mainrole/analytics_zookeeper.yaml
+++ b/hieradata/mainrole/analytics_zookeeper.yaml
@@ -1,2 +1,2 @@
cluster: analytics
-monitoring::configuration::group: analytics_eqiad
+nagios_group: analytics_eqiad
diff --git a/hieradata/mainrole/swift_proxy_codfw.yaml
b/hieradata/mainrole/swift_proxy_codfw.yaml
index 0c0f925..1a0ed89 100644
--- a/hieradata/mainrole/swift_proxy_codfw.yaml
+++ b/hieradata/mainrole/swift_proxy_codfw.yaml
@@ -1,4 +1,4 @@
cluster: swift
-monitoring::configuration::group: swift
+nagios_group: swift
lvs::realserver::realserver_ips:
- '10.2.1.27'
diff --git a/hieradata/mainrole/swift_storage.yaml
b/hieradata/mainrole/swift_storage.yaml
index 683d794..21bef47 100644
--- a/hieradata/mainrole/swift_storage.yaml
+++ b/hieradata/mainrole/swift_storage.yaml
@@ -1,2 +1,2 @@
cluster: swift
-monitoring::configuration::group: swift
+nagios_group: swift
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 8a4d6a6..4b54c6a 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -63,22 +63,22 @@
swift_fe_eqiad:
__regex: !ruby/regexp /^ms-fe100[1-4]\.eqiad\.wmnet$/
cluster: swift
- monitoring::configuration::group: swift
+ nagios_group: swift
swift_be_eqiad:
__regex: !ruby/regexp /^ms-be10[0-9][0-9]\.eqiad\.wmnet$/
cluster: swift
- monitoring::configuration::group: swift
+ nagios_group: swift
swift_fe_esams:
__regex: !ruby/regexp /^ms-fe300[1-2]\.esams\.wmnet$/
cluster: swift
- monitoring::configuration::group: swift
+ nagios_group: swift
swift_be_esams:
__regex: !ruby/regexp /^ms-be300[1-4]\.esams\.wmnet$/
cluster: swift
- monitoring::configuration::group: swift
+ nagios_group: swift
swift_fe_codfw:
__regex: !ruby/regexp /^ms-fe200[1-4]\.codfw\.wmnet$/
@@ -103,7 +103,7 @@
lsearchd:
__regex: !ruby/regexp /^search10[0-2][0-9]\.eqiad\.wmnet$/
cluster: search
- monitoring::configuration::group: lucene
+ nagios_group: lucene
rcs_eqiad:
__regex: !ruby/regexp /^rcs100[0-9]\.eqiad\.wmnet/
diff --git a/modules/base/manifests/monitoring/host.pp
b/modules/base/manifests/monitoring/host.pp
index 34bbc9e..8a88689 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -18,7 +18,6 @@
#
class base::monitoring::host($contact_group = 'admins') {
include base::puppet::params # In order to be able to use some variables
- require monitoring::configuration # a couple of defines needed by
monitoring
monitoring::host { $::hostname:
contact_group => $contact_group
diff --git a/modules/monitoring/manifests/configuration.pp
b/modules/monitoring/manifests/configuration.pp
deleted file mode 100644
index 84c45c9..0000000
--- a/modules/monitoring/manifests/configuration.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-# === Class monitoring::configuration
-#
-# Class for common parameters for the monitoring classes and defines
-#
-class monitoring::configuration (
- $dir = '/etc/nagios',
- $group = "${cluster}_${::site}",
- ) {
-}
-Class['monitoring::configuration'] -> Monitoring::Host <| |>
-Class['monitoring::configuration'] -> Monitoring::Service <| |>
-Class['monitoring::configuration'] -> Monitoring::Group <| |>
diff --git a/modules/monitoring/manifests/group.pp
b/modules/monitoring/manifests/group.pp
index 4731c04..d13094b 100644
--- a/modules/monitoring/manifests/group.pp
+++ b/modules/monitoring/manifests/group.pp
@@ -13,7 +13,7 @@
define monitoring::group (
$description,
$ensure=present,
- $config_dir = $::monitoring::configuration::dir,
+ $config_dir = '/etc/nagios'
) {
# Nagios hostgroup instance
nagios_hostgroup { $title:
diff --git a/modules/monitoring/manifests/host.pp
b/modules/monitoring/manifests/host.pp
index 690f8ca..00df8d6 100644
--- a/modules/monitoring/manifests/host.pp
+++ b/modules/monitoring/manifests/host.pp
@@ -3,7 +3,7 @@
#
define monitoring::host (
$ip_address = $::ipaddress,
- $group = $monitoring::configuration::group,
+ $group = hiera('nagios_group', "${cluster}_${::site}"),
$ensure = present,
$critical = 'false',
$contact_group = 'admins'
@@ -25,7 +25,7 @@
# Export the nagios host instance
@@nagios_host { $title:
ensure => $ensure,
- target =>
"${::monitoring::configuration::dir}/puppet_hosts.cfg",
+ target => "/etc/nagios/puppet_hosts.cfg",
host_name => $title,
address => $ip_address,
hostgroups => $hostgroup,
@@ -50,7 +50,7 @@
# Couple it with some hostextinfo
@@nagios_hostextinfo { $title:
ensure => $ensure,
- target =>
"${::monitoring::configuration::dir}/puppet_hostextinfo.cfg",
+ target => "/etc/nagios/puppet_hostextinfo.cfg",
host_name => $title,
notes => $title,
icon_image => "${image}.png",
diff --git a/modules/monitoring/manifests/service.pp
b/modules/monitoring/manifests/service.pp
index f2fdc52..a2bab62 100644
--- a/modules/monitoring/manifests/service.pp
+++ b/modules/monitoring/manifests/service.pp
@@ -3,7 +3,7 @@
$check_command,
$host = $::hostname,
$retries = 3,
- $group = $monitoring::configuration::group,
+ $group = hiera('nagios_group', "${cluster}_${::site}"),
$ensure = present,
$critical = 'false',
$passive = 'false',
@@ -11,7 +11,7 @@
$normal_check_interval = 1,
$retry_check_interval = 1,
$contact_group = 'admins',
- $config_dir = $monitoring::configuration::dir,
+ $config_dir = '/etc/nagios',
)
{
if ! $host {
--
To view, visit https://gerrit.wikimedia.org/r/178392
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5754ac714ee204e8f07d443ccd94ada5769120a6
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
