Use a single health log table #15157
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stelfrag
reviewed
Jun 8, 2023
stelfrag
reviewed
Jun 8, 2023
added 5 commits
June 8, 2023 14:38
|
What has changed with the PR:
|
thiagoftsm
reviewed
Jun 13, 2023
thiagoftsm
reviewed
Jun 14, 2023
thiagoftsm
reviewed
Jun 14, 2023
database/sqlite/sqlite_aclk_alert.c
Outdated
| @@ -307,19 +274,15 @@ void aclk_push_alert_event(struct aclk_sync_host_config *wc) | |||
|
|
|||
| buffer_sprintf(sql, "select aa.sequence_id, hl.unique_id, hl.alarm_id, hl.config_hash_id, hl.updated_by_id, hl.when_key, " \ | |||
| " hl.duration, hl.non_clear_duration, hl.flags, hl.exec_run_timestamp, hl.delay_up_to_timestamp, hl.name, " \ | |||
| " hl.chart, hl.family, hl.exec, hl.recipient, hl.source, hl.units, hl.info, hl.exec_code, hl.new_status, " \ | |||
| " hl.chart, hl.family, hl.exec, hl.recipient, ha.source, hl.units, hl.info, hl.exec_code, hl.new_status, " \ | |||
There was a problem hiding this comment.
Here we are inserting a field from ha among fields from hl table. To simplify developer read and probably database engine, I suggest to keep fields from the same table together.
thiagoftsm
reviewed
Jun 14, 2023
database/sqlite/sqlite_health.c
Outdated
| @@ -689,12 +660,11 @@ void sql_check_removed_alerts_state(char *uuid_str) | |||
| /* Health related SQL queries | |||
| Load from the health log table | |||
| */ | |||
| #define SQL_LOAD_HEALTH_LOG(guid) "SELECT hostname, unique_id, alarm_id, alarm_event_id, config_hash_id, updated_by_id, updates_id, when_key, duration, non_clear_duration, flags, exec_run_timestamp, delay_up_to_timestamp, name, chart, family, exec, recipient, source, units, info, exec_code, new_status, old_status, delay, new_value, old_value, last_repeat, class, component, type, chart_context, transition_id FROM health_log_%s group by alarm_id having max(alarm_event_id);", guid | |||
| #define SQL_LOAD_HEALTH_LOG "SELECT hl.unique_id, hl.alarm_id, hl.alarm_event_id, hl.config_hash_id, hl.updated_by_id, hl.updates_id, hl.when_key, hl.duration, hl.non_clear_duration, hl.flags, hl.exec_run_timestamp, hl.delay_up_to_timestamp, hl.name, hl.chart, hl.family, hl.exec, hl.recipient, ah.source, hl.units, hl.info, hl.exec_code, hl.new_status, hl.old_status, hl.delay, hl.new_value, hl.old_value, hl.last_repeat, ah.class, ah.component, ah.type, hl.chart_context, hl.transition_id FROM health_log hl, alert_hash ah where hl.config_hash_id = ah.hash_id and host_id = @host_id group by hl.alarm_id having max(hl.alarm_event_id);" | |||
There was a problem hiding this comment.
Like one of previous comment, I suggest to reorganize fields per table.
thiagoftsm
reviewed
Jun 14, 2023
database/sqlite/sqlite_health.c
Outdated
| @@ -1208,7 +1187,7 @@ int sql_health_get_last_executed_event(RRDHOST *host, ALARM_ENTRY *ae, RRDCALC_S | |||
| return ret; | |||
| } | |||
|
|
|||
| #define SQL_SELECT_HEALTH_LOG(guid) "SELECT hostname, unique_id, alarm_id, alarm_event_id, config_hash_id, updated_by_id, updates_id, when_key, duration, non_clear_duration, flags, exec_run_timestamp, delay_up_to_timestamp, name, chart, family, exec, recipient, source, units, info, exec_code, new_status, old_status, delay, new_value, old_value, last_repeat, class, component, type, chart_context, transition_id FROM health_log_%s WHERE 1=1 ", guid | |||
| #define SQL_SELECT_HEALTH_LOG "SELECT hl.unique_id, hl.alarm_id, hl.alarm_event_id, hl.config_hash_id, hl.updated_by_id, hl.updates_id, hl.when_key, hl.duration, hl.non_clear_duration, hl.flags, hl.exec_run_timestamp, hl.delay_up_to_timestamp, hl.name, hl.chart, hl.family, hl.exec, hl.recipient, ah.source, hl.units, hl.info, hl.exec_code, hl.new_status, hl.old_status, hl.delay, hl.new_value, hl.old_value, hl.last_repeat, ah.class, ah.component, ah.type, hl.chart_context, hl.transition_id FROM health_log hl, alert_hash ah WHERE hl.config_hash_id = ah.hash_id and host_id = @host_id " | |||
There was a problem hiding this comment.
if you accept suggestion to reorganize, please, reorganize this too.
added 2 commits
June 14, 2023 23:07
added 15 commits
June 15, 2023 13:15
stelfrag
approved these changes
Jun 21, 2023
thiagoftsm
approved these changes
Jun 21, 2023
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This PR changes health to use a single
health_logtable, instead of a table for each host.The PR will update database to version 9 and will move data from all the
health_log_XXXXtables to the new one. A newhost_idcolumn is added, which is the host'shost_uuid.Test Plan
After this PR all of health functionality (including cleaning up and cloud connectivity) should remain as before.
Additional Information
For users: How does this change affect me?