github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-27 17:06:29 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

"repmgr node check": improve Nagios output

Browse Source
This commit is contained in:
Ian Barwick
2017-08-17 13:54:48 +09:00
parent b1ba476241
commit 5127b9253b
1 changed files with 93 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
repmgr-action-node.c
View File

@@ -786,9 +786,11 @@ do_node_check_slots(PGconn *conn, OutputMode mode, t_node_info *node_info, Check
switch (mode) switch (mode)
{ {
case OM_NAGIOS: case OM_NAGIOS:
printf("REPMGR_INACTIVE_SLOTS %s: %s\n", printf("REPMGR_INACTIVE_SLOTS %s: %s | slots=%i;%i\n",
output_check_status(status), output_check_status(status),
details.data); details.data,
node_info->total_replication_slots,
node_info->inactive_replication_slots);
break; break;
case OM_TEXT: case OM_TEXT:
if (list_output != NULL) if (list_output != NULL)
@@ -1011,7 +1013,9 @@ do_node_check_replication_lag(PGconn *conn, OutputMode mode, t_node_info *node_i
case OM_NAGIOS: case OM_NAGIOS:
appendPQExpBuffer( appendPQExpBuffer(
&details, &details,
"0 seconds"); "0 seconds | lag=0;%i;%i",
config_file_options.replication_lag_warning,
config_file_options.replication_lag_critical);
break; break;
case OM_TEXT: case OM_TEXT:
appendPQExpBuffer( appendPQExpBuffer(
@@ -1043,13 +1047,16 @@ do_node_check_replication_lag(PGconn *conn, OutputMode mode, t_node_info *node_i
case OM_NAGIOS: case OM_NAGIOS:
appendPQExpBuffer( appendPQExpBuffer(
&details, &details,
"%i seconds (critical: %i)", "%i seconds | lag=%i;%i;%i",
lag_seconds, config_file_options.replication_lag_critical); lag_seconds,
lag_seconds,
config_file_options.replication_lag_warning,
config_file_options.replication_lag_critical);
break; break;
case OM_TEXT: case OM_TEXT:
appendPQExpBuffer( appendPQExpBuffer(
&details, &details,
"%i seconds, threshold: %i)", "%i seconds, critical threshold: %i)",
lag_seconds, config_file_options.replication_lag_critical); lag_seconds, config_file_options.replication_lag_critical);
break; break;
@@ -1072,13 +1079,16 @@ do_node_check_replication_lag(PGconn *conn, OutputMode mode, t_node_info *node_i
case OM_NAGIOS: case OM_NAGIOS:
appendPQExpBuffer( appendPQExpBuffer(
&details, &details,
"%i seconds (warning: %i)", "%i seconds | lag=%i;%i;%i",
lag_seconds, config_file_options.replication_lag_warning); lag_seconds,
lag_seconds,
config_file_options.replication_lag_warning,
config_file_options.replication_lag_critical);
break; break;
case OM_TEXT: case OM_TEXT:
appendPQExpBuffer( appendPQExpBuffer(
&details, &details,
"%i seconds, threshold: %i)", "%i seconds, warning threshold: %i)",
lag_seconds, config_file_options.replication_lag_warning); lag_seconds, config_file_options.replication_lag_warning);
break; break;
@@ -1118,6 +1128,14 @@ do_node_check_replication_lag(PGconn *conn, OutputMode mode, t_node_info *node_i
lag_seconds); lag_seconds);
break; break;
case OM_NAGIOS: case OM_NAGIOS:
appendPQExpBuffer(
&details,
"%i seconds | lag=%i;%i;%i",
lag_seconds,
lag_seconds,
config_file_options.replication_lag_warning,
config_file_options.replication_lag_critical);
break;
case OM_TEXT: case OM_TEXT:
appendPQExpBuffer( appendPQExpBuffer(
&details, &details,
@@ -1177,6 +1195,7 @@ do_node_check_downstream(PGconn *conn, OutputMode mode, CheckStatusList *list_ou
int missing_nodes_count = 0; int missing_nodes_count = 0;
CheckStatus status = CHECK_STATUS_OK; CheckStatus status = CHECK_STATUS_OK;
ItemList missing_nodes = { NULL, NULL }; ItemList missing_nodes = { NULL, NULL };
ItemList attached_nodes = { NULL, NULL };
PQExpBufferData details; PQExpBufferData details;
initPQExpBuffer(&details); initPQExpBuffer(&details);
@@ -1193,6 +1212,13 @@ do_node_check_downstream(PGconn *conn, OutputMode mode, CheckStatusList *list_ou
cell->node_info->node_name, cell->node_info->node_name,
cell->node_info->node_id); cell->node_info->node_id);
} }
else
{
item_list_append_format(&attached_nodes,
"%s (ID: %i)",
cell->node_info->node_name,
cell->node_info->node_id);
}
} }
if (missing_nodes_count == 0) if (missing_nodes_count == 0)
@@ -1220,10 +1246,8 @@ do_node_check_downstream(PGconn *conn, OutputMode mode, CheckStatusList *list_ou
missing_nodes_count, missing_nodes_count,
downstream_nodes.node_count); downstream_nodes.node_count);
if (mode == OM_NAGIOS) if (mode != OM_NAGIOS)
appendPQExpBuffer( {
&details, " (missing: ");
else
appendPQExpBuffer( appendPQExpBuffer(
&details, "; missing: "); &details, "; missing: ");
@@ -1241,18 +1265,57 @@ do_node_check_downstream(PGconn *conn, OutputMode mode, CheckStatusList *list_ou
&details, &details,
"%s", missing_cell->string); "%s", missing_cell->string);
} }
}
if (mode == OM_NAGIOS)
appendPQExpBufferChar(
&details, ')');
} }
switch (mode) switch (mode)
{ {
case OM_NAGIOS: case OM_NAGIOS:
printf("REPMGR_DOWNSTREAM_SERVERS %s: %s\n", {
printf("REPMGR_DOWNSTREAM_SERVERS %s: %s | ",
output_check_status(status), output_check_status(status),
details.data); details.data);
if (missing_nodes_count)
{
ItemListCell *missing_cell = NULL;
bool first = true;
printf("missing: ");
for (missing_cell = missing_nodes.head; missing_cell; missing_cell = missing_cell->next)
{
if (first == false)
printf(", ");
else
first = false;
if (first == false)
printf("%s", missing_cell->string);
}
}
if (downstream_nodes.node_count - missing_nodes_count)
{
ItemListCell *attached_cell = NULL;
bool first = true;
if (missing_nodes_count)
printf("; ");
printf("attached: ");
for (attached_cell = attached_nodes.head; attached_cell; attached_cell = attached_cell->next)
{
if (first == false)
printf(", ");
else
first = false;
if (first == false)
printf("%s", attached_cell->string);
}
}
printf("\n");
}
break; break;
case OM_TEXT: case OM_TEXT:
if (list_output != NULL) if (list_output != NULL)