From 4f8c15d7d0716e3335e0bee35d71c8e8e85c355e Mon Sep 17 00:00:00 2001 From: Florian Date: Sat, 13 Oct 2018 23:10:31 +0200 Subject: [PATCH 1/7] Update Pushover.py Changing priority depending on ZVEI / RIC --- plugins/Pushover/Pushover.py | 45 ++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/plugins/Pushover/Pushover.py b/plugins/Pushover/Pushover.py index d220de6..69bfa13 100644 --- a/plugins/Pushover/Pushover.py +++ b/plugins/Pushover/Pushover.py @@ -75,9 +75,20 @@ def run(typ, freq, data): # # building message for ZVEI # + if globalVars.config.get("Pushover", "zvei_sep_prio") == '1': + if data["zvei"] in globalVars.config.get("Pushover", "zvei_prio2"): + priority = '2' + elif data["zvei"] in globalVars.config.get("Pushover","zvei_prio1"): + priority = '1' + elif data["zvei"] in globalVars.config.get("Pushover","zvei_prio0"): + priority = '0' + else: + priority = '-1' + else: + priority = globalVars.config.get("Pushover","zvei_std_prio") + message = globalVars.config.get("Pushover", "zvei_message") title = globalVars.config.get("Pushover", "zvei_title") - priority = globalVars.config.get("Pushover", "zvei_prio") logging.debug("Sending message: %s", message) elif typ == "POC": @@ -86,17 +97,27 @@ def run(typ, freq, data): # Pushover-Request # logging.debug("send Pushover for %s", typ) - - if data["function"] == '1': - priority = globalVars.config.get("Pushover", "SubA") - elif data["function"] == '2': - priority = globalVars.config.get("Pushover", "SubB") - elif data["function"] == '3': - priority = globalVars.config.get("Pushover", "SubC") - elif data["function"] == '4': - priority = globalVars.config.get("Pushover", "SubD") - else: - priority = 0 + if globalVars.config.get("Pushover", "poc_spec_ric") == '0': + if data["function"] == '1': + priority = globalVars.config.get("Pushover", "SubA") + elif data["function"] == '2': + priority = globalVars.config.get("Pushover", "SubB") + elif data["function"] == '3': + priority = globalVars.config.get("Pushover", "SubC") + elif data["function"] == '4': + priority = globalVars.config.get("Pushover", "SubD") + else: + priority = 0 + else: + if data["ric"] in globalVars.config.get("Pushover", "poc_prio2"): + priority = 2 + elif data["ric"] in globalVars.config.get("Pushover","poc_prio1"): + priority = 1 + elif data["ric"] in globalVars.config.get("Pushover","poc_prio0"): + priority = 0 + else: + priority = -1 + message = globalVars.config.get("Pushover", "poc_message") title = globalVars.config.get("Pushover", "poc_title") From 2761ace2b0d032ce41ae18be8340f310e830e384 Mon Sep 17 00:00:00 2001 From: Florian Date: Sat, 13 Oct 2018 23:16:01 +0200 Subject: [PATCH 2/7] Update config.template.ini Adding config-parts for new functions --- config/config.template.ini | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/config/config.template.ini b/config/config.template.ini index dd999a5..bda5904 100644 --- a/config/config.template.ini +++ b/config/config.template.ini @@ -349,11 +349,30 @@ SubA = 1 SubB = 1 SubC = 2 SubD = -2 + +# ...or define the priority depending on the RIC +# 1. switch it on +poc_spec_ric = 0 + +# 2. fill the following lists, seperator is , +poc_prio2 = +poc_prio1 = +poc_prio0 = + poc_title = Alarm: %RIC%%LPAR%%FUNCCHAR%%RPAR% poc_message = %DATE% %TIME% - %DESCR%: %MSG% # Section for ZVEI -zvei_prio = 1 +# default prio for all ZVEI - except you specify it different +zvei_std_prio = 1 + +# [1 - on, 0 - off] - by switching on you can list certain ZVEI depending on their priority +zvei_sep_prio = 0 + +# use the following lists, separator is , +zvei_prio2 = +zvei_prio1 = +zvei_prio0 = zvei_title = Alarm: %ZVEI% zvei_message = %DATE% %TIME%: %ZVEI% From a4b19b66b99eb42b6bc8ccdf6984dff39341c0f9 Mon Sep 17 00:00:00 2001 From: Florian Date: Sat, 13 Oct 2018 23:18:09 +0200 Subject: [PATCH 3/7] fixing line indentations --- plugins/Pushover/Pushover.py | 38 ++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/plugins/Pushover/Pushover.py b/plugins/Pushover/Pushover.py index 69bfa13..8209db3 100644 --- a/plugins/Pushover/Pushover.py +++ b/plugins/Pushover/Pushover.py @@ -98,25 +98,25 @@ def run(typ, freq, data): # logging.debug("send Pushover for %s", typ) if globalVars.config.get("Pushover", "poc_spec_ric") == '0': - if data["function"] == '1': - priority = globalVars.config.get("Pushover", "SubA") - elif data["function"] == '2': - priority = globalVars.config.get("Pushover", "SubB") - elif data["function"] == '3': - priority = globalVars.config.get("Pushover", "SubC") - elif data["function"] == '4': - priority = globalVars.config.get("Pushover", "SubD") - else: - priority = 0 - else: - if data["ric"] in globalVars.config.get("Pushover", "poc_prio2"): - priority = 2 - elif data["ric"] in globalVars.config.get("Pushover","poc_prio1"): - priority = 1 - elif data["ric"] in globalVars.config.get("Pushover","poc_prio0"): - priority = 0 - else: - priority = -1 + if data["function"] == '1': + priority = globalVars.config.get("Pushover", "SubA") + elif data["function"] == '2': + priority = globalVars.config.get("Pushover", "SubB") + elif data["function"] == '3': + priority = globalVars.config.get("Pushover", "SubC") + elif data["function"] == '4': + priority = globalVars.config.get("Pushover", "SubD") + else: + priority = 0 + else: + if data["ric"] in globalVars.config.get("Pushover", "poc_prio2"): + priority = 2 + elif data["ric"] in globalVars.config.get("Pushover","poc_prio1"): + priority = 1 + elif data["ric"] in globalVars.config.get("Pushover","poc_prio0"): + priority = 0 + else: + priority = -1 message = globalVars.config.get("Pushover", "poc_message") title = globalVars.config.get("Pushover", "poc_title") From c00146ccd0a55c5f6fabcc459b6a7f803eff0a2e Mon Sep 17 00:00:00 2001 From: Florian Date: Sun, 14 Oct 2018 12:26:35 +0200 Subject: [PATCH 4/7] Update Pushover.py fixing line-indentations - 2nd trial --- plugins/Pushover/Pushover.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/Pushover/Pushover.py b/plugins/Pushover/Pushover.py index 8209db3..9a0b488 100644 --- a/plugins/Pushover/Pushover.py +++ b/plugins/Pushover/Pushover.py @@ -76,16 +76,16 @@ def run(typ, freq, data): # building message for ZVEI # if globalVars.config.get("Pushover", "zvei_sep_prio") == '1': - if data["zvei"] in globalVars.config.get("Pushover", "zvei_prio2"): - priority = '2' - elif data["zvei"] in globalVars.config.get("Pushover","zvei_prio1"): - priority = '1' - elif data["zvei"] in globalVars.config.get("Pushover","zvei_prio0"): - priority = '0' - else: - priority = '-1' - else: - priority = globalVars.config.get("Pushover","zvei_std_prio") + if data["zvei"] in globalVars.config.get("Pushover", "zvei_prio2"): + priority = '2' + elif data["zvei"] in globalVars.config.get("Pushover","zvei_prio1"): + priority = '1' + elif data["zvei"] in globalVars.config.get("Pushover","zvei_prio0"): + priority = '0' + else: + priority = '-1' + else: + priority = globalVars.config.get("Pushover","zvei_std_prio") message = globalVars.config.get("Pushover", "zvei_message") title = globalVars.config.get("Pushover", "zvei_title") From c26deb995efbccd3b4e6f570d2cbccc51a84229e Mon Sep 17 00:00:00 2001 From: Florian Date: Mon, 15 Oct 2018 20:53:16 +0200 Subject: [PATCH 5/7] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62f0368..f21ddcb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ ##### Fixed ##### Security +### __[v2.5]__ - 15.10.2018 +##### Added +- Pushover-Plugin: Priorität für einzelne RIC und ZVEI in config einstellbar [#378](https://github.com/Schrolli91/BOSWatch/pull/378) ### __[v2.4]__ - 17.08.2018 ##### Added From a333b22a062c57fcfd18bf7c0aaaf4dfa82914a4 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Tue, 16 Oct 2018 05:58:56 +0200 Subject: [PATCH 6/7] changelog angepasst MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Änderung in den "unreleased" Abschnitt verschoben --- CHANGELOG.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f21ddcb..0e81d70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### __[v2.#]__ - Unreleased ##### Added +- Pushover-Plugin: Priorität für einzelne RIC und ZVEI in config einstellbar [#378](https://github.com/Schrolli91/BOSWatch/pull/378) ##### Changed ##### Deprecated ##### Removed @@ -10,9 +11,6 @@ ##### Fixed ##### Security -### __[v2.5]__ - 15.10.2018 -##### Added -- Pushover-Plugin: Priorität für einzelne RIC und ZVEI in config einstellbar [#378](https://github.com/Schrolli91/BOSWatch/pull/378) ### __[v2.4]__ - 17.08.2018 ##### Added From 9ad1ed74ef2d8c7ba48fdb920d751a818085b3f0 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Tue, 16 Oct 2018 10:03:04 +0200 Subject: [PATCH 7/7] Update Pushover.py remove trailing whitespaces [Codacy] --- plugins/Pushover/Pushover.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Pushover/Pushover.py b/plugins/Pushover/Pushover.py index 9a0b488..051445d 100644 --- a/plugins/Pushover/Pushover.py +++ b/plugins/Pushover/Pushover.py @@ -86,7 +86,7 @@ def run(typ, freq, data): priority = '-1' else: priority = globalVars.config.get("Pushover","zvei_std_prio") - + message = globalVars.config.get("Pushover", "zvei_message") title = globalVars.config.get("Pushover", "zvei_title") logging.debug("Sending message: %s", message)