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] userparameters sleep

Browse Source
This commit is contained in:
Ramil Valitov 2020-07-07 12:20:27 +03:00
parent 639e654002
commit faf0adacba
No known key found for this signature in database
GPG Key ID: 2AB186DABDFE1914
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/all.sh
View File

@ -160,11 +160,11 @@ testPHPIsRunning() {
} }
testStatusScriptSocket() { testStatusScriptSocket() {
#Make the test: assertNotNull "Test socket is not defined" "$TEST_SOCKET"
DATA=$(sudo -u zabbix sudo "/etc/zabbix/zabbix_php_fpm_status.sh" "$TEST_SOCKET" "/php-fpm-status") DATA=$(sudo -u zabbix sudo "/etc/zabbix/zabbix_php_fpm_status.sh" "$TEST_SOCKET" "/php-fpm-status")
IS_OK=$(echo "$DATA" | grep -F '{"pool":"') IS_OK=$(echo "$DATA" | grep -F '{"pool":"')
assertNotNull "Failed to get status from pool $PHP_POOL: $DATA" "$IS_OK" assertNotNull "Failed to get status from pool $TEST_SOCKET: $DATA" "$IS_OK"
echo "Success test of $PHP_POOL" echo "Success test of $TEST_SOCKET"
} }
testStatusScriptPort() { testStatusScriptPort() {
@ -244,12 +244,17 @@ function restoreUserParameters() {
sudo cp "$TRAVIS_BUILD_DIR/zabbix/userparameter_php_fpm.conf" "$(sudo find /etc/zabbix/ -name 'zabbix_agentd*.d' -type d | head -n1)" sudo cp "$TRAVIS_BUILD_DIR/zabbix/userparameter_php_fpm.conf" "$(sudo find /etc/zabbix/ -name 'zabbix_agentd*.d' -type d | head -n1)"
} }
testZabbixDiscoverSleep() { function AddSleepToConfig() {
#Add sleep
PARAMS_FILE=$(getUserParameters) PARAMS_FILE=$(getUserParameters)
sudo sed -i 's#zabbix_php_fpm_discovery#UserParameter=php-fpm.discover[*],sudo /etc/zabbix/zabbix_php_fpm_discovery.sh sleep $1#' "$PARAMS_FILE" sudo sed -i 's#.*zabbix_php_fpm_discovery.*#UserParameter=php-fpm.discover[*],sudo /etc/zabbix/zabbix_php_fpm_discovery.sh sleep $1#' "$PARAMS_FILE"
sudo cat "$PARAMS_FILE" sudo cat "$PARAMS_FILE"
sudo service zabbix-agent restart sudo service zabbix-agent restart
sleep 2
}
testZabbixDiscoverSleep() {
#Add sleep
AddSleepToConfig
testZabbixDiscoverReturnsData testZabbixDiscoverReturnsData
} }
@ -263,10 +268,7 @@ testDiscoverScriptDoubleRun() {
testZabbixDiscoverDoubleRun() { testZabbixDiscoverDoubleRun() {
#Add sleep #Add sleep
PARAMS_FILE=$(getUserParameters) AddSleepToConfig
sudo sed -i 's#zabbix_php_fpm_discovery#UserParameter=php-fpm.discover[*],sudo /etc/zabbix/zabbix_php_fpm_discovery.sh sleep $1#' "$PARAMS_FILE"
sudo cat "$PARAMS_FILE"
sudo service zabbix-agent restart
DATA_FIRST=$(zabbix_get -s 127.0.0.1 -p 10050 -k php-fpm.discover["/php-fpm-status"]) DATA_FIRST=$(zabbix_get -s 127.0.0.1 -p 10050 -k php-fpm.discover["/php-fpm-status"])
DATA_SECOND=$(zabbix_get -s 127.0.0.1 -p 10050 -k php-fpm.discover["/php-fpm-status"]) DATA_SECOND=$(zabbix_get -s 127.0.0.1 -p 10050 -k php-fpm.discover["/php-fpm-status"])