From efc3e3eaa0788271cf61155d7e9be4d46e6e9d47 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 12 Feb 2014 16:26:59 +0100
Subject: moved check_mk server and client class to site_check_mk module

---
 puppet/modules/site_check_mk/manifests/client.pp | 24 ++++++++++++
 puppet/modules/site_check_mk/manifests/server.pp | 48 ++++++++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 puppet/modules/site_check_mk/manifests/client.pp
 create mode 100644 puppet/modules/site_check_mk/manifests/server.pp

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/client.pp b/puppet/modules/site_check_mk/manifests/client.pp
new file mode 100644
index 00000000..ae269168
--- /dev/null
+++ b/puppet/modules/site_check_mk/manifests/client.pp
@@ -0,0 +1,24 @@
+class site_check_mk::client {
+
+  $ssh_hash = hiera('ssh')
+  $pubkey   = $ssh_hash['authorized_keys']['monitor']['key']
+  $type     = $ssh_hash['authorized_keys']['monitor']['type']
+
+  include site_apt::preferences::check_mk
+
+  class { 'check_mk::agent':
+    agent_package_name          => 'check-mk-agent',
+    agent_logwatch_package_name => 'check-mk-agent-logwatch',
+    method                      => 'ssh',
+    homedir                     => '/etc/nagios/check_mk',
+    register_agent              => false
+  }
+
+  file { '/root/.ssh/authorized_keys2':
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0600',
+    content => "command=\"/usr/bin/check_mk_agent\",no-port-forwarding,no-x11-forwarding,no-agent-forwarding,no-pty,no-user-rc, ${type} ${pubkey} monitor"
+  }
+
+}
diff --git a/puppet/modules/site_check_mk/manifests/server.pp b/puppet/modules/site_check_mk/manifests/server.pp
new file mode 100644
index 00000000..625fc688
--- /dev/null
+++ b/puppet/modules/site_check_mk/manifests/server.pp
@@ -0,0 +1,48 @@
+class site_check_mk::server {
+
+  $ssh_hash = hiera('ssh')
+  $pubkey   = $ssh_hash['authorized_keys']['monitor']['key']
+  $type     = $ssh_hash['authorized_keys']['monitor']['type']
+  $seckey   = $ssh_hash['monitor']['private_key']
+  $ssh_port = $ssh_hash['port']
+
+  $nagios_hiera   = hiera_hash('nagios')
+  $hosts          = $nagios_hiera['hosts']
+  $all_hosts = inline_template("<% @hosts.keys.sort.each do |key| -%>\"<%= key %>\", <% end -%>")
+
+  package { 'check-mk-server':
+    ensure => installed,
+  }
+
+  # 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,
+    require       => Package['check-mk-server']
+  }
+
+  Exec['check_mk-reload'] -> Service['nagios']
+
+  file {
+    '/etc/check_mk/conf.d/use_ssh.mk':
+      content => template('site_check_mk/use_ssh.mk'),
+      notify  => Exec['check_mk-refresh'];
+    '/etc/check_mk/all_hosts_static':
+      content => $all_hosts,
+      notify  => Exec['check_mk-refresh'];
+    '/etc/check_mk/.ssh':
+      ensure => directory;
+    '/etc/check_mk/.ssh/id_rsa':
+      content => $seckey,
+      owner   => 'nagios',
+      mode    => '0600';
+    '/etc/check_mk/.ssh/id_rsa.pub':
+      content => "${type} ${pubkey} monitor",
+      owner   => 'nagios',
+      mode    => '0644';
+  }
+  include check_mk::agent::local_checks
+}
-- 
cgit v1.2.3


From 060124b047ac44f9f54573a389fea6c5b6ab18ea Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 12 Feb 2014 18:14:19 +0100
Subject: renamed site_check_mk::client to site_check_mk::agent

---
 puppet/modules/site_check_mk/manifests/agent.pp  | 24 ++++++++++++++++++++++++
 puppet/modules/site_check_mk/manifests/client.pp | 24 ------------------------
 2 files changed, 24 insertions(+), 24 deletions(-)
 create mode 100644 puppet/modules/site_check_mk/manifests/agent.pp
 delete mode 100644 puppet/modules/site_check_mk/manifests/client.pp

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent.pp b/puppet/modules/site_check_mk/manifests/agent.pp
new file mode 100644
index 00000000..bb0cb167
--- /dev/null
+++ b/puppet/modules/site_check_mk/manifests/agent.pp
@@ -0,0 +1,24 @@
+class site_check_mk::agent {
+
+  $ssh_hash = hiera('ssh')
+  $pubkey   = $ssh_hash['authorized_keys']['monitor']['key']
+  $type     = $ssh_hash['authorized_keys']['monitor']['type']
+
+  include site_apt::preferences::check_mk
+
+  class { 'check_mk::agent':
+    agent_package_name          => 'check-mk-agent',
+    agent_logwatch_package_name => 'check-mk-agent-logwatch',
+    method                      => 'ssh',
+    homedir                     => '/etc/nagios/check_mk',
+    register_agent              => false
+  }
+
+  file { '/root/.ssh/authorized_keys2':
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0600',
+    content => "command=\"/usr/bin/check_mk_agent\",no-port-forwarding,no-x11-forwarding,no-agent-forwarding,no-pty,no-user-rc, ${type} ${pubkey} monitor"
+  }
+
+}
diff --git a/puppet/modules/site_check_mk/manifests/client.pp b/puppet/modules/site_check_mk/manifests/client.pp
deleted file mode 100644
index ae269168..00000000
--- a/puppet/modules/site_check_mk/manifests/client.pp
+++ /dev/null
@@ -1,24 +0,0 @@
-class site_check_mk::client {
-
-  $ssh_hash = hiera('ssh')
-  $pubkey   = $ssh_hash['authorized_keys']['monitor']['key']
-  $type     = $ssh_hash['authorized_keys']['monitor']['type']
-
-  include site_apt::preferences::check_mk
-
-  class { 'check_mk::agent':
-    agent_package_name          => 'check-mk-agent',
-    agent_logwatch_package_name => 'check-mk-agent-logwatch',
-    method                      => 'ssh',
-    homedir                     => '/etc/nagios/check_mk',
-    register_agent              => false
-  }
-
-  file { '/root/.ssh/authorized_keys2':
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0600',
-    content => "command=\"/usr/bin/check_mk_agent\",no-port-forwarding,no-x11-forwarding,no-agent-forwarding,no-pty,no-user-rc, ${type} ${pubkey} monitor"
-  }
-
-}
-- 
cgit v1.2.3


From 1c8c4f6f3b68ba1da13e6b6374c6c55fe8214789 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 12 Feb 2014 18:45:17 +0100
Subject: execute nagios plugins locally with mrpe

