Merge "Issue #1615 Updated group name in common_static edexProcessStats.xml. Added delta script to update aggregate table group names from pluginName to dataType." into development

Former-commit-id: bd91d2b8be [formerly 5a5a5ba855] [formerly d905313941 [formerly 7071c075ee2282b6048cafdefac6d6c83a344ca0]]
Former-commit-id: d905313941
Former-commit-id: 2d8327e76f

deltaScripts/13.3.1/convertPluginNameToDataType.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+SQL_SCRIPT="convertPluginNameToDataType.sql"
+
+# ensure that the sql script is present
+if [ ! -f ${SQL_SCRIPT} ]; then
+   echo "ERROR: the required sql script - ${SQL_SCRIPT} was not found."
+   echo "FATAL: the update has failed!"
+   exit 1
+fi
+
+echo "INFO: update started"
+
+# run the update
+/awips2/psql/bin/psql -U awips -d metadata -f ${SQL_SCRIPT}
+if [ $? -ne 0 ]; then
+   echo "FATAL: the update has failed!"
+   exit 1
+fi
+
+echo "INFO: the update has completed successfully!"
+
+exit 0

deltaScripts/13.3.1/convertPluginNameToDataType.sql

@@ -0,0 +1,30 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+\set ON_ERROR_STOP 1
+\connect metadata;
+
+-- Start a transaction
+BEGIN;
+
+-- Replace pluginName with dataType
+update events.aggregate set grouping = regexp_replace(grouping, 'pluginName', 'dataType', 'g') where eventtype = 'com.raytheon.uf.common.stats.ProcessEvent' ;
+
+-- Commit the transaction
+END;

edexOsgi/com.raytheon.uf.edex.stats/utility/common_static/base/stats/edexProcessStats.xml

@@ -2,7 +2,7 @@
     <!-- Event Type should be fully qualified name of stat event -->
     <statisticsEvent type="com.raytheon.uf.common.stats.ProcessEvent"
         displayName="Processing Events" category="Data Ingest Events">
-        <statisticsGroup name="pluginName" displayName="Data Type" />
+        <statisticsGroup name="dataType" displayName="Data Type" />
         <!-- Processing time available display units:
              ms, Seconds, Minutes, Hours -->
         <statisticsAggregate field="processingTime"