Commit graph

290 commits

Author SHA1 Message Date
ricardo@cropalato.com.br
58edf35726 Merge remote-tracking branch 'upstream/master' into 7222 2014-11-17 06:25:50 -05:00
ricardo@cropalato.com.br
409be02191 Fixed typo 2014-11-17 06:14:41 -05:00
Steven Bambling
9995a40747 adding defined type to apply notifiation to service
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged this from: https://github.com/Icinga/puppet-icinga2/pull/44

refs#7677: https://dev.icinga.org/issues/7677
2014-11-16 21:36:37 -08:00
Nick Chappell
4f2b4370c6 Fixed merge conflicts in README. 2014-11-16 21:03:35 -08:00
ricardo@cropalato.com.br
519f16568e Merge remote-tracking branch 'upstream/master' into 7222 2014-11-14 10:09:45 -05:00
Ricardo Cropalato de Melo
5b289000e2 Adding PerfdataWriter object. #7220
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/47

refs#7220: https://dev.icinga.org/issues/7220
2014-11-13 22:02:03 -08:00
Steven Bambling
ade087a21b adding define to apply notifications to hosts
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/43

refs#7676: https://dev.icinga.org/issues/7676
2014-11-13 21:50:23 -08:00
Josh Holland
5f1e23e00d Escape backslash
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/40

refs#7675: https://dev.icinga.org/issues/7675
2014-11-13 21:34:49 -08:00
Josh Holland
f74aab291b Further fix the quoting of PostgreSQL password
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/40

refs#7675: https://dev.icinga.org/issues/7675
2014-11-13 21:34:44 -08:00
Josh Holland
27988d88dc Quote PostgreSQL database password properly
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/40

refs#7675: https://dev.icinga.org/issues/7675
2014-11-13 21:34:29 -08:00
Devon Mizelle
a5ae5b49ef forgot a line to define service name for centos5
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/41

refs#7674: https://dev.icinga.org/issues/7674
2014-11-13 21:12:10 -08:00
Devon Mizelle
6377816ff8 well, looks like we have to provide server support for centos5 anywayss
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/41

refs#7674: https://dev.icinga.org/issues/7674
2014-11-13 21:11:49 -08:00
Devon Mizelle
40228fddb5 add CentOS5 client package support
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/41

refs#7674: https://dev.icinga.org/issues/7674
2014-11-13 21:11:38 -08:00
Tom De Vylder
f48d22d309 Add nrpe_purge_unmanaged parameter to nrpe class
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/39

refs#7673: https://dev.icinga.org/issues/7673
2014-11-13 20:33:27 -08:00
Tom De Vylder
48d5bfb0ce Add previously unmanaged directory
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/39

refs#7673: https://dev.icinga.org/issues/7673
2014-11-13 20:33:16 -08:00
Tom De Vylder
bda1a2089d Parametrize purging of unmanaged nrpe configs
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/39

refs#7673: https://dev.icinga.org/issues/7673
2014-11-13 20:33:09 -08:00
Tom De Vylder
4c3c603350 Purge unmanaged files from nrpe.d
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/39

refs#7673: https://dev.icinga.org/issues/7673
2014-11-13 20:32:47 -08:00
Ricardo Cropalato de Melo
382bb05b5f + Added Livestatus Listener object. #7222 2014-11-13 13:06:47 -05:00
Ricardo Melo
b126dd5686 + Added scheduleddowntime object. #7218 2014-11-12 08:37:02 -05:00
Steven Bambling
e7710c6d2d only check some params if the "default" erb template is used. Also allow for "static" templates and files to be set in pace of "default" erb
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/35

refs#7628: https://dev.icinga.org/issues/7628
2014-11-11 21:47:23 -08:00
Steven Bambling
46298909ed adding ability to call a static checkcommand template
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/35

refs#7628: https://dev.icinga.org/issues/7628
2014-11-11 21:47:08 -08:00
Steven Bambling
6e5dd00438 missed removing timeperiod_ from a validate entry
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/37

refs#7217: https://dev.icinga.org/issues/7217
2014-11-11 21:23:13 -08:00
Steven Bambling
e4ec0c03a8 removing timeperiod_ from non specifc params
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/37

refs#7217: https://dev.icinga.org/issues/7217
2014-11-11 21:22:54 -08:00
Steven Bambling
9180f9a17e removing timeperiod_ from target/dir/file and mode
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/37

refs#7217: https://dev.icinga.org/issues/7217
2014-11-11 21:22:48 -08:00
Steven Bambling
ae65c9766b updating erb to use timeperiod methods
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/37

refs#7217: https://dev.icinga.org/issues/7217
2014-11-11 21:22:00 -08:00
Steven Bambling
52f0d25836 adding methods attribute and allowing settable import template
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/37

refs#7217: https://dev.icinga.org/issues/7217
2014-11-11 21:21:07 -08:00
Steven Bambling
12bd1a9f44 adding define and template to generate timeperiods
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/37

refs#7217: https://dev.icinga.org/issues/7217
2014-11-11 21:20:42 -08:00
Ricardo Melo
d02eae3b5b * Applied comments made by nickchappell. Fixed identation and few typos on README.md. Tabularize define parameters.
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/36