---
 puppet/modules/site_check_mk/manifests/agent.pp      |  1 +
 puppet/modules/site_check_mk/manifests/agent/mrpe.pp | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 puppet/modules/site_check_mk/manifests/agent/mrpe.pp

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent.pp b/puppet/modules/site_check_mk/manifests/agent.pp
index bb0cb167..ac5a7ebd 100644
--- a/puppet/modules/site_check_mk/manifests/agent.pp
+++ b/puppet/modules/site_check_mk/manifests/agent.pp
@@ -21,4 +21,5 @@ class site_check_mk::agent {
     content => "command=\"/usr/bin/check_mk_agent\",no-port-forwarding,no-x11-forwarding,no-agent-forwarding,no-pty,no-user-rc, ${type} ${pubkey} monitor"
   }
 
+  include site_check_mk::agent::mrpe
 }
diff --git a/puppet/modules/site_check_mk/manifests/agent/mrpe.pp b/puppet/modules/site_check_mk/manifests/agent/mrpe.pp
new file mode 100644
index 00000000..37df7f74
--- /dev/null
+++ b/puppet/modules/site_check_mk/manifests/agent/mrpe.pp
@@ -0,0 +1,17 @@
+class site_check_mk::agent::mrpe {
+  # check_mk can use standard nagios plugins using
+  # a wrapper called mrpe
+  # see http://mathias-kettner.de/checkmk_mrpe.html
+
+  package { 'nagios-plugins-basic':
+    ensure => latest,
+  }
+
+  file { '/etc/check_mk/mrpe.cfg':
+    ensure => present
+  } ->
+  file_line { 'Apt':
+    line => 'APT    /usr/lib/nagios/plugins/check_apt',
+    path => '/etc/check_mk/mrpe.cfg',
+  }
+}
-- 
cgit v1.2.3


From 12cea40d5dffe5aa6e269c05773ed49d9f00a9ea Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 13 Feb 2014 00:10:09 +0100
Subject: added site_check_mk::agent::couchdb and site_check_mk::agent::soledad
 for local checks

---
 puppet/modules/site_check_mk/manifests/agent/couchdb.pp | 17 +++++++++++++++++
 puppet/modules/site_check_mk/manifests/agent/soledad.pp | 10 ++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 puppet/modules/site_check_mk/manifests/agent/couchdb.pp
 create mode 100644 puppet/modules/site_check_mk/manifests/agent/soledad.pp

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent/couchdb.pp b/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
new file mode 100644
index 00000000..5b50e5a9
--- /dev/null
+++ b/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
@@ -0,0 +1,17 @@
+class site_check_mk::agent::couchdb {
+
+  # local custom checks
+  file { '/usr/lib/check_mk_agent/local/check_bigcouch_errors.sh':
+    ensure  => link,
+    target  => '/srv/leap/couchdb/scripts/tests/check_bigcouch_errors.sh',
+    require => Vcsrepo['/srv/leap/couchdb/scripts']
+  }
+
+  # local nagios plugin checks via mrpe
+  file_line {
+    'Tapicero_Procs':
+      line => 'Tapicero_Procs  /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a tapicero',
+      path => '/etc/check_mk/mrpe.cfg';
+  }
+
+}
diff --git a/puppet/modules/site_check_mk/manifests/agent/soledad.pp b/puppet/modules/site_check_mk/manifests/agent/soledad.pp
new file mode 100644
index 00000000..d75ae732
--- /dev/null
+++ b/puppet/modules/site_check_mk/manifests/agent/soledad.pp
@@ -0,0 +1,10 @@
+class site_check_mk::agent::soledad {
+
+  # local nagios plugin checks via mrpe
+  file_line {
+    'Soledad_Procs':
+      line => 'Soledad_Procs  /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a soledad',
+      path => '/etc/check_mk/mrpe.cfg';
+  }
+
+}
-- 
cgit v1.2.3


From d0eea33d88a6ffcbe01544678372d80e8c8de51f Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Fri, 14 Feb 2014 17:38:02 +0100
Subject: Include check_mk monitor pubkey in /root/.ssh/authorized_keys

instead of creating a /root/.ssh/authorized_keys2

see https://review.leap.se/r/148/#comment153
---
 puppet/modules/site_check_mk/manifests/agent.pp | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent.pp b/puppet/modules/site_check_mk/manifests/agent.pp
index ac5a7ebd..75188c7b 100644
--- a/puppet/modules/site_check_mk/manifests/agent.pp
+++ b/puppet/modules/site_check_mk/manifests/agent.pp
@@ -14,12 +14,5 @@ class site_check_mk::agent {
     register_agent              => false
   }
 
-  file { '/root/.ssh/authorized_keys2':
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0600',
-    content => "command=\"/usr/bin/check_mk_agent\",no-port-forwarding,no-x11-forwarding,no-agent-forwarding,no-pty,no-user-rc, ${type} ${pubkey} monitor"
-  }
-
   include site_check_mk::agent::mrpe
 }
-- 
cgit v1.2.3


