Changeset 76aafc4 in nscp for modules

Timestamp:

10/26/06 07:03:39 (7 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

7aef770

Parents:

70f2d7b

Message:

* empty log message *

Location:

modules

Files:

• CheckSystem/CheckSystem.cpp (modified) (1 diff)
• CheckSystem/PDHCollector.cpp (modified) (2 diffs)
• NRPEListener/NRPEListener.cpp (modified) (2 diffs)
• NSClientListener/NSClientListener.cpp (modified) (1 diff)

modules/CheckSystem/CheckSystem.cpp

@@ -117 +117 @@
             std::string counter = "\\" + (*it).name + "(" + (*it2).name + ")\\" + (*it3).name;
             std::cout << "testing: " << counter << ": ";
+            std::list<std::string> errors;
+            std::list<std::string> status;
             std::string error;
+            bool bStatus = true;
             if (PDH::Enumerations::validate(counter, error)) {
-              std::cout << " found ";
+              status.push_back("open");
             } else {
-              std::cout << " *NOT* found (" << error << ") " << std::endl;
-              break;
+              errors.push_back("NOT found: " + error);
+              bStatus = false;
             }
-            bool bOpend = false;
-            try {
+            if (bStatus) {
+              PDH::PDHCounter *pCounter = NULL;
               PDH::PDHQuery pdh;
-              PDHCollectors::StaticPDHCounterListener<double, PDH_FMT_DOUBLE> cDouble;
-              pdh.addCounter(counter, &cDouble);
-              pdh.open();
-              pdh.gatherData();
-              pdh.close();
-              bOpend = true;
-            } catch (const PDH::PDHException e) {
-              std::cout << " could *not* be open (" << e.getError() << ") " << std::endl;
-              break;
+              try {
+                PDHCollectors::StaticPDHCounterListener<double, PDH_FMT_DOUBLE> cDouble;
+                pCounter = pdh.addCounter(counter, &cDouble);
+                pdh.open();
+
+                if (pCounter != NULL) {
+                  try {
+                    PDH::PDHCounterInfo info = pCounter->getCounterInfo();
+                    errors.push_back("CounterName: " + info.szCounterName);
+                    errors.push_back("ExplainText: " + info.szExplainText);
+                    errors.push_back("FullPath: " + info.szFullPath);
+                    errors.push_back("InstanceName: " + info.szInstanceName);
+                    errors.push_back("MachineName: " + info.szMachineName);
+                    errors.push_back("ObjectName: " + info.szObjectName);
+                    errors.push_back("ParentInstance: " + info.szParentInstance);
+                    errors.push_back("Type: " + strEx::itos(info.dwType));
+                    errors.push_back("Scale: " + strEx::itos(info.lScale));
+                    errors.push_back("Default Scale: " + strEx::itos(info.lDefaultScale));
+                    errors.push_back("Status: " + strEx::itos(info.CStatus));
+                    status.push_back("described");
+                  } catch (const PDH::PDHException e) {
+                    errors.push_back("Describe failed: " + e.getError());
+                    bStatus = false;
+                  }
+                }
+
+                pdh.gatherData();
+                pdh.close();
+                status.push_back("queried");
+              } catch (const PDH::PDHException e) {
+                errors.push_back("Query failed: " + e.getError());
+                bStatus = false;
+                try {
+                  pdh.gatherData();
+                  pdh.close();
+                  bStatus = true;
+                } catch (const PDH::PDHException e) {
+                  errors.push_back("Query failed (again!): " + e.getError());
+                }
+              }
+
             }
-            std::cout << " open ";
-            std::cout << std::endl;
+            if (!bStatus) {
+              std::list<std::string>::const_iterator cit = status.begin();
+              for (;cit != status.end(); ++cit) {
+                std::cout << *cit << ", ";
+              }
+              std::cout << std::endl;
+              std::cout << "  | Log" << std::endl;
+              std::cout << "--+------  --    -" << std::endl;
+              cit = errors.begin();
+              for (;cit != errors.end(); ++cit) {
+                std::cout << "  | " << *cit << std::endl;
+              }
+            } else {
+              std::list<std::string>::const_iterator cit = status.begin();
+              for (;cit != status.end(); ++cit) {
+                std::cout << *cit << ", ";;
+              }
+              std::cout << std::endl;
+            }
           }
         }

modules/CheckSystem/PDHCollector.cpp

