Load initial

Author: J. M. Becker

.vscode/tasks.json

@@ -9,6 +9,13 @@
             "type": "shell",
             "group": "test",
             "problemMatcher": []
+        },
+        {
+            "taskName": "check_snmp_load",
+            "command": "./build/bin/check_snmp_load -v2c -c public localhost",
+            "type": "shell",
+            "group": "test",
+            "problemMatcher": []
         }
     ]
 }

conf/check_snmp_extras.conf

@@ -56,4 +56,9 @@ object CheckCommand "snmp-disk" {
 	command = [ PluginDir + "/check_snmp_disk", "$snmp_address$" ]
 
 }
+object CheckCommand "snmp-load" {
+	import "snmp-extras-command"
+
+	command = [ PluginDir + "/check_snmp_load", "$snmp_address$" ]
 
+}

contrib/check_snmp_extras.spec

@@ -30,5 +30,6 @@ popd
 %defattr(0644, root, root, 0755)
 
 %attr(0755, -, -) %{_libdir}/nagios/plugins/check_snmp_disk
+%attr(0755, -, -) %{_libdir}/nagios/plugins/check_snmp_load
 
 %config %{_datadir}/icinga2/include/plugins-contrib.d/check_snmp_extras.conf

src/CMakeLists.txt

@@ -1,10 +1,12 @@
 
 add_executable(check_snmp_disk check_snmp_disk.c)
+add_executable(check_snmp_load check_snmp_load.c)
 
 target_link_libraries(check_snmp_disk ${NETSNMP_LIBRARIES})
+target_link_libraries(check_snmp_load ${NETSNMP_LIBRARIES})
 
 
-install(TARGETS check_snmp_disk
+install(TARGETS check_snmp_disk check_snmp_load
   ARCHIVE DESTINATION ${ARCHIVE_DIR}
   LIBRARY DESTINATION ${LIBRARY_DIR}
   RUNTIME DESTINATION ${RUNTIME_DIR}

src/check_snmp_disk.c

@@ -12,12 +12,15 @@
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>
 
+int warning = 80;
+int critical = 90;
+
 struct hrentry_t
 {
-    int hrstind;
-    int hrfsind;
+    unsigned long hrstind;
+    unsigned long hrfsind;
 
-    size_t hrstaunit;
+    unsigned long hrstaunit;
     unsigned long hrstsize;
     unsigned long hrstused;
 
@@ -149,13 +152,13 @@ querryentries(netsnmp_session* pss, struct hrentry_t* hentry)
                 memcpy(hentry->hrstdesc, vp->val.string, vp->val_len);
             }
             if (netsnmp_oid_equals(hrstaunit_oid, index_len, vp->name, vp->name_length) == 0) {
-                hentry->hrstaunit = (size_t)*vp->val.integer;
+                hentry->hrstaunit = *vp->val.integer;
             }
             if (netsnmp_oid_equals(hrstsize_oid, index_len, vp->name, vp->name_length) == 0) {
-                hentry->hrstsize = (unsigned long)*vp->val.integer;
+                hentry->hrstsize = *vp->val.integer;
             }
             if (netsnmp_oid_equals(hrstused_oid, index_len, vp->name, vp->name_length) == 0) {
-                hentry->hrstused = (unsigned long)*vp->val.integer;
+                hentry->hrstused = *vp->val.integer;
             }
             if (netsnmp_oid_equals(hrfstype_oid, index_len, vp->name, vp->name_length) == 0) {
                 memcpy(hentry->hrfstype, vp->val.objid, vp->val_len);
@@ -172,13 +175,12 @@ int
 main(int argc, char** argv)
 {
     int arg;
-
-    int hrst;
-    int hrfsst;
     int query_status;
-
     int exit_status = STATUS_OK;
-    char oidbuf[MAX_OID_LEN];
+
+    unsigned long hrst;
+    unsigned long hrfsst;
+
     struct hrentry_t* hentry = NULL;
     struct hrentry_t* hfree = NULL;
 
@@ -249,12 +251,12 @@ main(int argc, char** argv)
 
     /* Correlate indexes */
     for (hrst_var = hrstindex_var; hrst_var; hrst_var = hrst_var->next_variable) {
-        hrst = (int)*hrst_var->val.integer;
+        hrst = *hrst_var->val.integer;
         hrfsst = 0;
 
         for (hrfsst_var = hrfsstindex_var; hrfsst_var; hrfsst_var = hrfsst_var->next_variable) {
-            if (hrst == (int)*hrfsst_var->val.integer) {
-                hrfsst = (int)hrfsst_var->name[hrfsst_var->name_length - 1];
+            if (hrst == *hrfsst_var->val.integer) {
+                hrfsst = hrfsst_var->name[hrfsst_var->name_length - 1];
                 break;
             }
         }
@@ -326,9 +328,10 @@ main(int argc, char** argv)
             exit_msg = oexit_msg;
     }
 
-    printf("%s", exit_msg);
+    printf("%s used space:", exit_msg);
+
     for (int n = 0; n < i; ++n) {
-        printf(" used space: %s %s (%.1f%%);", hrstdesc[n], bhused[n], hpused[n]);
+        printf(" %s %s (%.1f%%);", hrstdesc[n], bhused[n], hpused[n]);
     }
 
     printf("|");

src/check_snmp_extras.h

@@ -7,6 +7,3 @@
 
 #define MAX_ENTRIES 50
 #define MAX_DISPLAYSTRING_LEN 255
-
-int warning = 80;
-int critical = 90;