antipode.info/zabbix-php-fpm
3
0
Fork 0
mirror of https://github.com/rvalitov/zabbix-php-fpm.git synced 2023-11-05 03:30:27 +01:00
Code Issues Releases Wiki Activity

[fix] execution time is measured in ms

Browse Source
This commit is contained in:
Ramil Valitov 2020-07-07 15:37:07 +03:00
parent af58fff1fa
commit 0898e9464f
No known key found for this signature in database
GPG Key ID: 2AB186DABDFE1914
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zabbix/zabbix_php_fpm_discovery.sh
View File

@ -7,11 +7,11 @@
# Zabbix allows us to use a script that runs no more than 3 seconds by default. This option can be adjusted in settings: # Zabbix allows us to use a script that runs no more than 3 seconds by default. This option can be adjusted in settings:
# see Timeout option https://www.zabbix.com/forum/zabbix-help/1284-server-agentd-timeout-parameter-in-config # see Timeout option https://www.zabbix.com/forum/zabbix-help/1284-server-agentd-timeout-parameter-in-config
# So, we need to stop and save our state in case we need more time to run. # So, we need to stop and save our state in case we need more time to run.
# This parameter sets the maximum number of seconds that the script is allowed to run. # This parameter sets the maximum number of milliseconds that the script is allowed to run.
# After this duration is reached, the script will stop running and save its state. # After this duration is reached, the script will stop running and save its state.
# So, the actual execution time will be slightly more than this parameter. # So, the actual execution time will be slightly more than this parameter.
# We put value equivalent to 2 seconds here. # We put value equivalent to 1.5 seconds here.
MAX_EXECUTION_TIME="2" MAX_EXECUTION_TIME="1500"
#Status path used in calls to PHP-FPM #Status path used in calls to PHP-FPM
STATUS_PATH="/php-fpm-status" STATUS_PATH="/php-fpm-status"
@ -130,7 +130,7 @@ RESULTS_CACHE_FILE="$LOCAL_DIR/php_fpm_results.cache"
STATUS_SCRIPT="$LOCAL_DIR/zabbix_php_fpm_status.sh" STATUS_SCRIPT="$LOCAL_DIR/zabbix_php_fpm_status.sh"
#Start time of the script #Start time of the script
START_TIME=$($S_DATE +%s) START_TIME=$($S_DATE +%s%N)
ACTIVE_USER=$(${S_WHOAMI}) ACTIVE_USER=$(${S_WHOAMI})
@ -334,16 +334,16 @@ function SavePrintResults() {
} }
function CheckExecutionTime() { function CheckExecutionTime() {
CURRENT_TIME=$($S_DATE +%s) CURRENT_TIME=$($S_DATE +%s%N)
ELAPSED_TIME=$(echo "$CURRENT_TIME - $START_TIME" | $S_BC) ELAPSED_TIME=$(echo "($CURRENT_TIME - $START_TIME)/1000000" | $S_BC)
if [[ $ELAPSED_TIME -lt $MAX_EXECUTION_TIME ]]; then if [[ $ELAPSED_TIME -lt $MAX_EXECUTION_TIME ]]; then
#All good, we can continue #All good, we can continue
PrintDebug "Check execution time OK, elapsed $ELAPSED_TIME" PrintDebug "Check execution time OK, elapsed $ELAPSED_TIME ms"
return 1 return 1
fi fi
#We need to save our state and exit #We need to save our state and exit
PrintDebug "Check execution time: stop required, elapsed $ELAPSED_TIME" PrintDebug "Check execution time: stop required, elapsed $ELAPSED_TIME ms"
SavePrintResults SavePrintResults