Commit graph

141 commits

Author SHA1 Message Date
Nick Chappell
893956ded8 Merge branch '7222' of github.com:cropalato/puppet-icinga2 into cropalato-7222 2014-11-16 21:41:32 -08:00
Steven Bambling
e581fd6b6e fixing issue with README example
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:37:04 -08:00
Steven Bambling
1c6637252e correctly merge conflicts
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:58 -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
1047213430 * fixed typo
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:13 -08: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
21b374923f cleaning up readme
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:53:54 -08:00
Steven Bambling
afe86ed648 adding readme section for new define
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:38 -08:00
Devon Mizelle
7242b7b07c more readme warnings about centos 5 requirements
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:40 -08:00
Devon Mizelle
b139f775a6 adding specific pgsql instructions 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:33 -08:00
Devon Mizelle
bf5440fb3e more README puppet DSL fixing
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:25 -08:00
Devon Mizelle
fb9e17f7b8 fixing some missing commas in the Server usage example puppet DSL
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:20 -08:00
Devon Mizelle
36f9104c3b adding CentOS 5 information to README.md
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:57 -08:00
Tom De Vylder
23a7a6075c Document $nrpe_purge_unmanaged parameter
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:21 -08:00
Ricardo Cropalato de Melo
382bb05b5f + Added Livestatus Listener object. #7222 2014-11-13 13:06:47 -05:00
Ricardo Cropalato de Melo
18147f9dc2 * fixed conflict. 2014-11-13 12:09:50 -05:00
Ricardo Melo
eaa76e78a4 Fixed internal links.
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/42/
2014-11-12 20:58:39 -08:00
Ricardo Melo
fce7f11ff1 * fixed typo 2014-11-12 09:21:18 -05:00
Ricardo Melo
a21bc9f9f6 * removed empty lines. 2014-11-12 08:48:40 -05:00
Ricardo Melo
2dca509573 * removed duplication. 2014-11-12 08:47:26 -05:00
Ricardo Melo
7ed2bd5add Merge branch '7218' of https://github.com/cropalato/puppet-icinga2 into 7218 2014-11-12 08:38:06 -05:00
Ricardo Melo
5d71ca8e3b * fixed typo 2014-11-12 08:37:02 -05:00
Ricardo Melo
b126dd5686 + Added scheduleddowntime object. #7218 2014-11-12 08:37:02 -05:00
Steven Bambling
82c1930974 fixing readme to remove timeperiod_ for ranges param
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:06 -08:00
Steven Bambling
2059489c11 fixing param specific names for timeperiod in readme
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:39 -08:00
Steven Bambling
bebb8af23e fixing typo in doc
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:26 -08:00
Steven Bambling
d6b0acf4e4 setting link in object types
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:17 -08:00
Steven Bambling
adc8001ad5 adding README doc
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:06 -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
a52b14d4a1 * fixed typo 2014-11-11 18:28:23 -05:00
Ricardo Melo
d96a439357 + Added scheduleddowntime object. #7218 2014-11-04 12:40:30 -05:00
Ricardo Melo
60e5a294f8 * fixed eventcommand example
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
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
6f7a249841 updating README
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from PR #34: https://github.com/Icinga/puppet-icinga2/pull/34
2014-11-01 21:17:03 -07:00
Nick Chappell
2a0096fc1d Made a subsection for Debmon repo usage. 2014-10-19 16:20:40 -07:00
Nick Chappell
0b7336f9cf Added bold text to create a subsection header for the mail binaries parameter explanation. 2014-10-19 14:58:22 -07:00
Nick Chappell
dab058d712 Added bold text to create a subsection header. 2014-10-19 14:57:25 -07:00
Nick Chappell
477081af7a Add the id: anchor link to the apply_service_to_host object's subsection header. 2014-10-18 20:05:08 -07:00
Nick Chappell
d0144c8e43 Added the CheckCommand object to the object list and linked to it's subsection. 2014-10-18 20:03:56 -07:00
Nick Chappell
5a333c5169 Small README fixes. 2014-10-18 19:44:31 -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
Nick Chappell
c8d7606b51 Add a leading 0 to the file mode in the example in the README. 2014-10-10 22:32:59 -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
cc69fa52e4 Removed trailing whitespaces. 2014-10-09 23:34:48 -07:00
Steven Bambling
1c9027f3e3 updating README
Signed-off-by: Nick Chappell <nick@intronic.org>
2014-10-09 23:12:21 -07:00
Olivier FONTANNAUD
2826c0fa9f Refactor debmon support
Signed-off-by: Nick Chappell <nick@intronic.org>
2014-10-09 22:26:07 -07:00
ofontannaud
4dd15a17e7 Add debmon support
Signed-off-by: Nick Chappell <nick@intronic.org>
2014-10-09 22:26:07 -07:00