puppet_check_mk.git
11 months agoMerge remote-tracking branch 'shared/master' master
kwadronaut [Wed, 14 Nov 2018 10:09:02 +0000 (11:09 +0100)]
Merge remote-tracking branch 'shared/master'

2 years agoMerge branch 'params2' into 'master'
Micah [Fri, 21 Jul 2017 19:13:00 +0000 (19:13 +0000)]
Merge branch 'params2' into 'master'

fix syntax errors

See merge request !18

2 years agofix syntax errors
Matt Taggart [Fri, 21 Jul 2017 18:45:15 +0000 (11:45 -0700)]
fix syntax errors

2 years agoMerge branch 'params' into 'master'
Micah [Thu, 20 Jul 2017 23:35:50 +0000 (23:35 +0000)]
Merge branch 'params' into 'master'

create a check_mk::params and start using it

See merge request !17

2 years agocreate a check_mk::params and start using it
Matt Taggart [Thu, 20 Jul 2017 20:01:26 +0000 (13:01 -0700)]
create a check_mk::params and start using it

2 years agoAdopt syntax of puppetlabs/concat module
varac [Mon, 3 Apr 2017 09:45:14 +0000 (11:45 +0200)]
Adopt syntax of puppetlabs/concat module

3 years agoMerge branch 'localfile' into 'master'
Matt Taggart [Mon, 3 Oct 2016 20:28:16 +0000 (20:28 +0000)]
Merge branch 'localfile' into 'master'

make file a non-virtual resource

this check_mk local plugin file resource doesn't need to be a virtual
resource, I suspect the "@" was just a typo since it doesn't seem to
be 'realize'd or used in any collectors. Also remove the tag since
it's not used anywhere.

See merge request !16

3 years agomake file a non-virtual resource
Matt Taggart [Thu, 29 Sep 2016 20:09:22 +0000 (13:09 -0700)]
make file a non-virtual resource

this check_mk local plugin file resource doesn't need to be a virtual
resource, I suspect the "@" was just a typo since it doesn't seem to
be 'realize'd or used in any collectors. Also remove the tag since
it's not used anywhere.

3 years agoMerge branch 'example' into 'master'
varac [Tue, 31 May 2016 07:52:10 +0000 (07:52 +0000)]
Merge branch 'example' into 'master'

provide an example site_check_mk with basic examples to get users started

See merge request !15

3 years agoprovide an example site_check_mk with basic examples to get users started
Matt Taggart [Mon, 30 May 2016 23:40:10 +0000 (16:40 -0700)]
provide an example site_check_mk with basic examples to get users started

3 years agoMerge remote-tracking branch 'shared/master' into leap_master
varac [Mon, 9 May 2016 15:08:07 +0000 (17:08 +0200)]
Merge remote-tracking branch 'shared/master' into leap_master

3 years agoMerge branch 'check_mk_reload' into 'master'
Micah [Mon, 9 May 2016 14:59:37 +0000 (14:59 +0000)]
Merge branch 'check_mk_reload' into 'master'

[bug] create and reload nagios config if needed

We have the `inventory_only_on_changes` parameter that can
be set to `false` to run and inventory and create and
reload nagios config on every puppetrun.

This fixes the bug that `Exec[check_mk-reload]` would only run when
`/etc/nagios3/conf.d/check_mk/check_mk_objects.cfg` doesn't exist
(meaning it would run once and not after this, until the file gets
removed).

multinode|citest|unstable.bitmask.net]
- Resolves: https://leap.se/code/issues/6873

See merge request !14

3 years ago[bug] create and reload nagios config if needed
varac [Mon, 9 May 2016 09:36:34 +0000 (11:36 +0200)]
[bug] create and reload nagios config if needed

We have the `inventory_only_on_changes` parameter that can
be set to `false` to run and inventory and create and
reload nagios config on every puppetrun.

This fixes the bug that `Exec[check_mk-reload]` would only run when
`/etc/nagios3/conf.d/check_mk/check_mk_objects.cfg` doesn't exist
(meaning it would run once and not after this, until the file gets
removed).

