[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: normal_check_interval => check_interval
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: icinga: normal_check_interval => check_interval
..
icinga: normal_check_interval => check_interval
The directive has changed name in newer versions and the former is
deprecated
Change-Id: I0c429861b54ca5f45fcfc06890d9a892d9aeb69b
---
M modules/admin/files/home/akosiaris/.vim/syntax/nagios.vim
M modules/icinga/manifests/init.pp
M modules/icinga/manifests/monitor/checkpaging.pp
M modules/icinga/manifests/monitor/legal.pp
M modules/icinga/manifests/monitor/ripeatlas.pp
M modules/icinga/manifests/monitor/wikidata.pp
M modules/monitoring/manifests/graphite_anomaly.pp
M modules/monitoring/manifests/graphite_threshold.pp
M modules/monitoring/manifests/service.pp
M modules/role/manifests/mediawiki/common.pp
10 files changed, 99 insertions(+), 99 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/modules/admin/files/home/akosiaris/.vim/syntax/nagios.vim
b/modules/admin/files/home/akosiaris/.vim/syntax/nagios.vim
index 650b1a4..76571eb 100644
--- a/modules/admin/files/home/akosiaris/.vim/syntax/nagios.vim
+++ b/modules/admin/files/home/akosiaris/.vim/syntax/nagios.vim
@@ -67,7 +67,7 @@
syn keyword nagiosDirective contained host_notification_period hostgroup_name
servicegroup_name hostgroups servicegroups
syn keyword nagiosDirective contained is_volatile last_notification
syn keyword nagiosDirective contained low_flap_threshold max_check_attempts
-syn keyword nagiosDirective contained members monday normal_check_interval
+syn keyword nagiosDirective contained members monday check_interval
syn keyword nagiosDirective contained notification_failure_criteria
notification_failure_options
syn keyword nagiosDirective contained notification_interval
notification_options
syn keyword nagiosDirective contained notification_period notifications_enabled
diff --git a/modules/icinga/manifests/init.pp b/modules/icinga/manifests/init.pp
index 518fc20..8cb01f1 100644
--- a/modules/icinga/manifests/init.pp
+++ b/modules/icinga/manifests/init.pp
@@ -163,9 +163,9 @@
# Check that the icinga config is sane
monitoring::service { 'check_icinga_config':
-description => 'Check correctness of the icinga
configuration',
-check_command => 'check_icinga_config',
-normal_check_interval => 10,
+description=> 'Check correctness of the icinga configuration',
+check_command => 'check_icinga_config',
+check_interval => 10,
}
# script to schedule host downtimes
diff --git a/modules/icinga/manifests/monitor/checkpaging.pp
b/modules/icinga/manifests/monitor/checkpaging.pp
index 23c2626..ffe7d62 100644
--- a/modules/icinga/manifests/monitor/checkpaging.pp
+++ b/modules/icinga/manifests/monitor/checkpaging.pp
@@ -4,11 +4,11 @@
# is working properly
class icinga::monitor::checkpaging {
monitoring::service { 'check_to_check_nagios_paging':
-description => 'check_to_check_nagios_paging',
-check_command => 'check_to_check_nagios_paging',
-normal_check_interval => 1,
-retry_check_interval => 1,
-contact_group => 'admins',
-critical => false
+description => 'check_to_check_nagios_paging',
+check_command=> 'check_to_check_nagios_paging',
+check_interval => 1,
+retry_check_interval => 1,
+contact_group=> 'admins',
+critical => false
}
}
diff --git a/modules/icinga/manifests/monitor/legal.pp
b/modules/icinga/manifests/monitor/legal.pp
index fbf363e..d64ad13 100644
--- a/modules/icinga/manifests/monitor/legal.pp
+++ b/modules/icinga/manifests/monitor/legal.pp
@@ -15,29 +15,29 @@
}
monitoring::service { 'en.wp.o-legal-html':
-description => 'Ensure legal html en.wp',
-check_command =>
'check_legal_html!https://en.wikipedia.org/wiki/Main_Page!desktop_enwp',
-host => 'en.wikipedia.org',
-normal_check_interval => 1440,
-retry_check_interval => 30,
-contact_group => 'admins,legal',
+description => 'Ensure legal html en.wp',
+check_command=>
'check_legal_html!https://en.wikipedia.org/wiki/Main_Page!desktop_enwp',
+host => 'en.wikipedia.org',
+check_interval => 1440,
+retry_check_interval => 30,
+contact_group=> 'admins,legal',
}
monitoring::service { 'en.m.wp.o-legal-html':
-description => 'Ensure legal html en.m.wp',
-check_command =>
'check_legal_html!https://en.m.wikipedia.org/wiki/Main_Page!mobile',
-host => 'en.m.wikipedia.org',
-normal_check_interval => 1440,
-retry_check_interval => 30,
[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: normal_check_interval => check_interval
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/315086
Change subject: icinga: normal_check_interval => check_interval
..
icinga: normal_check_interval => check_interval
The directive has changed name in newer versions and the former is
deprecated
Change-Id: I0c429861b54ca5f45fcfc06890d9a892d9aeb69b
---
M modules/admin/files/home/akosiaris/.vim/syntax/nagios.vim
M modules/icinga/manifests/init.pp
M modules/icinga/manifests/monitor/checkpaging.pp
M modules/icinga/manifests/monitor/legal.pp
M modules/icinga/manifests/monitor/ripeatlas.pp
M modules/icinga/manifests/monitor/wikidata.pp
M modules/monitoring/manifests/graphite_anomaly.pp
M modules/monitoring/manifests/graphite_threshold.pp
M modules/monitoring/manifests/service.pp
M modules/role/manifests/mediawiki/common.pp
10 files changed, 99 insertions(+), 99 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/86/315086/1
diff --git a/modules/admin/files/home/akosiaris/.vim/syntax/nagios.vim
b/modules/admin/files/home/akosiaris/.vim/syntax/nagios.vim
index 650b1a4..76571eb 100644
--- a/modules/admin/files/home/akosiaris/.vim/syntax/nagios.vim
+++ b/modules/admin/files/home/akosiaris/.vim/syntax/nagios.vim
@@ -67,7 +67,7 @@
syn keyword nagiosDirective contained host_notification_period hostgroup_name
servicegroup_name hostgroups servicegroups
syn keyword nagiosDirective contained is_volatile last_notification
syn keyword nagiosDirective contained low_flap_threshold max_check_attempts
-syn keyword nagiosDirective contained members monday normal_check_interval
+syn keyword nagiosDirective contained members monday check_interval
syn keyword nagiosDirective contained notification_failure_criteria
notification_failure_options
syn keyword nagiosDirective contained notification_interval
notification_options
syn keyword nagiosDirective contained notification_period notifications_enabled
diff --git a/modules/icinga/manifests/init.pp b/modules/icinga/manifests/init.pp
index 5ec109d..f3f26fb 100644
--- a/modules/icinga/manifests/init.pp
+++ b/modules/icinga/manifests/init.pp
@@ -152,9 +152,9 @@
# Check that the icinga config is sane
monitoring::service { 'check_icinga_config':
-description => 'Check correctness of the icinga
configuration',
-check_command => 'check_icinga_config',
-normal_check_interval => 10,
+description=> 'Check correctness of the icinga configuration',
+check_command => 'check_icinga_config',
+check_interval => 10,
}
# script to schedule host downtimes
diff --git a/modules/icinga/manifests/monitor/checkpaging.pp
b/modules/icinga/manifests/monitor/checkpaging.pp
index 23c2626..ffe7d62 100644
--- a/modules/icinga/manifests/monitor/checkpaging.pp
+++ b/modules/icinga/manifests/monitor/checkpaging.pp
@@ -4,11 +4,11 @@
# is working properly
class icinga::monitor::checkpaging {
monitoring::service { 'check_to_check_nagios_paging':
-description => 'check_to_check_nagios_paging',
-check_command => 'check_to_check_nagios_paging',
-normal_check_interval => 1,
-retry_check_interval => 1,
-contact_group => 'admins',
-critical => false
+description => 'check_to_check_nagios_paging',
+check_command=> 'check_to_check_nagios_paging',
+check_interval => 1,
+retry_check_interval => 1,
+contact_group=> 'admins',
+critical => false
}
}
diff --git a/modules/icinga/manifests/monitor/legal.pp
b/modules/icinga/manifests/monitor/legal.pp
index fbf363e..d64ad13 100644
--- a/modules/icinga/manifests/monitor/legal.pp
+++ b/modules/icinga/manifests/monitor/legal.pp
@@ -15,29 +15,29 @@
}
monitoring::service { 'en.wp.o-legal-html':
-description => 'Ensure legal html en.wp',
-check_command =>
'check_legal_html!https://en.wikipedia.org/wiki/Main_Page!desktop_enwp',
-host => 'en.wikipedia.org',
-normal_check_interval => 1440,
-retry_check_interval => 30,
-contact_group => 'admins,legal',
+description => 'Ensure legal html en.wp',
+check_command=>
'check_legal_html!https://en.wikipedia.org/wiki/Main_Page!desktop_enwp',
+host => 'en.wikipedia.org',
+check_interval => 1440,
+retry_check_interval => 30,
+contact_group=> 'admins,legal',
}
monitoring::service { 'en.m.wp.o-legal-html':
-description => 'Ensure legal html en.m.wp',
-check_command =>
'check_legal_html!https://en.m.wikipedia.org/wiki/Main_Page!mobile',
-host => 'en.m.wikipedia.org',
-
