diff --git a/src/libs/zbxalerter/alert_manager.c b/src/libs/zbxalerter/alert_manager.c index 88597d55d8d..facfb8cc96b 100644 --- a/src/libs/zbxalerter/alert_manager.c +++ b/src/libs/zbxalerter/alert_manager.c @@ -1116,10 +1116,18 @@ static int mediatype_params_macro_resolv(zbx_macro_resolv_data_t *p, va_list arg if (0 == p->indexed) { if (0 == strcmp(p->macro, MVAR_ALERT_SUBJECT)) + { *replace_to = zbx_strdup(*replace_to, subject); +zabbix_log(LOG_LEVEL_DEBUG, "Andris1: %s(): replaced MVAR_ALERT_SUBJECT with:%s", __func__, *replace_to); + } else if (0 == strcmp(p->macro, MVAR_ALERT_MESSAGE)) + { *replace_to = zbx_strdup(*replace_to, message); +zabbix_log(LOG_LEVEL_DEBUG, "Andris2: %s(): replaced MVAR_ALERT_MESSAGE:%s", __func__, *replace_to); + } } + else +zabbix_log(LOG_LEVEL_DEBUG, "Andris3: %s(): replace nothing", __func__, *replace_to); return SUCCEED; } @@ -1156,6 +1164,7 @@ static char *am_substitute_mediatype_params(const char *mediatype_params, const zbx_json_free(&json); } +zabbix_log(LOG_LEVEL_DEBUG, "Andris4: %s(): returning alert_params:%s", __func__, alert_params); return alert_params; } @@ -1202,6 +1211,7 @@ static void am_queue_watchdog_alerts(zbx_am_t *manager, const zbx_db_config_t *d alert_params = am_substitute_mediatype_params(media->mediatype_params, alert_subject, alert_message); +zabbix_log(LOG_LEVEL_DEBUG, "Andris5: %s(): callling am_create_alert() with alert_params:%s", __func__, alert_params); alert = am_create_alert(0, media->mediatypeid, 0, 0, 0, media->sendto, alert_subject, shared_str_new(alert_message), alert_params, mediatype->message_format, 0, 0, 0); @@ -1385,6 +1395,7 @@ static void am_sync_watchdog(zbx_am_t *manager, zbx_am_media_t **medias, int med media->mediatype_type = medias[i]->mediatype_type; ZBX_UPDATE_STR(media->mediatype_params, medias[i]->mediatype_params); +zabbix_log(LOG_LEVEL_DEBUG, "Andris6: %s(): media->mediatype_params:%s", __func__, media->mediatype_params); zbx_am_mediatype_t *mediatype = am_get_mediatype(manager, media->mediatypeid); if (SMTP_AUTHENTICATION_OAUTH == mediatype->smtp_authentication) diff --git a/src/libs/zbxalerter/alert_syncer.c b/src/libs/zbxalerter/alert_syncer.c index 8e694d33096..7004030d365 100644 --- a/src/libs/zbxalerter/alert_syncer.c +++ b/src/libs/zbxalerter/alert_syncer.c @@ -938,6 +938,7 @@ static void get_mediatype_params(zbx_uint64_t mediatypeid, int mediatype_type, c zbx_db_free_result(result); *params = zbx_strdup(NULL, json.buffer); +zabbix_log(LOG_LEVEL_DEBUG, "Andris7: %s(): *params:%s", __func__, *params); zbx_json_free(&json); } @@ -992,6 +993,7 @@ static void am_db_update_watchdog(zbx_am_db_t *amdb, uint64_t alert_usrgrpid) get_mediatype_params(media->mediatypeid, media->mediatype_type, &media->mediatype_params); +zabbix_log(LOG_LEVEL_DEBUG, "Andris8: %s(): media->mediatype_params:%s", __func__, media->mediatype_params); zbx_vector_am_media_ptr_append(&medias, media); zbx_vector_uint64_append(&mediatypeids, media->mediatypeid); } diff --git a/src/libs/zbxalerter/alerter_protocol.c b/src/libs/zbxalerter/alerter_protocol.c index 7b39482a626..ecd297d8320 100644 --- a/src/libs/zbxalerter/alerter_protocol.c +++ b/src/libs/zbxalerter/alerter_protocol.c @@ -663,6 +663,7 @@ zbx_uint32_t zbx_alerter_serialize_medias(unsigned char **data, zbx_am_media_t * ptr += zbx_serialize_str(ptr, media->sendto, sendto_len); ptr += zbx_serialize_value(ptr, media->mediatype_type); (void)zbx_serialize_str(ptr, media->mediatype_params, params_len); +zabbix_log(LOG_LEVEL_DEBUG, "Andris9: %s(): media->mediatype_params:%s", __func__, media->mediatype_params); data_offset += data_len; } @@ -695,6 +696,7 @@ void zbx_alerter_deserialize_medias(const unsigned char *data, zbx_am_media_t ** data += zbx_deserialize_value(data, &media->mediatype_type); data += zbx_deserialize_str(data, &media->mediatype_params, len); +zabbix_log(LOG_LEVEL_DEBUG, "Andris10: %s(): media->mediatype_params:%s", __func__, media->mediatype_params); (*medias)[i] = media; } }