multinode|citest|unstable.bitmask.net]
- Resolves: https://leap.se/code/issues/6873

3 years agoMerge remote-tracking branch 'shared/master' into leap_master
varac [Tue, 3 May 2016 19:48:57 +0000 (21:48 +0200)]
Merge remote-tracking branch 'shared/master' into leap_master

3 years agouse inventory_only_on_changes to always run inventory and nagios reload
varac [Tue, 3 May 2016 19:18:33 +0000 (21:18 +0200)]
use inventory_only_on_changes to always run inventory and nagios reload

By default ($inventory_only_on_changes set to `true`) these two execs
are called only when config files changes:

  - Exec['check_mk-refresh'] (which inventorizes checks by calling
    `check_mk -II`)
  - Exec['check_mk-reload']  (which generates the nagios config and
    reloads nagios by calling `check_mk -O`)

By setting this parameter to `false` these execs will be called
on each puppetrun.

3 years agolint manifests/init.pp
varac [Tue, 3 May 2016 18:57:32 +0000 (20:57 +0200)]
lint manifests/init.pp

3 years agoMerge remote-tracking branch 'shared/master' into leap_master
varac [Wed, 9 Mar 2016 16:38:09 +0000 (17:38 +0100)]
Merge remote-tracking branch 'shared/master' into leap_master

3 years agoRemove old checks on agent inventory
varac [Wed, 9 Mar 2016 16:34:50 +0000 (17:34 +0100)]
Remove old checks on agent inventory

3 years agolint and improve config.pp
varac [Wed, 2 Mar 2016 21:41:21 +0000 (22:41 +0100)]
lint and improve config.pp

3 years agoMerge remote-tracking branch 'shared/master' into leap_master
varac [Tue, 1 Mar 2016 14:41:31 +0000 (15:41 +0100)]
Merge remote-tracking branch 'shared/master' into leap_master

3 years agoMerge branch 'sethostname3' into 'master'
Micah [Fri, 4 Dec 2015 02:48:34 +0000 (02:48 +0000)]
Merge branch 'sethostname3' into 'master'

also have the hostname override the name that the key gets on the agent

The previous merge request that added support for overriding the hostname used for ssh, but it neglected to override the host key name so when you did override the hostname then ssh would use the wrong key and fail.

See merge request !10

3 years agoalso have the hostname override the name that the key gets on the agent
Matt Taggart [Thu, 3 Dec 2015 22:58:02 +0000 (14:58 -0800)]
also have the hostname override the name that the key gets on the agent

3 years agoMerge branch 'sethostname2' into 'master'
Matt Taggart [Sat, 21 Nov 2015 21:01:24 +0000 (21:01 +0000)]
Merge branch 'sethostname2' into 'master'

allow setting the desired agent hostname, but default to fqdn

Sometimes the host's fqdn isn't the hostname you want it to use for ssh, allow overriding it

See merge request !9

3 years agoallow setting the desired agent hostname, but default to fqdn
Matt Taggart [Sat, 21 Nov 2015 00:42:10 +0000 (16:42 -0800)]
allow setting the desired agent hostname, but default to fqdn

3 years agoMerge branch 'usessh_perms' into 'master'
Micah [Fri, 20 Nov 2015 01:23:55 +0000 (01:23 +0000)]
Merge branch 'usessh_perms' into 'master'

ensure that use_ssh.mk permissions

are 644, otherwise it ends up unreadable by the nagios user

See merge request !7

3 years agoensure that use_ssh.mk permissions
Matt Taggart [Thu, 19 Nov 2015 20:50:16 +0000 (12:50 -0800)]
ensure that use_ssh.mk permissions

are 644, otherwise it ends up unreadable by the nagios user

4 years agoMerge branch 'fixunderscore' into 'master'
Micah [Tue, 10 Nov 2015 01:08:52 +0000 (01:08 +0000)]
Merge branch 'fixunderscore' into 'master'

fix check_mk::local to use underscores

The recently introduced check_mk::local class was inconsistent in it's naming.

See merge request !6

