Minor fix for add-version identification

guilhemmarchand · Aug 22, 2016 · c7a09bc · c7a09bc
1 parent 06a5769
commit c7a09bc
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 23 deletions.
diff --git a/default/data/models/NMON_Processing_Data_Collect.json b/default/data/models/NMON_Processing_Data_Collect.json
@@ -253,6 +253,18 @@
                     "displayName": "addon_type",
                     "comment": ""
                 },
+                {
+                    "fieldName": "addon_version",
+                    "owner": "NMON_Processing",
+                    "type": "string",
+                    "fieldSearch": "",
+                    "required": false,
+                    "multivalue": false,
+                    "hidden": false,
+                    "editable": true,
+                    "displayName": "addon_version",
+                    "comment": ""
+                },
                 {
                     "fieldName": "_time",
                     "owner": "BaseEvent",
@@ -324,28 +336,6 @@
                     "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": [
@@ -589,6 +579,18 @@
                     "displayName": "Version of Perl",
                     "comment": ""
                 },
+                {
+                    "fieldName": "addon_type",
+                    "owner": "NMON_Processing",
+                    "type": "string",
+                    "fieldSearch": "",
+                    "required": false,
+                    "multivalue": false,
+                    "hidden": false,
+                    "editable": true,
+                    "displayName": "addon_type",
+                    "comment": ""
+                },
                 {
                     "fieldName": "_time",
                     "owner": "BaseEvent",

diff --git a/default/savedsearches.conf b/default/savedsearches.conf
@@ -826,7 +826,8 @@ display.visualizations.charting.chart = pie
 display.visualizations.show = 0
 request.ui_dispatch_app = nmon
 request.ui_dispatch_view = pivot
-search = | pivot NMON_Processing_Data_Collect NMON_Processing latest(addon_type) AS "addon_type" latest(addon_version) AS "addon_version" latest(_time) AS "latest_time" SPLITROW host AS host SORT 0 host ROWSUMMARY 0 COLSUMMARY 0 NUMCOLS 0 SHOWOTHER 1
+search = | pivot NMON_Processing_Data_Collect NMON_Processing latest(addon_type) AS "addon_type" latest(addon_version) AS "addon_version" latest(_time) AS "latest_time" SPLITROW host AS host SORT 0 host ROWSUMMARY 0 COLSUMMARY 0 NUMCOLS 0 SHOWOTHER 1\
+| eval addon_version = if(isnotnull(addon_version), addon_version, "previous_to_1.2.45"), addon_type = if(isnotnull(addon_type), addon_type, "Undefined")
 
 [TA-nmon package deployment reporting (requires _internal access)]
 action.email.reportServerEnabled = 0