From 2436fddb4a63075f74f295bacd23128c766beb4c Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 17 Feb 2014 13:50:42 +0100
Subject: Remove adding of hosts from site_nagios::server (Feature #5132)

because now, check_mk will add the hosts
---
 puppet/modules/site_check_mk/manifests/server.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/server.pp b/puppet/modules/site_check_mk/manifests/server.pp
index 625fc688..e77862e5 100644
--- a/puppet/modules/site_check_mk/manifests/server.pp
+++ b/puppet/modules/site_check_mk/manifests/server.pp
@@ -8,7 +8,7 @@ class site_check_mk::server {
 
   $nagios_hiera   = hiera_hash('nagios')
   $hosts          = $nagios_hiera['hosts']
-  $all_hosts = inline_template("<% @hosts.keys.sort.each do |key| -%>\"<%= key %>\", <% end -%>")
+  $all_hosts      = inline_template ('<% @hosts.keys.sort.each do |key| -%>"<%= @hosts[key]["domain_internal"] %>", <% end -%>')
 
   package { 'check-mk-server':
     ensure => installed,
-- 
cgit v1.2.3


From 91bee3e81439cca0536856094edc7ceee7da60ff Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 13 Feb 2014 08:32:14 +0100
Subject: set up logwatch.d directory, added for soledad logwatch config

---
 puppet/modules/site_check_mk/manifests/agent/soledad.pp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent/soledad.pp b/puppet/modules/site_check_mk/manifests/agent/soledad.pp
index d75ae732..cbae81fe 100644
--- a/puppet/modules/site_check_mk/manifests/agent/soledad.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/soledad.pp
@@ -1,5 +1,9 @@
 class site_check_mk::agent::soledad {
 
+  file { '/etc/check_mk/logwatch.d/soledad.cfg':
+    source => 'puppet:///modules/site_check_mk/agent/logwatch/soledad.cfg',
+  }
+
   # local nagios plugin checks via mrpe
   file_line {
     'Soledad_Procs':
-- 
cgit v1.2.3


From 6007c2e5b8556460471d4cae9206a950dd184fec Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 19 Feb 2014 15:14:04 +0100
Subject: added mk_logwatch.1.2.4 (#5135)

---
 puppet/modules/site_check_mk/manifests/agent.pp          |  1 +
 puppet/modules/site_check_mk/manifests/agent/logwatch.pp | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 puppet/modules/site_check_mk/manifests/agent/logwatch.pp

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent.pp b/puppet/modules/site_check_mk/manifests/agent.pp
index 75188c7b..a29923c1 100644
--- a/puppet/modules/site_check_mk/manifests/agent.pp
+++ b/puppet/modules/site_check_mk/manifests/agent.pp
@@ -15,4 +15,5 @@ class site_check_mk::agent {
   }
 
   include site_check_mk::agent::mrpe
+  include site_check_mk::agent::logwatch
 }
diff --git a/puppet/modules/site_check_mk/manifests/agent/logwatch.pp b/puppet/modules/site_check_mk/manifests/agent/logwatch.pp
new file mode 100644
index 00000000..763b01a7
--- /dev/null
+++ b/puppet/modules/site_check_mk/manifests/agent/logwatch.pp
@@ -0,0 +1,11 @@
+class site_check_mk::agent::logwatch {
+  # Deploy mk_logwatch 1.2.4 so we can split the config
+  # into multiple config files in /etc/check_mk/logwatch.d
+  # see https://leap.se/code/issues/5135
+
+  file { '/usr/lib/check_mk_agent/plugins/mk_logwatch':
+    source => 'puppet:///modules/site_check_mk/agent/plugins/mk_logwatch.1.2.4',
+    mode   => '0755'
+  }
+
+}
-- 
cgit v1.2.3


From 20e1830ab70c2f63d240f909ab5622476b095ec9 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 19 Feb 2014 15:39:51 +0100
Subject: add site_check_mk::agent::tapicero, site_check_mk::agent::couchdb

---
 puppet/modules/site_check_mk/manifests/agent/couchdb.pp  | 12 +++++-------
 puppet/modules/site_check_mk/manifests/agent/tapicero.pp | 10 ++++++++++
 2 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 puppet/modules/site_check_mk/manifests/agent/tapicero.pp

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent/couchdb.pp b/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
index 5b50e5a9..c954292a 100644
--- a/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
@@ -1,5 +1,10 @@
 class site_check_mk::agent::couchdb {
 
+  file { '/etc/check_mk/logwatch.d/couchdb.cfg':
+    source => 'puppet:///modules/site_check_mk/agent/logwatch/couchdb.cfg',
+  }
+
+
   # local custom checks
   file { '/usr/lib/check_mk_agent/local/check_bigcouch_errors.sh':
     ensure  => link,
@@ -7,11 +12,4 @@ class site_check_mk::agent::couchdb {
     require => Vcsrepo['/srv/leap/couchdb/scripts']
   }
 
-  # local nagios plugin checks via mrpe
-  file_line {
-    'Tapicero_Procs':
-      line => 'Tapicero_Procs  /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a tapicero',
-      path => '/etc/check_mk/mrpe.cfg';
-  }
-
 }
diff --git a/puppet/modules/site_check_mk/manifests/agent/tapicero.pp b/puppet/modules/site_check_mk/manifests/agent/tapicero.pp
new file mode 100644
index 00000000..2379881c
--- /dev/null
+++ b/puppet/modules/site_check_mk/manifests/agent/tapicero.pp
@@ -0,0 +1,10 @@
+class site_check_mk::agent::tapicero {
+
+  # local nagios plugin checks via mrpe
+  file_line {
+    'Tapicero_Procs':
+      line => 'Tapicero_Procs  /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a tapicero',
+      path => '/etc/check_mk/mrpe.cfg';
+  }
+
+}
-- 
cgit v1.2.3


From 9d19be450d84e1fd281cbfc0f795ca411a2f5879 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 19 Feb 2014 15:51:09 +0100
Subject: set up logwatch.d directory

---
 puppet/modules/site_check_mk/manifests/agent/logwatch.pp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent/logwatch.pp b/puppet/modules/site_check_mk/manifests/agent/logwatch.pp
index 763b01a7..67db5a12 100644
--- a/puppet/modules/site_check_mk/manifests/agent/logwatch.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/logwatch.pp
@@ -8,4 +8,8 @@ class site_check_mk::agent::logwatch {
     mode   => '0755'
   }
 
+  file { '/etc/check_mk/logwatch.d':
+    ensure => directory
+  }
+
 }
-- 
cgit v1.2.3


From 6bb879a46c754958d07b530cf62d69a01537ccba Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 20 Feb 2014 00:31:39 +0100
Subject: added tapicero logwatch check

---
 puppet/modules/site_check_mk/manifests/agent/tapicero.pp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent/tapicero.pp b/puppet/modules/site_check_mk/manifests/agent/tapicero.pp
index 2379881c..088900f4 100644
--- a/puppet/modules/site_check_mk/manifests/agent/tapicero.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/tapicero.pp
@@ -1,5 +1,9 @@
 class site_check_mk::agent::tapicero {
 
+  file { '/etc/check_mk/logwatch.d/tapicero.cfg':
+    source => 'puppet:///modules/site_check_mk/agent/logwatch/tapicero.cfg',
+  }
+
   # local nagios plugin checks via mrpe
   file_line {
     'Tapicero_Procs':
-- 
cgit v1.2.3


From c0d0a5a0af891c360dded0c508591cf50899bc66 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 20 Feb 2014 17:07:48 +0100
Subject: now using concanated check_mk logwatch files where needed (#5155)

---
 .../site_check_mk/manifests/agent/logwatch.pp       | 21 ++++++++++++++++++++-
 .../manifests/agent/logwatch/syslog.pp              | 13 +++++++++++++
 .../site_check_mk/manifests/agent/tapicero.pp       |  6 ++++--
 3 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 puppet/modules/site_check_mk/manifests/agent/logwatch/syslog.pp

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent/logwatch.pp b/puppet/modules/site_check_mk/manifests/agent/logwatch.pp
index 67db5a12..38514af2 100644
--- a/puppet/modules/site_check_mk/manifests/agent/logwatch.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/logwatch.pp
@@ -8,8 +8,27 @@ class site_check_mk::agent::logwatch {
     mode   => '0755'
   }
 
+  # only config files that watch a distinct logfile should go in logwatch.d/
   file { '/etc/check_mk/logwatch.d':
-    ensure => directory
+    ensure  => directory,
+    recurse => true,
+    purge   => true,
   }
 
+  # service that share a common logfile (i.e. /var/log/syslog) need to get
+  # concanated in one file, otherwise the last file sourced will override
+  # the config before
+  # see mk_logwatch: "logwatch.cfg overwrites config files in logwatch.d",
+  # https://leap.se/code/issues/5155
+
+  # first, we need to deploy a custom logwatch.cfg that doesn't include
+  # a section about /var/log/syslog
+
+  file { '/etc/check_mk/logwatch.cfg':
+    source  => 'puppet:///modules/site_check_mk/agent/logwatch/logwatch.cfg',
+    require => Package['check_mk-agent-logwatch']
+  }
+
+  include concat::setup
+  include site_check_mk::agent::logwatch::syslog
 }
diff --git a/puppet/modules/site_check_mk/manifests/agent/logwatch/syslog.pp b/puppet/modules/site_check_mk/manifests/agent/logwatch/syslog.pp
new file mode 100644
index 00000000..ac3dda64
--- /dev/null
+++ b/puppet/modules/site_check_mk/manifests/agent/logwatch/syslog.pp
@@ -0,0 +1,13 @@
+class site_check_mk::agent::logwatch::syslog {
+
+  concat { '/etc/check_mk/logwatch.d/syslog.cfg':
+    warn    => true
+  }
+
+  concat::fragment { 'syslog_header':
+    source => 'puppet:///modules/site_check_mk/agent/logwatch/syslog.cfg',
+    target => '/etc/check_mk/logwatch.d/syslog.cfg',
+    order  => '01';
+  }
+
+}
diff --git a/puppet/modules/site_check_mk/manifests/agent/tapicero.pp b/puppet/modules/site_check_mk/manifests/agent/tapicero.pp
index 088900f4..dc785e52 100644
--- a/puppet/modules/site_check_mk/manifests/agent/tapicero.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/tapicero.pp
@@ -1,7 +1,9 @@
 class site_check_mk::agent::tapicero {
 
-  file { '/etc/check_mk/logwatch.d/tapicero.cfg':
-    source => 'puppet:///modules/site_check_mk/agent/logwatch/tapicero.cfg',
+  concat::fragment { 'syslog_tapicero':
+    source  => 'puppet:///modules/site_check_mk/agent/logwatch/tapicero.cfg',
+    target  => '/etc/check_mk/logwatch.d/syslog.cfg',
+    order   => '02';
   }
 
   # local nagios plugin checks via mrpe
-- 
cgit v1.2.3


From 2b875d23a3d2a53c9276dfee1a71085967dec4c0 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 24 Feb 2014 13:45:50 +0100
Subject: One monitor node for non-local environments and one for local
 environment (Feature #2981), wip

also, use the configured ssh port for every node
---
 puppet/modules/site_check_mk/manifests/server.pp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/server.pp b/puppet/modules/site_check_mk/manifests/server.pp
index e77862e5..4bbeb850 100644
--- a/puppet/modules/site_check_mk/manifests/server.pp
+++ b/puppet/modules/site_check_mk/manifests/server.pp
@@ -4,10 +4,11 @@ class site_check_mk::server {
   $pubkey   = $ssh_hash['authorized_keys']['monitor']['key']
   $type     = $ssh_hash['authorized_keys']['monitor']['type']
   $seckey   = $ssh_hash['monitor']['private_key']
-  $ssh_port = $ssh_hash['port']
 
   $nagios_hiera   = hiera_hash('nagios')
-  $hosts          = $nagios_hiera['hosts']
+  $nagios_hosts   = $nagios_hiera['hosts']
+
+  $hosts          = hiera_hash('hosts')
   $all_hosts      = inline_template ('<% @hosts.keys.sort.each do |key| -%>"<%= @hosts[key]["domain_internal"] %>", <% end -%>')
 
   package { 'check-mk-server':
-- 
cgit v1.2.3


From 59b09ce45333778619baca2bd4e34e5beba63584 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 25 Feb 2014 13:55:15 +0100
Subject: we use logwatch now to check for bigcouch errors

---
 puppet/modules/site_check_mk/manifests/agent/couchdb.pp | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent/couchdb.pp b/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
index c954292a..cc166d42 100644
--- a/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
@@ -3,13 +3,4 @@ class site_check_mk::agent::couchdb {
   file { '/etc/check_mk/logwatch.d/couchdb.cfg':
     source => 'puppet:///modules/site_check_mk/agent/logwatch/couchdb.cfg',
   }
-
-
-  # local custom checks
-  file { '/usr/lib/check_mk_agent/local/check_bigcouch_errors.sh':
-    ensure  => link,
-    target  => '/srv/leap/couchdb/scripts/tests/check_bigcouch_errors.sh',
-    require => Vcsrepo['/srv/leap/couchdb/scripts']
-  }
-
 }
-- 
cgit v1.2.3


From 299c059c239936901c4b234f78e89d99ce94e19c Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 25 Feb 2014 13:58:52 +0100
Subject: renamed logwatch/couchdb.cfg to logwatch/bigcouch.cfg

---
 puppet/modules/site_check_mk/manifests/agent/couchdb.pp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent/couchdb.pp b/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
index cc166d42..f2d286ca 100644
--- a/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
@@ -1,6 +1,7 @@
 class site_check_mk::agent::couchdb {
 
-  file { '/etc/check_mk/logwatch.d/couchdb.cfg':
-    source => 'puppet:///modules/site_check_mk/agent/logwatch/couchdb.cfg',
+  file { '/etc/check_mk/logwatch.d/bigcouch.cfg':
+    source => 'puppet:///modules/site_check_mk/agent/logwatch/bigcouch.cfg',
   }
+
 }
-- 
cgit v1.2.3


From ee83c7227f64bab9a36ecbfd86049bc3153b3760 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 25 Feb 2014 14:03:28 +0100
Subject: moved logwatch/tapicero.cfg to logwatch/syslog/tapicero.cfg

---
 puppet/modules/site_check_mk/manifests/agent/tapicero.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent/tapicero.pp b/puppet/modules/site_check_mk/manifests/agent/tapicero.pp
index dc785e52..369ed00b 100644
--- a/puppet/modules/site_check_mk/manifests/agent/tapicero.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/tapicero.pp
@@ -1,7 +1,7 @@
 class site_check_mk::agent::tapicero {
 
   concat::fragment { 'syslog_tapicero':
-    source  => 'puppet:///modules/site_check_mk/agent/logwatch/tapicero.cfg',
+    source  => 'puppet:///modules/site_check_mk/agent/logwatch/syslog/tapicero.cfg',
     target  => '/etc/check_mk/logwatch.d/syslog.cfg',
     order   => '02';
   }
-- 
cgit v1.2.3


From 91365fb3b9b455253484fca6ffbc3dac8361e5b9 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 25 Feb 2014 15:11:56 +0100
Subject: check syslog for /usr/local/bin/couch-doc-update failures

---
 puppet/modules/site_check_mk/manifests/agent/couchdb.pp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent/couchdb.pp b/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
index f2d286ca..9456efcc 100644
--- a/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
@@ -4,4 +4,10 @@ class site_check_mk::agent::couchdb {
     source => 'puppet:///modules/site_check_mk/agent/logwatch/bigcouch.cfg',
   }
 
+  concat::fragment { 'syslog_couchdb':
+    source  => 'puppet:///modules/site_check_mk/agent/logwatch/syslog/couchdb.cfg',
+    target  => '/etc/check_mk/logwatch.d/syslog.cfg',
+    order   => '02';
+  }
+
 }
-- 
cgit v1.2.3


From 42512cc9428afcd7d949e373e75da4f0d9fc8086 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 25 Feb 2014 16:02:53 +0100
Subject: check syslog for stunnel failures

---
 puppet/modules/site_check_mk/manifests/agent/stunnel.pp | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 puppet/modules/site_check_mk/manifests/agent/stunnel.pp

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent/stunnel.pp b/puppet/modules/site_check_mk/manifests/agent/stunnel.pp
new file mode 100644
index 00000000..64022824
--- /dev/null
+++ b/puppet/modules/site_check_mk/manifests/agent/stunnel.pp
@@ -0,0 +1,9 @@
+class site_check_mk::agent::stunnel {
+
+  concat::fragment { 'syslog_stunnel':
+    source  => 'puppet:///modules/site_check_mk/agent/logwatch/syslog/stunnel.cfg',
+    target  => '/etc/check_mk/logwatch.d/syslog.cfg',
+    order   => '02';
+  }
+
+}
-- 
cgit v1.2.3


From 40b13221967368060773af008f791ca7a053d18d Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 25 Feb 2014 16:27:57 +0100
Subject: set /usr/lib/nagios/plugins/check_icmp to setuid root (Feature #5171)

---
 puppet/modules/site_check_mk/manifests/server.pp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/server.pp b/puppet/modules/site_check_mk/manifests/server.pp
index 4bbeb850..0c98cd5a 100644
--- a/puppet/modules/site_check_mk/manifests/server.pp
+++ b/puppet/modules/site_check_mk/manifests/server.pp
@@ -44,6 +44,13 @@ class site_check_mk::server {
       content => "${type} ${pubkey} monitor",
       owner   => 'nagios',
       mode    => '0644';
+    # check_icmp must be suid root or called by sudo
+    # see https://leap.se/code/issues/5171
+    '/usr/lib/nagios/plugins/check_icmp':
+      mode    => '4755',
+      require => Package['nagios-plugins-basic'];
   }
+
+
   include check_mk::agent::local_checks
 }
-- 
cgit v1.2.3


From 0a6fbced6f2177464c000fc79a90c03171a3bcf6 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 25 Feb 2014 16:45:33 +0100
Subject: complete nagios monitoring for couchdb (Feature #2175)

---
 puppet/modules/site_check_mk/manifests/agent/couchdb.pp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent/couchdb.pp b/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
index 9456efcc..97e4a777 100644
--- a/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
@@ -1,13 +1,25 @@
 class site_check_mk::agent::couchdb {
 
+  # watch logs
   file { '/etc/check_mk/logwatch.d/bigcouch.cfg':
     source => 'puppet:///modules/site_check_mk/agent/logwatch/bigcouch.cfg',
   }
-
   concat::fragment { 'syslog_couchdb':
     source  => 'puppet:///modules/site_check_mk/agent/logwatch/syslog/couchdb.cfg',
     target  => '/etc/check_mk/logwatch.d/syslog.cfg',
     order   => '02';
   }
 
+
+  # check bigcouch processes
+  file_line {
+    'Bigcouch_epmd_procs':
+      line => 'Bigcouch_epmd_procs  /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a /opt/bigcouch/erts-5.9.1/bin/epmd',
+      path => '/etc/check_mk/mrpe.cfg';
+    'Bigcouch_beam_procs':
+      line => 'Bigcouch_beam_procs  /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a /opt/bigcouch/erts-5.9.1/bin/beam',
+      path => '/etc/check_mk/mrpe.cfg';
+  }
+
+
 }
-- 
cgit v1.2.3


From 5cc2e0d7a10c088d024bf0e5e4538b31a7d2844c Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 25 Feb 2014 17:19:36 +0100
Subject: nagios monitoring of haproxy nodes (Feature #2657)

---
 puppet/modules/site_check_mk/manifests/agent/haproxy.pp      | 12 ++++++++++++
 .../manifests/agent/package/nagios_plugins_contrib.pp        |  5 +++++
 2 files changed, 17 insertions(+)
 create mode 100644 puppet/modules/site_check_mk/manifests/agent/haproxy.pp
 create mode 100644 puppet/modules/site_check_mk/manifests/agent/package/nagios_plugins_contrib.pp

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent/haproxy.pp b/puppet/modules/site_check_mk/manifests/agent/haproxy.pp
new file mode 100644
index 00000000..e7986db1
--- /dev/null
+++ b/puppet/modules/site_check_mk/manifests/agent/haproxy.pp
@@ -0,0 +1,12 @@
+class site_check_mk::agent::haproxy {
+
+  include site_check_mk::agent::package::nagios_plugins_contrib
+
+  # local nagios plugin checks via mrpe
+  file_line {
+    'haproxy':
+      line => 'Haproxy  /usr/lib/nagios/plugins/check_haproxy -u "http://localhost:8000/haproxy;csv"',
+      path => '/etc/check_mk/mrpe.cfg';
+  }
+
+}
diff --git a/puppet/modules/site_check_mk/manifests/agent/package/nagios_plugins_contrib.pp b/puppet/modules/site_check_mk/manifests/agent/package/nagios_plugins_contrib.pp
new file mode 100644
index 00000000..95a60d17
--- /dev/null
+++ b/puppet/modules/site_check_mk/manifests/agent/package/nagios_plugins_contrib.pp
@@ -0,0 +1,5 @@
+class site_check_mk::agent::package::nagios_plugins_contrib  {
+  package { 'nagios-plugins-contrib':
+    ensure => installed,
+  }
+}
-- 
cgit v1.2.3


From 835d1f9699507e9e40cae32ffc90940e26bed3ee Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 25 Feb 2014 17:58:48 +0100
Subject: nagios: check open files for bigcouch process (Feature #4965)

---
 puppet/modules/site_check_mk/manifests/agent.pp               |  4 ++++
 puppet/modules/site_check_mk/manifests/agent/couchdb.pp       | 11 +++++++++++
 .../site_check_mk/manifests/agent/package/perl_plugin.pp      |  5 +++++
 3 files changed, 20 insertions(+)
 create mode 100644 puppet/modules/site_check_mk/manifests/agent/package/perl_plugin.pp

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent.pp b/puppet/modules/site_check_mk/manifests/agent.pp
index a29923c1..efb05b37 100644
--- a/puppet/modules/site_check_mk/manifests/agent.pp
+++ b/puppet/modules/site_check_mk/manifests/agent.pp
@@ -14,6 +14,10 @@ class site_check_mk::agent {
     register_agent              => false
   }
 
+  file { [ '/srv/leap/nagios', '/srv/leap/nagios/plugins' ]:
+    ensure  => directory,
+  }
+
   include site_check_mk::agent::mrpe
   include site_check_mk::agent::logwatch
 }
diff --git a/puppet/modules/site_check_mk/manifests/agent/couchdb.pp b/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
index 97e4a777..01e2b886 100644
--- a/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/couchdb.pp
@@ -21,5 +21,16 @@ class site_check_mk::agent::couchdb {
       path => '/etc/check_mk/mrpe.cfg';
   }
 
+  # check open files for bigcouch proc
+  include site_check_mk::agent::package::perl_plugin
+  file { '/srv/leap/nagios/plugins/check_unix_open_fds.pl':
+    source => 'puppet:///modules/site_check_mk/agent/nagios_plugins/check_unix_open_fds.pl',
+    mode   => '0755'
+  }
+  file_line {
+    'Bigcouch_open_files':
+      line => 'Bigcouch_open_files /srv/leap/nagios/plugins/check_unix_open_fds.pl -a beam -w 750,750 -c 1000,1000',
+      path => '/etc/check_mk/mrpe.cfg';
+  }
 
 }
diff --git a/puppet/modules/site_check_mk/manifests/agent/package/perl_plugin.pp b/puppet/modules/site_check_mk/manifests/agent/package/perl_plugin.pp
new file mode 100644
index 00000000..4feda375
--- /dev/null
+++ b/puppet/modules/site_check_mk/manifests/agent/package/perl_plugin.pp
@@ -0,0 +1,5 @@
+class site_check_mk::agent::package::perl_plugin  {
+  package { 'libnagios-plugin-perl':
+    ensure => installed,
+  }
+}
-- 
cgit v1.2.3


From 5b15447055de66f30bc7f036a588dec4638b9a7d Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 26 Feb 2014 14:52:04 +0100
Subject: check syslog for webapp errors

---
 puppet/modules/site_check_mk/manifests/agent/webapp.pp | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 puppet/modules/site_check_mk/manifests/agent/webapp.pp

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent/webapp.pp b/puppet/modules/site_check_mk/manifests/agent/webapp.pp
new file mode 100644
index 00000000..dc2baf19
--- /dev/null
+++ b/puppet/modules/site_check_mk/manifests/agent/webapp.pp
@@ -0,0 +1,9 @@
+class site_check_mk::agent::webapp {
+
+  concat::fragment { 'syslog_webapp':
+    source  => 'puppet:///modules/site_check_mk/agent/logwatch/syslog/webapp.cfg',
+    target  => '/etc/check_mk/logwatch.d/syslog.cfg',
+    order   => '02';
+  }
+
+}
-- 
cgit v1.2.3


From 2209afd630a75335e26516c6d9fa1c796bca8a49 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 27 Feb 2014 18:01:34 +0100
Subject: check webapp login (Feature #5172)

---
 puppet/modules/site_check_mk/manifests/agent/webapp.pp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent/webapp.pp b/puppet/modules/site_check_mk/manifests/agent/webapp.pp
index dc2baf19..48fa0828 100644
--- a/puppet/modules/site_check_mk/manifests/agent/webapp.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/webapp.pp
@@ -1,5 +1,14 @@
 class site_check_mk::agent::webapp {
 
+  # check webapp login
+  package { 'python-srp': ensure => installed }
+  file { '/usr/lib/check_mk_agent/local/nagios-webapp_login.py':
+    ensure => link,
+    target => '/srv/leap/webapp/test/nagios/webapp_login.py'
+  }
+
+
+  # check syslog
   concat::fragment { 'syslog_webapp':
     source  => 'puppet:///modules/site_check_mk/agent/logwatch/syslog/webapp.cfg',
     target  => '/etc/check_mk/logwatch.d/syslog.cfg',
-- 
cgit v1.2.3


From 89c5fd126f73dff0bd4258ec51ad03f523d64ade Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Fri, 28 Feb 2014 00:40:07 +0100
Subject: install more needed packages for webapp login check

---
 puppet/modules/site_check_mk/manifests/agent/webapp.pp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent/webapp.pp b/puppet/modules/site_check_mk/manifests/agent/webapp.pp
index 48fa0828..932d6bb9 100644
--- a/puppet/modules/site_check_mk/manifests/agent/webapp.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/webapp.pp
@@ -1,7 +1,9 @@
 class site_check_mk::agent::webapp {
 
   # check webapp login
-  package { 'python-srp': ensure => installed }
+  package { [ 'python-srp', 'python-requests', 'python-yaml' ]:
+    ensure => installed
+  }
   file { '/usr/lib/check_mk_agent/local/nagios-webapp_login.py':
     ensure => link,
     target => '/srv/leap/webapp/test/nagios/webapp_login.py'
-- 
cgit v1.2.3


From f802fcdc7396d8a3b804be6480adb8611638f2c0 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Fri, 28 Feb 2014 01:18:33 +0100
Subject: Make leap_cli tests accessible for check_mk (Feature #5148)

---
 puppet/modules/site_check_mk/manifests/agent.pp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent.pp b/puppet/modules/site_check_mk/manifests/agent.pp
index efb05b37..b752182e 100644
--- a/puppet/modules/site_check_mk/manifests/agent.pp
+++ b/puppet/modules/site_check_mk/manifests/agent.pp
@@ -18,6 +18,11 @@ class site_check_mk::agent {
     ensure  => directory,
   }
 
+  file { '/usr/lib/check_mk_agent/local/run_node_tests.sh':
+    source => 'puppet:///modules/site_check_mk/agent/local_checks/all_hosts/run_node_tests.sh',
+    mode   => '0755'
+  }
+
   include site_check_mk::agent::mrpe
   include site_check_mk::agent::logwatch
 }
-- 
cgit v1.2.3


From c7af5055fd9f255357a8dcd6e318c7a15a3b709c Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Fri, 28 Feb 2014 21:53:12 +0100
Subject: check leap_mx queue

---
 puppet/modules/site_check_mk/manifests/agent/mx.pp | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 puppet/modules/site_check_mk/manifests/agent/mx.pp

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent/mx.pp b/puppet/modules/site_check_mk/manifests/agent/mx.pp
new file mode 100644
index 00000000..c4d3ea13
--- /dev/null
+++ b/puppet/modules/site_check_mk/manifests/agent/mx.pp
@@ -0,0 +1,8 @@
+class site_check_mk::agent::mx {
+
+  file { '/usr/lib/check_mk_agent/local/check_leap_mx.sh':
+    source => 'puppet:///modules/site_check_mk/agent/local_checks/mx/check_leap_mx.sh',
+    mode   => '0755'
+  }
+
+}
-- 
cgit v1.2.3


From efb262a0337493b7a7954ccdd72119d8519370af Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Fri, 28 Feb 2014 23:05:52 +0100
Subject: check leap_mx (Feature #5175)

---
 puppet/modules/site_check_mk/manifests/agent/mx.pp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent/mx.pp b/puppet/modules/site_check_mk/manifests/agent/mx.pp
index c4d3ea13..2dd50400 100644
--- a/puppet/modules/site_check_mk/manifests/agent/mx.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/mx.pp
@@ -1,5 +1,19 @@
 class site_check_mk::agent::mx {
 
+  # watch logs
+  file { '/etc/check_mk/logwatch.d/leap_mx.cfg':
+    source => 'puppet:///modules/site_check_mk/agent/logwatch/leap_mx.cfg',
+  }
+
+  # local nagios plugin checks via mrpe
+  file_line {
+    'Leap_MX_Procs':
+      line => 'Leap_MX_Procs  /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a leap_mx',
+      path => '/etc/check_mk/mrpe.cfg';
+  }
+
+
+  # check stale files in queue dir
   file { '/usr/lib/check_mk_agent/local/check_leap_mx.sh':
     source => 'puppet:///modules/site_check_mk/agent/local_checks/mx/check_leap_mx.sh',
     mode   => '0755'
-- 
cgit v1.2.3


From 984939c4a74b71ce67db27a035ca5017f82c416f Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 3 Mar 2014 17:32:42 +0100
Subject: move generic syslog patterns to the end of syslog.cfg so we can
 ignore patterns first

---
 puppet/modules/site_check_mk/manifests/agent/logwatch/syslog.pp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent/logwatch/syslog.pp b/puppet/modules/site_check_mk/manifests/agent/logwatch/syslog.pp
index ac3dda64..c927780d 100644
--- a/puppet/modules/site_check_mk/manifests/agent/logwatch/syslog.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/logwatch/syslog.pp
@@ -5,9 +5,14 @@ class site_check_mk::agent::logwatch::syslog {
   }
 
   concat::fragment { 'syslog_header':
-    source => 'puppet:///modules/site_check_mk/agent/logwatch/syslog.cfg',
+    source => 'puppet:///modules/site_check_mk/agent/logwatch/syslog_header.cfg',
     target => '/etc/check_mk/logwatch.d/syslog.cfg',
     order  => '01';
   }
+  concat::fragment { 'syslog_tail':
+    source => 'puppet:///modules/site_check_mk/agent/logwatch/syslog_tail.cfg',
+    target => '/etc/check_mk/logwatch.d/syslog.cfg',
+    order  => '99';
+  }
 
 }
-- 
cgit v1.2.3


From 32217e18179687cd4adde350379c57c7f96ca59f Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 4 Mar 2014 15:16:39 +0100
Subject: fix check_mk resource dependencies (Bug #5145)

---
 .../modules/site_check_mk/manifests/agent/logwatch.pp |  6 ++++--
 puppet/modules/site_check_mk/manifests/agent/mrpe.pp  |  3 ++-
 puppet/modules/site_check_mk/manifests/server.pp      | 19 +++++++++++++------
 3 files changed, 19 insertions(+), 9 deletions(-)

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent/logwatch.pp b/puppet/modules/site_check_mk/manifests/agent/logwatch.pp
index 38514af2..4c249e6f 100644
--- a/puppet/modules/site_check_mk/manifests/agent/logwatch.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/logwatch.pp
@@ -4,8 +4,9 @@ class site_check_mk::agent::logwatch {
   # see https://leap.se/code/issues/5135
 
   file { '/usr/lib/check_mk_agent/plugins/mk_logwatch':
-    source => 'puppet:///modules/site_check_mk/agent/plugins/mk_logwatch.1.2.4',
-    mode   => '0755'
+    source  => 'puppet:///modules/site_check_mk/agent/plugins/mk_logwatch.1.2.4',
+    mode    => '0755',
+    require => Package['check-mk-agent']
   }
 
   # only config files that watch a distinct logfile should go in logwatch.d/
@@ -13,6 +14,7 @@ class site_check_mk::agent::logwatch {
     ensure  => directory,
     recurse => true,
     purge   => true,
+    require => Package['check-mk-server']
   }
 
   # service that share a common logfile (i.e. /var/log/syslog) need to get
diff --git a/puppet/modules/site_check_mk/manifests/agent/mrpe.pp b/puppet/modules/site_check_mk/manifests/agent/mrpe.pp
index 37df7f74..7222e4e1 100644
--- a/puppet/modules/site_check_mk/manifests/agent/mrpe.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/mrpe.pp
@@ -8,7 +8,8 @@ class site_check_mk::agent::mrpe {
   }
 
   file { '/etc/check_mk/mrpe.cfg':
-    ensure => present
+    ensure  => present,
+    require => Package['check-mk-server']
   } ->
   file_line { 'Apt':
     line => 'APT    /usr/lib/nagios/plugins/check_apt',
diff --git a/puppet/modules/site_check_mk/manifests/server.pp b/puppet/modules/site_check_mk/manifests/server.pp
index 0c98cd5a..d1bc5930 100644
--- a/puppet/modules/site_check_mk/manifests/server.pp
+++ b/puppet/modules/site_check_mk/manifests/server.pp
@@ -25,25 +25,32 @@ class site_check_mk::server {
     require       => Package['check-mk-server']
   }
 
-  Exec['check_mk-reload'] -> Service['nagios']
+  Exec['check_mk-reload'] ->
+    Exec['check_mk-refresh-inventory-daily'] ->
+    Service['nagios']
 
   file {
     '/etc/check_mk/conf.d/use_ssh.mk':
       content => template('site_check_mk/use_ssh.mk'),
-      notify  => Exec['check_mk-refresh'];
+      notify  => Exec['check_mk-refresh'],
+      require => Package['check-mk-server'];
     '/etc/check_mk/all_hosts_static':
       content => $all_hosts,
-      notify  => Exec['check_mk-refresh'];
+      notify  => Exec['check_mk-refresh'],
+      require => Package['check-mk-server'];
     '/etc/check_mk/.ssh':
-      ensure => directory;
+      ensure  => directory,
+      require => Package['check-mk-server'];
     '/etc/check_mk/.ssh/id_rsa':
       content => $seckey,
       owner   => 'nagios',
-      mode    => '0600';
+      mode    => '0600',
+      require => Package['check-mk-server'];
     '/etc/check_mk/.ssh/id_rsa.pub':
       content => "${type} ${pubkey} monitor",
       owner   => 'nagios',
-      mode    => '0644';
+      mode    => '0644',
+      require => Package['check-mk-server'];
     # check_icmp must be suid root or called by sudo
     # see https://leap.se/code/issues/5171
     '/usr/lib/nagios/plugins/check_icmp':
-- 
cgit v1.2.3


From 8c43ea97e565cc7a76ea15964249a9fb6edccbfb Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 4 Mar 2014 16:37:24 +0100
Subject: don't use storedconfigs for check_mk, requires current check_mk
 module (#5253)

---
 puppet/modules/site_check_mk/manifests/server.pp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/server.pp b/puppet/modules/site_check_mk/manifests/server.pp
index d1bc5930..e544ef0d 100644
--- a/puppet/modules/site_check_mk/manifests/server.pp
+++ b/puppet/modules/site_check_mk/manifests/server.pp
@@ -17,12 +17,13 @@ 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,
-    require       => Package['check-mk-server']
+    site              => '',
+    etc_dir           => '/etc',
+    nagios_subdir     => 'nagios3',
+    bin_dir           => '/usr/bin',
+    host_groups       => undef,
+    use_storedconfigs => false,
+    require           => Package['check-mk-server']
   }
 
   Exec['check_mk-reload'] ->
-- 
cgit v1.2.3


From 8bf1fa304a047fd74538345d1ffa5c2c4312dd55 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 5 Mar 2014 16:08:41 +0100
Subject: use the right package dependencies for site_check_mk::agent class and
 subclasses

---
 puppet/modules/site_check_mk/manifests/agent/logwatch.pp | 4 ++--
 puppet/modules/site_check_mk/manifests/agent/mrpe.pp     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent/logwatch.pp b/puppet/modules/site_check_mk/manifests/agent/logwatch.pp
index 4c249e6f..423cace2 100644
--- a/puppet/modules/site_check_mk/manifests/agent/logwatch.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/logwatch.pp
@@ -6,7 +6,7 @@ class site_check_mk::agent::logwatch {
   file { '/usr/lib/check_mk_agent/plugins/mk_logwatch':
     source  => 'puppet:///modules/site_check_mk/agent/plugins/mk_logwatch.1.2.4',
     mode    => '0755',
-    require => Package['check-mk-agent']
+    require => Package['check-mk-agent-logwatch']
   }
 
   # only config files that watch a distinct logfile should go in logwatch.d/
@@ -14,7 +14,7 @@ class site_check_mk::agent::logwatch {
     ensure  => directory,
     recurse => true,
     purge   => true,
-    require => Package['check-mk-server']
+    require => Package['check-mk-agent-logwatch']
   }
 
   # service that share a common logfile (i.e. /var/log/syslog) need to get
diff --git a/puppet/modules/site_check_mk/manifests/agent/mrpe.pp b/puppet/modules/site_check_mk/manifests/agent/mrpe.pp
index 7222e4e1..6921574f 100644
--- a/puppet/modules/site_check_mk/manifests/agent/mrpe.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/mrpe.pp
@@ -9,7 +9,7 @@ class site_check_mk::agent::mrpe {
 
   file { '/etc/check_mk/mrpe.cfg':
     ensure  => present,
-    require => Package['check-mk-server']
+    require => Package['check-mk-agent']
   } ->
   file_line { 'Apt':
     line => 'APT    /usr/lib/nagios/plugins/check_apt',
-- 
cgit v1.2.3


From 0b3cba122d0393540ca1625e56047ac67f457314 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 12 Mar 2014 23:49:32 +0100
Subject: check if soledad is working (Feature #5239)

---
 puppet/modules/site_check_mk/manifests/agent/webapp.pp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent/webapp.pp b/puppet/modules/site_check_mk/manifests/agent/webapp.pp
index 932d6bb9..cb160d83 100644
--- a/puppet/modules/site_check_mk/manifests/agent/webapp.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/webapp.pp
@@ -1,13 +1,17 @@
 class site_check_mk::agent::webapp {
 
-  # check webapp login
-  package { [ 'python-srp', 'python-requests', 'python-yaml' ]:
+  # check webapp login + soledad sync
+  package { [ 'python-srp', 'python-requests', 'python-yaml', 'python-u1db' ]:
     ensure => installed
   }
   file { '/usr/lib/check_mk_agent/local/nagios-webapp_login.py':
     ensure => link,
     target => '/srv/leap/webapp/test/nagios/webapp_login.py'
   }
+  file { '/usr/lib/check_mk_agent/local/soledad_sync.py':
+    ensure => link,
+    target => '/srv/leap/webapp/test/nagios/soledad_sync.py'
+  }
 
 
   # check syslog
-- 
cgit v1.2.3


From 1ebece7b07ee721eb888873e47fa512a6a42f807 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 25 Mar 2014 08:31:20 +0100
Subject:  ignore openvpn TLS initialization errors (Feature #5374)

---
 puppet/modules/site_check_mk/manifests/agent/openvpn.pp | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 puppet/modules/site_check_mk/manifests/agent/openvpn.pp

(limited to 'puppet/modules/site_check_mk/manifests')

diff --git a/puppet/modules/site_check_mk/manifests/agent/openvpn.pp b/puppet/modules/site_check_mk/manifests/agent/openvpn.pp
new file mode 100644
index 00000000..919a408d
--- /dev/null
+++ b/puppet/modules/site_check_mk/manifests/agent/openvpn.pp
@@ -0,0 +1,10 @@
+class site_check_mk::agent::openvpn {
+
+  # check syslog
+  concat::fragment { 'syslog_openpvn':
+    source  => 'puppet:///modules/site_check_mk/agent/logwatch/syslog/openvpn.cfg',
+    target  => '/etc/check_mk/logwatch.d/syslog.cfg',
+    order   => '02';
+  }
+
+}
-- 
cgit v1.2.3