4 years agofix tag name to use underscore too
Matt Taggart [Tue, 10 Nov 2015 00:24:09 +0000 (16:24 -0800)]
fix tag name to use underscore too

4 years agoMerge branch 'master' into 'master'
Jerome Charaoui [Wed, 7 Oct 2015 15:51:59 +0000 (15:51 +0000)]
Merge branch 'master' into 'master'

check_mk: syntax fixes, linting, version overrides

A couple small commits to fix some syntax errors, cleanup whitespace and lint, and allow for version overrides

See merge request !4

4 years agofix define name to match class
Micah Anderson [Wed, 23 Sep 2015 22:38:43 +0000 (18:38 -0400)]
fix define name to match class

4 years agoMerge remote-tracking branch 'riseup/master'
Matt Taggart [Tue, 30 Jun 2015 21:22:22 +0000 (14:22 -0700)]
Merge remote-tracking branch 'riseup/master'

4 years agoallow version override
Matt Taggart [Tue, 30 Jun 2015 20:48:09 +0000 (13:48 -0700)]
allow version override

For the distro package case, allow overriding the version for
agent and server

4 years agoadd agent::install_local to facilitate installation of local checks, for
Micah Anderson [Fri, 26 Jun 2015 20:10:32 +0000 (16:10 -0400)]
add agent::install_local to facilitate installation of local checks, for
example:

check-mk::agent::install_local { 'check-kvm' :
    ensure  => present,
    source  => 'puppet:///modules/ganeti/check-kvm',
}

4 years agoFix missing closing brace
Jerome Charaoui [Tue, 19 May 2015 20:44:08 +0000 (16:44 -0400)]
Fix missing closing brace

4 years agofix join to use an array
Matt Taggart [Tue, 12 May 2015 18:29:35 +0000 (11:29 -0700)]
fix join to use an array

4 years agoMerge remote-tracking branch 'shared/master' into leap_master
varac [Tue, 12 May 2015 18:18:28 +0000 (20:18 +0200)]
Merge remote-tracking branch 'shared/master' into leap_master

4 years agofix missing }
Matt Taggart [Tue, 12 May 2015 17:51:09 +0000 (10:51 -0700)]
fix missing }

4 years agoMerge branch 'master' of gitlab.com:shared-puppet-modules-group/check_mk
Matt Taggart [Tue, 12 May 2015 17:43:56 +0000 (10:43 -0700)]
Merge branch 'master' of gitlab.com:shared-puppet-modules-group/check_mk

Conflicts:
manifests/agent/generate_sshkey.pp

4 years agofix some else statements, adjust whitespace and indenting to be more sane, minor...
Matt Taggart [Tue, 12 May 2015 17:24:46 +0000 (10:24 -0700)]
fix some else statements, adjust whitespace and indenting to be more sane, minor linting

4 years agoMerge branch 'Dec2014merge' into 'master'
varac [Fri, 17 Apr 2015 19:45:31 +0000 (19:45 +0000)]
Merge branch 'Dec2014merge' into 'master'

riseup Dec2014merge

riseup changes from the last few months, rebased to be easier to deal with.
adds:
* mrpe support (to replace nrpe)
* ps support (to replace statd)
* storing ssh keys in an alternate location
* update docs
* some bug fixes

See merge request !2

4 years agoAdd GPLv3 license
Micah Anderson [Fri, 17 Apr 2015 15:23:16 +0000 (11:23 -0400)]
Add GPLv3 license

4 years agoimprove comments for ps stuff
Matt Taggart [Thu, 22 Jan 2015 21:10:10 +0000 (13:10 -0800)]
improve comments for ps stuff

4 years agomake sure package isn't already defined first
Matt Taggart [Thu, 22 Jan 2015 20:57:33 +0000 (12:57 -0800)]
make sure package isn't already defined first

4 years agoadd sshuser comment
Matt Taggart [Thu, 22 Jan 2015 20:55:43 +0000 (12:55 -0800)]
add sshuser comment

