Hannes/SeMonitoring
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Major Changes for Alarmhandling

Browse Source
This commit is contained in:
jhartworks
2025-04-22 16:29:58 +02:00
parent 30ed242653
commit 2dbb2f7fd0
2 changed files with 77 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Monitoring Server Influx V1/form.json
+12
View File
@@ -11,6 +11,18 @@
{ "type": "NumberSpinner", "name": "ISP", "caption": "ISP-Number" },
{ "type": "SelectInstance", "name": "VisuId", "caption": "Web Visu" },
{ "type": "CheckBox", "name": "SendNotification", "caption": "Send Notification" },
{ "type": "CheckBox", "name": "SendWhatsapp", "caption": "Send Whatsapp" },
{ "type": "SelectInstance", "name": "WhatappInst", "caption": "Whatsapp Insance" },
{ "type": "ValidationTextBox", "name": "WhatsappNumbers", "caption": "Whatsapp-Numbers" },
{ "type": "CheckBox", "name": "SendMail", "caption": "Send Mail" },
{ "type": "SelectInstance", "name": "MailInst", "caption": "Mail Insance"},
{ "type": "ValidationTextBox", "name": "MailAdresses", "caption": "Mail-Adresses" },
{ "type": "CheckBox", "name": "SendDiscord", "caption": "Send Discord" },
{ "type": "SelectInstance", "name": "DiscordInst", "caption": "Discord Insance"},
{ "type": "CheckBox", "name": "LogValues", "caption": "Log Values" },
{ "type": "Select", "name": "SslHttp", "caption": "SSL ?",
Monitoring Server Influx V1/module.php
+61 -3
View File
@@ -20,6 +20,17 @@ class MonitoringServer extends IPSModule {
$this->RegisterPropertyBoolean("SendNotification","false");
$this->RegisterPropertyBoolean("SendWhatsapp",false);
$this->RegisterPropertyInteger("WhatappInst", 0);
$this->RegisterPropertyString("WhatsappNumbers", "0159123456789,0157987456123");
$this->RegisterPropertyBoolean("SendMail",false);
$this->RegisterPropertyInteger("MailInst", 0);
$this->RegisterPropertyString("MailAdresses", "hallo@mail.com,info@stoerung.de");
$this->RegisterPropertyBoolean("SendDiscord",false);
$this->RegisterPropertyInteger("DiscordInst", 0);
$this->RegisterPropertyBoolean("LogValues","true");
$this->RegisterPropertyString("SslHttp","http://");
@@ -150,7 +161,7 @@ class MonitoringServer extends IPSModule {
$projectname = $this->ReadPropertyString("Projectname");
$ispnumber = $this->ReadPropertyInteger("ISP");
$sendit = $this->ReadPropertyBoolean("SendNotification");
$inalarmcount = 0;
$alarmvalues = 0;
$catChilds = IPS_GetChildrenIDs($catAlarmId);
@@ -170,11 +181,11 @@ class MonitoringServer extends IPSModule {
$time = time();
$payload = GetValue($childid);
$alarmvalues++;
if ($sendit == true){
if ($this->notify($childid, $visuId, $catAlarmId, $projectnumber, $projectname, $ispnumber) == true){
$inalarmcount ++;
}
}
}
@@ -360,6 +371,20 @@ class MonitoringServer extends IPSModule {
private function notify($trigid, $webfrontid, $targetid, $projectnumber, $projectname, $ispnr){
$sendit = $this->ReadPropertyBoolean("SendNotification");
$sendwhatsapp = $this->ReadPropertyBoolean("SendWhatsapp");
$sendmail = $this->ReadPropertyBoolean("SendMail");
$senddc = $this->ReadPropertyBoolean("SendDiscord");
$idWhatsapp = $this->ReadPropertyInteger("WhatappInst");
$numbersWhatsapp = $this->ReadPropertyString("WhatsappNumbers");
$idMail = $this->ReadPropertyInteger("MailInst");
$mailAdresses = $this->ReadPropertyString("MailAdresses");
$idDc = $this->ReadPropertyInteger("DiscordInst");
$tdOld = $this->ReadAttributeString("AtAlarmtable");
$td = $tdOld;
@@ -374,7 +399,40 @@ class MonitoringServer extends IPSModule {
$this->SetBuffer($smname, "false");
if ($sendit == true){
VISU_PostNotification($webfrontid, $art, $smname, $ico, $targetid);
}
if ($sendwhatsapp == true){
if ( $idWhatsapp > 0 && $idWhatsapp != 123456){
$paramvals = [
"pn" => $art,
"stoertext" => $smname
];
foreach ($numbersWhatsapp as $number){
WBM_SendMessage($idWhatsapp,$number,$paramvals);
}
}
}
if ($sendmail == true){
if ($idMail > 0 && $idMail != 123456){
foreach ($mailAdresses as $adress){
SMTP_SendMailEx($idMail, $adress, $art, $smname);
}
}
}
if ($senddc == true){
if ($idDc > 0 && $idDc != 123456){
DWM_SendMessage($idDc, $art, $smname);
}
}
$td = '<tr><td>'.$smname.'</td><td>'.$time.'</td></tr>'.$tdOld;
$this->WriteAttributeString("AtAlarmtable", $td);