3
0
mirror of https://github.com/rvalitov/zabbix-php-fpm.git synced 2023-11-05 03:30:27 +01:00
Commit Graph

32 Commits

Author SHA1 Message Date
Ramil Valitov
467f31abe5
[add] tests for root privileges (#55) 2020-09-14 18:39:58 +03:00
Ramil Valitov
106874e029
Feature/timeout (#42)
* WIP timeout

* [add] zabbix discover test

* decrease number of pools

* [add] similar pool names test

* [fix] pools check

* [add] discovery debug errors

* [add] extra output

* [add] full output

* [add] json

* [del] localhost

* [add] tests for localhost

* [fix] #35 analyze all pools

* [fix] port pools test

* [add] show host info

* [fix] localhost name resolution

* display full log

* [add] info for IP processing

* [fix] IP processing

* [add] timeout test

* [fix] sudo delete pools

* [add] test missing packages

* [add] timeout checks

* [add] pm checks

* [fix] pools count in tests

* [fix] move missing packages to seperate checks

* [fix] testZabbixDiscoverNumberOfIPPools

* [fix] explicitly remove packages

* [fix] testMissingPackagesDiscoveryScript

* [fix] status

* [add] more info on error

* [fix] testMissingPackagesDiscoveryScript

* [add] run scripts as zabbix user

* WIP tests for commands

* [del] update echo

* [fix] bash zabbix

* [fix] socket test

* [fix] discover pools errors

* [add] ondemand hot pools

* [fix] discover script errors

* [fix] recache of ondemand pools

* [add] continous checks

* [fix] discover checks

* [add] more details

* [add] sort cache and results

* [add] sleep tests

* WIP checks

* [fix] sleep timeout

* [fix] ondemand calls

* [add] more info

* [add] script timeout test

* [add] time execution print

* [add] double run tests

* [add] more timeout for ondemand pools

* [fix] userparameters sleep

* [add] display pools

* [add] clear cache in tests

* [fix] delete  cache

* [fix] max recursive checks

* [add] run duration test

* [add] more duration tests

* [fix] execution time is measured in ms

* [add] ondemand cache test

* [add] enrease Zabbix timeout

* [fix] zabbix timeout checks

* [add] multiple run steps

* [fix] stop PHP-FPM before modifications

* [fix] port checks and port range

* [fix] port calculation

* [fix] increase timeout

* [fix] order of tests

* [fix] run PHP directory ending slash

* [add, fix] cache of PHP run directory

* [fix] PHP locations

* Intermediate fix for timeout feature (#48)

* [add] more asserts and checks
* [fix] PHP sockets detection in tests
* [fix] improved socket dir detection
* [fix] improved service name detection, code simplification
* [fix] socket pools check
* [fix] mapfile -d
* [add] local vars
* [add] Travis CI folds
* [add] color output

* [add] extra sleep for service actions

* Feature/cache location (#50)
2020-09-14 11:59:05 +03:00
Ramil Valitov
6355c13658
Feature: tests to support older Ubuntu 14 & 16 (#46) 2020-07-21 06:26:29 +03:00
Ramil Valitov
c129bf941f
Fix discovery bugs: pools duplicate names and IP TCP connections (#38) 2020-07-07 23:38:01 +03:00
Ramil Valitov
5318b36d0a
Feature/travis ci (#37)
Supports Travis CI, fixes sudo problem
2020-06-29 00:43:33 +03:00
Ramil Valitov
2192bc31ca
[fix] get port number, not name (#26) 2020-02-07 13:08:15 +01:00
Ramil Valitov
ccf91cbf17
Fix ShellCheck errors and warnings (#25)
* [fix] comparison operators

* [fix] indents, globbing issue, and other shellcheck related fixes
2020-02-06 23:11:57 +01:00
Ramil Valitov
0618d6d2d3
Update queue triggers (#20)
* [add,del] new queue triggers

* [add] new template description

* [del] remove trigger PHP-FPM queue is not available

Backlog only works for TCP, not sockets. So, this trigger is not required.

* [add] info about new triggers

* [add] info about backlog in the triggers description
2020-01-21 15:46:08 +03:00
Ramil Valitov
1d4f9a8544
[add] check if cache file is writeable 2020-01-18 23:04:53 +03:00
Ramil Valitov
0af188ec6d
[add] detect current user 2020-01-18 23:04:28 +03:00
Ramil Valitov
8357d32b07
Caching of ondemand pools and status checks (#19)
* [add] zero exit code on success

* [add] cache for ondemand pm and check status of pools during discovery

* [fix] improved detection of some commands

* [add] info about ondemand pools, update syntax of discovery script in samples
2020-01-17 21:47:39 +03:00
Ramil Valitov
ae8edbbb24
[add] some missing description to data items 2020-01-04 02:18:49 +03:00
Ramil Valitov
75f1cd3ab5
Merge branch 'master' into bug/queue-trigger 2020-01-04 01:44:25 +03:00
Ramil Valitov
375683d172
[add] description to triggers 2020-01-04 01:43:42 +03:00
Ramil Valitov
15b6a3e8e7
[fix] listen queue trigger alarms only after 3 sequental checks 2020-01-04 01:36:53 +03:00
Ramil Valitov
54aa3e484c
[del] remove template for version 4.2
We don't have to support it, a single template version 4.0 is enough
2020-01-04 01:32:07 +03:00
Ramil Valitov
85a4bce885
Support for Zabbix version 4.0 (#15) 2019-12-24 14:15:50 +03:00
Ramil Valitov
52612d807d
[add] some new screens, improved colors of graphs, less data to show in graphs to make them more friendly and readable 2019-12-21 17:33:49 +03:00
Ramil Valitov
d13b33fa59
[add] shorter names of parameters in template 2019-12-21 15:28:43 +03:00
Ramil Valitov
2210d3bbd5
Fix for issue #12 (#13)
## Fix (all problems specified in issue #12)
- **More robust method to discover sockets** (when PHP pool uses sockets). Script performs automatic checks of socket files (the file exists and is really a socket).
- **More robust method to discover host and port** (when PHP pool uses TCP connection).
- **Support of pools when PHP daemon listens on any network interface**. This mode is activated when in PHP pool configuration the `listen` command specifies only a port, without a host IP, for example:
```
listen = 9000
```
- **Correct discovery of pools in some cases.** The script performs analysis of all processes that belong to the pool. Previously, we checked only the first process, as a result if a pool somehow had multiple processes (for example Memcached, Redis, PostgreSQL) then discovery could capture wrong data. Now this problem is fixed.
- **Improved detection of pools**. We use better expressions in `grep` now. Previously special characters in pool names could lead to script failures. Besides such approach is a more robust method to fix #10.

## New functionality
- **Debug mode** of the discovery script helps to investigate problems that may happen
2019-12-19 14:02:16 +03:00
Ramil Valitov
d78455db86
Merge branch 'master' into patch-2 2019-12-15 16:18:38 +03:00
Ramil Valitov
e6b19fc940
[fix] correct grep of pool name #10 2019-11-28 12:14:09 +03:00
Ramil Valitov
0678312563
[add, fix] detection of PHP-FPM pools spawned in TCP mode, fixes #8 2019-11-26 19:07:54 +03:00
Ramil Valitov
04243442fd
[del] remove debug file output 2019-11-26 18:26:39 +03:00
Ramil Valitov
a35cb432b9
[add] info how to use this script 2019-11-26 18:26:21 +03:00
Ramil Valitov
573c9b3123
[fix] better alias safe executables detection in addition to #6 2019-11-26 18:15:39 +03:00
LeoShivas
9acb7224d2
Update zabbix_php_fpm_discovery.sh
Replace $(NF-1) by $(NF).
I don't know, but on my CentOs server, the commande "lsof -p 1179 2>/dev/null | grep unix | head -1" gives me :
php-fpm 1179 php-fpm   24u  unix 0xffff8f77b774dc00       0t0 8958617 /local/php/sockets/php7_mediawiki.sock

So, the socket is in the last row, not in the before last.
2019-11-26 11:46:52 +01:00
Carl Heaton
5d9b551aa6 Improved alias safe method to get commands and locations of required executables (#6) 2019-11-05 00:45:20 +03:00
LeoShivas
7299a383cc
Update zabbix_php_fpm_template.xml
Replace vsize by rss because it's more relevant in monitoring.
2019-10-11 12:07:26 +02:00
Ramil Valitov
97304dcc0f
[fix] correct autodiscovery if there are problems with PID or socket, #1
If PID or socket are invalid or failed to detect, then it caused the JSON to be malformed because of extra comma.
2019-10-01 12:02:49 +03:00
Ramil Valitov
ce5b04f74c
[add] files for Zabbix 2019-08-13 11:32:59 +03:00
Ramil Valitov
a9e5d5401d [add] pools discovery 2019-08-12 15:22:49 +03:00