tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed some more native:: prefixes (oops).

This commit is contained in:
Gunnar Beutner 2013-02-15 12:49:14 +01:00
parent efd108982a
commit d13017ef60
9 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/config/icinga2_demo0_basic.conf
View File

@ -72,7 +72,7 @@ local object Component "compatido" {
*/ */
abstract object Service "icinga-service" { abstract object Service "icinga-service" {
methods = { methods = {
check = "native::PluginCheck" check = "PluginCheck"
} }
} }

2
contrib/config/icinga2_demo1_hostcheck.conf
View File

@ -72,7 +72,7 @@ local object Component "compatido" {
*/ */
abstract object Service "icinga-service" { abstract object Service "icinga-service" {
methods = { methods = {
check = "native::PluginCheck" check = "PluginCheck"
} }
} }

2
contrib/config/icinga2_demo2_hostgroup.conf
View File

@ -72,7 +72,7 @@ local object Component "compatido" {
*/ */
abstract object Service "icinga-service" { abstract object Service "icinga-service" {
methods = { methods = {
check = "native::PluginCheck" check = "PluginCheck"
} }
} }

2
contrib/config/icinga2_demo3_abstract.conf
View File

@ -72,7 +72,7 @@ local object Component "compatido" {
*/ */
abstract object Service "icinga-service" { abstract object Service "icinga-service" {
methods = { methods = {
check = "native::PluginCheck" check = "PluginCheck"
} }
} }

2
contrib/config/icinga2_demo4_distm.conf
View File

@ -78,7 +78,7 @@ local object Component "compatido" {
*/ */
abstract object Service "icinga-service" { abstract object Service "icinga-service" {
methods = { methods = {
check = "native::PluginCheck" check = "PluginCheck"
} }
} }

2
contrib/config/icinga2_demo5_distm_bench.conf
View File

@ -78,7 +78,7 @@ local object Component "compatido" {
*/ */
abstract object Service "icinga-service" { abstract object Service "icinga-service" {
methods = { methods = {
check = "native::PluginCheck" check = "PluginCheck"
} }
} }

10
docs/icinga2-config.txt
View File

@ -359,7 +359,7 @@ type Pizza {
%attribute number "radius", %attribute number "radius",
%attribute dictionary "ingredients" { %attribute dictionary "ingredients" {
%validator "native::ValidateIngredients", %validator "ValidateIngredients",
%attribute string "*", %attribute string "*",
@ -381,7 +381,7 @@ dictionary.
* Elements in the ingredients dictionary can be either a string or a 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 * If they're a dictionary they may contain attributes "quantity" (of type
number) and "name" (of type string). 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. validation of the ingredients dictionary.
* Pizza objects may contain attribute matching the pattern "custom::*" of any * Pizza objects may contain attribute matching the pattern "custom::*" of any
type. type.
@ -614,7 +614,7 @@ object Service "localhost-uptime" {
alias = "localhost Uptime", alias = "localhost Uptime",
methods = { methods = {
check = "native::PluginCheck" check = "PluginCheck"
}, },
check_command = "$plugindir$/check_snmp -H $address$ -C $community$ -o $oid$", 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 The check type of the service. For now only external check plugins are
supported ("native::PluginCheck"). supported ("PluginCheck").
Attribute: check_command Attribute: check_command
^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^
@ -869,7 +869,7 @@ local object Component "delegation" {
abstract object Service "icinga-service" { abstract object Service "icinga-service" {
methods = { methods = {
check = "native::PluginCheck" check = "PluginCheck"
}, },
macros = { macros = {

2
etc/icinga2/icinga2.conf.win32
View File

@ -71,7 +71,7 @@ local object Component "compatido" {
*/ */
abstract object Service "icinga-service" { abstract object Service "icinga-service" {
methods = { methods = {
check = "native::PluginCheck" check = "PluginCheck"
} }
} }

2
lib/icinga/pluginchecktask.cpp
View File

@ -21,7 +21,7 @@
using namespace icinga; using namespace icinga;
REGISTER_SCRIPTFUNCTION("native::PluginCheck", &PluginCheckTask::ScriptFunc); REGISTER_SCRIPTFUNCTION("PluginCheck", &PluginCheckTask::ScriptFunc);
PluginCheckTask::PluginCheckTask(const ScriptTask::Ptr& task, const Process::Ptr& process) PluginCheckTask::PluginCheckTask(const ScriptTask::Ptr& task, const Process::Ptr& process)
: m_Task(task), m_Process(process) : m_Task(task), m_Process(process)