feat: adds mysql resource group information

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4.3.33
+current_version = 4.3.34
 commit = False
 tag = False
 

Makefile

@@ -90,7 +90,11 @@ build-collector: clean-collector      ## Build the collector SQL scripts.
 
 	@echo "=> Building Assessment Data Collection Scripts for MySQL version $(VERSION)..."
 	@mkdir -p $(BUILD_DIR)/collector/mysql/sql/
+	@mkdir -p $(BUILD_DIR)/collector/mysql/sql/5.7
+	@mkdir -p $(BUILD_DIR)/collector/mysql/sql/base
 	@cp scripts/collector/mysql/sql/*.sql $(BUILD_DIR)/collector/mysql/sql
+	@cp scripts/collector/mysql/sql/5.7/*.sql $(BUILD_DIR)/collector/mysql/sql/5.7
+	@cp scripts/collector/mysql/sql/base/*.sql $(BUILD_DIR)/collector/mysql/sql/base
 	@cp scripts/collector/mysql/collect-data.sh $(BUILD_DIR)/collector/mysql/
 	@cp -L scripts/collector/mysql/db-machine-specs.sh $(BUILD_DIR)/collector/mysql/
 	@cp scripts/collector/mysql/README.txt $(BUILD_DIR)/collector/mysql/

scripts/collector/mysql/collect-data.sh

@@ -16,7 +16,7 @@
 
 ### Setup directories needed for execution
 #############################################################################
-OpVersion="4.3.33"
+OpVersion="4.3.34"
 dbmajor=""
 
 LOCALE=$(echo $LANG | cut -d '.' -f 1)
@@ -227,8 +227,9 @@ if ! [ -x "$(command -v ${SQLCMD})" ]; then
 fi
 
 export DMA_SOURCE_ID=$(${SQLCMD} --user=$user --password=$pass -h $host -P $port --force --silent --skip-column-names $db 2>>${OUTPUT_DIR}/opdb__stderr_${V_FILE_TAG}.log < sql/init.sql | tr -d '\r')
+export SCRIPT_PATH=$(${SQLCMD} --user=$user --password=$pass -h $host -P $port --force --silent --skip-column-names $db 2>>${OUTPUT_DIR}/opdb__stderr_${V_FILE_TAG}.log < sql/_base_path_lookup.sql | tr -d '\r')
 
-for f in $(ls -1 sql/*.sql | grep -v -e init.sql)
+for f in $(ls -1 sql/*.sql | grep -v -e init.sql | grep -v -e _base_path_lookup.sql)
 do
   fname=$(echo ${f} | cut -d '/' -f 2 | cut -d '.' -f 1)
     ${SQLCMD} --user=$user --password=$pass -h $host -P $port --force --table  ${db} >${OUTPUT_DIR}/opdb__mysql_${fname}__${V_TAG} 2>>${OUTPUT_DIR}/opdb__stderr_${V_FILE_TAG}.log  <<EOF
@@ -239,6 +240,17 @@ source ${f}
 exit
 EOF
 done
+for f in $(ls -1 sql/${SCRIPT_PATH}/*.sql | grep -v -e init.sql | grep -v -e _base_path_lookup.sql)
+do
+  fname=$(echo ${f} | cut -d '/' -f 3 | cut -d '.' -f 1)
+    ${SQLCMD} --user=$user --password=$pass -h $host -P $port --force --table  ${db} >${OUTPUT_DIR}/opdb__mysql_${fname}__${V_TAG} 2>>${OUTPUT_DIR}/opdb__stderr_${V_FILE_TAG}.log  <<EOF
+SET @DMA_SOURCE_ID='${DMA_SOURCE_ID}' ; 
+SET @DMA_MANUAL_ID='${V_MANUAL_ID}' ;
+SET @PKEY='${V_FILE_TAG}';
+source ${f}
+exit
+EOF
+done
 
 specsOut="output/opdb__mysql_db_machine_specs_${V_FILE_TAG}.csv"
 host=$(echo ${connectString} | cut -d '/' -f 4 | cut -d ':' -f 1)

scripts/collector/mysql/sql/5.7/resource_groups.sql

@@ -0,0 +1,17 @@
+-- name: collector-mysql-resource-groups
+select concat(char(34), @PKEY, char(34)) as pkey,
+    concat(char(34), @DMA_SOURCE_ID, char(34)) as dma_source_id,
+    concat(char(34), @DMA_MANUAL_ID, char(34)) as dma_manual_id,
+    concat(char(34), src.resource_group_name, char(34)) as resource_group_name,
+    concat(char(34), src.resource_group_type, char(34)) as resource_group_type,
+    concat(char(34), src.resource_group_enabled, char(34)) as resource_group_enabled,
+    concat(char(34), src.vcpu_ids, char(34)) as vcpu_ids,
+    concat(char(34), src.thread_priority, char(34)) as thread_priority
+from (
+        select 'Unsupported Version Placeholder' as resource_group_type,
+            0 as resource_group_enabled,
+            'Placeholder Value' as resource_group_name,
+            '' as vcpu_ids,
+            0 as thread_priority
+        limit 0
+    ) src;

scripts/collector/mysql/sql/_base_path_lookup.sql

@@ -0,0 +1,9 @@
+-- init-mysql-script-base-path
+select if(clean_version like '5.%', '5.7', 'base') as script_path
+from (
+    select if(
+        version() rlike '^[0-9]+\.[0-9]+\.[0-9]+$' = 1,
+        version(),
+        SUBSTRING_INDEX(VERSION(), '.', 2) || '.0'
+      ) as clean_version
+  ) as base;

scripts/collector/mysql/sql/base/resource_groups.sql

@@ -0,0 +1,17 @@
+-- name: collector-mysql-resource-groups
+select concat(char(34), @PKEY, char(34)) as pkey,
+    concat(char(34), @DMA_SOURCE_ID, char(34)) as dma_source_id,
+    concat(char(34), @DMA_MANUAL_ID, char(34)) as dma_manual_id,
+    concat(char(34), src.resource_group_name, char(34)) as resource_group_name,
+    concat(char(34), src.resource_group_type, char(34)) as resource_group_type,
+    concat(char(34), src.resource_group_enabled, char(34)) as resource_group_enabled,
+    concat(char(34), src.vcpu_ids, char(34)) as vcpu_ids,
+    concat(char(34), src.thread_priority, char(34)) as thread_priority
+from (
+        select rg.resource_group_type as resource_group_type,
+            rg.resource_group_enabled as resource_group_enabled,
+            rg.resource_group_name as resource_group_name,
+            rg.vcpu_ids as vcpu_ids,
+            rg.thread_priority as thread_priority,
+            from information_schema.resource_groups rg
+    ) src;

scripts/collector/oracle/collect-data.sh

@@ -16,7 +16,7 @@
 
 ### Setup directories needed for execution
 #############################################################################
-OpVersion="4.3.33" 
+OpVersion="4.3.34" 
 dbmajor=""
 
 LOCALE=$(echo $LANG | cut -d '.' -f 1)

scripts/collector/postgres/collect-data.sh

@@ -16,7 +16,7 @@
 
 ### Setup directories needed for execution
 #############################################################################
-OpVersion="4.3.33" 
+OpVersion="4.3.34" 
 dbmajor=""
 
 LOCALE=$(echo $LANG | cut -d '.' -f 1)

scripts/collector/sqlserver/instanceReview.ps1

@@ -245,7 +245,7 @@ $validSQLInstanceVersionCheckValues = $splitValidInstanceVerisionCheckObj | ForE
 $isValidSQLInstanceVersion = $validSQLInstanceVersionCheckValues[0]
 $isCloudOrLinuxHost = $validSQLInstanceVersionCheckValues[1]
 
-$op_version = "4.3.33" 
+$op_version = "4.3.34" 
 
 if ([string]($isValidSQLInstanceVersion) -eq "N") {
     Write-Host "#############################################################"

scripts/masker/dma-collection-masker

@@ -37,7 +37,7 @@ __all__ = [
     "run_masker",
 ]
 
-__version__ = "4.3.33"
+__version__ = "4.3.34"
 
 logger = logging.getLogger(__name__)