Changeset 6817602 in nscp for modules/CheckSystem

Timestamp:

02/22/06 21:47:57 (7 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

1b7ae3d

Parents:

89f1a84

Message:

Lots of update (I really should checkin more often :)

Location:

modules/CheckSystem

Files:

• CheckSystem.cpp (modified) (8 diffs)
• CheckSystem.h (modified) (2 diffs)
• PDHCollector.cpp (modified) (2 diffs)
• PDHCollector.h (modified) (2 diffs)

modules/CheckSystem/CheckSystem.cpp

@@ -10 +10 @@
 #include <sysinfo.h>
 #include <checkHelpers.hpp>
+#include <map>
 
 CheckSystem gNSClientCompat;
@@ -137 +138 @@
 }
 
+
+class cpuload_handler {
+public:
+  static int parse(std::string s) {
+    return strEx::stoi(s);
+  }
+  static int parse_percent(std::string s) {
+    return strEx::stoi(s);
+  }
+  static std::string print(int value) {
+    return strEx::itos(value) + "%";
+  }
+  static std::string print_unformated(int value) {
+    return strEx::itos(value);
+  }
+  static std::string print_percent(int value) {
+    return strEx::itos(value) + "%";
+  }
+  static std::string key_prefix() {
+    return "average load ";
+  }
+  static std::string key_postfix() {
+    return "";
+  }
+};
 NSCAPI::nagiosReturn CheckSystem::checkCPU(const unsigned int argLen, char **char_args, std::string &msg, std::string &perf) 
 {
-  typedef checkHolders::CheckConatiner<checkHolders::MaxMinBoundsInteger> CPULoadConatiner;
+  typedef checkHolders::CheckConatiner<checkHolders::MaxMinBounds<checkHolders::NumericBounds<int, cpuload_handler> > > CPULoadConatiner;
 
   std::list<std::string> stl_args = arrayBuffer::arrayBuffer2list(argLen, char_args);
@@ -179 +205 @@
       return NSCAPI::returnUNKNOWN;
     }
+    int value = pObject->getCPUAvrage(load.data + "m");
+    if (value == -1) {
+      msg = "ERROR: We don't collect data this far back: " + load.getAlias();
+      return NSCAPI::returnUNKNOWN;
+    }
     if (bNSClient) {
-      int value = pObject->getCPUAvrage(load.data + "m");
-      if (value == -1) {
-        msg = "ERROR: We don't collect data this far back: " + load.getAlias();
-        return NSCAPI::returnUNKNOWN;
-      }
       if (!msg.empty()) msg += "&";
       msg += strEx::itos(value);
     } else {
-      int value = pObject->getCPUAvrage(load.data);
-      if (value == -1) {
-        msg = "ERROR: We don't collect data this far back: " + load.getAlias();
-        return NSCAPI::returnUNKNOWN;
-      } else {
-        load.setDefault(tmpObject);
-        load.runCheck(value, returnCode, msg, perf);
-      }
+      load.setDefault(tmpObject);
+      load.runCheck(value, returnCode, msg, perf);
     }
   }
