Rename features: statusdat -> statusdata, compat-log -> compatlog .

diff --git a/.vagrant-puppet/modules/icinga-classicui/manifests/init.pp b/.vagrant-puppet/modules/icinga-classicui/manifests/init.pp
index 1d522fc500a20a8ff62c956a36cd03aa7810bf23..0ac5b96b244ca4687032c67f484c21d2a6048d2e 100644 (file)
--- a/.vagrant-puppet/modules/icinga-classicui/manifests/init.pp
+++ b/.vagrant-puppet/modules/icinga-classicui/manifests/init.pp
@@ -32,9 +32,9 @@ class icinga-classicui {
     require => [ Class['apache'], Group['icingacmd'] ]
   }
 
-  icinga2::feature { 'statusdat': }
+  icinga2::feature { 'statusdata': }
 
   icinga2::feature { 'command': }
 
-  icinga2::feature { 'compat-log': }
+  icinga2::feature { 'compatlog': }
 }

diff --git a/doc/2.2-setting-up-icinga-classic-ui.md b/doc/2.2-setting-up-icinga-classic-ui.md
index 0d6b9052be40b8a31320704aa37a84f010e3ecbc..176e39eafef7b3b1bbb2785e31c491ac46b9c790 100644 (file)
--- a/doc/2.2-setting-up-icinga-classic-ui.md
+++ b/doc/2.2-setting-up-icinga-classic-ui.md
@@ -33,7 +33,8 @@ by the Classic UI. The command pipe is also not enabled by default.
 
 You can use i2enfeature to enable these features:
 
-    # i2enfeature statusdat
+    # i2enfeature statusdata
+    # i2enfeature compatlog
     # i2enfeature command
 
 After enabling these features you will need to restart Icinga 2:

diff --git a/doc/2.6-running-icinga.md b/doc/2.6-running-icinga.md
index eaf19326337500451f7d0e4d63205f79d95de634..c5d427ddc3632bbba7dc76ecf3115d5a1df65fa1 100644 (file)
--- a/doc/2.6-running-icinga.md
+++ b/doc/2.6-running-icinga.md
@@ -85,18 +85,18 @@ You can view a list of available feature configuration files:
     Syntax: i2enfeature <feature>
     Enables the specified feature.
 
-    Available features: statusdat
+    Available features: statusdata
 
 Using the `i2enfeature` command you can enable features:
 
-    # i2enfeature statusdat
-    Module 'statusdat' was enabled.
+    # i2enfeature statusdata
+    Module 'statusdata' was enabled.
     Make sure to restart Icinga 2 for these changes to take effect.
 
 You can disable features using the `i2disfeature` command:
 
-    # i2disfeature statusdat
-    Module 'statusdat' was disabled.
+    # i2disfeature statusdata
+    Module 'statusdata' was disabled.
     Make sure to restart Icinga 2 for these changes to take effect.
 
 > **Note**

diff --git a/doc/4.3-object-types.md b/doc/4.3-object-types.md
index df41c7c58a3d68f952616b52e41a0f8835bd5d80..32c4a163351483354816e4302c070dea3c344a18 100644 (file)
--- a/doc/4.3-object-types.md
+++ b/doc/4.3-object-types.md
@@ -575,7 +575,7 @@ Example:
     library "compat"
 
     object CompatLogger "my-log" {
-      log\_dir = "/var/log/icinga2/compat/compat-log",
+      log\_dir = "/var/log/icinga2/compat",
       rotation\_method = "HOURLY"
     }
 

diff --git a/etc/icinga2/features-available/Makefile.am b/etc/icinga2/features-available/Makefile.am
index fc37d95f56f373325c90784cd1aea4a78d0578a9..777bb8b45da0962addc3cda7d0ac9148a24765ac 100644 (file)
--- a/etc/icinga2/features-available/Makefile.am
+++ b/etc/icinga2/features-available/Makefile.am
@@ -5,14 +5,14 @@ icinga2confdir = $(DESTDIR)${sysconfdir}/icinga2/features-available
 CONFIG_FILES = \
        checker.conf \
        command.conf \
-       compat-log.conf \
+       compatlog.conf \
        graphite.conf \
        ido-mysql.conf \
        livestatus.conf \
        notification.conf \
        perfdata.conf \
        syslog.conf \
-       statusdat.conf
+       statusdata.conf
 
 install-data-local:
        @$(MKDIR_P) $(icinga2confdir); \

diff --git a/etc/icinga2/features-available/compat-log.conf b/etc/icinga2/features-available/compatlog.conf
similarity index 79%
rename from etc/icinga2/features-available/compat-log.conf
rename to etc/icinga2/features-available/compatlog.conf
index b322feb7bed730f3e81586b9671b4206217752e8..58c5df7168e2c91f51378ad7abfa7cef88e17e3f 100644 (file)
--- a/etc/icinga2/features-available/compat-log.conf
+++ b/etc/icinga2/features-available/compatlog.conf
@@ -5,5 +5,5 @@
 
 library "compat"
 
-object CompatLogger "compat-log" { }
+object CompatLogger "compatlog" { }
 

diff --git a/etc/icinga2/features-available/statusdat.conf b/etc/icinga2/features-available/statusdata.conf
similarity index 100%
rename from etc/icinga2/features-available/statusdat.conf
rename to etc/icinga2/features-available/statusdata.conf

diff --git a/tools/migration/icinga2-migration.conf b/tools/migration/icinga2-migration.conf
index 6b49be68f99756af3f5f3c64ec6187abb6f1c07d..7ad0620527954d7a8f21586251c541236865185c 100644 (file)
--- a/tools/migration/icinga2-migration.conf
+++ b/tools/migration/icinga2-migration.conf
@@ -5,8 +5,8 @@ include "../../etc/icinga2/features-available/checker.conf"
 include "../../etc/icinga2/features-available/notification.conf"
 
 //classic ui
-include "../../etc/icinga2/features-available/statusdat.conf"
-include "../../etc/icinga2/features-available/compat-log.conf"
+include "../../etc/icinga2/features-available/statusdata.conf"
+include "../../etc/icinga2/features-available/compatlog.conf"
 include "../../etc/icinga2/features-available/command.conf"
 
 include "conf/resource.conf"