Changeset 7ec3dd1 in nscp for modules

Timestamp:

06/16/11 23:00:44 (2 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

e11d494

Parents:

3bdaf18

Message:

various fixes and changes here and there
Mainly build related (been trying to fix symbol dumper problems) as well as tweaks for the up-coming "nightly release")

Location:

modules

Files:

• CheckEventLog/CheckEventLog.cpp (modified) (1 diff)
• CheckSystem/PDHCollector.cpp (modified) (1 diff)
• CheckSystem/settings.hpp (added)
• CheckTaskSched/CheckTaskSched.cpp (modified) (1 diff)
• CheckTaskSched/settings.hpp (added)
• CheckTaskSched2/CheckTaskSched2.cpp (modified) (1 diff)
• FileLogger/FileLogger.cpp (modified) (1 diff)
• NRPEClient/NRPEClient.cpp (modified) (1 diff)
• NRPEServer/NRPEServer.cpp (modified) (1 diff)
• NRPEServer/settings.hpp (added)

modules/CheckEventLog/CheckEventLog.cpp

@@ -814 +814 @@
         if (err == ERROR_INSUFFICIENT_BUFFER) {
           if (!buffer_error_reported) {
-            NSC_LOG_ERROR_STD(_T("EvenlogBuffer is too small change the value of ") + setting_keys::event_log::BUFFER_SIZE_PATH + _T("=") + strEx::itos(dwNeeded+1) + _T(": ") + error::lookup::last_error(err));
+            NSC_LOG_ERROR_STD(_T("EvenlogBuffer is too small change the value of buffer_length=") + strEx::itos(dwNeeded+1) + _T(": ") + error::lookup::last_error(err));
             buffer_error_reported = true;
           }

modules/CheckSystem/PDHCollector.cpp

@@ -21 +21 @@
 #include "PDHCollector.h"
 #include <sysinfo.h>
-
+#include "settings.hpp"
 
 PDHCollector::PDHCollector() : hStopEvent_(NULL)/*, data_(NULL)*/ {

modules/CheckTaskSched/CheckTaskSched.cpp

@@ -30 +30 @@
 
 #include <settings/client/settings_client.hpp>
+#include "settings.hpp"
 
 

modules/CheckTaskSched2/CheckTaskSched2.cpp

@@ -30 +30 @@
 
 #include <settings/client/settings_client.hpp>
-
+#include "../CheckTaskSched/settings.hpp"
 
 CheckTaskSched2 gCheckTaskSched2;

modules/FileLogger/FileLogger.cpp

@@ -42 +42 @@
 }
 FileLogger::~FileLogger() {
+}
+namespace setting_keys {
+
+  namespace log {
+    DEFINE_PATH(SECTION, LOG_SECTION);
+    //DESCRIBE_SETTING_ADVANCED(SECTION, "LOG SECTION", "Configure loggning properties.");
+
+    DEFINE_SETTING_S(FILENAME, LOG_SECTION, "file", "nsclient.log");
+    //DESCRIBE_SETTING_ADVANCED(FILENAME, "SYNTAX", "The file to write log data to. If no directory is used this is relative to the NSClient++ binary.");
+
+    DEFINE_SETTING_S(ROOT, LOG_SECTION, "root", "auto");
+    //DESCRIBE_SETTING_ADVANCED(ROOT, "TODO", "TODO");
+
+    DEFINE_SETTING_S(DATEMASK, LOG_SECTION, "date format", "%Y-%m-%d %H:%M:%S");
+    //DESCRIBE_SETTING_ADVANCED(DATEMASK, "DATEMASK", "The date format used when logging to a file.");
+
+    DEFINE_SETTING_S(LOG_MASK, LOG_SECTION, "log mask", "normal");
+    //DESCRIBE_SETTING_ADVANCED(LOG_MASK, "LOG MASK", "The log mask information, error, warning, critical, debug");
+
+    DEFINE_SETTING_B(DEBUG_LOG, LOG_SECTION, "debug", false);
+    //DESCRIBE_SETTING_ADVANCED(DEBUG_LOG, "DEBUG LOGGING", "Enable debug logging can help track down errors and find problems but will impact overall perfoamnce negativly.");
+  }
 }
 

modules/NRPEClient/NRPEClient.cpp

@@ -32 +32 @@
 
 
+namespace setting_keys {
+
+  // NSClient Setting headlines
+  namespace nrpe {
+    DEFINE_PATH(SECTION, NRPE_SECTION_PROTOCOL);
+    //DESCRIBE_SETTING(SECTION, "NRPE SECTION", "Section for NRPE (NRPEListener.dll) (check_nrpe) protocol options.");
+
+
+    DEFINE_PATH(CH_SECTION, NRPE_CLIENT_HANDLER_SECTION);
+    //DESCRIBE_SETTING(CH_SECTION, "CLIENT HANDLER SECTION", "...");
+
+    DEFINE_SETTING_S(ALLOWED_HOSTS, NRPE_SECTION_PROTOCOL, GENERIC_KEY_ALLOWED_HOSTS, "");
+    DESCRIBE_SETTING(ALLOWED_HOSTS, "ALLOWED HOST ADDRESSES", "This is a comma-delimited list of IP address of hosts that are allowed to talk to NSClient deamon. If you leave this blank the global version will be used instead.");
+
+    DEFINE_SETTING_I(PORT, NRPE_SECTION_PROTOCOL, "port", 5666);
+    //DESCRIBE_SETTING(PORT, "NSCLIENT PORT NUMBER", "This is the port the NSClientListener.dll will listen to.");
+
+    DEFINE_SETTING_S(BINDADDR, NRPE_SECTION_PROTOCOL, GENERIC_KEY_BIND_TO, "");
+    //DESCRIBE_SETTING(BINDADDR, "BIND TO ADDRESS", "Allows you to bind server to a specific local address. This has to be a dotted ip adress not a hostname. Leaving this blank will bind to all avalible IP adresses.");
+
+    DEFINE_SETTING_I(READ_TIMEOUT, NRPE_SECTION_PROTOCOL, GENERIC_KEY_SOCK_READ_TIMEOUT, 30);
+    //DESCRIBE_SETTING(READ_TIMEOUT, "SOCKET TIMEOUT", "Timeout when reading packets on incoming sockets. If the data has not arrived withint this time we will bail out.");
+
+    DEFINE_SETTING_I(LISTENQUE, NRPE_SECTION_PROTOCOL, GENERIC_KEY_SOCK_LISTENQUE, 0);
+    //DESCRIBE_SETTING_ADVANCED(LISTENQUE, "LISTEN QUEUE", "Number of sockets to queue before starting to refuse new incoming connections. This can be used to tweak the amount of simultaneous sockets that the server accepts.");
+
+    DEFINE_SETTING_I(THREAD_POOL, NRPE_SECTION_PROTOCOL, "thread pool", 10);
+    //DESCRIBE_SETTING_ADVANCED(THREAD_POOL, "THREAD POOL", "");
+
+
+
+    DEFINE_SETTING_B(CACHE_ALLOWED, NRPE_SECTION_PROTOCOL, GENERIC_KEY_SOCK_CACHE_ALLOWED, false);
+    DESCRIBE_SETTING_ADVANCED(CACHE_ALLOWED, "ALLOWED HOSTS CACHING", "Used to cache looked up hosts if you check dynamic/changing hosts set this to false.");
+
+    //DEFINE_SETTING_B(KEYUSE_SSL, NRPE_SECTION_PROTOCOL, GENERIC_KEY_USE_SSL, true);
+    //DESCRIBE_SETTING(KEYUSE_SSL, "USE SSL SOCKET", "This option controls if SSL should be used on the socket.");
+
+    DEFINE_SETTING_I(PAYLOAD_LENGTH, NRPE_SECTION_PROTOCOL, "payload length", 1024);
+    //DESCRIBE_SETTING_ADVANCED(PAYLOAD_LENGTH, "PAYLOAD LENGTH", "Length of payload to/from the NRPE agent. This is a hard specific value so you have to \"configure\" (read recompile) your NRPE agent to use the same value for it to work.");
+
+    //DEFINE_SETTING_B(ALLOW_PERFDATA, NRPE_SECTION, "performance data", true);
+    //DESCRIBE_SETTING_ADVANCED(ALLOW_PERFDATA, "PERFORMANCE DATA", "Send performance data back to nagios (set this to 0 to remove all performance data).");
+
+    //DEFINE_SETTING_I(CMD_TIMEOUT, NRPE_SECTION, "command timeout", 60);
+    //DESCRIBE_SETTING(CMD_TIMEOUT, "COMMAND TIMEOUT", "This specifies the maximum number of seconds that the NRPE daemon will allow plug-ins to finish executing before killing them off.");
+
+    DEFINE_SETTING_B(ALLOW_ARGS, NRPE_SECTION, "allow arguments", false);
+    //DESCRIBE_SETTING(ALLOW_ARGS, "COMMAND ARGUMENT PROCESSING", "This option determines whether or not the NRPE daemon will allow clients to specify arguments to commands that are executed.");
+
+    DEFINE_SETTING_B(ALLOW_NASTY, NRPE_SECTION, "allow nasy characters", false);
+    //DESCRIBE_SETTING(ALLOW_NASTY, "COMMAND ALLOW NASTY META CHARS", "This option determines whether or not the NRPE daemon will allow clients to specify nasty (as in |`&><'\"\\[]{}) characters in arguments.");
+
+  }
+}
 namespace sh = nscapi::settings_helper;
 

modules/NRPEServer/NRPEServer.cpp

@@ -27 +27 @@
 
 #include <settings/client/settings_client.hpp>
+#include "settings.hpp"