@@ -380 +400 @@
 NSCAPI::nagiosReturn CheckSystem::checkMem(const unsigned int argLen, char **char_args, std::string &msg, std::string &perf)
 {
-  typedef checkHolders::CheckConatiner<checkHolders::MaxMinPercentageBoundsDiskSizei64 > MemoryConatiner;
+  typedef checkHolders::CheckConatiner<checkHolders::MaxMinBounds<checkHolders::NumericPercentageBounds<checkHolders::PercentageValueType<unsigned __int64, unsigned __int64>, checkHolders::disk_size_handler<unsigned __int64> > > > MemoryConatiner;
   std::list<std::string> stl_args = arrayBuffer::arrayBuffer2list(argLen, char_args);
   if (stl_args.empty()) {
@@ -390 +410 @@
   bool bNSClient = false;
   MemoryConatiner bounds;
-
-  bounds.data = "page";
+  typedef enum { tPaged, tPage, tVirtual, tPhysical } check_type;
+  check_type type = tPaged;
 
   MAP_OPTIONS_BEGIN(stl_args)
@@ -398 +418 @@
     MAP_OPTIONS_SHOWALL(bounds)
     MAP_OPTIONS_BOOL_TRUE(NSCLIENT, bNSClient)
+    MAP_OPTIONS_MODE("type", "paged", type, tPaged)
+    MAP_OPTIONS_MODE("type", "page", type, tPage)
+    MAP_OPTIONS_MODE("type", "virtual", type, tVirtual)
+    MAP_OPTIONS_MODE("type", "physical", type, tPhysical)
     MAP_OPTIONS_MISSING(msg, "Unknown argument: ")
   MAP_OPTIONS_END()
 
-  PDHCollector *pObject = pdhThread.getThread();
-  if (!pObject) {
-    msg = "ERROR: PDH Collection thread not running.";
-    return NSCAPI::returnUNKNOWN;
-  }
-  checkHolders::PercentageValueType<long long, long long> value;
-  value.value = pObject->getMemCommit();
-  value.total = pObject->getMemCommitLimit();
+
+  checkHolders::PercentageValueType<unsigned long long, unsigned long long> value;
+  if (type == tPaged) {
+    PDHCollector *pObject = pdhThread.getThread();
+    if (!pObject) {
+      msg = "ERROR: PDH Collection thread not running.";
+      return NSCAPI::returnUNKNOWN;
+    }
+    value.value = pObject->getMemCommit();
+    value.total = pObject->getMemCommitLimit();
+    if (bounds.data.empty())
+      bounds.data = "paged bytes";
+  } else {
+    CheckMemory::memData data;
+    try {
+      data = memoryChecker.getMemoryStatus();
+    } catch (CheckMemoryException e) {
+      msg = e.getError() + ":" + strEx::itos(e.getErrorCode());
+      return NSCAPI::returnCRIT;
+    }
+//    MEMORYSTATUS mem;
+//    GlobalMemoryStatus(&mem);
+    if (type == tPage) {
+      value.value = data.pageFile.total-data.pageFile.avail; // mem.dwTotalPageFile-mem.dwAvailPageFile;
+      value.total = data.pageFile.total; //mem.dwTotalPageFile;
+      if (bounds.data.empty())
+        bounds.data = "page file";
+    } else  if (type == tPhysical) {
+      value.value = data.phys.total-data.phys.avail; //mem.dwTotalPhys-mem.dwAvailPhys;
+      value.total = data.phys.total; //mem.dwTotalPhys;
+      if (bounds.data.empty())
+        bounds.data = "physical memory";
+    } else  if (type == tVirtual) {
+      value.value = data.virtualMem.total-data.virtualMem.avail;//mem.dwTotalVirtual-mem.dwAvailVirtual;
+      value.total = data.virtualMem.total;//mem.dwTotalVirtual;
+      if (bounds.data.empty())
+        bounds.data = "virtual memory";
+    }
+  }
+
   if (bNSClient) {
     msg = strEx::itos(value.total) + "&" + strEx::itos(value.value);
@@ -431 +487 @@
   CEnumProcess::CProcessEntry entry;
 } NSPROCDATA;
-typedef std::hash_map<std::string,NSPROCDATA> NSPROCLST;
+typedef std::map<std::string,NSPROCDATA,strEx::case_blind_string_compare> NSPROCLST;
 /**
 * Get a hash_map with all running processes.
@@ -613 +669 @@
       pdh.addCounter(counter.data, &cDouble);
       pdh.open();
-      pdh.collect();
-      Sleep(1000);
+      if (bCheckAverages) {
+        pdh.collect();
+        Sleep(1000);
+      }
       pdh.gatherData();
       pdh.close();

modules/CheckSystem/CheckSystem.h

@@ -1 +1 @@
 #pragma once
 #include "PDHCollector.h"
+#include <CheckMemory.h>
 
 NSC_WRAPPERS_MAIN();
@@ -6 +7 @@
 class CheckSystem {
 private:
+  CheckMemory memoryChecker;
   int processMethod_;
   PDHCollectorThread pdhThread;

modules/CheckSystem/PDHCollector.cpp

@@ -199 +199 @@
 * @return Some form of memory check
 */
-long long PDHCollector::getMemCommitLimit() {
+unsigned long long PDHCollector::getMemCommitLimit() {
   MutexLock mutex(mutexHandler);
   if (!mutex.hasMutex()) {
@@ -212 +212 @@
 * @return Some form of memory check
 */
-long long PDHCollector::getMemCommit() {
+unsigned long long PDHCollector::getMemCommit() {
   MutexLock mutex(mutexHandler);
   if (!mutex.hasMutex()) {

modules/CheckSystem/PDHCollector.h

@@ -30 +30 @@
   int checkIntervall_;
 
-  PDHCollectors::StaticPDHCounterListener<__int64, PDHCollectors::format_large> memCmtLim;
-  PDHCollectors::StaticPDHCounterListener<__int64, PDHCollectors::format_large> memCmt;
+  PDHCollectors::StaticPDHCounterListener<unsigned __int64, PDHCollectors::format_large> memCmtLim;
+  PDHCollectors::StaticPDHCounterListener<unsigned __int64, PDHCollectors::format_large> memCmt;
   PDHCollectors::StaticPDHCounterListener<__int64, PDHCollectors::format_large> upTime;
   PDHCollectors::RoundINTPDHBufferListener<__int64, PDHCollectors::format_large> cpu;
@@ -44 +44 @@
   int getCPUAvrage(std::string time);
   long long getUptime();
-  long long getMemCommitLimit();
-  long long getMemCommit();
+  unsigned long long getMemCommitLimit();
+  unsigned long long getMemCommit();