Check for source field when requesting /api/v1/alarm_log (#15306)
check for source field
Emmanuel Vasilakis committed
Jul 4, 2023 at 14:26 UTC
d594a22beab55e0b32809b05d5a39d6cfd1de7a1
1 file changed
+2
-2
database/sqlite/sqlite_health.c
+2
-2
@@ -1345,7 +1345,7 @@ void sql_health_alarm_log2json(RRDHOST *host, BUFFER *wb, uint32_t after, char *
1345
if (sqlite3_column_type(res, 31) != SQLITE_NULL)
1346
uuid_unparse_lower(*((uuid_t *) sqlite3_column_blob(res, 31)), transition_id);
1347
1348
- char *edit_command = health_edit_command_from_source((char *)sqlite3_column_text(res, 17));
1348
+ char *edit_command = sqlite3_column_bytes(res, 17) > 0 ? health_edit_command_from_source((char *)sqlite3_column_text(res, 17)) : strdupz("UNKNOWN=0=UNKNOWN");
1349
1350
if (count)
1351
buffer_sprintf(wb, ",");
@@ -1415,7 +1415,7 @@ void sql_health_alarm_log2json(RRDHOST *host, BUFFER *wb, uint32_t after, char *
1415
sqlite3_column_text(res, 15) ? (const char *) sqlite3_column_text(res, 15) : string2str(host->health.health_default_exec),
1416
sqlite3_column_text(res, 16) ? (const char *) sqlite3_column_text(res, 16) : string2str(host->health.health_default_recipient),
1417
sqlite3_column_int(res, 20),
1418
- sqlite3_column_text(res, 17),
1418
+ sqlite3_column_text(res, 17) ? (const char *) sqlite3_column_text(res, 17) : (char *) "Unknown",
1419
edit_command,
1420
sqlite3_column_text(res, 18),
1421
(long unsigned int)sqlite3_column_int64(res, 6),