Merge pull request #14 from renatomefi/improve/add-all-status

Add all metrics from PHP fpm status page

Author: renatomefi

php-fpm-healthcheck

@@ -29,8 +29,13 @@
 # 
 # Metric options, fails in case the CURRENT VALUE is bigger than the GIVEN VALUE
 # --accepted-conn=n
-# --listen-queue-len=n
+# --listen-queue=n
+# --max-listen-queue=n
+# --idle-processes=n
 # --active-processes=n
+# --total-processes=n
+# --max-active-processes=n
+# --max-children-reached=n
 # --slow-requests=n
 #
 
@@ -74,7 +79,7 @@ check_fpm_health_by() {
     VALUE_EXPECTED="$2";
     VALUE_ACTUAL=$(echo "$FPM_STATUS" | grep "^$OPTION" | cut -d: -f2 | sed 's/ //g')
 
-    if test "$VERBOSE" = 1; then printf "'%s' value is: '%s' and expected is less than: '%s'\\n" "$OPTION" "$VALUE_ACTUAL" "$VALUE_EXPECTED"; fi;
+    if test "$VERBOSE" = 1; then printf "'%s' value '%s' and expected is less than '%s'\\n" "$OPTION" "$VALUE_ACTUAL" "$VALUE_EXPECTED"; fi;
 
     if test "$VALUE_ACTUAL" -gt "$VALUE_EXPECTED"; then
         >&2 printf "'%s' value '%s' is greater than expected '%s'\\n" "$OPTION" "$VALUE_ACTUAL" "$VALUE_EXPECTED";
@@ -109,7 +114,7 @@ check_fpm_health() {
     done
 }
 
-if ! GETOPT=$(getopt -o v --long verbose,accepted-conn:,listen-queue-len:,active-processes:,slow-requests: -n 'php-fpm-healthcheck' -- "$@"); then
+if ! GETOPT=$(getopt -o v --long verbose,accepted-conn:,listen-queue:,max-listen-queue:,listen-queue-len:,idle-processes:,active-processes:,total-processes:,max-active-processes:,max-children-reached:,slow-requests: -n 'php-fpm-healthcheck' -- "$@"); then
     >&2 echo "Invalid options, terminating." ; exit 3
 fi;
 

test/testinfra/test_execution.py

@@ -20,6 +20,29 @@ def test_valid_with_non_integer_value_exits_properly(host):
     assert cmd.rc == 3
     assert "option value must be an integer" in cmd.stderr
 
+@pytest.mark.php_fpm
+def test_all_available_options_at_once(host):
+    cmd = host.run("php-fpm-healthcheck --accepted-conn=1000 --listen-queue=1000 --max-listen-queue=1000 --listen-queue-len=1000 --idle-processes=1000 --active-processes=1000 --total-processes=1000 --max-active-processes=1000 --max-children-reached=1000 --slow-requests=1000")
+    assert cmd.rc == 0    
+
+@pytest.mark.php_fpm
+@pytest.mark.parametrize("option", [
+    "--accepted-conn",
+    "--listen-queue",
+    "--max-listen-queue",
+    "--idle-processes",
+    "--active-processes",
+    "--total-processes",
+    "--max-active-processes",
+    "--max-children-reached",
+    "--slow-requests",
+])
+def test_all_available_options(host, option):
+    cmd = host.run("php-fpm-healthcheck --verbose {0}=1000".format(option))
+    assert cmd.rc == 0
+    assert "value" in cmd.stdout
+    assert "and expected is less than '1000'" in cmd.stdout
+
 @pytest.mark.alpine
 def test_missing_fcgi_apk(host):
     host.run("apk del fcgi")

test/testinfra/test_metrics.py

@@ -1,5 +1,19 @@
 import pytest
 
+@pytest.mark.php_fpm
+def test_metric_fail_accepted_conn(host):
+    cmd = host.run("php-fpm-healthcheck --accepted-conn=0")
+    assert cmd.rc == 1
+    assert "'accepted conn' value '1' is greater than expected '0'" in cmd.stderr
+
+@pytest.mark.php_fpm
+def test_metric_fail_accepted_conn_with_other_metrics(host):
+    cmd = host.run("php-fpm-healthcheck --verbose --listen-queue=10 --max-active-processes=10 --accepted-conn=0")
+    assert cmd.rc == 1
+    assert "'accepted conn' value '2' is greater than expected '0'" in cmd.stderr
+    assert "'listen queue' value" in cmd.stdout
+    assert "'max active processes' value" in cmd.stdout
+
 @pytest.mark.php_fpm
 def test_metric_accepted_conn(host):
     cmd = host.run("php-fpm-healthcheck -v")