[icinga-checkins] icinga.org: icinga-vagrant/master: icinga2x-elastic: First run

git at icinga.org git at icinga.org
Mon Nov 28 20:02:44 CET 2016


Module: icinga-vagrant
Branch: master
Commit: a048501be2c6cff80ba4d420440d73464a58a71e
URL:    https://git.icinga.org/?p=icinga-vagrant.git;a=commit;h=a048501be2c6cff80ba4d420440d73464a58a71e

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Sun Jun 26 12:36:19 2016 +0200

icinga2x-elastic: First run

---

 icinga2x-elastic/files/etc/icinga2/icinga2.conf |    2 +-
 icinga2x-elastic/manifests/default.pp           |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/icinga2x-elastic/files/etc/icinga2/icinga2.conf b/icinga2x-elastic/files/etc/icinga2/icinga2.conf
index 9f2720a..706a5e3 100644
--- a/icinga2x-elastic/files/etc/icinga2/icinga2.conf
+++ b/icinga2x-elastic/files/etc/icinga2/icinga2.conf
@@ -6,4 +6,4 @@ include <plugins-contrib>
 include "features-enabled/*.conf"
 
 include_recursive "conf.d"
-include_recursive "bp"
+//include_recursive "bp"
diff --git a/icinga2x-elastic/manifests/default.pp b/icinga2x-elastic/manifests/default.pp
index 9609cfa..b6a6208 100644
--- a/icinga2x-elastic/manifests/default.pp
+++ b/icinga2x-elastic/manifests/default.pp
@@ -221,9 +221,8 @@ file { '/etc/security/limits.d/99-elasticsearch.conf':
 class { 'java':
 } ->
 class { 'elasticsearch':
-  version      => '1.7.3-1',
   manage_repo  => true,
-  repo_version => '1.7',
+  repo_version => '2.x',
   java_install => false,
 } ->
 elasticsearch::instance { 'elastic-es':



More information about the icinga-checkins mailing list