Added new threshold modes

Imanol-Mikel Barba Sabariego
1 parent 1b19e6ce
Showing 32 changed files with 82 additions and 54 deletions
CMakeLists.txt
check_csgo/README.md
check_csgo/auxiliar.cpp
check_csgo/auxiliar.h
check_csgo/check_csgo.cpp
check_csgo/check_csgo.h
check_memfree/auxiliar.cpp
check_memfree/auxiliar.h
check_memfree/check_memfree.cpp
check_memfree/check_memfree.h
check_memfree/range.h
check_memfree_freebsd/auxiliar.cpp
check_memfree_freebsd/auxiliar.h
check_memfree_freebsd/check_memfree.h
check_memfree_freebsd/range.h
check_openvpn/README.md
check_openvpn/auxiliar.cpp
check_openvpn/auxiliar.h
check_openvpn/check_openvpn.cpp
check_openvpn/check_openvpn.h
@@ -49,62 +49,19 @@ int checkDriveType(const char* disk) {
  
 map<int,SMARTAttr> prepareAttrMap(int driveType) {
   map<int,SMARTAttr> map;
-
-  SMARTAttr realloc;
-  realloc.name = "Reallocated_Sector_Ct";
-  realloc.value = -1;
-  realloc.severity = WARN;
-  realloc.optional = false;
-  map[REALLOC_SEC_COUNT_ID] = realloc;
-
-  SMARTAttr pending;
-  SMARTAttr off_uncorrect;
-  SMARTAttr wear;
-  SMARTAttr wearout;
-  SMARTAttr badblocks;
-  SMARTAttr rep_uncorrect;
+  map[REALLOC_SEC_COUNT_ID] = reallocated;
+  map[REP_UNCORRECT_ID] = rep_uncorrect;
  
   switch(driveType) {
     case HDD:
-      pending.name = "Current_Pending_Sector";
-      pending.value = -1;
-      pending.severity = CRIT;
-      pending.optional = false;
       map[CURRENT_PENDING_SEC_ID] = pending;
-
-      off_uncorrect.name = "Offline_Uncorrectable";
-      off_uncorrect.value = -1;
-      off_uncorrect.severity = CRIT;
-      off_uncorrect.optional = false;
       map[OFFLINE_UNCORRECT_ID] = off_uncorrect;
-
-      break;
+    break;
     case SSD:
-      wear.name = "Wear_Leveling_Count";
-      wear.value = -1;
-      wear.severity = WARN;
-      wear.optional = true;
       map[WEAR_COUNT_ID] = wear;
-
-      wearout.name = "Media_Wearout_Indicator";
-      wearout.value = -1;
-      wearout.severity = WARN;
-      wearout.optional = true;
-      map[WEAR_COUNT_ID] = wearout;
-
-      badblocks.name = "Runtime_Bad_Block";
-      badblocks.value = -1;
-      badblocks.severity = CRIT;
-      badblocks.optional = false;
-      map[RUNTIME_BAD_BLOCKS_IDD] = badblocks;
-
-      rep_uncorrect.name = "Reported_Uncorrect";
-      rep_uncorrect.value = -1;
-      rep_uncorrect.severity = CRIT;
-      rep_uncorrect.optional = false;
-      map[REP_UNCORRECT_ID] = rep_uncorrect;
-
-      break;
+      map[MEDIA_WEAROUT_ID] = wearout;
+      map[RUNTIME_BAD_BLOCKS_ID] = badblocks;
+    break;
   }
   return map;
 }
@@ -148,10 +105,15 @@ int evalStatus(const char* disk, int driveType, string *status) {
       *status = string(disk) + " status UNKNOWN";
       return UNKN;
     }
+
     int veredict = 0;
-    if(attr.value) {
-      veredict = attr.severity;
+    if(attr.value > attr.threshold_warn) {
+      veredict = WARN;
     }
+    if(attr.threshold_crit != -1 && attr.value > attr.threshold_crit) {
+      veredict = CRIT;
+    }
+
     switch(veredict) {
       case OK:
         break;
@@ -31,8 +31,8 @@
 #define CURRENT_PENDING_SEC_ID 197
 #define OFFLINE_UNCORRECT_ID 198
 #define WEAR_COUNT_ID 177
-#define MEDIA_WEAROUT_INDICATOR 233
-#define RUNTIME_BAD_BLOCKS_IDD 183
+#define MEDIA_WEAROUT_ID 233
+#define RUNTIME_BAD_BLOCKS_ID 183
 #define REP_UNCORRECT_ID 187
  
 #define HDD 0
@@ -42,13 +42,79 @@ using namespace std;
  
 struct SMARTAttr
 {
+  int id;
   string name;
   int value;
-  int severity;
+  int threshold_warn;
+  int threshold_crit;
   bool optional;
 }; typedef struct SMARTAttr SMARTAttr;
  
  
+// Attribute definitions
+SMARTAttr reallocated = {
+  .id = REALLOC_SEC_COUNT_ID,
+  .name = "Reallocated_Sector_Ct",
+  .value = -1,
+  .threshold_warn = 0,
+  .threshold_crit = -1,
+  .optional = false,
+};
+
+SMARTAttr pending = {
+  .id = CURRENT_PENDING_SEC_ID,
+  .name = "Current_Pending_Sector",
+  .value = -1,
+  .threshold_warn = 0,
+  .threshold_crit = -1, 
+  .optional = false,
+};
+
+SMARTAttr off_uncorrect = {
+  .id = OFFLINE_UNCORRECT_ID,
+  .name = "Offline_Uncorrectable",
+  .value = -1,
+  .threshold_warn = 0,
+  .threshold_crit = 0, 
+  .optional = false,
+};
+
+SMARTAttr wear = {
+  .id = WEAR_COUNT_ID,
+  .name = "Wear_Leveling_Count",
+  .value = -1,
+  .threshold_warn = 80,
+  .threshold_crit = 90, 
+  .optional = true,
+};
+
+SMARTAttr wearout = {
+  .id = MEDIA_WEAROUT_ID,
+  .name = "Media_Wearout_Indicator",
+  .value = -1,
+  .threshold_warn = 80,
+  .threshold_crit = 90,
+  .optional = true,
+};
+
+SMARTAttr badblocks = {
+  .id = RUNTIME_BAD_BLOCKS_ID,
+  .name = "Runtime_Bad_Block",
+  .value = -1,
+  .threshold_warn = 0,
+  .threshold_crit = 0, 
+  .optional = false,
+};
+
+SMARTAttr rep_uncorrect = {
+  .id = REP_UNCORRECT_ID,
+  .name = "Reported_Uncorrect",
+  .value = -1,
+  .threshold_warn = 0,
+  .threshold_crit = 0, 
+  .optional = false,
+};
+
 map<int,SMARTAttr> prepareAttrMap(int driveType);
 int getSmartAttrValue(string line);
 int getSmartAttrID(string line);