Schrolli91/BOSWatch
1
0
Fork 0
mirror of https://github.com/Schrolli91/BOSWatch.git synced 2026-01-23 16:40:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
1222 commits 4 branches 17 tags 4 MiB
Commit graph

273 commits

Author SHA1 Message Date
Florian 2e03519333 Fixing message 
Set default-message to alarm
Fixing ZVEI-message; it now contains zvei, and, if available, description
 2017-04-17 10:46:39 +02:00
Florian 142e2ba5b0 Fixing typo 
Removed double-c from conn-string
 2017-04-17 10:00:20 +02:00
Florian 08c671cd09 Update Sms77.py 
Adapting to new API
 2017-04-16 23:48:46 +02:00
Florian 642d95b11a Enabling typ-handling 
Enable FMS and ZVEI-handling for plugin; message is set depending on the available information and processed to the http-handling. If typ is invalid an empty message will be sent.
The text of the message can be adapted with regard to the information resulting from decoding
 2017-04-16 23:47:08 +02:00
Mikrocontroller c77f2a9fdd Encode data URL-safe, support of multiple URLs 2017-04-12 23:20:40 +02:00
Florian 7d7c33e208 Create boswatch_cleanup.sql 
Extracted routines to cleanup old database-entries.
 2017-04-04 22:17:54 +02:00
Florian 7abda0bc50 Delete events 
Delete events from default-installation and extract them to a separate file
 2017-04-04 22:16:28 +02:00
Jockel 07c3a98981 base build 2017-02-20 10:25:56 +01:00
Bastian Schroll 63e01a486d Merge pull request #208 from PeterLaemmle/master 
Update Telegram.py
 2017-02-14 20:57:23 +01:00
Bastian Schroll 3c00628b2d some edits for code quallity 2017-02-12 10:04:31 +01:00
PeterLaemmle df24ee4e9e Update Telegram.py 
Added FMS and ZVEI support
 2017-02-01 20:41:35 +01:00