4 years agorevert this part, since we contruct $target we _do_ need to check authdir/authfile
Matt Taggart [Thu, 22 Jan 2015 20:40:06 +0000 (12:40 -0800)]
revert this part, since we contruct $target we _do_ need to check authdir/authfile

4 years agowe don't need to check $authfile, puppet will do the right thing
Matt Taggart [Thu, 22 Jan 2015 20:11:04 +0000 (12:11 -0800)]
we don't need to check $authfile, puppet will do the right thing

Conflicts:
manifests/agent/generate_sshkey.pp

4 years agomake setting host_tags a little safer if we're using the module default of undef
Matt Taggart [Mon, 10 Nov 2014 22:47:37 +0000 (14:47 -0800)]
make setting host_tags a little safer if we're using the module default of undef

4 years agoadd details about migrating from statd and nrpe
Matt Taggart [Tue, 8 Jul 2014 22:24:09 +0000 (15:24 -0700)]
add details about migrating from statd and nrpe

4 years agonew resource collector for 'ps' checks
Matt Taggart [Fri, 27 Jun 2014 00:21:27 +0000 (17:21 -0700)]
new resource collector for 'ps' checks

4 years agoadd mrpe subclass to setup the needed things for doing mrpe checks, so that those...
Matt Taggart [Fri, 16 May 2014 18:52:32 +0000 (11:52 -0700)]
add mrpe subclass to setup the needed things for doing mrpe checks, so that those checks can just include it (stolen from the leap site_check_mk, seems like a good thing to have in the shared module)

4 years agoset the user/group the key needs to be owner by on the server, default to nagios...
Matt Taggart [Tue, 13 May 2014 22:56:22 +0000 (15:56 -0700)]
set the user/group the key needs to be owner by on the server, default to nagios, but this might need to be something else for OMD (if so then that will need tobe passed down via agent::config)

4 years agodefine some files so that the nagios module doesn't try to recurse+purge them
Matt Taggart [Tue, 13 May 2014 22:38:36 +0000 (15:38 -0700)]
define some files so that the nagios module doesn't try to recurse+purge them

4 years agouse new override_builtin parameter to fix problem with central authorized_keys direct...
Matt Taggart [Tue, 13 May 2014 17:27:34 +0000 (10:27 -0700)]
use new override_builtin parameter to fix problem with central authorized_keys directory, use sshuser

4 years agomake resource name unique per host to ensure no collisions
Matt Taggart [Mon, 5 May 2014 20:00:49 +0000 (13:00 -0700)]
make resource name unique per host to ensure no collisions

4 years agocreate an sshuser parameter, so we can determine when we need to use sudo in the...
Matt Taggart [Thu, 1 May 2014 21:07:53 +0000 (14:07 -0700)]
create an sshuser parameter, so we can determine when we need to use sudo in the agent authorized_keys command

4 years agoswitch to using a more standard storage location on the puppetmaster, and make sure...
Matt Taggart [Tue, 29 Apr 2014 19:33:37 +0000 (12:33 -0700)]
switch to using a more standard storage location on the puppetmaster, and make sure it exists, work around bug with /var/lib/puppet/modules, drop monitoring user/group

4 years agoremove username from key filename, add comments explaining where things are getting...
Matt Taggart [Tue, 29 Apr 2014 18:33:41 +0000 (11:33 -0700)]
remove username from key filename, add comments explaining where things are getting installed, don't install the private key on the agent, it's not needed there

4 years agoadd TODO for proper distro support
Matt Taggart [Thu, 24 Apr 2014 23:25:56 +0000 (16:25 -0700)]
add TODO for proper distro support

4 years agoadd some comments about how these classes should be checking if the ssh method is...
Matt Taggart [Thu, 24 Apr 2014 23:05:13 +0000 (16:05 -0700)]
add some comments about how these classes should be checking if the ssh method is being used before doing xinetd related things

4 years agoif using ssh, clean up any existing xinetd config
Matt Taggart [Thu, 24 Apr 2014 22:39:08 +0000 (15:39 -0700)]
if using ssh, clean up any existing xinetd config

