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

25 Commits

Author SHA1 Message Date
Ramil Valitov
9be8a6af6d
WIP tests for commands 2020-07-07 00:22:29 +03:00
Ramil Valitov
8c9ec82da5
[add] timeout checks 2020-07-06 22:43:19 +03:00
Ramil Valitov
5d96c99765
Merge branch 'bug/duplicate-names' into feature/timeout 2020-06-29 19:00:13 +03:00
Ramil Valitov
54db0b85bf
[fix] IP processing 2020-06-29 16:02:20 +03:00
Ramil Valitov
8d642e70cb
[add] info for IP processing 2020-06-29 15:53:22 +03:00
Ramil Valitov
6ac9292c0a
[fix] localhost name resolution 2020-06-29 15:40:20 +03:00
Ramil Valitov
9aae10855b
[fix] #35 analyze all pools 2020-06-29 14:32:31 +03:00
Ramil Valitov
e2264c575a
[del] localhost 2020-06-29 03:02:55 +03:00
Ramil Valitov
d8eb7a3de5
[add] json 2020-06-29 02:52:57 +03:00
Ramil Valitov
21e4630738
[add] extra output 2020-06-29 02:37:13 +03:00
Ramil Valitov
1fcb408790
WIP timeout 2020-06-28 18:18:43 +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
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
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
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
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