29d120f059
Add CLOSE_DURATION, remove EventStartMode
2024-02-23 16:50:57 -05:00
920568c704
Use switch instead of ifs and add CLOSE_DURATION as valid value
2024-02-23 16:50:44 -05:00
989b3b7ba4
Merge pull request #3838 from IgorA100/patch-3
...
Fix: Logging levels coloring for languages other than English
2024-02-23 09:01:19 -05:00
ed64db315b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-02-23 08:56:32 -05:00
a738f1bc2e
Remove unused EventStartMode. Fixes #3839
2024-02-23 08:56:26 -05:00
6e5d26f294
Bump to 1.37.53
2024-02-22 16:58:54 -05:00
78ab72a0d9
Remove EventStartMode stuff
2024-02-22 16:58:14 -05:00
824d6ec032
Remove EventStartMode stuff
2024-02-22 16:58:03 -05:00
87d71a030a
Add EventCloseMode to Monitors
2024-02-22 16:13:34 -05: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
5fd7e9faf5
Add CpuUserPercent, CpuNicePercent, CpuSystemPercent, CpuIdlePercent, CpuUsagePercent to Servers table
2024-02-22 16:06:03 -05:00
f9a1b6b4f4
Only show cpuUsage if we have an Id
2024-02-22 12:55:35 -05:00
ebad97038e
Implement CpuLoad in Server object
2024-02-22 12:52:49 -05:00
799dcd5f51
Default thisServer to a default server object.
2024-02-22 12:52:39 -05:00
b5096677c7
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-02-22 10:57:18 -05:00
1742c03b1a
Handle non-multi-server case. Fixes #3836
2024-02-22 10:57:01 -05:00
15cdb9e816
Merge branch 'master' into event_start_mode
2024-02-22 10:47:49 -05:00
eeb8856157
Ad EventStartMode and EventCLoseMode to monitor
2024-02-22 10:46:36 -05:00
0d98b2523d
Split recording=ONMOTION and recording=ALWAYS logic out explicitly, even though it leads to redundant code, it should be easier to debug.
2024-02-22 10:39:38 -05:00
ae2dc039ac
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-02-22 10:02:46 -05:00
141980076c
Merge pull request #3837 from BHMSD-bdailey/master
...
Prevent events from exceeding the section_length
2024-02-22 09:53:06 -05:00
364d0c438e
Split the if so that we get better debug output
2024-02-22 09:52:17 -05:00
b079281900
Remove second data-click-to-select
2024-02-22 09:33:54 -05:00
0cbce2a8a4
Apply bootstrap table to servers list. Split the servers content into it's own file. Add overflow:auto to the container which for some reason fixes button visibility.
2024-02-22 09:33:32 -05:00
8f35339198
Fix StorageServerId value
2024-02-22 09:06:54 -05:00
025fc939a9
Update debug to make it unique
2024-02-22 07:49:49 -05:00
34815e02b9
Fix: Logging levels coloring
...
When getting the index, you cannot use text(), because there may be different meaning depending on the language!
If the value is different from 'Level', lvl_ndx will not be found and coloring will not work.
2024-02-22 11:16:30 +03:00
ebee72bf65
Prevent events from exceeding the section_length even if we are still in alarm
2024-02-21 17:10:18 -05:00
edcf09882f
Subsitute a 0 when ZM_SERVER_ID is not defined
2024-02-21 16:35:04 -05:00
91aeeb4d60
Fix support for FilterServerId
2024-02-21 16:34:25 -05:00
63b3f2bd36
Always increment alarm_frames if it is an alarm packet. Doesn't have to have an image.
2024-02-21 14:21:16 -05:00
1c83b137bb
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-02-21 14:06:53 -05:00
15e4a7ac65
Move setting of last_signal up to where it is used for clarity
2024-02-21 12:09:24 -05:00
c7bcb64f61
Merge pull request #3835 from BHMSD-bdailey/master
...
Simple typo and consistency fixes.
2024-02-21 11:30:19 -05:00
ec24235cd3
Merge branch 'ZoneMinder:master' into master
2024-02-21 10:48:24 -05:00
7e6efde1a9
Simple typo and consistency fixes.
2024-02-21 10:47:53 -05:00
48774d3c31
Handle undefined sort field
2024-02-21 10:06:17 -05:00
0994e9da48
Merge pull request #3832 from webgeek1234/rpi-dec
...
Fix raspberry pi hardware decoding
2024-02-21 09:52:21 -05:00
3151b99185
Merge pull request #3834 from IgorA100/patch-2
...
Adding the lost "All Events" button from Live View
2024-02-21 09:44:34 -05:00
9783c5a560
Adding an "All Events" Button from Live View
...
Ability to jump to viewing all events from live viewing.
2024-02-21 15:44:51 +03:00
d9cfcfbaa7
Clicking the "All Events" button from Live View
...
When you press the button, we go to view all events.
2024-02-21 15:17:15 +03:00
72cbf4a393
Include unistd because we use sleep
2024-02-20 20:29:49 -05:00
e03afd678a
Add a return value to zmDbReconnect which seems to fix the crashing
2024-02-20 19:31:11 -05:00
93ee735086
Fix nitpick
2024-02-20 18:56:54 -05:00
87156149a0
Only do mysql_close if we think we are connected
2024-02-20 18:56:02 -05:00
e9e429083e
Add zmDbReconnect, which closes the connection before trying to reconnect, in an attempt to prevent mem leak. This adds a 1 sec sleep if we fail to connect. This also removes the disabling of db logging before doing logging... because we are going to assume (possibly incorrectly) that the logging code is correct and generating well-formed sql, and hence the error is external. This might be a bad idea.
2024-02-20 18:36:10 -05:00
661d8620fd
Add Cpu Usage % to header
2024-02-20 13:15:38 -05:00
f54f10df72
Add server stats fields
2024-02-20 13:14:23 -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
Isaac Connor
Isaac Connor
BHMSD-bdailey
IgorA100