summaryrefslogtreecommitdiff
path: root/files
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-09-06 13:52:31 +0200
committervarac <varacanero@zeromail.org>2016-09-06 13:52:31 +0200
commit96506dd7c96a8b908be1b3ff085daad073f37dcd (patch)
treeb8a959353b21f1c6657a0a295088bf856185dd13 /files
parent06274c52ec2fff82019b4e839be2e1846a8edcf8 (diff)
Ignore most of the flapping checks
Diffstat (limited to 'files')
-rw-r--r--files/puppet/modules/custom/files/check_mk/ignored_services.custom.mk7
-rw-r--r--files/puppet/modules/custom/files/ignored_services.custom.mk8
-rw-r--r--files/puppet/modules/custom/manifests/check_mk.pp11
-rw-r--r--files/puppet/modules/custom/manifests/init.pp9
4 files changed, 34 insertions, 1 deletions
diff --git a/files/puppet/modules/custom/files/check_mk/ignored_services.custom.mk b/files/puppet/modules/custom/files/check_mk/ignored_services.custom.mk
new file mode 100644
index 0000000..eb7890b
--- /dev/null
+++ b/files/puppet/modules/custom/files/check_mk/ignored_services.custom.mk
@@ -0,0 +1,7 @@
+# Ignore all checks that are too noisy or flapping on other machines than the clientdev env
+ignored_services += [
+ # doesn't work because we don't use check_mk tags
+ #([ '!clientdev' ], ALL_HOSTS, [ "LOG /var/log/leap/webapp.log", "LOG /var/log/soledad.log", "Job pixelated-functional-tests" ] ),
+ ( [ "alpaca.mail.bitmask.i", "donkey.unstable.bitmask.i", "elephant.dev.bitmask.i", "leech.demo.bitmask.i" ],
+ [ "LOG /var/log/leap/webapp.log", "LOG /var/log/soledad.log", "Job pixelated-functional-tests" ] ),
+]
diff --git a/files/puppet/modules/custom/files/ignored_services.custom.mk b/files/puppet/modules/custom/files/ignored_services.custom.mk
new file mode 100644
index 0000000..28e0036
--- /dev/null
+++ b/files/puppet/modules/custom/files/ignored_services.custom.mk
@@ -0,0 +1,8 @@
+# Ignore all checks that are too noisy or flapping on other machines than the clientdev env
+ignored_services += [
+ # doesn't work because we don't use check_mk tags
+ #([ '!clientdev' ], ALL_HOSTS, [ "LOG /var/log/leap/webapp.log", "LOG /var/log/soledad.log", "Job pixelated-functional-tests" ] ),
+ ("donkey.unstable.bitmask.i", "Job pixelated-functional-tests"),
+ ( [ "alpaca.mail.bitmask.i", "donkey.unstable.bitmask.i", "elephant.dev.bitmask.i", "leech.demo.bitmask.i" ], "LOG /var/log/leap/webapp.log" ),
+ ( ["aardwolf.unstable.bitmask.i", "ant.demo.bitmask.i"], "LOG /var/log/soledad.log"),
+]
diff --git a/files/puppet/modules/custom/manifests/check_mk.pp b/files/puppet/modules/custom/manifests/check_mk.pp
new file mode 100644
index 0000000..a3020fe
--- /dev/null
+++ b/files/puppet/modules/custom/manifests/check_mk.pp
@@ -0,0 +1,11 @@
+# custom changes to check_mk
+#
+class custom::check_mk {
+
+ file { '/etc/check_mk/conf.d/ignored_services.custom.mk':
+ source => 'puppet:///modules/custom/check_mk/ignored_services.custom.mk',
+ mode => '0644',
+ owner => 'root',
+ group => 'root',
+ }
+}
diff --git a/files/puppet/modules/custom/manifests/init.pp b/files/puppet/modules/custom/manifests/init.pp
index 983ca42..0a67491 100644
--- a/files/puppet/modules/custom/manifests/init.pp
+++ b/files/puppet/modules/custom/manifests/init.pp
@@ -5,11 +5,18 @@ class custom {
$services = hiera('services', [])
+ # monitoring
+ # munin
include custom_munin_node
include custom_shorewall::munin_node
+ # check_mk
+ if member ( $services, 'monitor') {
+ include ::custom::check_mk
+ }
+
# packages we want to install on every server
- ensure_packages (['iotop', 'vim', 'tmux', 'bash-completion', 'ncdu'])
+ ensure_packages (['iotop', 'vim', 'tmux', 'bash-completion', 'ncdu', 'tig'])
if member ( $services, 'openvpn') {
include custom_munin_node::openvpn