Commit Graph

288 Commits

Author SHA1 Message Date
Isaac Connor 456f29fcba Rename column Id OF Monitor_Statuses to simplify JOINS. 2018-01-26 13:39:37 -05:00
Isaac Connor 2d9f9125aa add update_storage_stats procedure 2018-01-26 13:08:10 -05:00
Isaac Connor 0bd1ee5992 Merge branch 'master' into m 2018-01-25 08:43:31 -05:00
Isaac Connor 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
Simpler1 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
Isaac Connor bc792a8325 Use coalesce to handle NULLs 2018-01-19 13:09:46 -05:00
Isaac Connor 2ce68e83c5 Update TotalEvents on event_insertion 2018-01-19 12:15:05 -05:00
Isaac Connor 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
Isaac Connor 306e9a75ee Fix issues with a period in the column name 2018-01-16 21:45:01 -05:00
Isaac Connor 9f42871c86 Fix Zone Triggers, bump version 2018-01-16 11:49:17 -05:00
Isaac Connor 48b636c749 fix missing triggers on Events tables. Add triggers for ZoneCount updating. 2018-01-16 09:30:40 -05:00
Isaac Connor bb0974044b add Scheme to Events 2018-01-15 17:45:45 -05:00
Andrew Bauer 7451afcfab
delete extra apostraphe 2018-01-15 11:13:26 -06:00
Andrew Bauer 31cc03eafc
fix datatype issue with BTTV Video presets 2018-01-15 09:45:40 -06:00
Andrew Bauer d54f3f7168
fix misaligned fields in Axis & Qihan presets 2018-01-15 09:15:57 -06:00
Andrew Bauer 80362f99fa fix misaligned db fields for certain presets (#2034) 2018-01-14 21:14:30 -05:00
Isaac Connor 4d342abf53 fixes 2018-01-11 14:34:57 -05:00
Isaac Connor 5e0c954aff remove crap 2018-01-10 15:23:22 -05:00
Isaac Connor f246599704 Fix inserting default Server entry 2018-01-10 14:56:12 -05:00
Isaac Connor f5b8461a54 Fix indexes on Groups_MOnitors 2018-01-10 14:33:31 -05:00
Isaac Connor 92bc6d6c20 put back the .pl 2018-01-10 12:55:42 -05:00
Isaac Connor 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
Isaac Connor 1db4d7df83 start work on Events_(Hour|Day|Month|etc) tables for the event count data 2018-01-09 16:35:28 -05:00
Isaac Connor 5c75df1a40 drop archived and Frames indexes from Events, as they are useless. Add a StorageId Index 2018-01-05 14:40:03 -05:00
Isaac Connor 6c07347721 Fix Update DiskSpace Filter adding 2018-01-01 13:19:16 -05:00
Isaac Connor 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
Isaac Connor 0c350b8f41 add ServerId to Storage 2017-12-22 11:38:59 -08:00
Isaac Connor 2c1aa2a92f missing ; 2017-12-20 21:22:37 -05:00
Isaac Connor d312482a2b add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE 2017-12-18 12:52:26 -05:00
Isaac Connor 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
Isaac Connor dd69bc3d7b Merge branch 'master' into storageareas 2017-12-11 11:39:42 -05:00
Andy Bauer a2d266f8f9 fix floreen ptz control sql 2017-12-09 16:05:42 -06:00
Isaac Connor 6270408c8f rework group MonitorIds and add GroupId filters to api 2017-12-04 15:52:16 -05:00
Isaac Connor af1729792f add AutoMove and AutoMoveTo to Filters 2017-12-03 17:04:11 -05:00
Isaac Connor 4b92a788f7 fix filter execute 2017-11-24 15:37:50 -05:00
Isaac Connor 9d6b417b60 make zmwatch.pl update columns in the Monitors table for Event And DiskSpace counts 2017-11-22 17:03:37 -08:00
Isaac Connor 1fe421ed9d add DiskSpace columns to Monitors 2017-11-22 14:22:12 -08:00
Isaac Connor 1745c83d2f add eventcount columns to Monitors 2017-11-22 14:04:07 -08:00
Isaac Connor cd1d2e1721 lots more debugging. re-add status update command on failure 2017-11-22 01:18:07 -05:00
Isaac Connor d411ed329b get rid of mistyped zmaFPS and zmcFPS 2017-11-16 09:14:26 -05:00
Daniel Hodgson bfd28dda71
Update zm_create.sql.in
Added missing column `AnalysisFPS`
2017-11-15 17:59:07 -08:00
Daniel Hodgson 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
Isaac Connor a7f590a28d add value for the DiskSpace column 2017-11-01 12:37:08 -04:00
Isaac Connor ac6964b159 add position clearing to other Layouts 2017-11-01 11:56:18 -04:00
Isaac Connor 36e13039c7 Switch to LONGTEXT FROM JSON type 2017-11-01 11:05:21 -04:00
Isaac Connor a6c790b374 use a shared include for the filters bar 2017-10-30 07:37:08 -07:00
Isaac Connor b3d420b13b add standard layouts to db creation 2017-10-27 12:06:07 -07:00
Isaac Connor 60fb654a47 rough in the MontageLayouts table 2017-10-27 09:57:41 -07:00
Isaac Connor 127608e36a add Indexes to logs 2017-10-25 11:10:56 -07:00
Isaac Connor fdbbc5101e Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas 2017-10-24 16:10:20 -07:00