Changeset e0936e3 in nscp

Timestamp:

02/14/08 07:14:39 (5 years ago)

Author:

Michael Medin <michael@…>

Children:

34f5502

Parents:

da7207d

Message:

+ Added so commands starting in host_ (NSCA Handlers) are sent as host-commands

• Fixed a copy constructor in NSCA Commands (now service checks are sent as service checks)

Location:

trunk

Files:

• NSC.dist (modified) (2 diffs)
• changelog (modified) (1 diff)
• modules/NSCAAgent/NSCAThread.cpp (modified) (1 diff)
• modules/NSCAAgent/NSCAThread.h (modified) (1 diff)

trunk/NSC.dist

@@ -268 +268 @@
 ;# CHECK COMMAND LIST
 ;  The checks to run everytime we submit results back to nagios
+;  Any command(alias/key) starting with a host_ is sent as HOST_COMMAND others are sent as SERVICE_COMMANDS
+;  where the alias/key is used as service name.
 ;
 [NSCA Commands]
@@ -273 +275 @@
 ;my_mem_check=checkMem MaxWarn=80% MaxCrit=90% ShowAll type=page
 ;my_svc_check=checkServiceState CheckAll exclude=wampmysqld exclude=MpfService
+;host_check=check_ok

trunk/changelog

@@ -5 +5 @@
  * Add module for relaying events
  * Add API for rehashing the daemon (or implement it the API is there but does nothing)
+
+2008-02-14 MickeM
+ + Added so commands starting in host_ (NSCA Handlers) are sent as host-commands
+ * Fixed a copy constructor in NSCA Commands (now service checks are sent as service checks)
 
 2008-02-13 MickeM

trunk/modules/NSCAAgent/NSCAThread.cpp

@@ -79 +79 @@
 void NSCAThread::addCommand(std::wstring key) {
   std::wstring value = NSCModuleHelper::getSettingsString(NSCA_CMD_SECTION_TITLE, key, _T(""));
-  commands_.push_back(Command(key, value));
+  if ((key.length() > 4) && (key.substr(0,4) == _T("host")))
+    commands_.push_back(Command(_T(""), value));
+  else
+    commands_.push_back(Command(key, value));
 }
 

trunk/modules/NSCAAgent/NSCAThread.h

@@ -197 +197 @@
     cmd_ = other.cmd_;
     args_ = other.args_;
+    alias_ = other.alias_;
 
   }