Schrolli91/BOSWatch
1
0
Fork 0
mirror of https://github.com/Schrolli91/BOSWatch.git synced 2026-01-04 15:50:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
1073 commits 4 branches 17 tags 4 MiB
Commit graph

229 commits

Author SHA1 Message Date
Florian c7ee204c41 Update poc.py 
Fixing wrong comment
 2017-01-09 09:31:42 +01:00
Florian 5c09b22cce Fixing filter 
Fixing function for filtering RIC:
- if RIC is denied by config, finish function and return false (denied RIC is strongest way to filter)
- l. 64 - fixing missing 0
 2017-01-08 12:21:44 +01:00
Florian 7a636ceeae poc.py 
Update filter-rules
 2016-12-22 22:36:35 +01:00
Florian ae1c27b45f Update poc.py 
Including upper and lower boundary
 2016-12-03 15:39:35 +01:00
Florian 2ded273271 Update poc.py 
Rewriting filter function so that both allow/deny-rule and filter-range will be evaluated. Suitable for e.g. signal-RIC
 2016-12-03 14:49:22 +01:00
Florian c96109899d Update wildcardHandler.py 
Fixing problem that replacement has been tried whether POC was alarmed or ZVEI; works fine for both POC and ZVEI.

Original author might verify, works fine for me
 2016-11-25 22:48:47 +01:00
Bastian Schroll d0c5bed6eb set new version number and date for version 2.1 2016-11-20 13:36:09 +01:00
Bastian Schroll e3b3377f9e resolve some Code Style Problems 2016-11-20 13:05:24 +01:00
Jockel 5e516c65a6 added var for static sub ric messages 2016-11-01 10:18:47 +01:00
Bastian Schroll 7bf7f3c47b remove some unnecessary pass statements 2016-10-03 16:45:12 +02:00
Bastian Schroll 6b520881b6 resolve some codacy problems 2016-10-03 16:32:54 +02:00
Bastian Schroll d16b28ce4f buf in regexFilter.py 2016-10-03 16:27:34 +02:00
Bastian Schroll fe86ae2a06 edit in regexFilter.py 
redefine builtin
 2016-10-03 12:36:15 +02:00
Bastian Schroll e938cdcd6d rename globals. call to globalVars. 2016-10-03 12:02:18 +02:00
Bastian Schroll f8fcda94b6 rename globals to globalVars 
to prevent to redifine an builtin function
 2016-10-03 11:56:27 +02:00
Bastian Schroll e8e870849d rename filter to regexFilter 
to prevent to redifine an builtin function
 2016-10-03 11:50:18 +02:00
Bastian Schroll 77fb7fb44f remove trailing whitespaces 
to improve codacy rating
 2016-10-02 21:28:04 +02:00
Bastian Schroll 6e6a0a4a45 edit interface.txt info 
information now in plugins/readme.md
 2016-10-02 12:38:47 +02:00
Bastian Schroll ff91d4b086 prepare for RC 
edit date and version number for RC
 2016-10-02 12:03:11 +02:00
Bastian Schroll 564c66e1cd Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2016-09-30 17:12:45 +02:00
Matthias Gilch 42a81ce6b5 Fix IndexError 
When multimon can't decode the full ZVEI there's an IndexError thrown.
This is a small fix for this issue.
 2016-08-29 12:10:54 +02:00
Bastian Schroll da38224e93 change gmtime to localtime in timeHandler #84 2016-07-18 15:44:26 +02:00
Bastian Schroll 4e2229e8b0 fix bug #85 
fix the bug drom issue #85
 2016-03-26 09:44:45 +01:00
Schrolli91 0c3ed6d788 insert -g --gain function 2015-12-25 23:13:12 +01:00
JHCD 02efb9552a reduce entries in globals.py 
only entries for use in more than one .py-file have to stay here...
 2015-07-31 19:50:27 +02:00
JHCD e26fc45313 rename includes/converter.py -> includes/helper/freqConverter.py 2015-07-31 19:20:05 +02:00
JHCD e7b5bffdd3 add data['timestamp'] #72 
to make sure, that all Plugins use the same timestamp
 2015-07-31 19:09:27 +02:00
JHCD 28936d68ec change string converting for NMA and firE plugins #73 2015-07-30 22:18:31 +02:00
JHCD 30320b3c71 add possibility to start Plugins asynchron 
If you are using many Plugins or Plugins with a long execution time you could execute them in an asynchronous manner.
It must be pointed out that enabling (0|1) this consume time, so don't use it for one rapid Plugin.
 2015-07-30 18:55:36 +02:00
