7bfd94b9d2
Merge branch 'patch-6' of github.com:IgorA100/zoneminder into IgorA100-patch-6
2024-05-15 11:45:49 -04:00
3648bfd56f
Merge branch 'ZoneMinder:master' into patch-6
2024-05-08 01:15:45 +03:00
4a38036255
Handle failure to open serial port better. Log error and don't crash.
2024-04-30 07:02:56 -04:00
178eacc06b
Use Term instead of exit when q is hit so that we clean up the pid file
2024-04-12 14:07:20 -04:00
a720292025
Merge branch 'ZoneMinder:master' into patch-6
2024-04-07 20:45:21 +03:00
8a6414bb46
Merge branch 'support_mariadb'
2024-04-05 18:13:04 -04:00
c0c8a041ee
Fix missing ?
2024-04-05 18:12:24 -04:00
49704656b8
Merge branch 'ZoneMinder:master' into patch-6
2024-04-05 22:58:55 +03:00
d5aa5bfa46
Add Object_Types table and perl code to use it.
2024-03-29 18:42:46 -04:00
443e3bd0fd
Width and Height cannot be nullm hence make defaults 0
2024-03-29 18:20:56 -04:00
c77078d098
Merge branch 'ZoneMinder:master' into patch-6
2024-03-28 23:31:53 +03:00
434ce6a08c
Use ZM_DB_TYPE when connecting to db.
2024-03-28 09:56:04 -04:00
2241c88654
Fix comman translation
2024-03-24 11:49:25 -04:00
2b8bb77040
Replace , with . in cpuloads
2024-03-23 11:31:01 -04:00
1fe81e40f7
Replace commas with periods
2024-03-22 17:32:05 -04:00
4ae874c2f7
Use 0 instead of '' for server id if not multi-server
2024-03-22 10:02:51 -04:00
2bd081310d
Merge branch 'master' into patch-6
2024-03-22 00:52:20 +03:00
39e2c9a5a6
Move array_diff down to where it is used
2024-03-21 12:43:01 -04:00
2e4133507a
Add Network.pm
2024-03-21 10:34:54 -04:00
fda44f6e3f
Fixups for Manufacturer and Model routines. OutputCodec default is 0 as it is NOT NULL. Also Importance is an integer, so default should be 0.
2024-03-21 10:33:03 -04:00
586614e2bb
Updates to hash_diff and parseNameEqualsValueToHash
2024-03-21 10:09:02 -04:00
789e07297d
Add defaults for control fields
2024-03-21 10:00:05 -04:00
c6e71b19dc
Update to add new api credentials, get_config, set_config, reboot, ping and parse ip/auth from Monitor->Path
2024-03-21 09:44:03 -04:00
7e26498b80
Get ip/authentication from Monitor->Path if possibile. Add new api components credentials, reboot, ping.
2024-03-21 09:38:06 -04:00
62ad1f28fb
Add updating server record with values as well.
2024-03-20 10:38:44 -04:00
30408df4ed
Add saving Cpuload when setting run status of server
2024-03-20 10:38:21 -04:00
ba19ad3ed6
Don't populate CpuLoad in CpuLoad() as it overwrites stored value. Need to add in proper object support Fixes load being 0
2024-03-20 10:37:55 -04:00
6ee529cca5
Fully specify logging functions as we don't actually import them into our namespace
2024-03-20 09:55:34 -04:00
95ee9f816d
Merge branch 'ZoneMinder:master' into patch-6
2024-03-15 23:20:35 +03:00
70fd777b02
Fall back to top if we fail to open proc/stat
2024-03-14 18:05:03 -04:00
f9ea031581
Merge branch 'patch-6' of github.com:IgorA100/zoneminder into IgorA100-patch-6
2024-03-14 17:15:46 -04:00
62ba0bf903
Add duration to hints for EVENT_CLOSE_MODE and use alternate regexp for pattern
2024-03-14 11:54:15 -04:00
2a56636142
We do not use a temporary file to store previous statistics
2024-03-06 19:18:55 +03:00
c74531a380
Ref: Calculation of CPU load as a percentage
...
We no longer use sllep()
A temporary file is now used to save the previous state.
Without the previous state, correct calculation of the load is not possible.
CPU load is calculated during the database update interval
2024-03-03 16:24:17 +03:00
852dd772ab
Merge branch 'ZoneMinder:master' into patch-6
2024-03-03 00:38:02 +03:00
19e6e9baf2
Merge pull request #3707 from Simpler1/default_sound
...
feat(sound): Include default alarm sound (again)
2024-03-02 11:11:03 -05:00
7fdc204082
feat(): Custom snapp.ogg sound for ZoneMinder
2024-03-02 10:15:44 -05:00
8d342c3ac7
Fix: return
2024-02-27 17:47:59 +03:00
9200eb42e9
Add ReadStat() Refactoring CpuUsage()
...
CPU load calculation
2024-02-27 17:32:03 +03:00
98a1c73fb2
Add CpuNicePercent, CpuIdlePercent, CpuUsagePercent to Server_Stats
2024-02-26 23:46:49 +03:00
d25a07eb04
Fix: ...
2024-02-26 23:19:28 +03:00
871ca68024
Changing uptime return line parsing for CpuLoad()
...
Changing uptime return line parsing for CpuLoad()
Depending on the locale it could be like this:
16:50:53 up 1 day, 1:10, 3 users, load average: 0.89, 0.94, 1.14
or like this:
16:50:53 up 1 day, 1:10, 3 users, load average: 0.89, 0.94, 1.14
2024-02-26 17:06:23 +03:00
4c38d5ba75
Merge branch 'master' into event_start_mode
2024-02-22 16:13:16 -05:00
00155dc841
Fix CpuSysPercent to CpuSystemPercent
2024-02-22 16:06:27 -05:00
15cdb9e816
Merge branch 'master' into event_start_mode
2024-02-22 10:47:49 -05:00
8f35339198
Fix StorageServerId value
2024-02-22 09:06:54 -05:00
91aeeb4d60
Fix support for FilterServerId
2024-02-21 16:34:25 -05:00
48774d3c31
Handle undefined sort field
2024-02-21 10:06:17 -05:00
68e2b19440
Update to use Server module updates and store CpuUsage stats instead of just load
2024-02-20 13:13:27 -05:00
93ef297c24
Implement CpuUsage to get data either from /proc/stat or top output.
2024-02-20 13:12:50 -05:00
Isaac Connor
IgorA100
Isaac Connor
Simpler1