Florian 8724cc64fe Update eMail.py 
Adapting to master-branch (#200)
 2017-01-25 22:03:04 +01:00
Florian 20e9f567a0 Update eMail.py 
Fixing if-condition for TLS
 2017-01-16 21:22:22 +01:00
Florian 8cdfef4bce Update eMail.py 
Using only SMTP via SSL can lead to errors depending on the configuration of the mail server
As there is no switch in the config file (which is good so) the approach is to use SSL first and, if this fails, switch to non-SSL connection.

Due to the importance of this plugin the pull request is affecting the master-branch.
 2017-01-16 21:20:14 +01:00
Florian 7ad21a7a6d Update eMail.py 
Fixing wrong variable - globals to globalVars
 2017-01-16 13:08:17 +01:00
Florian 7390a539d3 MySQL.py 
Adapting to global net-identifiers
 2016-12-22 22:37:06 +01:00
Bastian Schroll 14d1dedcec fix comment bug 2016-11-20 13:37:29 +01:00
Bastian Schroll edfc38bffb resolve ununsed code imports 2016-11-20 13:34:24 +01:00
Bastian Schroll e3b3377f9e resolve some Code Style Problems 2016-11-20 13:05:24 +01:00
Bastian Schroll 1877c7f367 Merged branch develop into develop 2016-11-20 12:51:50 +01:00
Bastian Schroll 95599577b0 Merge pull request #160 from thejockel/develop 
added var for static sub ric messages
 2016-11-19 17:47:24 +01:00
thejockel 60f7368c9d Update README.md 2016-11-06 09:17:53 +01:00
Bastian Schroll f7cb657d72 Merged branch develop into develop 2016-11-04 19:59:40 +01:00
Bastian Schroll b286606cef Merge pull request #159 from flothi/patch-1 
Update boswatch.sql
 2016-11-01 17:26:26 +01:00
flothi cf3ae2d6dc Update boswatch.sql 
Add error-handling: 
Rename existing columns from old versions to new (correct) spelling.
 2016-10-31 23:16:18 +01:00
flothi cd80d7760d Update boswatch.sql 
Adapting table 'poc' to script and changed the letter 'k' to 'c' in function.
 2016-10-31 21:30:04 +01:00
fwmarcel 5567ab3c06 FMS and ZVEI added 2016-10-29 15:47:35 +02:00
fwmarcel e6144a367f yowsup added 2016-10-29 15:46:36 +02:00
Bastian Schroll 78cecc7ef5 Merge remote-tracking branch 'refs/remotes/origin/master' 
Conflicts:
	plugins/eMail/eMail.py
 2016-10-27 22:11:19 +02:00
fwmarcel cf0ab3de28 Update eMail.py 2016-10-26 20:48:02 +02:00
PeterLaemmle 4f7976402a Update Telegram.py 
Import telegram errors
 2016-10-26 15:40:54 +02:00
PeterLaemmle d58e887092 Update Telegram.py 2016-10-16 16:07:47 +02:00
PeterLaemmle 6dba081961 Update Telegram.py 2016-10-14 16:36:00 +02:00
PeterLaemmle 3f7c2a4774 Update Telegram.py 2016-10-14 14:12:03 +02:00
PeterLaemmle 22aea69136 Update Telegram.py 
Added exception for Telegram errors
 2016-10-14 14:04:35 +02:00
Bastian Schroll 8438c1483a Merge pull request #139 from Cryjack/MySQL 
Tabelle für Webuser aus SQL entfernt
 2016-10-05 11:24:35 +02:00
Ricardo Krippner 9dbf748737 removed table for webuser 2016-10-05 09:57:13 +02:00
Bastian Schroll 0f64e6d8e6 Merge pull request #137 from PeterLaemmle/patch-2 
Update notifyMyAndroid.py
 2016-10-04 12:57:43 +02:00
PeterLaemmle 7eb5083553 Update notifyMyAndroid.py 
Remove needless global declaration in notifyMyAndroid.py main- on onLoad-function.
 2016-10-04 11:38:42 +02:00
Bastian Schroll 92ed27db03 Merge pull request #135 from PeterLaemmle/patch-2 
Update Telegram.py
 2016-10-04 09:37:12 +02:00
PeterLaemmle 22cb035f18 Update Telegram.py 
Remove needless global declaration in Telegram.py main function.
 2016-10-04 08:29:02 +02: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
PeterLaemmle bae19499ad Update Telegram.py 2016-10-03 16:09:20 +02:00
Bastian Schroll 25752da5db little change on httpRequest 2016-10-03 13:38:30 +02:00
Bastian Schroll 651157c274 Merge remote-tracking branch 'refs/remotes/thejockel/develop' 
Conflicts:
	plugins/httpRequest/httpRequest.py
 2016-10-03 13:36:50 +02:00
Jan-Hendrik Plogmann 06c5846709 added error logging for http plugin 2016-10-03 12:50:20 +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 76dbdc0692 bug in telegram plugin 2016-10-02 22:59:14 +02:00
Bastian Schroll b444f257ac change encoding tag to utf-8 2016-10-02 22:45:15 +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
Jan-Hendrik Plogmann 6da22e331a added missing except for httpRequest 2016-10-01 20:37:38 +02:00
Jan-Hendrik Plogmann 87238e60cc added missing except for httpRequest 2016-10-01 20:35:44 +02:00
Jan-Hendrik Plogmann 0df55885d9 changed httprequest plugin 2016-10-01 19:51:20 +02:00
Bastian Schroll 6c2ec0c4df Merge branch 'refs/heads/pr/106' into develop 
# Conflicts:
#	config/config.template.ini
 2016-10-01 11:22:17 +02:00
PeterLaemmle 6b315e2a5c Delete sendTelegram.py 2016-09-30 20:59:02 +02:00
PeterLaemmle d1c5708d89 Create Telegram.py 2016-09-30 20:58:35 +02:00
PeterLaemmle 91fd449bee Update sendTelegram.py 2016-09-30 20:54:35 +02:00
Bastian Schroll 3c63740265 Merge branch 'refs/heads/pr/112' into develop 
# Conflicts:
#	config/config.template.ini
 2016-09-30 17:58:20 +02:00
Bastian Schroll fae72759f2 resolve conflict 2016-09-30 17:46:27 +02:00
Bastian Schroll cb8008e873 Merge pull request #116 from Cryjack/MySQL 
Plugin Update MySQL
 2016-09-30 17:06:44 +02:00
Ricardo Krippner 83eebea87f no message 2016-09-29 14:48:50 +02:00
Ricardo Krippner 1f41b0a8ca update Timestamp-Data 2016-09-29 14:32:43 +02:00
Ricardo Krippner e4e3de1abd updated MySQL Plugin 2016-09-29 14:22:23 +02:00
Ricardo Krippner 5033448696 added FFAgent Plugin 2016-09-29 14:21:35 +02:00
Ricardo Krippner fbca3b2cbb added SMS77 Plugin 2016-09-29 14:20:51 +02:00
Ricardo Krippner 75de1c9688 added Pushover Plugin 2016-09-29 14:20:05 +02:00
flothi 9cad255804 Enabling SMS functionality 
Use gammu to send SMS immediately via BOSWatch (connected UMTS-Stick). Watch out the prerequisites!
 2016-08-25 21:38:40 +02:00
PeterLaemmle 6946979f05 Update sendTelegram.py 2016-08-23 17:16:07 +02:00
PeterLaemmle b9e4e5f072 Create sendTelegram.py 
BOSWatch plugin to send messages using the Telegram messenger BOT API.
 2016-08-20 14:05:02 +02:00
Tim Essig 8b2bfab8b2 Add ric prefixes to notifyMyAndroid-Plugin 
Allow rics in nma.csv to be defined as prefixes
 2016-08-01 18:43:58 +02:00
Schrolli91 cbab0eadd0 edit readmes 2015-10-12 22:03:04 +02:00
JHCD 41122e9a6a add csv-field eventPrefix to NMA-Plugin 
will be insert in front of "id/description"
f.e.: "Alarm: 1234567" or "Alarm: POCSAG testdata äöüß"
 2015-07-31 20:16:13 +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 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 dbe33a30d8 add appName to config.ini #33 2015-07-28 20:24:57 +02:00
JHCD 19653e5515 add line break to eMail plugin #71 2015-07-28 19:44:14 +02:00
JHCD 6520edea4c change replace wildcards to helper-function 2015-07-24 19:52:18 +02:00
JHCD 997b5eeec3 add NMA plugin #33 
first version, only with one receiver
 2015-07-19 20:29:22 +02:00
JHCD e6ca09c550 delete unused row 2015-07-14 19:13:04 +02:00
JHCD 6b7cf98034 make sure MySQL use utf-8 #63 2015-07-14 19:11:54 +02:00
JHCD e936298ed6 change send eMail to UTF-8 #63 2015-07-14 17:35:58 +02:00
Bastian Schroll ae0fd40e06 fix timeHandler problem in eMail plugin 2015-07-14 16:59:02 +02:00
JHCD 1c78f9ad78 add missing primary key to bos_pocsag 2015-07-13 15:03:31 +02:00
JHCD ffb1495a3b changes in database 
- rename "funktion" to "function"
- change structure/type of some fields (performance)
 2015-07-13 14:15:33 +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 76686e016c insert configHandler.checkConfig() helper in all plugins so save always same code 2015-07-09 07:52:21 +02:00
Schrolli cbb9481c5c edit plugin readme Issue #40 2015-07-09 07:09:32 +02:00
Schrolli 49b93daa95 use configHandler.checkConfig() helper in template plugin for demonstration 2015-07-08 09:45:36 +02:00
Schrolli 07872ac817 edit plugin readme Issue #40 
remove interface.txt - all infos now in the plugins/readme.md
 2015-07-08 09:44:13 +02:00
Schrolli 88bdaa2c29 edit plugin readme Issue #40 2015-07-08 07:30:09 +02:00
Schrolli 3880227fc2 edit plugin readme Issue #40 2015-07-07 14:24:41 +02:00
Schrolli 1d65f9fb97 edit plugin readme Issue #40 2015-07-07 14:08:46 +02:00
Schrolli 4ad5766f98 insert wildcardHandler.replaceWildcards() in httpReq Plugin 2015-07-07 13:17:18 +02:00
Bastian Schroll 79b71b99e8 insert little docu into firEmergency Plugin 
Pull Request #47
 2015-07-05 09:02:21 +02:00
kevinkleist 1945acb7d4 Update firEmergency.py 
Add Subric in Numeric (POCSAG)
Add Description in ZVEI + POCSAG

!!! Subric is Subric+"XX" because of an Issuse in firEmergency
 2015-07-04 22:22:29 +02:00
JHCD 4a5798b127 undo commit 02b5393 (see issue #43) 2015-07-04 01:25:21 +02:00
JHCD 02b53930cf resolve issue #43 2015-07-04 00:18:24 +02:00
Bastian Schroll 80f955beca solve error by helper import in http plugin 2015-07-03 23:52:31 +02:00
JHCD 6a1c77b916 solve issue #41: support more than one recipient 2015-07-03 23:43:22 +02:00
Bastian Schroll ac8a02e3ca insert helper function timeHandler.getTimestamp() 2015-07-02 21:39:43 +02:00
Schrolli 4a995683c0 update interface.txt to new helper structure 2015-07-02 15:19:46 +02:00
Schrolli 68fb88cc63 move helper functions in seperate folder and split to logical files 2015-07-02 15:16:24 +02:00
Schrolli 3b66a1d952 edit Interface.txt 2015-07-02 13:00:38 +02:00
Schrolli f02d306082 insert a plugin-coding-readme 
Issue #40
 2015-07-02 12:56:16 +02:00
Schrolli 4b5bd9073f edit readme.md and interface.txt 2015-07-02 10:06:40 +02:00
Schrolli 48c4d1e354 remove trailing whitespace 2015-07-02 09:02:49 +02:00
Bastian Schroll 25daa26c98 little error in httpRequest Plugin 2015-07-01 20:33:43 +02:00
Schrolli 214ce78470 Extend interface.txt 2015-07-01 15:02:45 +02:00
Schrolli 29873c5ec3 use helper function curtime() and split date and time in eMail plugin 2015-07-01 14:35:44 +02:00
Schrolli 71070932db use helper function for date and time 2015-07-01 14:27:22 +02:00
Schrolli 8c5cb8ec85 update parameters for httpRequest plugin 2015-07-01 09:31:23 +02:00
Schrolli d28dfa951b edit MySQL plugin - save all given information from data[ ] into MySQL database 2015-06-30 12:26:27 +02:00
Schrolli 64768e544e move and edit boswatch.sql 2015-06-30 12:25:22 +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 407e22e1e4 resolve small bug in onLoad() 2015-06-29 17:06:11 +02:00
Schrolli 6371d1cf3c replace the return with an else: statement after config reading 2015-06-29 12:25:21 +02:00
Schrolli 95d2d2f119 insert onLoad() routine in plugins 2015-06-29 12:19:44 +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 74c804f4c3 change exception-handling 
- only error-msg instead of logging.exception
- second logging.debug with exec-trace
 2015-06-23 17:59:43 +02:00
JHCD f2fcbf4ca5 add TCP-support to jsonSocket-Plugin 
rename plugin from jsonUDP to jsonSocket
 2015-06-22 18:00:39 +02:00
JHCD ca82806cf5 add an jsonUDP-plugin 
send data via UDP
as a json-string
 2015-06-21 18:28:05 +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 fedf879a06 undo docu in case of parsing-error :-/ 2015-06-05 09:47:17 +02:00
JHCD 7c5e223579 undo docu in case of parsing-error :-/ 2015-06-05 09:43:15 +02:00
JHCD baa9b47983 small documentation 2015-06-04 20:26:46 +02:00
JHCD f71cbc10ca disable debugging 2015-06-04 20:21:36 +02:00
JHCD 5499f6e3e0 add eMail-plugin for fms, zvei and pocsag 
plugin dispatch messages via eMail/SMTP
supports: tls, user/password, wildcards in subject and message-text
 2015-06-04 20:18:44 +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 70094d55a3 add firEmergency-plugin 2015-06-04 19:03:32 +02:00
JHCD 0a621b283a a little bit documentation 2015-05-31 12:40:43 +02:00
Schrolli a0521a6b36 httpRequest Plugin with wildcard params 2015-05-28 13:39:53 +02:00
Schrolli 5454e4980f little change 2015-05-28 13:26:00 +02:00
Schrolli 9bfe832530 fix error in httpRequest plugin 2015-05-28 09:17:22 +02:00
Schrolli 475039c171 little changes 2015-05-28 08:43:08 +02:00
Schrolli 346d5a41f6 little changes for docu 2015-05-27 11:55:04 +02:00
JHCD c22400420a add code-documentation to BosMon-plugin 2015-05-26 20:13:05 +02:00
JHCD 2b333975c5 add some documentation 2015-05-25 00:13:34 +02:00
JHCD 21ad7e1a4a add some documentation 2015-05-25 00:11:35 +02:00
JHCD 9c3c1f5df4 implement FMS in BosMon-plugin 2015-05-24 23:09:38 +02:00
Bastian Schroll 298ed0a06c fixed error httpreq plugin 2015-05-23 08:40:35 +02:00
JHCD 2ddee40d9d disable HTTPConnection debugging 2015-05-22 23:52:09 +02:00
JHCD 8ef7a46dac Merge branch 'develop' of https://github.com/Schrolli91/BOSWatch into develop 2015-05-22 23:48:01 +02:00
JHCD 01bec5df35 implement ZVEI in BosMon-plugin 2015-05-22 23:46:54 +02:00