Removed some more native:: prefixes (oops).

diff --git a/contrib/config/icinga2_demo0_basic.conf b/contrib/config/icinga2_demo0_basic.conf
index e553ecec8ec7305b1dc843a8ab5b30a9fb315ecc..d87dc04619a44af5b084500ff0d802eb3bc1d188 100644 (file)
--- a/contrib/config/icinga2_demo0_basic.conf
+++ b/contrib/config/icinga2_demo0_basic.conf
@@ -72,7 +72,7 @@ local object Component "compatido" {
  */
 abstract object Service "icinga-service" {
   methods = {
-    check = "native::PluginCheck"
+    check = "PluginCheck"
   }
 }
 

diff --git a/contrib/config/icinga2_demo1_hostcheck.conf b/contrib/config/icinga2_demo1_hostcheck.conf
index 63be2439056f486e1eaaf4c3796ac831091521a7..d2c46f3ac0be309491d6e22f5b277caf65699cc1 100644 (file)
--- a/contrib/config/icinga2_demo1_hostcheck.conf
+++ b/contrib/config/icinga2_demo1_hostcheck.conf
@@ -72,7 +72,7 @@ local object Component "compatido" {
  */
 abstract object Service "icinga-service" {
   methods = {
-    check = "native::PluginCheck"
+    check = "PluginCheck"
   }
 }
 

diff --git a/contrib/config/icinga2_demo2_hostgroup.conf b/contrib/config/icinga2_demo2_hostgroup.conf
index 43aa2330eb2717cb7910908bde92b8b8400ccc4d..561656d0084d3ce647c57d2f0656c0028d07714f 100644 (file)
--- a/contrib/config/icinga2_demo2_hostgroup.conf
+++ b/contrib/config/icinga2_demo2_hostgroup.conf
@@ -72,7 +72,7 @@ local object Component "compatido" {
  */
 abstract object Service "icinga-service" {
   methods = {
-    check = "native::PluginCheck"
+    check = "PluginCheck"
   }
 }
 

diff --git a/contrib/config/icinga2_demo3_abstract.conf b/contrib/config/icinga2_demo3_abstract.conf
index 8277c2b601aaf6d210c0179c218cce1ce34d6611..ac7e0f8f0b49562d744d9d698670c075bea825ce 100644 (file)
--- a/contrib/config/icinga2_demo3_abstract.conf
+++ b/contrib/config/icinga2_demo3_abstract.conf
@@ -72,7 +72,7 @@ local object Component "compatido" {
  */
 abstract object Service "icinga-service" {
   methods = {
-    check = "native::PluginCheck"
+    check = "PluginCheck"
   }
 }
 

diff --git a/contrib/config/icinga2_demo4_distm.conf b/contrib/config/icinga2_demo4_distm.conf
index 5a1efc01dedae6e5845647486e14b796e8ec1476..e5796df302cf6aa506e9cdd38e8c8b8b2cc3b568 100644 (file)
--- a/contrib/config/icinga2_demo4_distm.conf
+++ b/contrib/config/icinga2_demo4_distm.conf
@@ -78,7 +78,7 @@ local object Component "compatido" {
  */
 abstract object Service "icinga-service" {
   methods = {
-    check = "native::PluginCheck"
+    check = "PluginCheck"
   }
 }
 

diff --git a/contrib/config/icinga2_demo5_distm_bench.conf b/contrib/config/icinga2_demo5_distm_bench.conf
index 64e8de9d6885df099710763da70eab135935050f..0bd22f1df4a1dd47802cd7f949f9e4b44d99e50b 100644 (file)
--- a/contrib/config/icinga2_demo5_distm_bench.conf
+++ b/contrib/config/icinga2_demo5_distm_bench.conf
@@ -78,7 +78,7 @@ local object Component "compatido" {
  */
 abstract object Service "icinga-service" {
   methods = {
-    check = "native::PluginCheck"
+    check = "PluginCheck"
   }
 }
 

diff --git a/docs/icinga2-config.txt b/docs/icinga2-config.txt
index d431aad5c9ce7c09c6d472e63b55f079b02ff5ab..318df23a24be93c7997edfdeffcfb71b21a83766 100644 (file)
--- a/docs/icinga2-config.txt
+++ b/docs/icinga2-config.txt
@@ -359,7 +359,7 @@ type Pizza {
        %attribute number "radius",
 
        %attribute dictionary "ingredients" {
-               %validator "native::ValidateIngredients",
+               %validator "ValidateIngredients",
 
                %attribute string "*",
 
@@ -381,7 +381,7 @@ dictionary.
 * Elements in the ingredients dictionary can be either a string or a dictionary.
 * If they're a dictionary they may contain attributes "quantity" (of type
 number) and "name" (of type string).
-* The script function "native::ValidateIngredients" is run to perform further
+* The script function "ValidateIngredients" is run to perform further
 validation of the ingredients dictionary.
 * Pizza objects may contain attribute matching the pattern "custom::*" of any
 type.
@@ -614,7 +614,7 @@ object Service "localhost-uptime" {
   alias = "localhost Uptime",
 
   methods = {
-    check = "native::PluginCheck"
+    check = "PluginCheck"
   },
 
   check_command = "$plugindir$/check_snmp -H $address$ -C $community$ -o $oid$",
@@ -649,7 +649,7 @@ Attribute: methods - check
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The check type of the service. For now only external check plugins are
-supported ("native::PluginCheck").
+supported ("PluginCheck").
 
 Attribute: check_command
 ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -869,7 +869,7 @@ local object Component "delegation" {
 
 abstract object Service "icinga-service" {
   methods = {
-    check = "native::PluginCheck"
+    check = "PluginCheck"
   },
 
   macros = {

diff --git a/etc/icinga2/icinga2.conf.win32 b/etc/icinga2/icinga2.conf.win32
index 72ef7516a305425c6149c56581d1ab4981342ffb..be79b1f6d08736fda61babec6cc908dd697a53ec 100644 (file)
--- a/etc/icinga2/icinga2.conf.win32
+++ b/etc/icinga2/icinga2.conf.win32
@@ -71,7 +71,7 @@ local object Component "compatido" {
  */
 abstract object Service "icinga-service" {
   methods = {
-    check = "native::PluginCheck"
+    check = "PluginCheck"
   }
 }
 

diff --git a/lib/icinga/pluginchecktask.cpp b/lib/icinga/pluginchecktask.cpp
index 62ed38d15662d60d89ff094da708659f6045066e..f88cfce950eb50324384fc46219bab02df66e1c1 100644 (file)
--- a/lib/icinga/pluginchecktask.cpp
+++ b/lib/icinga/pluginchecktask.cpp
@@ -21,7 +21,7 @@
 
 using namespace icinga;
 
-REGISTER_SCRIPTFUNCTION("native::PluginCheck",  &PluginCheckTask::ScriptFunc);
+REGISTER_SCRIPTFUNCTION("PluginCheck",  &PluginCheckTask::ScriptFunc);
 
 PluginCheckTask::PluginCheckTask(const ScriptTask::Ptr& task, const Process::Ptr& process)
        : m_Task(task), m_Process(process)