Merge pull request #324 from jaredhendrickson13/next_patch

v1.5.2 Fixes

Author: jaredhendrickson13

composer.lock

@@ -91,8 +91,8 @@ class APIQuery {
 
         # Only proceed if key is not excluded from queries
         if (!$this->is_excluded($q_key)) {
-            # Always prefer exact matches first
-            if ($entry[$key] === $value) {
+            # Always prefer exact matches first. Don't strict type match since the pfSense config won't store types.
+            if ($entry[$key] == $value) {
                 return true;
             }
 

pfSense-pkg-API/files/etc/inc/api/framework/APIQuery.inc

@@ -45,6 +45,7 @@ class APIStatusSystemRead extends APIModel {
             "temp_c" => $this->__get_temp(),
             "temp_f" => $this->__get_temp(false),
             "load_avg" => $this->__get_load_avg(),
+            "cpu_count" => (int)get_single_sysctl("hw.ncpu"),
             "mbuf_usage" => $this->__get_mbuf_usage(),
             "mem_usage" => (!is_null(mem_usage())) ? APITools\float_percent(mem_usage()) : null,
             "swap_usage" => (!is_null(swap_usage())) ? APITools\float_percent(swap_usage()) : null,

pfSense-pkg-API/files/etc/inc/api/models/APIStatusSystemRead.inc

@@ -1,4 +1,4 @@
 jinja2~=3.1.2
 requests~=2.28.1
 pylint~=2.15.4
-urllib3~=1.26.12
+urllib3~=1.26.13