refs#7216: https://dev.icinga.org/issues/7216
2014-11-11 21:10:51 -08:00
Ricardo Melo
09db5bba18 Adding notification object. #2716
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/36

refs#7216: https://dev.icinga.org/issues/7216
2014-11-11 21:10:37 -08:00
Ricardo Melo
4dfe6fa664 added default value to arguments, env and vars and moved check to the template.
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged in from: https://github.com/Icinga/puppet-icinga2/pull/33

refs#7215: https://dev.icinga.org/issues/7215
2014-11-01 21:39:10 -07:00
Ricardo Melo
6af3b7b9ae * fixed typos, changed default values and changed parameters validation.
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged in from: https://github.com/Icinga/puppet-icinga2/pull/33

refs#7215: https://dev.icinga.org/issues/7215
2014-11-01 21:39:10 -07:00
Ricardo Melo
f9a4feb746 Add a EventCommand object defined type, refs#7215
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged in from: https://github.com/Icinga/puppet-icinga2/pull/33

refs#7215: https://dev.icinga.org/issues/7215
2014-11-01 21:38:59 -07:00
Ricardo Melo
d55c055682 added default value to arguments, env and vars and moved check to the template.
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged in from: https://github.com/Icinga/puppet-icinga2/pull/32

refs#7228: https://dev.icinga.org/issues/7228
2014-11-01 21:19:06 -07:00
Ricardo Melo
abe26cb9e3 * fixed validation
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged in from: https://github.com/Icinga/puppet-icinga2/pull/32

refs#7228: https://dev.icinga.org/issues/7228
2014-11-01 21:18:53 -07:00
Ricardo Melo
537735a486 * fixed typos and mistakes. thanks nickchappell.
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged in from: https://github.com/Icinga/puppet-icinga2/pull/32

refs#7228: https://dev.icinga.org/issues/7228
2014-11-01 21:18:43 -07:00
Ricardo Melo
f0415a6c5a + Adding notificationcommand object
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged in from: https://github.com/Icinga/puppet-icinga2/pull/32

refs#7228: https://dev.icinga.org/issues/7228
2014-11-01 21:17:16 -07:00
Steven Bambling
a5ce5144d9 adding checkplugin_template_module parameter to call tempaltes from other modules. Useful for roles/profiles setup
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from PR #34: https://github.com/Icinga/puppet-icinga2/pull/34
2014-10-23 21:30:46 -07:00
Nick Chappell
cf5c8e99bc Update the path for the target directory so it matches the target directories of the other object types. 2014-10-18 19:48:27 -07:00
Ricardo Melo
f1b88abebf * fixed #7213
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged in from Github PR29: https://github.com/Icinga/puppet-icinga2/pull/29

refs#7213: https://dev.icinga.org/issues/7213
2014-10-18 19:42:08 -07:00
Ricardo Melo
42e6186709 added new file
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged in from Github PR29: https://github.com/Icinga/puppet-icinga2/pull/29

refs#7213: https://dev.icinga.org/issues/7213
2014-10-18 19:41:25 -07:00
Markus Frosch
cf3f80e3fe Use actual debmon.org repository key
29D662D2 is the actual debmon.org key
BC7D020A is Alexander Wirt's (formorer) old key
2014-10-15 10:34:06 +02:00
Markus Frosch
972b7abee8 Always include Class apt on Debian, needed by apt::source
In addition some indention fixes.
2014-10-15 10:30:26 +02:00
Melanie Gault
80c87b0ad1 add dependency and apply dependency objects
Signed-off-by: Nick Chappell <nick@intronic.org>

Icinga refs#7219: https://dev.icinga.org/issues/7219
2014-10-14 21:52:18 -07:00
Nick Chappell
5f2b0ff8da Merge branch 'pr/27/server_check_plugin_defined_type'
Merged in from: https://github.com/Icinga/puppet-icinga2/pull/27
2014-10-10 22:13:39 -07:00
Nick Chappell
95a15f2b2c Merge branch 'pr/23/features_enable_disable'
Merged in from: https://github.com/Icinga/puppet-icinga2/pull/23
2014-10-10 22:00:51 -07:00
Nick Chappell
28961d8fce Comments in the icinga2::object::graphitewriter manifest. 2014-10-09 23:43:02 -07:00
Steven Bambling
f437b8406f allow either source or content to be used as the file distribution method
Signed-off-by: Nick Chappell <nick@intronic.org>
2014-10-09 23:30:49 -07:00
Steven Bambling
5e82839bb1 moving to using templates as the content source
Signed-off-by: Nick Chappell <nick@intronic.org>
2014-10-09 23:30:49 -07:00
Steven Bambling
556aab7259 updating checkplugin_libdir for centos machies
Signed-off-by: Nick Chappell <nick@intronic.org>
2014-10-09 23:30:49 -07:00
Steven Bambling
075ca2a4bf adding new parameter for checkplugin_libdir to keep backwards compatibility
Signed-off-by: Nick Chappell <nick@intronic.org>
2014-10-09 23:30:49 -07:00