Skip to content

Commit 466f806

Browse files
committed
refactor(php-status): always assume http://localhost/monitoring.php and, if not found, be tolerant
1 parent 3cc58c9 commit 466f806

File tree

3 files changed

+478
-165
lines changed

3 files changed

+478
-165
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,16 @@ Build, CI/CD:
4444
* Windows MSI still installs all plugins to ProgramFiles64Folder/ICINGA2/sbin/linuxfabrik, but does not depend on an Icinga2 agent any longer
4545

4646

47+
Grafana:
48+
49+
* All panels: do not connect across nulls
50+
51+
4752
Monitoring Plugins:
4853

4954
* all plugins: ignore unknown arguments instead of generating an error (this helps with updating Icinga and Nagios service definitions considerably)
5055
* nextcloud-version: modernize code
56+
* php-status: always assume http://localhost/monitoring.php and, if not found, be tolerant
5157
* redis-status, valkey-status: modernize code and unify both plugins again after [PR #954](https://github.com/Linuxfabrik/monitoring-plugins/pull/954)
5258

5359

check-plugins/php-status/README.md

Lines changed: 34 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,10 @@ options:
6464
connections. Default: False
6565
--no-proxy Do not use a proxy. Default: False
6666
--timeout TIMEOUT Network timeout in seconds. Default: 8 (seconds)
67-
--url URL URL to optional PHP `monitoring.php` script.
67+
--url URL URL to optional PHP `monitoring.php` script. The plugin
68+
will work, but its accuracy will be reduced if the
69+
`monitoring.php` file cannot be fetched via HTTP(S).
70+
Default: http://localhost/monitoring.php
6871
-w, --warning WARN Set the WARN threshold for Opcache usage as a
6972
percentage. Default: >= 90
7073
```
@@ -79,25 +82,36 @@ options:
7982
Output:
8083

8184
```text
82-
Everything is ok. PHP v8.0.12 (/etc/php.ini), Opcache Mem 6.8% used (8.7MiB/128.0MiB), Wasted 0.0% (0.0B, max. 5.0%), Keys 0.0% used (1/16229), Hit Rate 0.0% (0.0 hits, 1.0 misses), Interned Strings 4.1% used (250.8KiB/6.0MiB, 5482 Strings), 0 OOM / 0 manual / 0 key restarts,
83-
84-
Key ! Value
85-
--------------------------------+---------------
86-
date.timezone ! Europe/Zurich
87-
display_errors ! Off
88-
display_startup_errors ! Off
89-
error_reporting ! 22519
90-
expose_php ! Off
91-
max_execution_time ! 30
92-
memory_limit ! 64M
93-
post_max_size ! 50M
94-
upload_max_filesize ! 20M
95-
opcache.enable ! True
96-
opcache.interned_strings_buffer ! 8
97-
opcache.max_accelerated_files ! 10000
98-
opcache.memory_consumption ! 134217728
99-
opcache.revalidate_freq ! 1
100-
opcache.save_comments ! True
85+
Everything is ok. PHP v8.3.26 (/etc/php.ini), Opcache Mem 59.2% used (75.8MiB/128.0MiB),
86+
Wasted 0% (0.0B, max. 5.0%), Keys 78.4% used (6245/7963), Hit Rate 100.0% (13.5M hits, 3.3K misses),
87+
Interned Strings 61.8% used (12.4MiB/20.0MiB, 130787 Strings), 0 OOM / 0 manual / 0 key restarts,
88+
No startup errors were detected. No unexpected configurations detected. All expected modules were
89+
found.
90+
91+
Key ! Value
92+
--------------------------------+----------------------------------
93+
date.timezone ! Europe/Zurich
94+
default_socket_timeout ! 10
95+
display_errors ! Off
96+
display_startup_errors ! Off
97+
error_reporting ! 22519
98+
expose_php ! Off
99+
max_execution_time ! 3600
100+
max_file_uploads ! 100
101+
max_input_time ! -1
102+
memory_limit ! 1024M
103+
post_max_size ! 16M
104+
SMTP ! localhost
105+
upload_max_filesize ! 10000M
106+
opcache.blacklist_filename ! /etc/php-zts.d/opcache*.blacklist
107+
opcache.enable ! True
108+
opcache.enable_cli ! True
109+
opcache.huge_code_pages ! False
110+
opcache.interned_strings_buffer ! 20
111+
opcache.max_accelerated_files ! 7963
112+
opcache.memory_consumption ! 128.0MiB
113+
opcache.revalidate_freq ! 60
114+
opcache.save_comments ! True
101115
opcache.validate_timestamps ! True
102116
```
103117

0 commit comments

Comments
 (0)