From 0b25e08fa2aee9a94c54056cb45cc4b20146f0ed Mon Sep 17 00:00:00 2001
From: timmib <>
Date: Mon, 18 Jan 2021 11:32:18 +0000
Subject: [PATCH] 93_InfluxDBLogger.pm: InfluxDB support perl for measurement
 attribute

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@23543 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 FHEM/93_InfluxDBLogger.pm | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/FHEM/93_InfluxDBLogger.pm b/FHEM/93_InfluxDBLogger.pm
index d889a7d09..485d15095 100644
--- a/FHEM/93_InfluxDBLogger.pm
+++ b/FHEM/93_InfluxDBLogger.pm
@@ -197,9 +197,16 @@ sub InfluxDBLogger_GetMeasurement($$$)
     my ($hash, $dev_hash, $device, $reading, $value) = @_;
     my $name = $hash->{NAME};
 
-    my $measurement =  AttrVal($name, "measurement", $reading);
-    $measurement =~ s/\$DEVICE/$device/ei;
-    $measurement =~ s/\$READINGNAME/$reading/ei;
+    my $measurement =  AttrVal($name, "measurement", undef);
+
+    if (defined $measurement) {
+        $measurement =~ s/\{(.*)\}/eval($1)/ei;
+        $measurement =~ s/\$DEVICE/$device/ei;
+        $measurement =~ s/\$READINGNAME/$reading/ei;
+    }
+    else {
+       $measurement = $reading;
+    }
 
     return $measurement;
 }
@@ -213,8 +220,8 @@ sub InfluxDBLogger_GetTagSet($$$)
         if ( $tags_set eq "-" ) {
             $tags_set = undef;
         } else {
-            $tags_set =~ s/\{(.*)\}/eval($1) /ei;
-            $tags_set =~ s/\$DEVICE/$device /ei;
+            $tags_set =~ s/\{(.*)\}/eval($1)/ei;
+            $tags_set =~ s/\$DEVICE/$device/ei;
         }
     } else {
       $tags_set = AttrVal($name, "deviceTagName", "site_name")."=".$device;
@@ -598,13 +605,15 @@ sub InfluxDBLogger_Rename($$) {
             The keyword $DEVICE will be replaced by the device-name.
             The keyword $READINGNAME will be replaced by the reading-name
             Default is $READINGNAME.
+            Perl-Expressions can be used in curly braces. $name, $device, $reading, $value are available as variables.
+            attr influx measurement { AttrVal($device, "influx_measurement", $reading)}
         </li>
         <li><b>tags</b> <code>attr &lt;name&gt; tags &lt;x,y&gt;</code><br />
             This is the list of tags that will be sent to InfluxDB. The keyword $DEVICE will be replaced by the device-name.
             If this attribute is set it will override the attribute deviceTagName. If the attribute is set to "-"
             no tags will be written (useful if measurement is set to $DEVICE and fields to $READINGNAME=$READINGVALUE)
             Default is site_name=$DEVICE.
-            Perl-Expression can be used in curly braces to evaluate the alias-attribute as a tag for example. $name, $device, $reading, $value are available as variables.
+            Perl-Expressions can be used in curly braces to evaluate the alias-attribute as a tag for example. $name, $device, $reading, $value are available as variables.
             attr influx tags device={AttrVal($device, "alias", "fallback")}
         </li>
         <li><b>fields</b> <code>attr &lt;name&gt; fields &lt;val=$READINGVALUE&gt;</code><br />
@@ -718,6 +727,8 @@ sub InfluxDBLogger_Rename($$) {
             Das Schlüsselwort $DEVICE wird ersetzt durch den Gerätenamen.
             Das Schlüsselwort $READINGNAME wird ersetzt durch den Readingnamen.
             Standard ist $READINGNAME.
+            Es können Perl-Ausdrücke in geschweiften Klammern verwendet werden. $name, $device, $reading, $value stehen dabei als Variable zur Verfügung.
+            attr influx measurement { AttrVal($device, "influx_measurement", $reading)}
         </li>
         <li><b>tags</b> <code>attr &lt;name&gt; tags &lt;x,y&gt;</code><br />
             Dies ist the Liste der tags die an InfluxDB mitgesendet werden. Das Schlüsselwort $DEVICE wird ersetzt durch den Gerätenamen.