From 03dd42463e4ac45e9593a65063c73e6df58aa24a Mon Sep 17 00:00:00 2001
From: Brad Gonzales <bradley_l_gonzales@raytheon.com>
Date: Thu, 14 Feb 2013 17:27:11 -0600
Subject: [PATCH] Issue #1615 Updated group name in common_static
 edexProcessStats.xml.  Added delta script to update aggregate table group
 names from pluginName to dataType.

Amend: Corrected comment in convertPluginNameToDataType.sh

Change-Id: I5e0084704cef599d368165058b8008bbb2bc8e18

Former-commit-id: a2391d76c91d3d2b86b8e74eed1e0754091650a0
---
 .../13.3.1/convertPluginNameToDataType.sh     | 23 ++++++++++++++
 .../13.3.1/convertPluginNameToDataType.sql    | 30 +++++++++++++++++++
 .../base/stats/edexProcessStats.xml           |  2 +-
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 deltaScripts/13.3.1/convertPluginNameToDataType.sh
 create mode 100644 deltaScripts/13.3.1/convertPluginNameToDataType.sql

diff --git a/deltaScripts/13.3.1/convertPluginNameToDataType.sh b/deltaScripts/13.3.1/convertPluginNameToDataType.sh
new file mode 100644
index 0000000000..cf3e42f9bd
--- /dev/null
+++ b/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
diff --git a/deltaScripts/13.3.1/convertPluginNameToDataType.sql b/deltaScripts/13.3.1/convertPluginNameToDataType.sql
new file mode 100644
index 0000000000..06ddff02b6
--- /dev/null
+++ b/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;
diff --git a/edexOsgi/com.raytheon.uf.edex.stats/utility/common_static/base/stats/edexProcessStats.xml b/edexOsgi/com.raytheon.uf.edex.stats/utility/common_static/base/stats/edexProcessStats.xml
index 90c2d74058..13264c5463 100644
--- a/edexOsgi/com.raytheon.uf.edex.stats/utility/common_static/base/stats/edexProcessStats.xml
+++ b/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"