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

26 Commits

Author SHA1 Message Date
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