From cda0e7e4b2dd04f3a85ba3e849f73ef83e4d6fc2 Mon Sep 17 00:00:00 2001 From: Dmitry Kochetov Date: Mon, 26 Aug 2024 16:25:26 +0300 Subject: [PATCH] Added field in collect data --- config/config.go | 2 +- current_version_agent | 2 +- install.sh | 4 ++-- metrics/dbCollectQueries.go | 11 +++++++---- mysqlconfigurer.sh | 4 ++-- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/config/config.go b/config/config.go index 2d71817..9217f5c 100644 --- a/config/config.go +++ b/config/config.go @@ -10,7 +10,7 @@ import ( ) const ( - ReleemAgentVersion = "1.19.0" + ReleemAgentVersion = "1.19.1" ) var ( diff --git a/current_version_agent b/current_version_agent index c1af674..7df3a13 100644 --- a/current_version_agent +++ b/current_version_agent @@ -1 +1 @@ -1.19.0 \ No newline at end of file +1.19.1 \ No newline at end of file diff --git a/install.sh b/install.sh index 43512df..df7659c 100644 --- a/install.sh +++ b/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -# install.sh - Version 1.19.0 +# install.sh - Version 1.19.1 # (C) Releem, Inc 2022 # All rights reserved @@ -7,7 +7,7 @@ # using the package manager. set -e -install_script_version=1.19.0 +install_script_version=1.19.1 logfile="releem-install.log" WORKDIR="/opt/releem" diff --git a/metrics/dbCollectQueries.go b/metrics/dbCollectQueries.go index e8e917b..e7b5b6e 100644 --- a/metrics/dbCollectQueries.go +++ b/metrics/dbCollectQueries.go @@ -92,28 +92,31 @@ func (DbCollectQueriesOptimization *DbCollectQueriesOptimization) GetMetrics(met { var output []MetricGroupValue type information_schema_table_type struct { - TABLE_NAME string TABLE_SCHEMA string + TABLE_NAME string + TABLE_TYPE string ENGINE string + ROW_FORMAT string TABLE_ROWS string AVG_ROW_LENGTH string + MAX_DATA_LENGTH string DATA_LENGTH string INDEX_LENGTH string TABLE_COLLATION string } var information_schema_table information_schema_table_type - rows, err := config.DB.Query("SELECT IFNULL(TABLE_NAME, 'NULL') as TABLE_NAME, IFNULL(TABLE_SCHEMA, 'NULL') as TABLE_SCHEMA, IFNULL(ENGINE, 'NULL') as ENGINE, IFNULL(TABLE_ROWS, 'NULL') as TABLE_ROWS, IFNULL(AVG_ROW_LENGTH, 'NULL') as AVG_ROW_LENGTH, IFNULL(DATA_LENGTH, 'NULL') as DATA_LENGTH, IFNULL(INDEX_LENGTH, 'NULL') as INDEX_LENGTH, IFNULL(TABLE_COLLATION, 'NULL') as TABLE_COLLATION FROM information_schema.tables") + rows, err := config.DB.Query("SELECT IFNULL(TABLE_SCHEMA, 'NULL') as TABLE_SCHEMA, IFNULL(TABLE_NAME, 'NULL') as TABLE_NAME, IFNULL(TABLE_TYPE, 'NULL') as TABLE_TYPE, IFNULL(ENGINE, 'NULL') as ENGINE, IFNULL(ROW_FORMAT, 'NULL') as ROW_FORMAT, IFNULL(TABLE_ROWS, 'NULL') as TABLE_ROWS, IFNULL(AVG_ROW_LENGTH, 'NULL') as AVG_ROW_LENGTH, IFNULL(MAX_DATA_LENGTH, 'NULL') as MAX_DATA_LENGTH,IFNULL(DATA_LENGTH, 'NULL') as DATA_LENGTH, IFNULL(INDEX_LENGTH, 'NULL') as INDEX_LENGTH, IFNULL(TABLE_COLLATION, 'NULL') as TABLE_COLLATION FROM information_schema.tables") if err != nil { DbCollectQueriesOptimization.logger.Error(err) } else { for rows.Next() { - err := rows.Scan(&information_schema_table.TABLE_NAME, &information_schema_table.TABLE_SCHEMA, &information_schema_table.ENGINE, &information_schema_table.TABLE_ROWS, &information_schema_table.AVG_ROW_LENGTH, &information_schema_table.DATA_LENGTH, &information_schema_table.INDEX_LENGTH, &information_schema_table.TABLE_COLLATION) + err := rows.Scan(&information_schema_table.TABLE_SCHEMA, &information_schema_table.TABLE_NAME, &information_schema_table.TABLE_TYPE, &information_schema_table.ENGINE, &information_schema_table.ROW_FORMAT, &information_schema_table.TABLE_ROWS, &information_schema_table.AVG_ROW_LENGTH, &information_schema_table.MAX_DATA_LENGTH, &information_schema_table.DATA_LENGTH, &information_schema_table.INDEX_LENGTH, &information_schema_table.TABLE_COLLATION) if err != nil { DbCollectQueriesOptimization.logger.Error(err) return err } - table := MetricGroupValue{"TABLE_NAME": information_schema_table.TABLE_NAME, "TABLE_SCHEMA": information_schema_table.TABLE_SCHEMA, "ENGINE": information_schema_table.ENGINE, "TABLE_ROWS": information_schema_table.TABLE_ROWS, "AVG_ROW_LENGTH": information_schema_table.AVG_ROW_LENGTH, "DATA_LENGTH": information_schema_table.DATA_LENGTH, "INDEX_LENGTH": information_schema_table.INDEX_LENGTH, "TABLE_COLLATION": information_schema_table.TABLE_COLLATION} + table := MetricGroupValue{"TABLE_SCHEMA": information_schema_table.TABLE_SCHEMA, "TABLE_NAME": information_schema_table.TABLE_NAME, "TABLE_TYPE": information_schema_table.TABLE_TYPE, "ENGINE": information_schema_table.ENGINE, "ROW_FORMAT": information_schema_table.ROW_FORMAT, "TABLE_ROWS": information_schema_table.TABLE_ROWS, "AVG_ROW_LENGTH": information_schema_table.AVG_ROW_LENGTH, "MAX_DATA_LENGTH": information_schema_table.MAX_DATA_LENGTH, "DATA_LENGTH": information_schema_table.DATA_LENGTH, "INDEX_LENGTH": information_schema_table.INDEX_LENGTH, "TABLE_COLLATION": information_schema_table.TABLE_COLLATION} output = append(output, table) } } diff --git a/mysqlconfigurer.sh b/mysqlconfigurer.sh index a9f967f..01bde3e 100755 --- a/mysqlconfigurer.sh +++ b/mysqlconfigurer.sh @@ -1,5 +1,5 @@ #!/bin/bash -# mysqlconfigurer.sh - Version 1.19.0 +# mysqlconfigurer.sh - Version 1.19.1 # (C) Releem, Inc 2022 # All rights reserved @@ -12,7 +12,7 @@ MYSQLTUNER_REPORT=$MYSQLCONFIGURER_PATH"mysqltunerreport.json" RELEEM_MYSQL_VERSION=$MYSQLCONFIGURER_PATH"mysql_version" MYSQLCONFIGURER_CONFIGFILE="${MYSQLCONFIGURER_PATH}${MYSQLCONFIGURER_FILE_NAME}" MYSQL_MEMORY_LIMIT=0 -VERSION="1.19.0" +VERSION="1.19.1" RELEEM_INSTALL_PATH=$MYSQLCONFIGURER_PATH"install.sh" logfile="releem-mysqlconfigurer.log"