0ad01f09bd
refix triggers updating EventCounts. remove unsigned from eventcounts and diskspace totals.
2018-02-20 22:48:23 -05:00
1981359d69
fixes, use summaries from Events_Day/etc instead of Events table
2018-02-19 19:45:21 -05:00
678634916f
fix event insert trigger
2018-02-19 17:29:30 -05:00
e4ec1712f4
remove the table creation/dropping and a if/elseif fix
2018-02-18 11:48:00 -05:00
e18a14337f
use path to triggers.sql
2018-02-18 11:47:03 -05:00
fe0ccafae8
add missing ;
2018-02-18 11:29:22 -05:00
d52277b283
update monitor counts
2018-02-18 11:28:58 -05:00
4b04b1ee7c
remove unwanted space
2018-02-18 11:19:20 -05:00
94212eda2f
fix triggers
2018-02-18 11:01:33 -05:00
717d00ac99
missing //
2018-02-09 16:08:44 -05:00
0d5c8f385f
fix DiskSpace summing when Nulls are present
2018-02-07 08:02:49 -05:00
4c5e47b050
fix DiskSpace summing when Nulls are present
2018-02-07 08:02:05 -05:00
8343793c48
Fix updating Storage area DiskSpace by using COALESCE
2018-02-06 11:34:40 -05:00
0f83dfc769
Correct events_day, etc update trigger
2018-02-06 08:43:09 -05:00
4bd92a3b94
fixes
2018-02-05 23:01:04 -05:00
c767d79aef
fix typo
2018-02-05 22:59:37 -05:00
34f6584081
Update zm_create.sql.in
2018-02-05 18:53:47 -05:00
86ae1b6598
Add missing commas
2018-02-05 17:31:34 -05:00
6822643d22
add update triggers for all the event tables so that diskspace counts work
2018-02-05 15:46:39 -05:00
cfb7987f0f
Replace EventTotal Updates in zmstats.pl with triggers which will hold locks less. Move stats updates to zmaudit.pl
2018-02-03 14:54:30 -05:00
a7171eccf6
Replace EventTotal Updates in zmstats.pl with triggers which will hold locks less. Move stats updates to zmaudit.pl
2018-02-03 14:54:01 -05:00
8e547134d5
Replace EventTotal Updates in zmstats.pl with triggers which will hold locks less. Move stats updates to zmaudit.pl
2018-02-03 14:50:19 -05:00
73f7026643
use COALESCE to ensure integer values
2018-02-03 11:01:33 -05:00
12c4ab07ea
use COALESCE to ensure integer values
2018-02-03 11:01:26 -05:00
868e17a414
Allow Method in Monitors to be NULL
2018-02-02 10:31:55 -05:00
060acffb9d
make DiskSpace in storage table be int instead of unsigned. Event deletions can make it go negative and then the delete fails.
2018-02-01 11:32:55 -05:00
73edd3221a
make DiskSpace in storage table be int instead of unsigned. Event deletions can make it go negative and then the delete fails.
2018-02-01 11:32:44 -05:00
ef51a21df4
add new runstate called Connected
2018-01-31 14:36:41 -05:00
456f29fcba
Rename column Id OF Monitor_Statuses to simplify JOINS.
2018-01-26 13:39:37 -05:00
2d9f9125aa
add update_storage_stats procedure
2018-01-26 13:08:10 -05:00
0bd1ee5992
Merge branch 'master' into m
2018-01-25 08:43:31 -05:00
b821d665bf
Fix commas
2018-01-24 12:16:18 -05:00
50fc4a2d94
Use a memory table called Monitor_Status to store FPS and Status info for Monitors. This is to reduce locking and updates on the main Monitors table.
2018-01-24 11:51:11 -05:00
fd2d2a0d77
ad update to update events_update_trigger to dix totaldiskspace
2018-01-23 18:43:59 +01:00
ce19c65cc9
Ipcc ( #2040 )
...
* fix(ipcc): Invert up/down to work properly
* fix(ipcc): Change the initial values for ipcc camera
2018-01-22 15:33:11 -05:00
e59ade5391
Only alter MonitorIds if it exists.
2018-01-22 14:06:03 -05:00
843eee1e13
handle case where zmstats and zmstats.pl both exist
2018-01-22 14:05:38 -05:00
1291835c45
do some output to tell use what we are doing during update process
2018-01-19 16:32:48 -05:00
a03ceec154
Fix Day=>Wek
2018-01-19 13:29:45 -05:00
bc792a8325
Use coalesce to handle NULLs
2018-01-19 13:09:46 -05:00
b5d1e1e5a2
update triggers to use coalesce
2018-01-19 13:03:47 -05:00
033d8e9cd8
add update
2018-01-19 12:17:42 -05:00
2ce68e83c5
Update TotalEvents on event_insertion
2018-01-19 12:15:05 -05:00
314390a161
restructure indexes on the various Events tables. Use two separate indexes for MonitorId and StartTime because we access these tables using one or the other, but rarely both
2018-01-18 11:39:23 -05:00
1dbd8405a4
restructure indexes on the various Events tables. Use two separate indexes for MonitorId and StartTime because we access these tables using one or the other, but rarely both
2018-01-18 11:39:09 -05:00
e8dddac142
only rename the columns if they exist. Makes this update re-runnable
2018-01-17 10:01:16 -05:00
306e9a75ee
Fix issues with a period in the column name
2018-01-16 21:45:01 -05:00
9f42871c86
Fix Zone Triggers, bump version
2018-01-16 11:49:17 -05:00
48b636c749
fix missing triggers on Events tables. Add triggers for ZoneCount updating.
2018-01-16 09:30:40 -05:00
bb0974044b
add Scheme to Events
2018-01-15 17:45:45 -05:00
7451afcfab
delete extra apostraphe
2018-01-15 11:13:26 -06:00
31cc03eafc
fix datatype issue with BTTV Video presets
2018-01-15 09:45:40 -06:00
d54f3f7168
fix misaligned fields in Axis & Qihan presets
2018-01-15 09:15:57 -06:00
80362f99fa
fix misaligned db fields for certain presets ( #2034 )
2018-01-14 21:14:30 -05:00
4d342abf53
fixes
2018-01-11 14:34:57 -05:00
5e0c954aff
remove crap
2018-01-10 15:23:22 -05:00
f246599704
Fix inserting default Server entry
2018-01-10 14:56:12 -05:00
a4d3b32b8c
Update all the event counts in the Monitors so that Triggers can be acurate
2018-01-10 14:40:42 -05:00
f5b8461a54
Fix indexes on Groups_MOnitors
2018-01-10 14:33:31 -05:00
eb2e78ccf7
Fix column names in triggers
2018-01-10 14:33:21 -05:00
4908ca1732
add the zmstats.pl, etc to Servers instead of Stroage
2018-01-10 12:56:01 -05:00
92bc6d6c20
put back the .pl
2018-01-10 12:55:42 -05:00
c6ae965b9c
add Events_Archived and update triggers to update Archived and Total Events
2018-01-10 12:27:42 -05:00
acd12d234a
add Events_Archived table. Add zmstats, zmaudit and zmtrigger settings to Servers table to tell if we should run the services or not. Fix a missing backtick at Scheme
2018-01-10 12:26:59 -05:00
1db4d7df83
start work on Events_(Hour|Day|Month|etc) tables for the event count data
2018-01-09 16:35:28 -05:00
348764985b
Fix Storage DiskSpace updating when Event.DiskSpace IS NULL
2018-01-08 15:42:28 -05:00
e877fa1d61
make zmupdate_1.31.19 re-runable.
2018-01-08 14:49:57 -05:00
b25452d4c5
Don't both to add the Floreon control type. That can be done with zmcamtool
2018-01-05 15:47:28 -05:00
5c75df1a40
drop archived and Frames indexes from Events, as they are useless. Add a StorageId Index
2018-01-05 14:40:03 -05:00
37a40a30d3
drop archived and Frames indexes from Events, as they are useless. Add a StorageId Index
2018-01-05 14:39:54 -05:00
b7ad24a266
revert the triggers to update Monitor Stats. THey just don't work
2018-01-04 17:22:51 -05:00
db0e35bf55
Move eventcounts update from zmwatch.pl to triggers and zmaudit.pl
2018-01-04 15:04:13 -05:00
4033cf5ffc
bump version to 1.31.19 with triggers
2018-01-04 13:07:02 -05:00
6c07347721
Fix Update DiskSpace Filter adding
2018-01-01 13:19:16 -05:00
edd5bd8874
create the Update DIskSpace filter if it doesn't exist
2018-01-01 12:44:09 -05:00
a79017b168
add a KEY to Events for EndTime and DiskSpace, since we are constantly selecting on those. Insert the Update DiskSpace filter on db creation.
2018-01-01 12:43:47 -05:00
0c350b8f41
add ServerId to Storage
2017-12-22 11:38:59 -08:00
2c1aa2a92f
missing ;
2017-12-20 21:22:37 -05:00
0e2d2ce611
fix typos
2017-12-18 13:05:04 -05:00
d312482a2b
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
2017-12-18 12:52:26 -05:00
833ae0ee8f
alter the type of the Channel field to match the update that occurred in 1.23.3
2017-12-11 15:09:41 -05:00
dd69bc3d7b
Merge branch 'master' into storageareas
2017-12-11 11:39:42 -05:00
a2d266f8f9
fix floreen ptz control sql
2017-12-09 16:05:42 -06:00
a867c488e0
ned to actually remove the MonitorIds column
2017-12-09 14:05:18 -05:00
e46f75c130
fix db update
2017-12-05 15:22:15 -08:00
4f40b0464c
Don't remove MonitorIds column.. just to support downgrading
2017-12-04 17:11:16 -05:00
1f2f708287
Handle empty strings in MonitorsIds
2017-12-04 17:00:52 -05:00
6270408c8f
rework group MonitorIds and add GroupId filters to api
2017-12-04 15:52:16 -05:00
af1729792f
add AutoMove and AutoMoveTo to Filters
2017-12-03 17:04:11 -05:00
4a884afecb
need the update file
2017-11-26 15:08:12 -05:00
4b92a788f7
fix filter execute
2017-11-24 15:37:50 -05:00
9d6b417b60
make zmwatch.pl update columns in the Monitors table for Event And DiskSpace counts
2017-11-22 17:03:37 -08:00
1fe421ed9d
add DiskSpace columns to Monitors
2017-11-22 14:22:12 -08:00
1745c83d2f
add eventcount columns to Monitors
2017-11-22 14:04:07 -08:00
cd1d2e1721
lots more debugging. re-add status update command on failure
2017-11-22 01:18:07 -05:00
489d3ba6ed
Merge ../ZoneMinder.master into storageareas
2017-11-21 12:23:17 -05:00
7cdd6b2596
fix crap from merge of Floreen camera ptz
2017-11-21 12:19:47 -05:00
ded6b1864a
2006 support floureon 1080p 18x 30x ( #2007 )
...
* perl control script for Fluoreon 1080p
* DB update for Floureon cameras support
2017-11-18 19:02:23 -05:00
d411ed329b
get rid of mistyped zmaFPS and zmcFPS
2017-11-16 09:14:26 -05:00
bfd28dda71
Update zm_create.sql.in
...
Added missing column `AnalysisFPS`
2017-11-15 17:59:07 -08:00
087a902698
Update zm_create.sql.in
...
The `CaptureFPS` column is missing in the db creation script, causing errors in the Log whenever a monitor is queried.
2017-11-15 17:44:59 -08:00
a7f590a28d
add value for the DiskSpace column
2017-11-01 12:37:08 -04:00
ac6964b159
add position clearing to other Layouts
2017-11-01 11:56:18 -04:00
b1cb83c8ff
Freeform layout has to clear left,top,bottom,right
2017-11-01 11:53:45 -04:00
36e13039c7
Switch to LONGTEXT FROM JSON type
2017-11-01 11:05:21 -04:00
3deb8a35bb
fixes
2017-10-30 21:38:27 -04:00
b5491102ef
Fix saving MontageLayouts
2017-10-30 20:21:16 -04:00
01acd154f9
fix adding Layouts
2017-10-30 16:28:55 -04:00
a6c790b374
use a shared include for the filters bar
2017-10-30 07:37:08 -07:00
f420dde04d
fix quotes
2017-10-30 09:05:08 -04:00
b3d420b13b
add standard layouts to db creation
2017-10-27 12:06:07 -07:00
9942b886f2
conditionally add the standard layouts
2017-10-27 12:04:42 -07:00
60fb654a47
rough in the MontageLayouts table
2017-10-27 09:57:41 -07:00
127608e36a
add Indexes to logs
2017-10-25 11:10:56 -07:00
fdbbc5101e
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
2017-10-24 16:10:20 -07:00
e34ed8898a
Add Index to Logs
2017-10-24 16:10:04 -07:00
cfaf10335b
add Monitor status, capturrFPS and AnalysisFPS to processes
2017-10-24 16:08:31 -07:00
cedad14507
fix Load->CpuLoad
2017-10-24 15:13:02 -07:00
f32103b01d
Add Load, Mem, Swap to Servers
2017-10-24 14:21:25 -07:00
12fd1c151e
add Load and Memory fields to Servers
2017-10-24 11:58:44 -07:00
57bc975454
Rouch in Maps
2017-10-23 10:52:51 -07:00
c8cb00e57e
fix typo
2017-10-16 08:30:28 -07:00
581b7262ce
Fix error when creating DB with zm_create.sql
...
The following command:
`mysql -uroot -p < /usr/share/zoneminder/db/zm_create.sql`
Throws the following error:
`ERROR 1136 (21S01) at line 603: Column count doesn't match value count at row 1`
This is due to a missing column when inserting into the Storage table on line 603
2017-10-15 01:24:35 -07:00
b96b2636bb
add the update to add Type to Storage
2017-10-12 07:50:43 -07:00
8abb8a9259
add Type to Storage
2017-10-12 07:32:48 -07:00
e16d852248
make DiskSpace be a bigint
2017-10-11 14:07:01 -04:00
c654d008f0
add monitor selector to montagereview and montage.
2017-10-10 09:36:56 -04:00
fa7f6088c8
Update zm_create.sql.in
...
Add support for TVIP672WI
2017-10-09 11:14:13 -05:00
20087e69e6
TEXT cannot have a default value
2017-10-04 22:22:28 -04:00
b2426321b0
increase the length of MonitorIds in Groups
2017-10-04 21:53:47 -04:00
354262c557
wip nvsocket
2017-10-03 13:28:56 -07:00
e8cc0d8256
set a default on DefaultVideo
2017-10-02 15:43:15 -04:00
99c602e83d
add ParentId to Groups, bump version
2017-09-28 12:23:23 -04:00
a5079f205e
add Manufacturers and Models Tables
2017-08-25 15:35:17 -04:00
b3984ea2da
Merge branch 'master' into storageareas
2017-07-14 10:38:20 -04:00
3789dcb5de
Introducing Maginon Supra IPC camera Controls and script ( #1947 )
...
* Added Maginon Supra IPC to Controls
* Adding support for Maginon Supra IPC camera
2017-07-13 11:10:20 -04:00
4a90980fbe
add Id to Filters
2017-07-11 20:35:56 -04:00
046acbc05b
fix some field
2017-07-11 20:34:06 -04:00
6c68ca40e4
add some indexes
2017-07-11 20:33:09 -04:00
8497e4c24d
remove tilde
2017-07-11 14:59:55 -04:00
786dcb0dc1
Add orientation to Events
2017-07-11 14:31:41 -04:00
cb98e3faea
bump version to 1.31.3
2017-07-11 14:11:15 -04:00
a1d1a6a0d4
fix Options and and Protocol which can be NULL
2017-06-28 11:32:18 -04:00
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
01717a5c14
Merge branch 'master' into filter_by_runstate
2017-06-06 20:34:47 -04:00
a515041e14
Merge branch 'master' into storageareas
2017-05-23 15:17:46 -04:00
655839e56a
Allow NULLS in various fields
2017-05-23 14:20:19 -04:00
433515dba9
Allow NULLS in LinkedMonitors
2017-05-23 14:14:24 -04:00
739d1e5304
Add lines to Convert db to allow NULLS
2017-05-23 14:07:10 -04:00
f4224bb88e
Merge branch 'master' into storageareas
2017-05-17 17:47:39 -04:00
Isaac Connor
Isaac Connor
flashoftheblades
Isaac
Simpler1
Andrew Bauer
Isaac Connor
Isaac Connor
Andy Bauer
Isaac Connor
Ognyan Bankov
Daniel Hodgson
Isaac Connor
Daniel Hodgson
Isaac Connor
Isaac Connor
Michael Barkdoll
APHW2 MFGENG
Martin Goodwell