Adding add-on extraction

guilhemmarchand · Aug 21, 2016 · 0166b62 · 0166b62
1 parent f9229b0
commit 0166b62
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 1 deletion.
diff --git a/default/data/models/NMON_Processing_Data_Collect.json b/default/data/models/NMON_Processing_Data_Collect.json
@@ -312,6 +312,28 @@
                     "comment": "",
                     "calculationType": "Eval",
                     "expression": "round((size_in_bytes/1000/1000),2)"
+                },
+                {
+                    "outputFields": [
+                        {
+                            "fieldName": "addon_version",
+                            "owner": "NMON_Processing",
+                            "type": "string",
+                            "fieldSearch": "",
+                            "required": false,
+                            "multivalue": false,
+                            "hidden": false,
+                            "editable": true,
+                            "displayName": "addon_version",
+                            "comment": ""
+                        }
+                    ],
+                    "calculationID": "z96ho6924dok6y9skvdj3v7vi",
+                    "owner": "NMON_Processing",
+                    "editable": true,
+                    "comment": "",
+                    "calculationType": "Eval",
+                    "expression": "if(isnotnull(addon_version), addon_version, \"previous_to_1.2.45\")"
                 }
             ],
             "constraints": [

diff --git a/default/props.conf b/default/props.conf
@@ -178,8 +178,8 @@ EXTRACT-splunk_home = (?i).+\w*\sRoot\sDirectory\s\(\$SPLUNK_HOME\)\:\s{0,}(?P<s
 
 # For nmon-logger
 EXTRACT-nmon_home = (?i).+\w*\sRoot\sDirectory\s\(\$NMON_VAR\)\:\s{0,}(?P<nmon_var>[a-zA-Z0-9\/\\\-\_\.\:]+)\s
-
 EXTRACT-operating_system = (?i).+Guest\sOperating\sSystem\:\s{0,}(?P<operating_system>[a-zA-Z0-9]+)\s
+EXTRACT-addon_version = (?i).+addon\sversion\:\s{0,}(?P<addon_version>[a-zA-Z0-9\.]+)\s
 EXTRACT-python_version = (?i).+Python\sversion\:\s{0,}(?P<python_version>[a-zA-Z0-9\.]+)\s
 EXTRACT-perl_version = (?i).+Perl\sversion\:\s{0,}(?P<perl_version>[a-zA-Z0-9\.]+)\s
 EVAL-converter_inuse = case(isnotnull(python_version), "Python", isnotnull(perl_version), "Perl")

diff --git a/resources/PA-nmon_1245.tgz b/resources/PA-nmon_1245.tgz
diff --git a/resources/TA-nmon_1245.tgz b/resources/TA-nmon_1245.tgz
diff --git a/resources/TA-nmon_selfmode_1245.tgz b/resources/TA-nmon_selfmode_1245.tgz