ee323ea67 · cryptotaxi247/netdata-1

@@ -120,7 +120,8 @@ void dict_mssql_fill_instance_transactions(struct mssql_db_instance *mdi)

120 long value = 0;

121 SQLLEN col_object_len = 0, col_value_len = 0;

122

123 - SQLRETURN ret = SQLExecDirect(mdi->parent->conn->dbInstanceTransactionSTMT, (SQLCHAR *)NETDATA_QUERY_BUFFER_STATS, SQL_NTS);

123 + SQLRETURN ret =

124 + SQLExecDirect(mdi->parent->conn->dbInstanceTransactionSTMT, (SQLCHAR *)NETDATA_QUERY_BUFFER_STATS, SQL_NTS);

125 if (likely(netdata_mssql_check_result(ret))) {

126 mdi->collecting_data = false;

127 netdata_MSSQL_error(

@@ -166,7 +167,9 @@ void dict_mssql_fill_instance_transactions(struct mssql_db_instance *mdi)

167

168 // We cannot use strcmp, because buffer is filled with spaces instead NULL.

169 if (unlikely(!strncmp(

169 - object_name, NETDATA_MSSQL_BUFFER_PAGE_READS_METRIC, sizeof(NETDATA_MSSQL_BUFFER_PAGE_READS_METRIC) - 1)))

170 + object_name,

171 + NETDATA_MSSQL_BUFFER_PAGE_READS_METRIC,

172 + sizeof(NETDATA_MSSQL_BUFFER_PAGE_READS_METRIC) - 1)))

173 mdi->MSSQLBufferPageReads.current.Data = (ULONGLONG)value;

