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

85 Commits

Author SHA1 Message Date
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
ad08d1c11f
Feature/nginx ispconfig (#51)
[add] patch and nginx config for ISPConfig
2020-08-05 23:38:54 +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
e110535232
Feature/zabbix5 tests + codefactor (#41) 2020-07-03 16:48:27 +03:00
Ramil Valitov
3f42afd59a
[add] welcome bot 2020-07-01 13:16:09 +03:00
Ramil Valitov
c71636ff35
[add] info about support of Zabbix 5, closes #33 2020-06-29 14:30:08 +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
edeeeaa2c0
[add] more test cases 2020-05-19 03:15:51 +03:00
Ramil Valitov
2192bc31ca
[fix] get port number, not name (#26) 2020-02-07 13:08:15 +01:00
Ramil Valitov
0400614376
[add] tested Zabbix 4.0.4 2020-02-06 23:58:29 +01:00
Ramil Valitov
359ec4e07d
[add] tested with PHP 7.4 2020-02-06 23:55:58 +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
b4e4e172f3
move info to Wiki (#23) 2020-01-29 13:00:12 +03: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
2e2983dbde
[add] comments about listen queue 2020-01-19 00:02:41 +03:00
Ramil Valitov
c28535caa2
[add] more problem cases for zabbix_get 2020-01-18 23:35:39 +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
68e5a4d377
[add,fix] more info how to use zabbix_get, correct command syntax for php-fpm.discover 2020-01-18 22:38:35 +03:00
Ramil Valitov
7f1621a72c
[add] missing info for Zabbix server 2020-01-18 01:02:11 +03:00
Ramil Valitov
0659b41962
[add] info how to install release and development versions 2020-01-18 00:57:43 +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
94f821269f
[add] description of triggers in README 2020-01-04 02:46:08 +03:00
Ramil Valitov
ee707bd4ef
[add] more details how to use zabbix-get command 2020-01-04 02:32:04 +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
1c1411d836
Feature ISPConfig patch (#16)
* [add] patch file

* [add] info how to use a patch
2019-12-24 16:34:21 +03:00
Ramil Valitov
efb6eaf651
[add] update about supported versions of PHP 2019-12-24 15:22:52 +03:00
Ramil Valitov
85a4bce885
Support for Zabbix version 4.0 (#15) 2019-12-24 14:15:50 +03:00
Ramil Valitov
874dbe6958
[add] info about screens 2019-12-21 20:51:31 +03:00
Ramil Valitov
a6feafea40
[add] screens example 2019-12-21 20:49:48 +03:00
Ramil Valitov
3497d053d8
[add] more troubleshooting 2019-12-21 19:15:09 +03:00
Ramil Valitov
2e71a996aa
[add] more details how to run Zabbix agent as root 2019-12-21 19:14:37 +03:00
Ramil Valitov
be9802dec9
[add] info how to install zabbix-get 2019-12-21 18:20:36 +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
5797127be2
[add] details about pm ondemand issue 2019-12-19 14:29:04 +03:00
Ramil Valitov
718ae76828
[add] info about supported pool's listen directive and PM managers 2019-12-19 14:25:50 +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
805ef87655
Merge pull request #9 from LeoShivas/patch-2
Pools detection fix for CentOS
2019-12-15 16:19:40 +03:00
Ramil Valitov
d78455db86
Merge branch 'master' into patch-2 2019-12-15 16:18:38 +03:00
Ramil Valitov
c3bec2e000
[add] one more step how to grant previliges without root #7 2019-11-29 14:57:53 +03:00
Ramil Valitov
799f76ec1a
[add] info how to use zabbix_get for troubleshooting 2019-11-28 12:41:32 +03:00
Ramil Valitov
e6b19fc940
[fix] correct grep of pool name #10 2019-11-28 12:14:09 +03:00
Ramil Valitov
fc5b1d583c
[add] method how to grant previliges without root #7 2019-11-28 12:13:04 +03:00
Ramil Valitov
80401be1f2
[add] more details about cgi-fcgi package installation in Debian 2019-11-26 22:36:21 +03:00