4 years agoPurge old checks from check_mk_objects.cfg on Exec['check_mk-refresh']
varac [Tue, 9 Dec 2014 20:40:11 +0000 (21:40 +0100)]
Purge old checks from check_mk_objects.cfg on Exec['check_mk-refresh']

5 years ago/etc/init.d/xinetd has no status cmd in debian as of wheezy
varac [Fri, 26 Sep 2014 16:55:12 +0000 (18:55 +0200)]
/etc/init.d/xinetd has no status cmd in debian as of wheezy

5 years agoreplace homedir with more specific keydir, authdir, and authfile in order to allow...
Matt Taggart [Tue, 22 Apr 2014 07:17:34 +0000 (00:17 -0700)]
replace homedir with more specific keydir, authdir, and authfile in order to allow overriding each. modify ::agent, ::agent::config, and ::agent::generate_sshkey to allow changing at each level, with reasonable defaults

5 years agofix comment from copied code
Matt Taggart [Mon, 21 Apr 2014 22:57:36 +0000 (15:57 -0700)]
fix comment from copied code

5 years agoMerge branch '5253_make_storedconfigs_optional' into leap_master
varac [Tue, 4 Mar 2014 17:19:17 +0000 (18:19 +0100)]
Merge branch '5253_make_storedconfigs_optional' into leap_master

5 years agouse check_mk::server::collect_hosts for collecting storedconfig nodes
varac [Tue, 4 Mar 2014 15:40:27 +0000 (16:40 +0100)]
use check_mk::server::collect_hosts for collecting storedconfig nodes

5 years agouse check_mk::agent::register if registering storedconfig nodes
varac [Tue, 4 Mar 2014 15:18:35 +0000 (16:18 +0100)]
use check_mk::agent::register if registering storedconfig nodes

5 years agoadded class to deploy local checks
varac [Wed, 12 Feb 2014 15:34:50 +0000 (16:34 +0100)]
added class to deploy local checks

5 years agouse latest check-mk packages so they can be installed them from backports
varac [Wed, 12 Feb 2014 15:33:08 +0000 (16:33 +0100)]
use latest check-mk packages so they can be installed them from backports

when apt-pinnned so.

5 years agoadded parameter to configure nagios subdir name
varac [Thu, 6 Feb 2014 17:45:45 +0000 (18:45 +0100)]
added parameter to configure nagios subdir name

5 years agofixed leftover in agent.pp, linted
varac [Wed, 5 Feb 2014 16:22:06 +0000 (17:22 +0100)]
fixed leftover in agent.pp, linted

5 years agoMerge remote-tracking branch 'riseup/master'
varac [Wed, 5 Feb 2014 16:11:17 +0000 (17:11 +0100)]
Merge remote-tracking branch 'riseup/master'

Conflicts:
manifests/agent.pp
manifests/agent/config.pp

5 years agodon't install xinetd by default, restructed agent use of ssh
varac [Tue, 4 Feb 2014 16:55:09 +0000 (17:55 +0100)]
don't install xinetd by default, restructed agent use of ssh

5 years agopass the homedir parameter down from check_mk::agent so we can override it
Matt Taggart [Fri, 17 Jan 2014 22:49:51 +0000 (14:49 -0800)]
pass the homedir parameter down from check_mk::agent so we can override it

5 years agodisable service dependency
Matt Taggart [Fri, 17 Jan 2014 21:52:12 +0000 (13:52 -0800)]
disable service dependency

5 years agomake variable parameters so we can override them
Matt Taggart [Fri, 17 Jan 2014 21:32:55 +0000 (13:32 -0800)]
make variable parameters so we can override them

5 years agomentions this clone's home
Matt Taggart [Tue, 14 Jan 2014 21:32:52 +0000 (13:32 -0800)]
mentions this clone's home

5 years agoupdated readme.md about ssh authentication, added examples for debian in debian.md
varac [Mon, 13 Jan 2014 09:55:25 +0000 (10:55 +0100)]
updated readme.md about ssh authentication, added examples for debian in debian.md