JHCD 3e7cc1f365 add more logging.debug for #67 2015-07-29 18:43:25 +02:00
JHCD b529e93763 expand notifyMyAndroid-plugin for multi recipients and/or different priorities #33 
use csv/nma.csv to config different priorities or multiple recipients
 2015-07-28 22:50:22 +02:00
JHCD 19653e5515 add line break to eMail plugin #71 2015-07-28 19:44:14 +02:00
JHCD f95a270177 replace passwords and apikeys with "***" in logging #69 2015-07-27 20:55:50 +02:00
JHCD 65a35d4a64 change logging behaviour of NMAHandler #33 
NMA applicationname is now configurable
NMA event contains now module and function
 2015-07-24 14:39:32 +02:00
JHCD b09f1731ea add logging handler for NotifyMyAndroid #46 2015-07-23 20:37:33 +02:00
JHCD 997b5eeec3 add NMA plugin #33 
first version, only with one receiver
 2015-07-19 20:29:22 +02:00
JHCD f3db4635c7 convert csv-files to UTF-8 #63 2015-07-14 16:49:14 +02:00
JHCD e829778db2 add convert csv-field "description" to utf-8 
to make sure, that only utf-8 chars are in process
 2015-07-13 19:43:47 +02:00
Schrolli d8981ba114 insert header and encoding in __init__.py (Issue #60) 2015-07-13 10:23:09 +02:00
Schrolli c19a89859b change encoding 
- change code encoding from cp1252 to UTF-8 (Issue #60)
 2015-07-13 10:19:45 +02:00
Schrolli 1ea5cce24e edit build date 2015-07-13 09:42:54 +02:00
Schrolli bd6432b1e5 Fix error in pluginLoader.py 
see Issue #52
 2015-07-09 08:04:55 +02:00
Schrolli 1ab3b61ef4 insert helper configHandler.py 
little edit in wildcardHandler.py error message
 2015-07-08 09:42:52 +02:00
Schrolli 4ad5766f98 insert wildcardHandler.replaceWildcards() in httpReq Plugin 2015-07-07 13:17:18 +02:00
Schrolli 444b6a7ba6 edit build date 2015-07-06 10:36:35 +02:00
Bastian Schroll 649b00bf8a insert a try:exception: for the three decode() methods 
Issue #44
 2015-07-04 14:37:35 +02:00
Bastian Schroll 9f99d0e705 edit pluginLoader debug msg 2015-07-04 08:34:50 +02:00
Bastian Schroll c4c5b79626 Issue #44 2015-07-04 08:14:33 +02:00
Bastian Schroll 624addad43 Issue #44 2015-07-04 00:53:29 +02:00
Bastian Schroll e31ab65911 Issue #44 2015-07-04 00:39:34 +02:00
JHCD 9a867fa91e Merge branch 'develop' of https://github.com/Schrolli91/BOSWatch into develop 2015-07-03 23:38:05 +02:00
JHCD dfc982a7e4 solve bug in exception-handling 
we don't want to break down BOSWatch, if an plugin doesn't work
 2015-07-03 23:36:50 +02:00
Bastian Schroll 664cceff18 error in timeHandler 2015-07-03 23:25:54 +02:00
Bastian Schroll ac8a02e3ca insert helper function timeHandler.getTimestamp() 2015-07-02 21:39:43 +02:00
Schrolli 68fb88cc63 move helper functions in seperate folder and split to logical files 2015-07-02 15:16:24 +02:00
Schrolli c94ddfce31 add helper.replaceWildcards() to helper.py 2015-07-02 11:51:28 +02:00
Schrolli 48c4d1e354 remove trailing whitespace 2015-07-02 09:02:49 +02:00
Schrolli 5e6cf3b7ae add pocsag testdata for test-driver 2015-07-02 07:48:17 +02:00
Schrolli ab4b63daac insert version number and build date in the globals 2015-07-02 07:33:27 +02:00
JHCD 4562704b84 dos2linux-converting 2015-07-01 22:31:20 +02:00
JHCD 01ae87c918 solve some bugs 
- solve issue #35
- some bugs in logging errors
- move check subprocesses in include-file
 2015-07-01 22:04:06 +02:00
JHCD 241a31ec01 solve bug in if-clause 2015-07-01 21:57:27 +02:00
Bastian Schroll 5f9bfa7a63 edit decoder.py 2015-07-01 19:01:16 +02:00
Schrolli dea33d5b7e little docu mistake in helper.py 2015-07-01 14:52:33 +02:00
Schrolli 2778b9e710 file for little helper functions - also for use in plugins directly 2015-07-01 14:11:11 +02:00
Schrolli 0199151165 littles changes at arguments debug 2015-06-30 12:38:52 +02:00
Schrolli 948aaea065 insert a debug log in doubleFilter.newEntry() 2015-06-30 08:55:46 +02:00
Schrolli 8b8cd81abc resolve error in RegEX Filter 2015-06-30 08:27:50 +02:00
Schrolli bcc0fca656 added the name of the talking function to the logging 2015-06-30 07:59:27 +02:00
JHCD 9b6e5c8da3 some changes in exception-handling 2015-06-29 23:32:55 +02:00
JHCD 09b9cc5f7d change pluginLoader and exception-handling 
- if the function plugin.onLoad() throws an exception the plugin will skipped
- change exception-handling for pluginLoader
 2015-06-29 23:24:48 +02:00
JHCD eba5b7947a enhancement of doubleFilter 
- expand id for pocsag: new pocID+function als "id"
- if wanted, enable doubleFilter_check_msg in config.ini
  it will check if the new msg is a substring of the old one
  if not it will pass
 2015-06-29 17:15:20 +02:00
Schrolli 7da58fe521 call the .onLoad() routine during plugin loading 2015-06-29 12:55:13 +02:00
JHCD 304b7ddeb0 small bug, forgotten to read config-param 2015-06-28 22:37:01 +02:00
JHCD 098faa0255 implemtation of new doubleAlarm-Filter 
You can set the number of historical entries the filter will check
and the time ignoring the id in case of a double alarm
 2015-06-28 22:32:17 +02:00
JHCD 4eaf27c754 implemtation of new doubleAlarm-Filter 
You can set the number of historical entries the filter will check
and the time ignoring the id in case of a double alarm
 2015-06-28 22:28:21 +02:00
JHCD f6e25d77b4 only dos2linux on files 2015-06-25 21:19:41 +02:00
JHCD 00902784a4 add new argument for logfile-location 
-u --usevarlog
Use '/var/log/boswatch' for logfiles instead of subdir 'log' in BOSWatch directory
 2015-06-25 17:10:31 +02:00
JHCD f58891a8ec extract class and functions from boswatch.py to includes 2015-06-25 16:13:52 +02:00
JHCD 3280c68737 change exception-handling 
- only error-msg instead of logging.exception
- second logging.debug with exec-trace
 2015-06-23 22:50:33 +02:00
JHCD d6b9174112 change exception-handling 
- only error-msg instead of logging.exception
- second logging.debug with exec-trace
 2015-06-23 22:27:48 +02:00
JHCD c32beae4bb change exception-handling 
- only error-msg instead of logging.exception
- second logging.debug with exec-trace
 2015-06-23 18:37:32 +02:00
JHCD 698416d66e small changes in exception-handling 2015-06-14 20:35:04 +02:00
JHCD 97e87fcae2 small changes in documentation 2015-06-14 20:21:21 +02:00
JHCD 16865b2c57 bug with "enabled demodulators"-line of multimon-ng output, when using pocsag 
- to enable detecting pocsag-bitrate the first searching is only on "*pocsag*"
- in the "enabled demodulators"-line every given demodulator is displayed, even "POCSAG*"
- pocsag-bitrate detection is searching for "POCSAG{512|1024|2400}:"
-> now the "enabled demodulators"-line will be ignored
 2015-06-14 19:50:13 +02:00
JHCD c1c5595b6f small changes in log-level 2015-06-14 19:49:48 +02:00
JHCD f1f6503198 new functionality: lookUp description in a given csv-file for FMS, ZVEI and POC 
you have the possibility to set a discription for every FMS, ZWEI oder RIC address
descriptions will be imported via csv-files
if enabled BOSWatch will look up the description and could be used in the plugins

eMail-plugin extended wildcards to use describtion %DESC%
 2015-06-05 21:49:51 +02:00
JHCD 300675a0e3 move creation of ric-sub as char to poc-decoder 2015-06-05 11:26:01 +02:00
JHCD 5d58044c2e add fms direction as Text-String to plugin interface 
0 = FZG->LST
1 = LST->FZG
 2015-06-04 20:13:37 +02:00
JHCD 7857aa3146 add support for poc <7 characters 
look likes multimon-ng doesn't print out left-hand zeros
 2015-06-04 19:07:46 +02:00
JHCD 0a621b283a a little bit documentation 2015-05-31 12:40:43 +02:00
Schrolli 2e91c3d8c9 insert freqToHz() method in boswatch.py 2015-05-29 11:25:25 +02:00
Schrolli b3ee8d29ae checkFilters() with freq und wildcards 2015-05-28 09:18:21 +02:00
Schrolli 346d5a41f6 little changes for docu 2015-05-27 11:55:04 +02:00
Schrolli 5394bceedf insert a Lots of Docu in includes 2015-05-27 07:48:24 +02:00
Schrolli 0e952d6057 little debug and error edits 2015-05-26 11:41:05 +02:00
Schrolli be9aa3b722 error handling in decoder.py 2015-05-26 09:14:04 +02:00
Schrolli d9b8ae3035 little changes 2015-05-26 07:19:24 +02:00
Bastian Schroll 3370b4387d regex filter - set dataField to check 2015-05-25 10:37:20 +02:00
Bastian Schroll fa328676e8 bug in filter.py 2015-05-25 10:28:35 +02:00
Bastian Schroll 42384407ce edit resolveF() 2015-05-25 10:25:31 +02:00
Bastian Schroll 0d55903dec resolve F in zvei 2015-05-25 00:40:41 +02:00
Bastian Schroll 3e59ca2127 revert edit in filter.py 2015-05-24 23:59:00 +02:00
Bastian Schroll d460947685 little change filter.py 2015-05-24 23:52:10 +02:00
JHCD 9c3c1f5df4 implement FMS in BosMon-plugin 2015-05-24 23:09:38 +02:00
JHCD 72ef930c7f simple filter for pocsag 
- implement allow-/deny-list
- move rangefilter

restructure config.ini to follow code-structure
implemented switch to turn on/off regEx-filter
 2015-05-24 21:24:26 +02:00
Bastian Schroll 02a84b6ec9 add filter check to alarm 
add filter.checkFilters() to alarmHandler.processAlarm()
 2015-05-23 09:34:48 +02:00
Bastian Schroll 206463f8e9 load filters in boswatch.py 2015-05-23 09:09:13 +02:00
Bastian Schroll fbdc08d05a debug edit in filter.py 2015-05-23 09:04:01 +02:00
Bastian Schroll 7adb710be1 insert filter.checkFilters() 2015-05-23 08:58:46 +02:00
Bastian Schroll 43e56967cc add filter.py 
filtering alarms
method getFilters() added
 2015-05-23 08:47:05 +02:00
Bastian Schroll f53bdb30f6 debug return from plugin 2015-05-22 22:58:43 +02:00
Bastian Schroll 0849672cbe rename pluginloader -> pluginLoader 2015-05-22 22:40:44 +02:00
Bastian Schroll c590d70655 rename pluginloader -> pluginLoader 2015-05-22 22:40:24 +02:00
JHCD 096ba7e6b6 bugfixing call processAlarm 2015-05-22 22:27:41 +02:00
JHCD 5a30548102 import correct module 2015-05-22 22:22:50 +02:00
JHCD e99286bc83 rename pluginHandler.py -> alarmHandler.py 
Method rename:
throwAlarm() ->processAlaram()
 2015-05-22 22:09:32 +02:00
JHCD 54d0230713 merge decoder after restructuring 2015-05-22 21:57:41 +02:00
JHCD f53552781b Merge branch 'develop' of https://github.com/Schrolli91/BOSWatch into develop 
Conflicts:
	includes/decoder.py
 2015-05-22 21:53:37 +02:00
JHCD 5929908c72 add information 2015-05-22 21:49:06 +02:00
JHCD 4915de585d restructure decoder - fms 2015-05-22 21:48:16 +02:00
JHCD 89aae1fb29 restructure decode - zvei 2015-05-22 21:40:38 +02:00
Bastian Schroll 26c9e23db8 rename pluginHander.py->alarmHandler.py 
Method rename:
throwAlarm() ->processAlarm()
 2015-05-22 21:32:37 +02:00
Bastian Schroll 82a837c19e move loadPlugins() pHanlder->pLoader 2015-05-22 21:27:46 +02:00
JHCD e009cecf9f restructure decoders (poc) 2015-05-22 20:17:01 +02:00
JHCD edb4db348a path-thrugh frequenz 2015-05-22 17:44:34 +02:00
JHCD eadc4e2ccb change test to prod mode... 
delete unused include-path variable
 2015-05-22 16:53:05 +02:00
JHCD e67a357d8e (re-)structure code - use include-files now 
- move gobals and other stuff to includes
- extract code from boswatch.py to include-files

bugfix in BosMon-plugin
 2015-05-22 16:44:23 +02:00
Schrolli 76ec264046 change directory into main-dev-dir 2015-05-20 13:29:16 +02:00