Ramil Valitov
76b2c79b1b
[fix] remove extra {}, allow spaces in pool names
2020-09-21 02:24:53 +03:00
Ramil Valitov
14c12a8115
Merge branch 'master' into feature/parallel
2020-09-21 02:10:09 +03:00
Ramil Valitov
cc2242da7b
[add] info screen, parallel pending pools analysis
2020-09-21 01:49:37 +03:00
Ramil Valitov
790edf8985
[add] info about required package name for cgi-fcgi utility to make it easier for the user to understand what package is missing, helps #53
2020-09-20 21:10:42 +03:00
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
bd92d4b4f9
[add] analyze pools in parallel
2020-08-07 18:50:37 +03:00
Ramil Valitov
8e5a83eede
Feature/cache location ( #50 )
2020-08-05 23:59:19 +03:00
Ramil Valitov
591b32e499
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
2020-07-29 04:16:44 +03:00
Ramil Valitov
cd320cc5cf
Merge branch 'master' into feature/timeout
2020-07-21 06:41:40 +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
06e53d2731
[add] ondemand cache test
2020-07-07 15:57:20 +03:00
Ramil Valitov
0898e9464f
[fix] execution time is measured in ms
2020-07-07 15:37:07 +03:00
Ramil Valitov
3c97963d64
[add] time execution print
2020-07-07 07:06:56 +03:00
Ramil Valitov
974926ed63
[fix] sleep timeout
2020-07-07 06:27:30 +03:00
Ramil Valitov
3ae47e6346
[add] sleep tests
2020-07-07 05:55:00 +03:00
Ramil Valitov
ab44dad6ec
[add] sort cache and results
2020-07-07 05:37:40 +03:00
Ramil Valitov
c474b4c6c5
[add] continous checks
2020-07-07 01:31:17 +03:00
Ramil Valitov
5b7f642e49
[add] ondemand hot pools
2020-07-07 01:05:11 +03:00
Ramil Valitov
337bb77d0a
[del] update echo
2020-07-07 00:26:28 +03:00
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