summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-05-03 21:50:03 +0200
committervarac <varacanero@zeromail.org>2016-05-03 21:50:03 +0200
commite9ebc834e7500dceefd0530ba6d0262e87855374 (patch)
treee71df343a254aad610d6b77832f206c496247753 /puppet
parent8b5541290fc985acd7364d48aaf357457c7622f7 (diff)
[bug] run check_mk inventory on every puppetrun
After upgrading the platform, there might be old check_mk checks registered on the monitor hosts. We now run a check_mk inventory on every run that also purged old non-existng checks. - Resolves: #6873
Diffstat (limited to 'puppet')
m---------puppet/modules/check_mk0
-rw-r--r--puppet/modules/site_check_mk/manifests/server.pp21
2 files changed, 11 insertions, 10 deletions
diff --git a/puppet/modules/check_mk b/puppet/modules/check_mk
-Subproject 3df00e29388adbf1c0e058df09a7c3886edbaca
+Subproject 265ed2182f790a723996fd84de4dfcb93f800ee
diff --git a/puppet/modules/site_check_mk/manifests/server.pp b/puppet/modules/site_check_mk/manifests/server.pp
index 0159a050..090f0bae 100644
--- a/puppet/modules/site_check_mk/manifests/server.pp
+++ b/puppet/modules/site_check_mk/manifests/server.pp
@@ -32,18 +32,19 @@ class site_check_mk::server {
# override paths to use the system check_mk rather than OMD
class { 'check_mk::config':
- site => '',
- etc_dir => '/etc',
- nagios_subdir => 'nagios3',
- bin_dir => '/usr/bin',
- host_groups => undef,
- use_storedconfigs => false,
- require => Package['check-mk-server']
+ site => '',
+ etc_dir => '/etc',
+ nagios_subdir => 'nagios3',
+ bin_dir => '/usr/bin',
+ host_groups => undef,
+ use_storedconfigs => false,
+ inventory_only_on_changes => false,
+ require => Package['check-mk-server']
}
- Exec['check_mk-reload'] ->
- Exec['check_mk-refresh-inventory-daily'] ->
- Service['nagios']
+ Exec['check_mk-refresh'] ->
+ Exec['check_mk-reload'] ->
+ Service['nagios']
file {
'/etc/check_mk/conf.d/use_ssh.mk':