From 913495ea99e2f03cae797af03298ce280ce93648 Mon Sep 17 00:00:00 2001
From: Matthias Behr <mbehr@mcbehr.de>
Date: Mon, 30 Mar 2015 13:40:15 +0200
Subject: [PATCH] meterExec support

---
 etc/vzlogger_generic.schema.json      | 18 +++++++++++++++++-
 etc/vzlogger_generic.schema.json.todo |  2 --
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/etc/vzlogger_generic.schema.json b/etc/vzlogger_generic.schema.json
index e1891fa5..1083f102 100644
--- a/etc/vzlogger_generic.schema.json
+++ b/etc/vzlogger_generic.schema.json
@@ -190,13 +190,28 @@
             ]
         },
 
+        "meterExec": {
+            "title": "meter extracting data from the output of a shell command/executable",
+            "allOf": [
+                { "$ref": "#/definitions/meter" },
+                { "properties": {
+                        "protocol": { "type": "string", "enum": ["exec"] },
+                        "command": { "type": "string", "description": "Command to be executed. Only possible if running as non root. Output will be parsed." },
+                        "format": { "type": "string", "description": "optional format string. Supports $v for value, $i for identifier and $t for timestamp. E.g. $i:$v. If empty just a value is read from each line of the file." }
+                    },
+                    "required": [ "command" ]
+                }
+
+            ]
+        },
+
         "meterFluksoV2": {
             "title": "fluksov2 meter",
             "allOf": [
                 { "$ref": "#/definitions/meter" },
                 { "properties": {
                         "protocol": { "type": "string", "enum": ["fluksov2"] },
-                        "fifo": { "type": "string", "description": "fifo to be used. E.g. /var/spid/delta/out" }
+                        "fifo": { "type": "string", "description": "fifo to be used.", "default": "/var/run/spid/delta/out" }
                     },
                     "required": [ "fifo" ]
                 }
@@ -221,6 +236,7 @@
                     {"$ref": "#/definitions/meterSML"},
                     {"$ref": "#/definitions/meterRandom"},
                     {"$ref": "#/definitions/meterFile"},
+                    {"$ref": "#/definitions/meterExec"},
                     {"$ref": "#/definitions/meterFluksoV2"}
                 ]}
         }
diff --git a/etc/vzlogger_generic.schema.json.todo b/etc/vzlogger_generic.schema.json.todo
index 96a15a05..2ba4de9b 100644
--- a/etc/vzlogger_generic.schema.json.todo
+++ b/etc/vzlogger_generic.schema.json.todo
@@ -9,7 +9,5 @@
             }
     todo: "meters" can be called "sensors" as well
     todo: add regex for uuid (see config_validate_uuid())
-    todo: enum for api (mysmartgrid, null, volkszaehler)
-    todo: enum for protocol (d0, sml, fluksov2, file, exec, s0)
     todo: meterD0 needs device or host
   */