From 08e5bb93e9cb321522964d4b7a471d05b40fc6e4 Mon Sep 17 00:00:00 2001 From: Johannes Holzwarth | SE-Inno GmbH Date: Mon, 15 Jan 2024 12:06:04 +0100 Subject: [PATCH] new --- Monitoring Server Influx V1/module.php | 45 +++++++++++++------------- library.json | 2 +- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/Monitoring Server Influx V1/module.php b/Monitoring Server Influx V1/module.php index 8007197..f132dbb 100644 --- a/Monitoring Server Influx V1/module.php +++ b/Monitoring Server Influx V1/module.php @@ -78,7 +78,9 @@ class MonitoringServer extends IPSModule { $status = ($stoptime - $starttime) * 1000; $status = floor($status); } - print_r($status); + if ($status == 4){ + print_r("Everything fine :)"); + } return $status; } @@ -94,28 +96,25 @@ class MonitoringServer extends IPSModule { - if (is_bool($value) == true){ - if ($value == true){ - curl_setopt($ch, CURLOPT_POSTFIELDS, $system.','.$category.'='.$valuename.' value=1'); - } - else{ - curl_setopt($ch, CURLOPT_POSTFIELDS, $system.','.$category.'='.$valuename.' value=0'); - } + if ($value == filter_var($value, FILTER_VALIDATE_FLOAT)){ + curl_setopt($ch, CURLOPT_POSTFIELDS, $system.','.$category.'='.$valuename.' value=' . number_format($value/1,1,'.','') ); + //echo 'es war ein float '; + }elseif ($value = filter_var($value, FILTER_VALIDATE_BOOLEAN)){ + + if ($value == true){ + curl_setopt($ch, CURLOPT_POSTFIELDS, $system.','.$category.'='.$valuename.' value=1'); + } + else{ + curl_setopt($ch, CURLOPT_POSTFIELDS, $system.','.$category.'='.$valuename.' value=0'); + } //echo 'es war ein bool '; - } + }elseif (filter_var($value, FILTER_VALIDATE_INT)){ + curl_setopt($ch, CURLOPT_POSTFIELDS, $system.','.$category.'='.$valuename.' value=' .$value); + //echo 'es war ein int '; + } - - - if (is_integer($value) == true){ - curl_setopt($ch, CURLOPT_POSTFIELDS, $system.','.$category.'='.$valuename.' value=' .$value); - } - - if (is_float($value) == true){ - curl_setopt($ch, CURLOPT_POSTFIELDS, $system.','.$category.'='.$valuename.' value=' . number_format($value/1,1,'.','') ); - //echo 'es war ein float '; - - } + } public function checkAlarms() { @@ -264,9 +263,11 @@ class MonitoringServer extends IPSModule { $system = "P".$projectnumber."_ISP".$ispnumber; $category = "Digital"; $valuename = $parname."_".$varname; - // if($this->state["status"] == "pass"){ } - Write2Influx($payload, $ssl, $server, $port, $db, $system, $category, $valuename); + if($this->checkInfluxState() < 5){ + Write2Influx($payload, $ssl, $server, $port, $db, $system, $category, $valuename); + } + } diff --git a/library.json b/library.json index 0ab951b..7315974 100644 --- a/library.json +++ b/library.json @@ -8,6 +8,6 @@ "date": 1491343200 }, "version": "1.6", - "build": 0, + "build": 1, "date": 0 } \ No newline at end of file