6 years agomake registering of agents on check_mk host optional
varac [Wed, 21 Aug 2013 12:07:00 +0000 (14:07 +0200)]
make registering of agents on check_mk host optional

6 years agospecify default vars directly, not via scoped variables
varac [Thu, 25 Jul 2013 10:35:40 +0000 (12:35 +0200)]
specify default vars directly, not via scoped variables

6 years agochown monitoring:monitoring etc/check_mk/conf.d/use_ssh.mk
varac [Thu, 25 Jul 2013 09:22:14 +0000 (11:22 +0200)]
chown monitoring:monitoring etc/check_mk/conf.d/use_ssh.mk

6 years agomake shell user + group configurable, defaulting to monitoring
varac [Thu, 25 Jul 2013 09:20:24 +0000 (11:20 +0200)]
make shell user + group configurable, defaulting to monitoring

6 years agodon't alias httpd service, use parameter name for it
varac [Wed, 17 Jul 2013 16:49:56 +0000 (18:49 +0200)]
don't alias httpd service, use parameter name for it

6 years agoadded debian example config snippets
varac [Mon, 15 Jul 2013 09:19:51 +0000 (11:19 +0200)]
added debian example config snippets

6 years agonotify Exec['check_mk-refresh'] for use_ssh.mk
varac [Mon, 15 Jul 2013 08:11:39 +0000 (10:11 +0200)]
notify Exec['check_mk-refresh'] for use_ssh.mk

6 years agoonly use service {'xinetd':} if needed
varac [Mon, 15 Jul 2013 08:09:29 +0000 (10:09 +0200)]
only use service {'xinetd':} if needed

6 years agofixed filepath for use_ssh.mk
varac [Mon, 15 Jul 2013 08:06:41 +0000 (10:06 +0200)]
fixed filepath for use_ssh.mk

6 years agofixed class reference for etc_dir config variable
varac [Mon, 15 Jul 2013 08:01:45 +0000 (10:01 +0200)]
fixed class reference for etc_dir config variable

6 years agoforgot check_mk::server::configure_ssh class name
varac [Mon, 15 Jul 2013 07:58:17 +0000 (09:58 +0200)]
forgot check_mk::server::configure_ssh class name

6 years agoadded use_ssh to check_mk class
varac [Mon, 15 Jul 2013 07:56:11 +0000 (09:56 +0200)]
added use_ssh to check_mk class

6 years agoonly include host_tags in tags of they are not empty
varac [Mon, 15 Jul 2013 07:35:25 +0000 (09:35 +0200)]
only include host_tags in tags of they are not empty

6 years agotypo in classname
varac [Mon, 15 Jul 2013 07:30:54 +0000 (09:30 +0200)]
typo in classname

6 years agoMust pass ip_whitelist to Class[Check_mk::Agent::Config]
varac [Mon, 15 Jul 2013 07:29:48 +0000 (09:29 +0200)]
Must pass ip_whitelist to Class[Check_mk::Agent::Config]

6 years agossh support for agent
varac [Mon, 15 Jul 2013 07:27:27 +0000 (09:27 +0200)]
ssh support for agent

6 years agoadded check_mk::omd_repo and updated README
varac [Mon, 15 Jul 2013 06:56:22 +0000 (08:56 +0200)]
added check_mk::omd_repo and updated README

6 years agoadded omdadmin htpasswd parameter
varac [Mon, 15 Jul 2013 06:55:36 +0000 (08:55 +0200)]
added omdadmin htpasswd parameter

6 years agoxinitd -> xinetd
varac [Wed, 10 Jul 2013 17:01:30 +0000 (19:01 +0200)]
xinitd -> xinetd

6 years agomake service names configurable
varac [Wed, 10 Jul 2013 16:54:08 +0000 (18:54 +0200)]
make service names configurable

6 years agoallow $version to be left empty in agent::install
varac [Wed, 10 Jul 2013 16:19:20 +0000 (18:19 +0200)]
allow $version to be left empty in agent::install

6 years agomake agent package names configurable
varac [Wed, 10 Jul 2013 16:17:15 +0000 (18:17 +0200)]
make agent package names configurable