Isaac Connor
|
2748f47fb7
|
add Url to Storage for S3 support
|
2018-03-28 08:23:03 -07:00 |
Isaac Connor
|
27736fb5d9
|
Merge ../ZoneMinder.master into storageareas
|
2018-03-15 11:04:41 -04:00 |
Andy Bauer
|
b41363fd60
|
Merge branch 'patch-3' of https://github.com/habibapp1365/zoneminder into habibapp1365-patch-3
|
2018-03-06 11:37:49 -06:00 |
habibapp1365
|
aa2134bde4
|
Update zm_create.sql.in
|
2018-03-06 19:59:06 +03:30 |
|
Isaac Connor
|
dc074bd2c0
|
fix path to triggers.sql
|
2018-02-28 07:18:38 -08:00 |
Isaac Connor
|
3aa31fd524
|
Merge branch 'master' into storageareas
|
2018-02-23 10:23:35 -05:00 |
|
Isaac Connor
|
cece2f35f0
|
remove triggers from zm_create.sql.in as they are now contained in triggers.sql
|
2018-02-23 07:50:05 -05:00 |
|
Isaac Connor
|
0a6b463301
|
FIx MontageLayout=>MontageLayouts
|
2018-02-23 07:46:37 -05:00 |
|
Isaac Connor
|
834edafc63
|
install triggers as well
|
2018-02-23 07:46:24 -05:00 |
|
Isaac Connor
|
52bca9d3ae
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-02-20 22:48:45 -05:00 |
|
Isaac Connor
|
13ef478820
|
refix triggers updating EventCounts. remove unsigned from eventcounts and diskspace totals.
|
2018-02-20 22:48:34 -05:00 |
|
Isaac Connor
|
0ad01f09bd
|
refix triggers updating EventCounts. remove unsigned from eventcounts and diskspace totals.
|
2018-02-20 22:48:23 -05:00 |
Isaac Connor
|
1981359d69
|
fixes, use summaries from Events_Day/etc instead of Events table
|
2018-02-19 19:45:21 -05:00 |
|
Isaac Connor
|
678634916f
|
fix event insert trigger
|
2018-02-19 17:29:30 -05:00 |
|
Isaac Connor
|
e4ec1712f4
|
remove the table creation/dropping and a if/elseif fix
|
2018-02-18 11:48:00 -05:00 |
|
Isaac Connor
|
e18a14337f
|
use path to triggers.sql
|
2018-02-18 11:47:03 -05:00 |
|
Isaac Connor
|
fe0ccafae8
|
add missing ;
|
2018-02-18 11:29:22 -05:00 |
|
Isaac Connor
|
d52277b283
|
update monitor counts
|
2018-02-18 11:28:58 -05:00 |
|
Isaac Connor
|
4b04b1ee7c
|
remove unwanted space
|
2018-02-18 11:19:20 -05:00 |
|
Isaac Connor
|
94212eda2f
|
fix triggers
|
2018-02-18 11:01:33 -05:00 |
|
Isaac Connor
|
717d00ac99
|
missing //
|
2018-02-09 16:08:44 -05:00 |
|
Isaac Connor
|
0d5c8f385f
|
fix DiskSpace summing when Nulls are present
|
2018-02-07 08:02:49 -05:00 |
|
Isaac Connor
|
4c5e47b050
|
fix DiskSpace summing when Nulls are present
|
2018-02-07 08:02:05 -05:00 |
|
Isaac Connor
|
8343793c48
|
Fix updating Storage area DiskSpace by using COALESCE
|
2018-02-06 11:34:40 -05:00 |
|
Isaac Connor
|
0f83dfc769
|
Correct events_day, etc update trigger
|
2018-02-06 08:43:09 -05:00 |
|
Isaac Connor
|
4bd92a3b94
|
fixes
|
2018-02-05 23:01:04 -05:00 |
|
Isaac Connor
|
c767d79aef
|
fix typo
|
2018-02-05 22:59:37 -05:00 |
flashoftheblades
|
34f6584081
|
Update zm_create.sql.in
|
2018-02-05 18:53:47 -05:00 |
|
Isaac Connor
|
86ae1b6598
|
Add missing commas
|
2018-02-05 17:31:34 -05:00 |
|
Isaac Connor
|
6822643d22
|
add update triggers for all the event tables so that diskspace counts work
|
2018-02-05 15:46:39 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
73f7026643
|
use COALESCE to ensure integer values
|
2018-02-03 11:01:33 -05:00 |
|
Isaac Connor
|
12c4ab07ea
|
use COALESCE to ensure integer values
|
2018-02-03 11:01:26 -05:00 |
|
Isaac Connor
|
868e17a414
|
Allow Method in Monitors to be NULL
|
2018-02-02 10:31:55 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
ef51a21df4
|
add new runstate called Connected
|
2018-01-31 14:36:41 -05:00 |
|
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
|
b821d665bf
|
Fix commas
|
2018-01-24 12:16:18 -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 |
Isaac
|
fd2d2a0d77
|
ad update to update events_update_trigger to dix totaldiskspace
|
2018-01-23 18:43:59 +01: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
|
e59ade5391
|
Only alter MonitorIds if it exists.
|
2018-01-22 14:06:03 -05:00 |
|
Isaac Connor
|
843eee1e13
|
handle case where zmstats and zmstats.pl both exist
|
2018-01-22 14:05:38 -05:00 |
|
Isaac Connor
|
1291835c45
|
do some output to tell use what we are doing during update process
|
2018-01-19 16:32:48 -05:00 |
|
Isaac Connor
|
a03ceec154
|
Fix Day=>Wek
|
2018-01-19 13:29:45 -05:00 |
|
Isaac Connor
|
bc792a8325
|
Use coalesce to handle NULLs
|
2018-01-19 13:09:46 -05:00 |
|
Isaac Connor
|
b5d1e1e5a2
|
update triggers to use coalesce
|
2018-01-19 13:03:47 -05:00 |
|
Isaac Connor
|
033d8e9cd8
|
add update
|
2018-01-19 12:17:42 -05:00 |
|
Isaac Connor
|
2ce68e83c5
|
Update TotalEvents on event_insertion
|
2018-01-19 12:15:05 -05:00 |
|
Isaac Connor
|
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 |
|
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
|
e8dddac142
|
only rename the columns if they exist. Makes this update re-runnable
|
2018-01-17 10:01:16 -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
|
a4d3b32b8c
|
Update all the event counts in the Monitors so that Triggers can be acurate
|
2018-01-10 14:40:42 -05:00 |
|
Isaac Connor
|
f5b8461a54
|
Fix indexes on Groups_MOnitors
|
2018-01-10 14:33:31 -05:00 |
|
Isaac Connor
|
eb2e78ccf7
|
Fix column names in triggers
|
2018-01-10 14:33:21 -05:00 |
|
Isaac Connor
|
4908ca1732
|
add the zmstats.pl, etc to Servers instead of Stroage
|
2018-01-10 12:56:01 -05:00 |
|
Isaac Connor
|
92bc6d6c20
|
put back the .pl
|
2018-01-10 12:55:42 -05:00 |
|
Isaac Connor
|
c6ae965b9c
|
add Events_Archived and update triggers to update Archived and Total Events
|
2018-01-10 12:27: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
|
348764985b
|
Fix Storage DiskSpace updating when Event.DiskSpace IS NULL
|
2018-01-08 15:42:28 -05:00 |
|
Isaac Connor
|
e877fa1d61
|
make zmupdate_1.31.19 re-runable.
|
2018-01-08 14:49:57 -05:00 |
|
Isaac Connor
|
b25452d4c5
|
Don't both to add the Floreon control type. That can be done with zmcamtool
|
2018-01-05 15:47: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
|
37a40a30d3
|
drop archived and Frames indexes from Events, as they are useless. Add a StorageId Index
|
2018-01-05 14:39:54 -05:00 |
|
Isaac Connor
|
b7ad24a266
|
revert the triggers to update Monitor Stats. THey just don't work
|
2018-01-04 17:22:51 -05:00 |
|
Isaac Connor
|
db0e35bf55
|
Move eventcounts update from zmwatch.pl to triggers and zmaudit.pl
|
2018-01-04 15:04:13 -05:00 |
|
Isaac Connor
|
4033cf5ffc
|
bump version to 1.31.19 with triggers
|
2018-01-04 13:07:02 -05:00 |
|
Isaac Connor
|
6c07347721
|
Fix Update DiskSpace Filter adding
|
2018-01-01 13:19:16 -05:00 |
|
Isaac Connor
|
edd5bd8874
|
create the Update DIskSpace filter if it doesn't exist
|
2018-01-01 12:44:09 -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
|
0e2d2ce611
|
fix typos
|
2017-12-18 13:05:04 -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
|
a867c488e0
|
ned to actually remove the MonitorIds column
|
2017-12-09 14:05:18 -05:00 |
|
Isaac Connor
|
e46f75c130
|
fix db update
|
2017-12-05 15:22:15 -08:00 |
|
Isaac Connor
|
4f40b0464c
|
Don't remove MonitorIds column.. just to support downgrading
|
2017-12-04 17:11:16 -05:00 |
|
Isaac Connor
|
1f2f708287
|
Handle empty strings in MonitorsIds
|
2017-12-04 17:00:52 -05: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 |