@@ -120 +120 @@
 
   DWORD waitStatus = 0;
+  bool first = true;
   do {
     MutexLock mutex(mutexHandler);
@@ -128 +129 @@
         pdh.gatherData();
       } catch (const PDH::PDHException &e) {
-        NSC_LOG_ERROR_STD("Failed to query performance counters: " + e.getError());
+        if (first) {  // If this is the first run an error will be thrown since the data is not yet avalible
+                // This is "ok" but perhaps another solution would be better, but this works :)
+          first = false;
+        } else {
+          NSC_LOG_ERROR_STD("Failed to query performance counters: " + e.getError());
+        }
       }
     } 

modules/NRPEListener/NRPEListener.cpp

@@ -28 +28 @@
   return ret;
 }
+bool getCacheAllowedHosts() {
+  int val = NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, MAIN_ALLOWED_HOSTS_CACHE, -1);
+  if (val == -1)
+    val = NSCModuleHelper::getSettingsInt(MAIN_SECTION_TITLE, MAIN_ALLOWED_HOSTS_CACHE, MAIN_ALLOWED_HOSTS_CACHE_DEFAULT);
+  return val==1?true:false;
+}
 
 bool NRPEListener::loadModule() {
@@ -33 +39 @@
   timeout = NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_TIMEOUT ,NRPE_SETTINGS_TIMEOUT_DEFAULT);
   std::list<std::string> commands = NSCModuleHelper::getSettingsSection(NRPE_HANDLER_SECTION_TITLE);
-  std::list<std::string>::iterator it;
-  for (it = commands.begin(); it != commands.end(); it++) {
-    strEx::token t = strEx::getToken(*it, '=');
-    if (t.first.substr(0,7) == "command") {
-      strEx::token t2 = strEx::getToken(t.first, '[');
-      t2 = strEx::getToken(t2.second, ']');
-      t.first = t2.first;
-    }
-    if (t.first.empty() || t.second.empty()) {
+  std::list<std::string>::const_iterator it;
+  for (it = commands.begin(); it != commands.end(); ++it) {
+    std::string command_name;
+    if (((*it).length() > 7)&&((*it).substr(0,7) == "command")) {
+      strEx::token t = strEx::getToken((*it), '[');
+      t = strEx::getToken(t.second, ']');
+      command_name = t.first;
+    } else {
+      command_name = (*it);
+    }
+    std::string s = NSCModuleHelper::getSettingsString(NRPE_HANDLER_SECTION_TITLE, (*it), "");
+    if (command_name.empty() || s.empty()) {
       NSC_LOG_ERROR_STD("Invalid command definition: " + (*it));
     } else {
-      addCommand(t.first.c_str(), t.second);
-    }
-  }
-
-  allowedHosts.setAllowedHosts(strEx::splitEx(getAllowedHosts(), ","));
+      addCommand(command_name.c_str(), s);
+    }
+  }
+
+  allowedHosts.setAllowedHosts(strEx::splitEx(getAllowedHosts(), ","), getCacheAllowedHosts());
   try {
     unsigned short port = NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_PORT, NRPE_SETTINGS_PORT_DEFAULT);

modules/NSClientListener/NSClientListener.cpp

@@ -38 +38 @@
   return ret;
 }
+bool getCacheAllowedHosts() {
+  int val = NSCModuleHelper::getSettingsInt(NSCLIENT_SECTION_TITLE, MAIN_ALLOWED_HOSTS_CACHE, -1);
+  if (val == -1)
+    val = NSCModuleHelper::getSettingsInt(MAIN_SECTION_TITLE, MAIN_ALLOWED_HOSTS_CACHE, MAIN_ALLOWED_HOSTS_CACHE_DEFAULT);
+  return val==1?true:false;
+}
 
 bool NSClientListener::loadModule() {
-  allowedHosts.setAllowedHosts(strEx::splitEx(getAllowedHosts(), ","));
+  allowedHosts.setAllowedHosts(strEx::splitEx(getAllowedHosts(), ","), getCacheAllowedHosts());
   unsigned short port = NSCModuleHelper::getSettingsInt(NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_PORT, NSCLIENT_SETTINGS_PORT_DEFAULT);
   std::string host = NSCModuleHelper::getSettingsString(NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_BINDADDR, NSCLIENT_SETTINGS_BINDADDR_DEFAULT);