174 else if (unlikely(!strncmp(

175 object_name,

@@ -298,16 +301,19 @@ void dict_mssql_fill_transactions(struct mssql_db_instance *mdi, const char *dbn

301 else if (unlikely(!strncmp(

302 object_name, NETDATA_MSSQL_BACKUP_RESTORE_METRIC, sizeof(NETDATA_MSSQL_BACKUP_RESTORE_METRIC) - 1)))

303 mdi->MSSQLDatabaseBackupRestoreOperations.current.Data = (ULONGLONG)value;

301 - else if (unlikely(!strncmp(object_name, NETDATA_MSSQL_LOG_FLUSHED_METRIC, sizeof(NETDATA_MSSQL_LOG_FLUSHED_METRIC) - 1)))

304 + else if (unlikely(!strncmp(

305 + object_name, NETDATA_MSSQL_LOG_FLUSHED_METRIC, sizeof(NETDATA_MSSQL_LOG_FLUSHED_METRIC) - 1)))

306 mdi->MSSQLDatabaseLogFlushed.current.Data = (ULONGLONG)value;

303 - else if (unlikely(!strncmp(object_name, NETDATA_MSSQL_LOG_FLUSHES_METRIC, sizeof(NETDATA_MSSQL_LOG_FLUSHES_METRIC) - 1)))

307 + else if (unlikely(!strncmp(

308 + object_name, NETDATA_MSSQL_LOG_FLUSHES_METRIC, sizeof(NETDATA_MSSQL_LOG_FLUSHES_METRIC) - 1)))

309 mdi->MSSQLDatabaseLogFlushes.current.Data = (ULONGLONG)value;

310 else if (unlikely(!strncmp(

311 object_name,

312 NETDATA_MSSQL_NUMBER_DEADLOCKS_METRIC,

313 sizeof(NETDATA_MSSQL_NUMBER_DEADLOCKS_METRIC) - 1)))

314 mdi->MSSQLDatabaseDeadLockSec.current.Data = (ULONGLONG)value;

310 - else if (unlikely(!strncmp(object_name, NETDATA_MSSQL_LOCK_WAITS_METRIC, sizeof(NETDATA_MSSQL_LOCK_WAITS_METRIC) - 1)))

315 + else if (unlikely(!strncmp(

316 + object_name, NETDATA_MSSQL_LOCK_WAITS_METRIC, sizeof(NETDATA_MSSQL_LOCK_WAITS_METRIC) - 1)))

317 mdi->MSSQLDatabaseLockWaitSec.current.Data = (ULONGLONG)value;

318 else if (unlikely(!strncmp(

319 object_name, NETDATA_MSSQL_LOCK_TIMEOUTS_METRIC, sizeof(NETDATA_MSSQL_LOCK_TIMEOUTS_METRIC) - 1)))

@@ -711,9 +717,10 @@ endreplication:

717 (void)netdata_select_db(mdi->parent->conn->netdataSQLHDBc, "master");

718 netdata_MSSQL_release_results(mdi->parent->conn->dbReplicationPublisher);

719 }

714 -int dict_mssql_databases_run_queries(const DICTIONARY_ITEM *item __maybe_unused, void *value, void *data __maybe_unused) {

720 +int dict_mssql_databases_run_queries(const DICTIONARY_ITEM *item __maybe_unused, void *value, void *data __maybe_unused)

721 +{

722 struct mssql_db_instance *mdi = value;

716 - const char *dbname = dictionary_acquired_item_name((DICTIONARY_ITEM *) item);

723 + const char *dbname = dictionary_acquired_item_name((DICTIONARY_ITEM *)item);

724

725 if (unlikely(!mdi->collecting_data || !mdi->parent || !mdi->parent->conn)) {

726 goto enddrunquery;

@@ -723,7 +730,7 @@ int dict_mssql_databases_run_queries(const DICTIONARY_ITEM *item __maybe_unused,

730 if (unlikely(mdi->MSSQLDatabaseDataFileSize.current.Data != ULONG_LONG_MAX)) {

731 if (likely(mdi->parent->conn->collect_data_size))

732 mdi->MSSQLDatabaseDataFileSize.current.Data = netdata_MSSQL_fill_long_value(

726 - mdi->parent->conn->dataFileSizeSTMT, NETDATA_QUERY_DATA_FILE_SIZE_MASK, dbname, mdi->parent->instanceID);

733 + mdi->parent->conn->dataFileSizeSTMT, NETDATA_QUERY_DATA_FILE_SIZE_MASK, dbname, mdi->parent->instanceID);

734 } else {

735 mdi->collecting_data = false;

736 goto enddrunquery;

@@ -903,7 +910,8 @@ void netdata_mssql_fill_user_connection(struct mssql_instance *mi)

910 goto enduserconn;

911 }

912

906 - ret = SQLBindCol(mi->conn->dbSQLConnections, 1, SQL_C_LONG, &connections, sizeof(connections), &col_user_connections_len);

913 + ret = SQLBindCol(

914 + mi->conn->dbSQLConnections, 1, SQL_C_LONG, &connections, sizeof(connections), &col_user_connections_len);

915 if (likely(netdata_mssql_check_result(ret))) {

916 netdata_MSSQL_error(SQL_HANDLE_STMT, mi->conn->dbSQLConnections, NETDATA_MSSQL_ODBC_PREPARE, mi->instanceID);

917 goto enduserconn;

@@ -1323,22 +1331,15 @@ static void netdata_read_config_options()

1331 dbconn->instances = additional_instances;

1332 dbconn->windows_auth = inicfg_get_boolean(&netdata_config, section_name, "windows authentication", false);

1333 dbconn->is_sqlexpress = inicfg_get_boolean(&netdata_config, section_name, "express", false);

1326 - dbconn->collect_transactions = inicfg_get_boolean(

1327 - &netdata_config, section_name, "collect transactions", true);

1328 - dbconn->collect_waits = inicfg_get_boolean(

1329 - &netdata_config, section_name, "collect waits", true);

1330 - dbconn->collect_locks = inicfg_get_boolean(

1331 - &netdata_config, section_name, "collect lock metrics", true);

1332 - dbconn->collect_replication = inicfg_get_boolean(

1333 - &netdata_config, section_name, "collect replication", true);

1334 - dbconn->collect_jobs = inicfg_get_boolean(

1335 - &netdata_config, section_name, "collect jobs", true);

1336 - dbconn->collect_buffer = inicfg_get_boolean(

1337 - &netdata_config, section_name, "collect buffer stats", true);

1338 - dbconn->collect_data_size = inicfg_get_boolean(

1339 - &netdata_config, section_name, "collect database size", true);

1340 - dbconn->collect_user_connections = inicfg_get_boolean(

1341 - &netdata_config, section_name, "collect user connections", true);

1334 + dbconn->collect_transactions = inicfg_get_boolean(&netdata_config, section_name, "collect transactions", true);

1335 + dbconn->collect_waits = inicfg_get_boolean(&netdata_config, section_name, "collect waits", true);

1336 + dbconn->collect_locks = inicfg_get_boolean(&netdata_config, section_name, "collect lock metrics", true);

1337 + dbconn->collect_replication = inicfg_get_boolean(&netdata_config, section_name, "collect replication", true);

1338 + dbconn->collect_jobs = inicfg_get_boolean(&netdata_config, section_name, "collect jobs", true);

1339 + dbconn->collect_buffer = inicfg_get_boolean(&netdata_config, section_name, "collect buffer stats", true);

1340 + dbconn->collect_data_size = inicfg_get_boolean(&netdata_config, section_name, "collect database size", true);

1341 + dbconn->collect_user_connections =

1342 + inicfg_get_boolean(&netdata_config, section_name, "collect user connections", true);

1343 dbconn->is_connected = FALSE;

1344

1345 netdata_mount_mssql_connection_string(dbconn);

@@ -1544,7 +1545,7 @@ static int initialize(int update_every)

1545

1546 if (likely(create_thread)) {

1547 mssql_queries_thread =

1547 - nd_thread_create("mssql_queries", NETDATA_THREAD_OPTION_DEFAULT, netdata_mssql_queries, &update_every);

1548 + nd_thread_create("mssql_queries", NETDATA_THREAD_OPTION_DEFAULT, netdata_mssql_queries, &update_every);

1549 }

1550

1551 return 0;

@@ -1636,7 +1637,8 @@ static void do_mssql_locks(PERF_DATA_BLOCK *pDataBlock, struct mssql_instance *m

1637 if (unlikely(!pi))

1638 break;

1639

1639 - if (unlikely(!getInstanceName(pDataBlock, pObjectType, pi, windows_shared_buffer, sizeof(windows_shared_buffer))))

1640 + if (unlikely(!getInstanceName(

1641 + pDataBlock, pObjectType, pi, windows_shared_buffer, sizeof(windows_shared_buffer))))

1642 strncpyz(windows_shared_buffer, "[unknown]", sizeof(windows_shared_buffer) - 1);

1643

1644 if (unlikely(!strcasecmp(windows_shared_buffer, "_Total")))

@@ -3034,7 +3036,8 @@ static void do_mssql_databases(PERF_DATA_BLOCK *pDataBlock, struct mssql_instanc

3036 if (unlikely(!pi))

3037 break;

3038

3037 - if (unlikely(!getInstanceName(pDataBlock, pObjectType, pi, windows_shared_buffer, sizeof(windows_shared_buffer))))

3039 + if (unlikely(

3040 + !getInstanceName(pDataBlock, pObjectType, pi, windows_shared_buffer, sizeof(windows_shared_buffer))))

3041 strncpyz(windows_shared_buffer, "[unknown]", sizeof(windows_shared_buffer) - 1);

3042

3043 if (unlikely(!strcasecmp(windows_shared_buffer, "_Total")))

Format plugin (MSSQL) (#21383)