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

version 1.7.4

Browse Source
This commit is contained in:
Johannes Holzwarth | SE-Inno GmbH
2024-01-24 10:41:00 +01:00
parent fd7eedea75
commit c1ba3eb052
5 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Monitoring Client/form.json
+1 -1
View File
@@ -7,7 +7,7 @@
{ "type": "SelectObject", "name": "MqttCLientID", "caption": "MQTT-Client" }, { "type": "SelectObject", "name": "MqttCLientID", "caption": "MQTT-Client" },
{ "type": "NumberSpinner", "name": "Projectyear", "caption": "Projectyear" }, { "type": "NumberSpinner", "name": "Projectyear", "caption": "Projectyear" },
{ "type": "ValidationTextBox", "name": "Projectnumber", "caption": "Projectnumber" }, { "type": "NumberSpinner", "name": "Projectnumber", "caption": "Projectnumber" },
{ "type": "ValidationTextBox", "name": "Projectname", "caption": "Projectname" }, { "type": "ValidationTextBox", "name": "Projectname", "caption": "Projectname" },
{ "type": "NumberSpinner", "name": "ISP", "caption": "ISP-Number" }, { "type": "NumberSpinner", "name": "ISP", "caption": "ISP-Number" },
{ "type": "NumberSpinner", "name": "Updatetime", "caption": "Updatetime","suffix": "seconds","minimum ": "10" } { "type": "NumberSpinner", "name": "Updatetime", "caption": "Updatetime","suffix": "seconds","minimum ": "10" }
Monitoring Client/module.php
+11 -10
View File
@@ -11,7 +11,7 @@ class MonitoringClient extends IPSModule {
$this->RegisterPropertyInteger("ParseAnalogCategoryID","0"); $this->RegisterPropertyInteger("ParseAnalogCategoryID","0");
$this->RegisterPropertyInteger("MqttCLientID","0"); $this->RegisterPropertyInteger("MqttCLientID","0");
$this->RegisterPropertyString("Projectnumber",""); $this->RegisterPropertyInteger("Projectnumber","230001");
$this->RegisterPropertyString("Projectname",""); $this->RegisterPropertyString("Projectname","");
$this->RegisterPropertyInteger("ISP","1"); $this->RegisterPropertyInteger("ISP","1");
$this->RegisterPropertyInteger("Projectyear","2023"); $this->RegisterPropertyInteger("Projectyear","2023");
@@ -91,7 +91,7 @@ class MonitoringClient extends IPSModule {
} }
// name object to help with debugging // name object to help with debugging
IPS_SetName($id, "Temporary MQTT Server Device for topic " . $topic); IPS_SetName($id, "Temporary MQTT Device for: " . $topic);
// configure temporary device // configure temporary device
$config_arr = array( $config_arr = array(
@@ -101,6 +101,7 @@ class MonitoringClient extends IPSModule {
); );
$config_str = json_encode($config_arr); $config_str = json_encode($config_arr);
IPS_SetConfiguration($id, $config_str); IPS_SetConfiguration($id, $config_str);
IPS_SetHidden($id,true);
IPS_ApplyChanges($id); IPS_ApplyChanges($id);
// get Value variable and use it to publish the payload // get Value variable and use it to publish the payload
@@ -118,17 +119,17 @@ class MonitoringClient extends IPSModule {
public function SendTopic() { public function SendTopic() {
$mqttId = $this->ReadPropertyInteger("MqttCLientID"); $mqttId = $this->ReadPropertyInteger("MqttCLientID");
$projectyear = $this->ReadPropertyInteger("Projectyear"); $projectyear = $this->ReadPropertyInteger("Projectyear");
$projectnumber = $this->ReadPropertyString("Projectnumber"); $projectnumber = $this->ReadPropertyInteger("Projectnumber");
$projectname = $this->ReadPropertyString("Projectname"); $projectname = $this->ReadPropertyString("Projectname");
$ispnumber = $this->ReadPropertyInteger("ISP"); $ispnumber = $this->ReadPropertyInteger("ISP");
$updatetime = $this->ReadPropertyInteger("Updatetime"); $updatetime = $this->ReadPropertyInteger("Updatetime");
$catIds[0]["id"] = $this->ReadPropertyInteger("ParseNotifyCategoryID"); $catIds[0]["id"] = $this->ReadPropertyInteger("ParseNotifyCategoryID");
$catIds[0]["top"] = "Projekte". $projectyear."/".$projectnumber. "/ISP" .$ispnumber. "/Notify/"; $catIds[0]["top"] = "Projekte". $projectyear."/P".$projectnumber. "/ISP" .$ispnumber. "/Notify/";
$catIds[1]["id"] = $this->ReadPropertyInteger("ParseAlarmCategoryID"); $catIds[1]["id"] = $this->ReadPropertyInteger("ParseAlarmCategoryID");
$catIds[1]["top"] = "Projekte". $projectyear."/".$projectnumber. "/ISP" .$ispnumber. "/Alarm/"; $catIds[1]["top"] = "Projekte". $projectyear."/P".$projectnumber. "/ISP" .$ispnumber. "/Alarm/";
$catIds[2]["id"] = $this->ReadPropertyInteger("ParseAnalogCategoryID"); $catIds[2]["id"] = $this->ReadPropertyInteger("ParseAnalogCategoryID");
$catIds[2]["top"] = "Projekte". $projectyear."/".$projectnumber. "/ISP" .$ispnumber. "/Analog/"; $catIds[2]["top"] = "Projekte". $projectyear."/P".$projectnumber. "/ISP" .$ispnumber. "/Analog/";
@@ -166,17 +167,17 @@ class MonitoringClient extends IPSModule {
$mqttId = $this->ReadPropertyInteger("MqttCLientID"); $mqttId = $this->ReadPropertyInteger("MqttCLientID");
$projectyear = $this->ReadPropertyInteger("Projectyear"); $projectyear = $this->ReadPropertyInteger("Projectyear");
$projectnumber = $this->ReadPropertyString("Projectnumber"); $projectnumber = $this->ReadPropertyInteger("Projectnumber");
$projectname = $this->ReadPropertyString("Projectname"); $projectname = $this->ReadPropertyString("Projectname");
$ispnumber = $this->ReadPropertyInteger("ISP"); $ispnumber = $this->ReadPropertyInteger("ISP");
$updatetime = $this->ReadPropertyInteger("Updatetime"); $updatetime = $this->ReadPropertyInteger("Updatetime");
$catIds[0]["id"] = $this->ReadPropertyInteger("ParseNotifyCategoryID"); $catIds[0]["id"] = $this->ReadPropertyInteger("ParseNotifyCategoryID");
$catIds[0]["top"] = "Projekte". $projectyear."/".$projectnumber. "/ISP" .$ispnumber. "/Notify/"; $catIds[0]["top"] = "Projekte". $projectyear."/P".$projectnumber. "/ISP" .$ispnumber. "/Notify/";
$catIds[1]["id"] = $this->ReadPropertyInteger("ParseAlarmCategoryID"); $catIds[1]["id"] = $this->ReadPropertyInteger("ParseAlarmCategoryID");
$catIds[1]["top"] = "Projekte". $projectyear."/".$projectnumber. "/ISP" .$ispnumber. "/Alarm/"; $catIds[1]["top"] = "Projekte". $projectyear."/P".$projectnumber. "/ISP" .$ispnumber. "/Alarm/";
$catIds[2]["id"] = $this->ReadPropertyInteger("ParseAnalogCategoryID"); $catIds[2]["id"] = $this->ReadPropertyInteger("ParseAnalogCategoryID");
$catIds[2]["top"] = "Projekte". $projectyear."/".$projectnumber. "/ISP" .$ispnumber. "/Analog/"; $catIds[2]["top"] = "Projekte". $projectyear."/P".$projectnumber. "/ISP" .$ispnumber. "/Analog/";
Monitoring Server Influx V1/form.json
+2 -1
View File
@@ -24,7 +24,8 @@
{ "type": "ValidationTextBox", "name": "InfluxDatabase", "caption": "Influx Database" }, { "type": "ValidationTextBox", "name": "InfluxDatabase", "caption": "Influx Database" },
{ "type": "NumberSpinner", "name": "UpdateintervallValues", "caption": "Updateintervall Values in Seconds" }, { "type": "NumberSpinner", "name": "UpdateintervallValues", "caption": "Updateintervall Values in Seconds" },
{ "type": "NumberSpinner", "name": "UpdateintervallAlarms", "caption": "Updateintervall Alarms in Seconds" } { "type": "NumberSpinner", "name": "UpdateintervallAlarms", "caption": "Updateintervall Alarms in Seconds" },
{ "type": "CheckBox", "name": "Debug", "caption": "Debug" }
], ],
"actions": "actions":
Monitoring Server Influx V1/module.php
+14 -3
View File
@@ -38,8 +38,6 @@ class MonitoringServer extends IPSModule {
$this->RegisterVariableInteger("AlarmActiveCount", "Number of Values in Alarmstate", "", 1); $this->RegisterVariableInteger("AlarmActiveCount", "Number of Values in Alarmstate", "", 1);
$this->RegisterVariableInteger("AnalogVarCount", "Number of Analogvalues", "", 2); $this->RegisterVariableInteger("AnalogVarCount", "Number of Analogvalues", "", 2);
$this->RegisterVariableInteger("DigitalVarCount", "Number of DigitalValues", "", 3); $this->RegisterVariableInteger("DigitalVarCount", "Number of DigitalValues", "", 3);
$this->RegisterVariableString("InfluxState", "Influx-DB State", "", 4);
$this->RegisterVariableString("InfluxMessage", "Influx-DB Message", "", 5);
} }
@@ -182,6 +180,7 @@ class MonitoringServer extends IPSModule {
$ispnumber = $this->ReadPropertyInteger("ISP"); $ispnumber = $this->ReadPropertyInteger("ISP");
$logit = $this->ReadPropertyBoolean("LogValues"); $logit = $this->ReadPropertyBoolean("LogValues");
$logit = $this->ReadPropertyBoolean("LogValues");
$numberofvalues = 0; $numberofvalues = 0;
@@ -240,6 +239,7 @@ class MonitoringServer extends IPSModule {
$system = "P".$projectnumber."_ISP".$ispnumber; $system = "P".$projectnumber."_ISP".$ispnumber;
$category = $system."_Analog"; $category = $system."_Analog";
$valuename = $parname."".$varname; $valuename = $parname."".$varname;
//IPS_LogMessage ("Analog Var-Logger", "Ready: ".$system."/".$category."/".$valuename." with Value: ".$payload); //IPS_LogMessage ("Analog Var-Logger", "Ready: ".$system."/".$category."/".$valuename." with Value: ".$payload);
if($this->checkInfluxState() > -1){ if($this->checkInfluxState() > -1){
@@ -384,16 +384,27 @@ class MonitoringServer extends IPSModule {
$catChilds = IPS_GetChildrenIDs($catAlarmId); $catChilds = IPS_GetChildrenIDs($catAlarmId);
foreach ($catChilds as $catChild) { //for each object in category foreach ($catChilds as $catChild) { //for each object in category
$this->createAlarmprofile();
$objchildids = IPS_GetChildrenIDs($catChild); //get variables of objects $objchildids = IPS_GetChildrenIDs($catChild); //get variables of objects
$parname = IPS_GetName($catChild); $parname = IPS_GetName($catChild);
IPS_SetName($catChild,$this->getTextAfterLastSlash($parname)); IPS_SetName($catChild,$this->getTextAfterLastSlash($parname));
IPS_SetVariableCustomProfile($catChild, "Alarm");
} }
} }
} }
public function createAlarmprofile(){
if(!IPS_VariableProfileExists ("Alarm") ){
IPS_CreateVariableProfile("Alarm", 0);
IPS_SetVariableProfileAssociation("Alarm", true, "Störung", "Alert", 0xFF0000);
IPS_SetVariableProfileAssociation("Alarm", false, "OK", "Ok", 0x00FF00);
}
}
} }
?> ?>
library.json
+1 -1
View File
@@ -8,6 +8,6 @@
"date": 1491343200 "date": 1491343200
}, },
"version": "1.7", "version": "1.7",
"build": 3, "build": 4,
"date": 0 "date": 0
} }