diff options
| author | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2022-01-05 00:50:10 +0300 |
|---|---|---|
| committer | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2022-01-05 00:50:10 +0300 |
| commit | 9d822c6f5ead1480d71f3e4d8b31fa2a9391020b (patch) | |
| tree | 6ed3e6693afcd38fc32da689f0168d87cf709d4b /src/zabbix_server | |
| parent | 729a48cff3694ccaa49ef292adb5913894de8c9a (diff) | |
.......... [DEV-2051] removed functions names from the function comments
Diffstat (limited to 'src/zabbix_server')
69 files changed, 0 insertions, 1962 deletions
diff --git a/src/zabbix_server/actions.c b/src/zabbix_server/actions.c index c2b05b2afb0..2a44dd44027 100644 --- a/src/zabbix_server/actions.c +++ b/src/zabbix_server/actions.c @@ -32,8 +32,6 @@ /****************************************************************************** * * - * Function: compare_events * - * * * Purpose: compare events by objectid * * * * Parameters: d1 - [IN] event structure to compare to d2 * @@ -56,8 +54,6 @@ static int compare_events(const void *d1, const void *d2) /****************************************************************************** * * - * Function: add_condition_match * - * * * Purpose: save eventids that match condition * * * * Parameters: esc_events - [IN] events to check * @@ -103,8 +99,6 @@ static void add_condition_match(const zbx_vector_ptr_t *esc_events, zbx_conditio /****************************************************************************** * * - * Function: get_object_ids * - * * * Purpose: get objectids of escalation events * * * * Parameters: esc_events [IN] - events to check * @@ -130,8 +124,6 @@ static void get_object_ids(const zbx_vector_ptr_t *esc_events, zbx_vector_uint64 /****************************************************************************** * * - * Function: check_host_group_condition * - * * * Purpose: check host group condition * * * * Parameters: esc_events - [IN] events to check * @@ -216,8 +208,6 @@ static int check_host_group_condition(const zbx_vector_ptr_t *esc_events, zbx_co /****************************************************************************** * * - * Function: trigger_parents_sql_alloc * - * * * Purpose: mapping between discovered triggers and their prototypes * * * * Parameters: sql [IN/OUT] - allocated sql query * @@ -241,8 +231,6 @@ static void trigger_parents_sql_alloc(char **sql, size_t *sql_alloc, zbx_vector_ /****************************************************************************** * * - * Function: objectids_to_pair * - * * * Purpose: copy objects to pair, for hierarchy checks * * * * Parameters: objectids [IN] - objects * @@ -265,8 +253,6 @@ static void objectids_to_pair(zbx_vector_uint64_t *objectids, zbx_vector_uint64_ /****************************************************************************** * * - * Function: check_object_hierarchy * - * * * Purpose: there can be multiple levels of templates, that need * * resolving in order to compare to condition * * * @@ -404,8 +390,6 @@ static void check_object_hierarchy(int object, const zbx_vector_ptr_t *esc_event /****************************************************************************** * * - * Function: check_host_template_condition * - * * * Purpose: check host template condition * * * * Parameters: esc_events - [IN] events to check * @@ -470,8 +454,6 @@ static int check_host_template_condition(const zbx_vector_ptr_t *esc_events, zbx /****************************************************************************** * * - * Function: check_host_condition * - * * * Purpose: check host condition * * * * Parameters: esc_events - [IN] events to check * @@ -534,8 +516,6 @@ static int check_host_condition(const zbx_vector_ptr_t *esc_events, zbx_conditio /****************************************************************************** * * - * Function: check_trigger_id_condition * - * * * Purpose: check trigger id condition * * * * Parameters: esc_events - [IN] events to check * @@ -594,8 +574,6 @@ static int check_trigger_id_condition(const zbx_vector_ptr_t *esc_events, zbx_co /****************************************************************************** * * - * Function: check_trigger_name_condition * - * * * Purpose: check trigger name condition * * * * Parameters: esc_events - [IN] events to check * @@ -635,8 +613,6 @@ static int check_trigger_name_condition(const zbx_vector_ptr_t *esc_events, zbx_ /****************************************************************************** * * - * Function: check_trigger_severity_condition * - * * * Purpose: check trigger severity condition * * * * Parameters: esc_events - [IN] events to check * @@ -686,8 +662,6 @@ static int check_trigger_severity_condition(const zbx_vector_ptr_t *esc_events, /****************************************************************************** * * - * Function: check_time_period_condition * - * * * Purpose: check time period condition * * * * Parameters: esc_events - [IN] events to check * @@ -824,8 +798,6 @@ static int check_acknowledged_condition(const zbx_vector_ptr_t *esc_events, zbx_ /****************************************************************************** * * - * Function: check_condition_event_tag * - * * * Purpose: check condition event tag * * * * Parameters: esc_events - [IN] events to check * @@ -863,8 +835,6 @@ static void check_condition_event_tag(const zbx_vector_ptr_t *esc_events, zbx_co /****************************************************************************** * * - * Function: check_condition_event_tag_value * - * * * Purpose: check condition event tag value * * * * Parameters: esc_events - [IN] events to check * @@ -903,8 +873,6 @@ static void check_condition_event_tag_value(const zbx_vector_ptr_t *esc_events, /****************************************************************************** * * - * Function: check_trigger_condition * - * * * Purpose: check if event matches single condition * * * * Parameters: event - trigger event to check * @@ -976,8 +944,6 @@ static void check_trigger_condition(const zbx_vector_ptr_t *esc_events, zbx_cond /****************************************************************************** * * - * Function: get_object_ids_discovery * - * * * Purpose: get objectids for dhost * * * * Parameters: esc_events - [IN] events to check * @@ -1005,8 +971,6 @@ static void get_object_ids_discovery(const zbx_vector_ptr_t *esc_events, zbx_vec } /****************************************************************************** * * - * Function: check_drule_condition * - * * * Purpose: check discovery rule condition * * * * Parameters: esc_events - [IN] events to check * @@ -1103,8 +1067,6 @@ static int check_drule_condition(const zbx_vector_ptr_t *esc_events, zbx_conditi /****************************************************************************** * * - * Function: check_dcheck_condition * - * * * Purpose: check discovery check condition * * * * Parameters: esc_events - [IN] events to check * @@ -1178,8 +1140,6 @@ static int check_dcheck_condition(const zbx_vector_ptr_t *esc_events, zbx_condit /****************************************************************************** * * - * Function: check_dobject_condition * - * * * Purpose: check discovery object condition * * * * Parameters: esc_events - [IN] events to check * @@ -1210,8 +1170,6 @@ static int check_dobject_condition(const zbx_vector_ptr_t *esc_events, zbx_condi /****************************************************************************** * * - * Function: check_proxy_condition * - * * * Purpose: check proxy condition for discovery event * * * * Parameters: esc_events - [IN] events to check * @@ -1304,8 +1262,6 @@ static int check_proxy_condition(const zbx_vector_ptr_t *esc_events, zbx_conditi /****************************************************************************** * * - * Function: check_dvalue_condition * - * * * Purpose: check discovery value condition * * * * Parameters: esc_events - [IN] events to check * @@ -1407,8 +1363,6 @@ static int check_dvalue_condition(const zbx_vector_ptr_t *esc_events, zbx_condit /****************************************************************************** * * - * Function: check_dhost_ip_condition * - * * * Purpose: check host ip condition for discovery event * * * * Parameters: esc_events - [IN] events to check * @@ -1498,8 +1452,6 @@ static int check_dhost_ip_condition(const zbx_vector_ptr_t *esc_events, zbx_cond /****************************************************************************** * * - * Function: check_dservice_type_condition * - * * * Purpose: check service type condition for discovery event * * * * Parameters: esc_events - [IN] events to check * @@ -1580,8 +1532,6 @@ static int check_dservice_type_condition(const zbx_vector_ptr_t *esc_events, zbx /****************************************************************************** * * - * Function: check_dstatus_condition * - * * * Purpose: check discovery status condition * * * * Parameters: esc_events - [IN] events to check * @@ -1620,8 +1570,6 @@ static int check_dstatus_condition(const zbx_vector_ptr_t *esc_events, zbx_condi /****************************************************************************** * * - * Function: check_duptime_condition * - * * * Purpose: check uptime condition for discovery * * * * Parameters: esc_events - [IN] events to check * @@ -1716,8 +1664,6 @@ static int check_duptime_condition(const zbx_vector_ptr_t *esc_events, zbx_condi /****************************************************************************** * * - * Function: check_dservice_port_condition * - * * * Purpose: check service port condition for discovery * * * * Parameters: esc_events - [IN] events to check * @@ -1792,8 +1738,6 @@ static int check_dservice_port_condition(const zbx_vector_ptr_t *esc_events, zbx /****************************************************************************** * * - * Function: check_discovery_condition * - * * * Purpose: check if event matches single condition * * * * Parameters: event - discovery event to check * @@ -1860,8 +1804,6 @@ static void check_discovery_condition(const zbx_vector_ptr_t *esc_events, zbx_co /****************************************************************************** * * - * Function: check_hostname_metadata_condition * - * * * Purpose: check metadata or host condition for auto registration * * * * Parameters: esc_events - [IN] events to check * @@ -1947,8 +1889,6 @@ static int check_hostname_metadata_condition(const zbx_vector_ptr_t *esc_events, /****************************************************************************** * * - * Function: check_areg_proxy_condition * - * * * Purpose: check proxy condition for auto registration * * * * Parameters: esc_events - [IN] events to check * @@ -2017,8 +1957,6 @@ static int check_areg_proxy_condition(const zbx_vector_ptr_t *esc_events, zbx_co /****************************************************************************** * * - * Function: check_autoregistration_condition * - * * * Purpose: check if event matches single condition * * * * Parameters: event - autoregistration event to check * @@ -2063,8 +2001,6 @@ static void check_autoregistration_condition(const zbx_vector_ptr_t *esc_events, /****************************************************************************** * * - * Function: is_supported_event_object * - * * * Purpose: not all event objects are supported for internal events * * * * Parameters: events - [IN] events to check * @@ -2081,8 +2017,6 @@ static int is_supported_event_object(const DB_EVENT *event) /****************************************************************************** * * - * Function: check_intern_event_type_condition * - * * * Purpose: check event type condition for internal events * * * * Parameters: esc_events - [IN] events to check * @@ -2135,8 +2069,6 @@ static int check_intern_event_type_condition(const zbx_vector_ptr_t *esc_events, /****************************************************************************** * * - * Function: get_object_ids_internal * - * * * Purpose: get objectids of escalation internal events * * * * Parameters: esc_events - [IN] events to check * @@ -2175,8 +2107,6 @@ static void get_object_ids_internal(const zbx_vector_ptr_t *esc_events, zbx_vect /****************************************************************************** * * - * Function: check_intern_host_group_condition * - * * * Purpose: check host group condition for internal events * * * * Parameters: esc_events - [IN] events to check * @@ -2292,8 +2222,6 @@ static int check_intern_host_group_condition(const zbx_vector_ptr_t *esc_events, /****************************************************************************** * * - * Function: item_parents_sql_alloc * - * * * Purpose: get parent id from item discovery * * * * Parameters: sql [IN/OUT] - allocated sql query * @@ -2320,8 +2248,6 @@ static void item_parents_sql_alloc(char **sql, size_t *sql_alloc, zbx_vector_uin /****************************************************************************** * * - * Function: check_intern_host_template_condition * - * * * Purpose: check host template condition for internal events * * * * Parameters: esc_events - [IN] events to check * @@ -2415,8 +2341,6 @@ static int check_intern_host_template_condition(const zbx_vector_ptr_t *esc_even /****************************************************************************** * * - * Function: check_intern_host_condition * - * * * Purpose: check host condition for internal events * * * * Parameters: esc_events - [IN] events to check * @@ -2514,8 +2438,6 @@ static int check_intern_host_condition(const zbx_vector_ptr_t *esc_events, zbx_c /****************************************************************************** * * - * Function: check_internal_condition * - * * * Purpose: check if internal event matches single condition * * * * Parameters: event - [IN] trigger event to check * @@ -2569,8 +2491,6 @@ static void check_internal_condition(const zbx_vector_ptr_t *esc_events, zbx_con /****************************************************************************** * * - * Function: check_events_condition * - * * * Purpose: check if multiple events matches single condition * * * * Parameters: esc_events - [IN] events to check * @@ -2611,8 +2531,6 @@ static void check_events_condition(const zbx_vector_ptr_t *esc_events, unsigned /****************************************************************************** * * - * Function: check_action_condition * - * * * Purpose: check if event matches single condition * * * * Parameters: event - event to check * @@ -2649,8 +2567,6 @@ int check_action_condition(const DB_EVENT *event, zbx_condition_t *condition) /****************************************************************************** * * - * Function: check_action_conditions * - * * * Purpose: check if action have to be processed for the event * * (check all conditions of the action) * * * @@ -2758,8 +2674,6 @@ clean: /****************************************************************************** * * - * Function: execute_operations * - * * * Purpose: execute host, group, template operations linked to the action * * * * Parameters: action - action to execute operations for * @@ -2916,8 +2830,6 @@ zbx_escalation_new_t; /****************************************************************************** * * - * Function: is_recovery_event * - * * * Purpose: checks if the event is recovery event * * * * Parameters: event - [IN] the event to check * @@ -2957,8 +2869,6 @@ static int is_recovery_event(const DB_EVENT *event) /****************************************************************************** * * - * Function: is_escalation_event * - * * * Purpose: to determine if event needs condition checks * * * * Parameters: event - [IN] event to validate * @@ -2984,8 +2894,6 @@ static int is_escalation_event(const DB_EVENT *event) /****************************************************************************** * * - * Function: uniq_conditions_compare_func * - * * * Purpose: compare to find equal conditions * * * * Parameters: d1 - [IN] condition structure to compare to d2 * @@ -3014,8 +2922,6 @@ static int uniq_conditions_compare_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: uniq_conditions_hash_func * - * * * Purpose: generate hash based on condition values * * * * Parameters: data - [IN] condition structure * @@ -3039,8 +2945,6 @@ static zbx_hash_t uniq_conditions_hash_func(const void *data) /****************************************************************************** * * - * Function: get_escalation_events * - * * * Purpose: add events that have escalation possible and skip others, also * * adds according to source * * * @@ -3064,8 +2968,6 @@ static void get_escalation_events(const zbx_vector_ptr_t *events, zbx_vector_ptr /****************************************************************************** * * - * Function: db_condition_clean * - * * * Purpose: cleans condition data structure * * * * Parameters: condition - [IN] the condition data to free * @@ -3080,8 +2982,6 @@ static void db_condition_clean(zbx_condition_t *condition) /****************************************************************************** * * - * Function: zbx_conditions_eval_clean * - * * * Purpose: cleans condition data structures from hashset * * * * Parameters: uniq_conditions - [IN] hashset with data structures to clean * @@ -3100,8 +3000,6 @@ static void conditions_eval_clean(zbx_hashset_t *uniq_conditions) /****************************************************************************** * * - * Function: zbx_action_eval_free * - * * * Purpose: frees action evaluation data structure * * * * Parameters: action - [IN] the action evaluation to free * @@ -3118,8 +3016,6 @@ static void zbx_action_eval_free(zbx_action_eval_t *action) /****************************************************************************** * * - * Function: prepare_actions_conditions_eval * - * * * Purpose: make actions to point, to conditions from hashset, where all * * conditions are unique, this ensures that we don't double check * * same conditions. * @@ -3187,8 +3083,6 @@ static void prepare_actions_conditions_eval(zbx_vector_ptr_t *actions, zbx_hashs /****************************************************************************** * * - * Function: process_actions * - * * * Purpose: process all actions of each event in a list * * * * Parameters: events - [IN] events to apply actions for * @@ -3412,8 +3306,6 @@ void process_actions(const zbx_vector_ptr_t *events, const zbx_vector_uint64_pai /****************************************************************************** * * - * Function: process_actions_by_acknowledgements * - * * * Purpose: process actions for each acknowledgement in the array * * * * Parameters: event_ack - [IN] vector for eventid/ackid pairs * @@ -3575,8 +3467,6 @@ out: /****************************************************************************** * * - * Function: get_actions_info * - * * * Purpose: reads actions from database * * * * Parameters: actionids - [IN] requested action ids * diff --git a/src/zabbix_server/alerter/alert_manager.c b/src/zabbix_server/alerter/alert_manager.c index 40b6cb04629..4e1d029a626 100644 --- a/src/zabbix_server/alerter/alert_manager.c +++ b/src/zabbix_server/alerter/alert_manager.c @@ -354,8 +354,6 @@ static void shared_str_release(zbx_shared_str_t str) /****************************************************************************** * * - * Function: am_dispatch_free * - * * ******************************************************************************/ static void am_dispatch_free(zbx_am_dispatch_t *dispatch) { @@ -369,8 +367,6 @@ static void am_dispatch_free(zbx_am_dispatch_t *dispatch) /****************************************************************************** * * - * Function: am_get_mediatype * - * * * Purpose: gets media type object * * * * Parameters: manager - [IN] the alert manager * @@ -386,8 +382,6 @@ static zbx_am_mediatype_t *am_get_mediatype(zbx_am_t *manager, zbx_uint64_t medi /****************************************************************************** * * - * Function: zbx_am_update_webhook * - * * * Purpose: updates additional webhook media type fields * * * ******************************************************************************/ @@ -420,8 +414,6 @@ static void zbx_am_update_webhook(zbx_am_t *manager, zbx_am_mediatype_t *mediaty /****************************************************************************** * * - * Function: am_update_mediatype * - * * * Purpose: updates media type object, creating one if necessary * * * * Parameters: manager - [IN] the alert manager * @@ -493,8 +485,6 @@ static void am_update_mediatype(zbx_am_t *manager, zbx_uint64_t mediatypeid, uns /****************************************************************************** * * - * Function: am_push_mediatype * - * * * Purpose: pushes media type into manager media type queue * * * * Parameters: manager - [IN] the alert manager * @@ -528,8 +518,6 @@ static void am_push_mediatype(zbx_am_t *manager, zbx_am_mediatype_t *mediatype) /****************************************************************************** * * - * Function: am_pop_mediatype * - * * * Purpose: gets the next media type from queue * * * * Parameters: manager - [IN] the alert manager * @@ -556,8 +544,6 @@ static zbx_am_mediatype_t *am_pop_mediatype(zbx_am_t *manager) /****************************************************************************** * * - * Function: am_remove_mediatype * - * * ******************************************************************************/ static void am_remove_mediatype(zbx_am_t *manager, zbx_am_mediatype_t *mediatype) { @@ -581,8 +567,6 @@ static void am_remove_mediatype(zbx_am_t *manager, zbx_am_mediatype_t *mediatype /****************************************************************************** * * - * Function: am_release_mediatype * - * * ******************************************************************************/ static int am_release_mediatype(zbx_am_t *manager, zbx_am_mediatype_t *mediatype) { @@ -597,8 +581,6 @@ static int am_release_mediatype(zbx_am_t *manager, zbx_am_mediatype_t *mediatype /****************************************************************************** * * - * Function: am_calc_alertpoolid * - * * * Purpose: calculate alert pool id from event source, object and objectid * * * * Parameters: source - [IN] the event source * @@ -629,8 +611,6 @@ static zbx_uint64_t am_calc_alertpoolid(int source, int object, zbx_uint64_t obj /****************************************************************************** * * - * Function: am_get_alertpool * - * * * Purpose: gets alert pool object, creating one if the object with specified * * identifiers was not found * * * @@ -665,8 +645,6 @@ static zbx_am_alertpool_t *am_get_alertpool(zbx_am_t *manager, zbx_uint64_t medi /****************************************************************************** * * - * Function: am_push_alertpool * - * * * Purpose: pushes alert pool into media type alert pool queue * * * * Parameters: mediatype - [IN] the media type * @@ -694,8 +672,6 @@ static void am_push_alertpool(zbx_am_mediatype_t *mediatype, zbx_am_alertpool_t /****************************************************************************** * * - * Function: am_pop_alertpool * - * * * Purpose: gets the next alert pool from queue * * * * Parameters: mediatype - [IN] the media type * @@ -722,8 +698,6 @@ static zbx_am_alertpool_t *am_pop_alertpool(zbx_am_mediatype_t *mediatype) /****************************************************************************** * * - * Function: am_release_alertpool * - * * * Purpose: removes alert pool * * * * Parameters: manager - [IN] the alert manager * @@ -747,8 +721,6 @@ static int am_release_alertpool(zbx_am_t *manager, zbx_am_alertpool_t *alertpool /****************************************************************************** * * - * Function: am_create_alert * - * * * Purpose: creates new alert object * * * * Parameters: ... - [IN] alert data * @@ -797,8 +769,6 @@ static zbx_am_alert_t *am_create_alert(zbx_uint64_t alertid, zbx_uint64_t mediat /****************************************************************************** * * - * Function: am_copy_db_alert * - * * * Purpose: creates new alert object from db alert * * * * Parameters: db_alert - [IN] the db alert object * @@ -841,8 +811,6 @@ static zbx_am_alert_t *am_copy_db_alert(zbx_am_db_alert_t *db_alert) /****************************************************************************** * * - * Function: am_alert_free * - * * * Purpose: frees the alert object * * * * Parameters: alert - [IN] the alert object * @@ -859,8 +827,6 @@ static void am_alert_free(zbx_am_alert_t *alert) /****************************************************************************** * * - * Function: am_push_alert * - * * * Purpose: pushes alert into alert pool alert queue * * * * Parameters: alertpool - [IN] the alert pool * @@ -876,8 +842,6 @@ static void am_push_alert(zbx_am_alertpool_t *alertpool, zbx_am_alert_t *alert) /****************************************************************************** * * - * Function: am_pop_alert * - * * * Purpose: gets the next alert from queue * * * * Parameters: manager - [IN] the manager * @@ -912,8 +876,6 @@ static zbx_am_alert_t *am_pop_alert(zbx_am_t *manager) /****************************************************************************** * * - * Function: am_remove_alert * - * * * Purpose: removes alert and requeues associated alert pool and media type * * * * Parameters: manager - [IN] the alert manager * @@ -947,8 +909,6 @@ static void am_remove_alert(zbx_am_t *manager, zbx_am_alert_t *alert) /****************************************************************************** * * - * Function: am_retry_alert * - * * * Purpose: retries alert if there are attempts left or removes it * * * * Parameters: manager - [IN] the alert manager * @@ -993,8 +953,6 @@ out: /****************************************************************************** * * - * Function: am_alerter_free * - * * * Purpose: frees alerter * * * ******************************************************************************/ @@ -1006,8 +964,6 @@ static void am_alerter_free(zbx_am_alerter_t *alerter) /****************************************************************************** * * - * Function: am_register_alerter * - * * * Purpose: registers alerter * * * * Parameters: manager - [IN] the manager * @@ -1052,8 +1008,6 @@ static void am_register_alerter(zbx_am_t *manager, zbx_ipc_client_t *client, zbx /****************************************************************************** * * - * Function: am_get_alerter_by_client * - * * * Purpose: returns alerter by connected client * * * * Parameters: manager - [IN] the manager * @@ -1089,8 +1043,6 @@ static zbx_am_alerter_t *am_get_alerter_by_client(zbx_am_t *manager, zbx_ipc_cli /****************************************************************************** * * - * Function: am_create_db_alert_message * - * * * Purpose: get and format error message from database when it is unavailable * * * * Return value: full database error message is allocated * @@ -1131,8 +1083,6 @@ static char *am_create_db_alert_message(void) /****************************************************************************** * * - * Function: am_queue_watchdog_alerts * - * * * Purpose: queues 'database down' watchdog alerts * * * * Parameters: manager - [IN] the alert manager * @@ -1188,8 +1138,6 @@ static void am_queue_watchdog_alerts(zbx_am_t *manager) /****************************************************************************** * * - * Function: am_init * - * * * Purpose: initializes alert manager * * * * Parameters: manager - [IN] the manager to initialize * @@ -1236,8 +1184,6 @@ out: /****************************************************************************** * * - * Function: am_destroy * - * * * Purpose: destroys alert manager * * * * Parameters: manager - [IN] the manager to destroy * @@ -1276,8 +1222,6 @@ static void am_destroy(zbx_am_t *manager) /****************************************************************************** * * - * Function: am_db_update_alert * - * * * Purpose: update alert status in local cache to be flushed after reading * * new alerts from database * * * @@ -1323,8 +1267,6 @@ static void am_db_update_alert(zbx_am_t *manager, zbx_am_alert_t *alert, int sta /****************************************************************************** * * - * Function: am_external_alert_send_response * - * * * Purpose: send response to external alert request * * * * Parameters: alerter_service - [IN] the IPC service * @@ -1354,8 +1296,6 @@ static void am_external_alert_send_response(const zbx_ipc_service_t *alerter_ser /****************************************************************************** * * - * Function: am_sync_watchdog * - * * * Purpose: synchronize watchdog alert recipients * * * * Parameters: manager - [IN] the manager * @@ -1423,8 +1363,6 @@ static void am_sync_watchdog(zbx_am_t *manager, zbx_am_media_t **medias, int med /****************************************************************************** * * - * Function: am_prepare_mediatype_exec_command * - * * * Purpose: gets script media type parameters with expanded macros * * * * Parameters: mediatype - [IN] the media type * @@ -1492,8 +1430,6 @@ static int am_prepare_mediatype_exec_command(zbx_am_mediatype_t *mediatype, zbx_ /****************************************************************************** * * - * Function: am_process_alert * - * * * Purpose: sends alert to the alerter * * * * Parameters: manager - [IN] the alert manager * @@ -1607,8 +1543,6 @@ out: /****************************************************************************** * * - * Function: am_process_result * - * * * Purpose: process alerter result * * * * Parameters: manager - [IN] the manager * @@ -1684,8 +1618,6 @@ out: /****************************************************************************** * * - * Function: am_check_queue * - * * * Purpose: checks alert queue if there is an alert that should be sent now * * * * Parameters: manager - [IN] the alert manager * @@ -1728,8 +1660,6 @@ static int am_check_queue(zbx_am_t *manager, int now) /****************************************************************************** * * - * Function: am_update_mediatypes * - * * * Purpose: update cached media types * * * ******************************************************************************/ @@ -1764,8 +1694,6 @@ static void am_update_mediatypes(zbx_am_t *manager, zbx_ipc_message_t *message) /****************************************************************************** * * - * Function: am_queue_alert * - * * * Purpose: queue new alerts * * * ******************************************************************************/ @@ -1795,8 +1723,6 @@ static int am_queue_alert(zbx_am_t *manager, zbx_am_alert_t *alert, int now) /****************************************************************************** * * - * Function: am_queue_alerts * - * * * Purpose: queue new alerts * * * ******************************************************************************/ @@ -1824,8 +1750,6 @@ static void am_queue_alerts(zbx_am_t *manager, zbx_ipc_message_t *message, int n /****************************************************************************** * * - * Function: am_update_watchdog * - * * * Purpose: update 'database down' watchdog alert recipients * * * ******************************************************************************/ @@ -1844,8 +1768,6 @@ static void am_update_watchdog(zbx_am_t *manager, zbx_ipc_message_t *message) /****************************************************************************** * * - * Function: am_drop_mediatypes * - * * * Purpose: remove unused mediatypes * * * ******************************************************************************/ @@ -1873,8 +1795,6 @@ static void am_drop_mediatypes(zbx_am_t *manager, zbx_ipc_message_t *message) /****************************************************************************** * * - * Function: am_flush_results * - * * * Purpose: returns alert sending results * * * ******************************************************************************/ @@ -1926,8 +1846,6 @@ out: /****************************************************************************** * * - * Function: am_process_external_alert_request * - * * * Purpose: process external alert request * * * * Parameters: manager - [IN] the alert manager * @@ -1990,8 +1908,6 @@ static void am_process_external_alert_request(zbx_am_t *manager, zbx_uint64_t id /****************************************************************************** * * - * Function: am_process_begin_dispatch * - * * * Purpose: begin file dispatch * * * * Parameters: manager - [IN] the manager * @@ -2017,8 +1933,6 @@ static void am_process_begin_dispatch(zbx_ipc_client_t *client, const unsigned c /****************************************************************************** * * - * Function: am_prepare_dispatch_message * - * * * Purpose: prepare message to dispatch by attaching dispatch contents for * * supported media types * * * @@ -2057,8 +1971,6 @@ static void am_prepare_dispatch_message(zbx_am_dispatch_t *dispatch, DB_MEDIATYP /****************************************************************************** * * - * Function: am_process_send_dispatch * - * * * Purpose: send dispatch to the specified media type users * * * * Parameters: manager - [IN] the manager * @@ -2125,8 +2037,6 @@ out: /****************************************************************************** * * - * Function: am_process_end_dispatch * - * * * Purpose: finish sending dispatches * * * * Parameters: client - [IN] the connected worker IPC client * @@ -2147,8 +2057,6 @@ static void am_process_end_dispatch(zbx_ipc_client_t *client) /****************************************************************************** * * - * Function: am_remove_unused_mediatypes * - * * * Purpose: remove unused media types * * * ******************************************************************************/ @@ -2167,8 +2075,6 @@ static void am_remove_unused_mediatypes(zbx_am_t *manager) /****************************************************************************** * * - * Function: am_process_diag_stats * - * * * Purpose: process diagnostic statistics request * * * ******************************************************************************/ @@ -2184,8 +2090,6 @@ static void am_process_diag_stats(zbx_am_t *manager, zbx_ipc_client_t *client) /****************************************************************************** * * - * Function: am_compare_mediatype_by_alerts_desc * - * * * Purpose: compare mediatypes by total queued alerts * * * ******************************************************************************/ @@ -2199,8 +2103,6 @@ static int am_compare_mediatype_by_alerts_desc(const void *d1, const void *d2) /****************************************************************************** * * - * Function: am_process_diag_top_mediatypes * - * * * Purpose: processes top mediatypes by queued alerts * * * * Parameters: manager - [IN] the manager * @@ -2274,8 +2176,6 @@ static int am_source_compare_func(const void *d1, const void *d2) } /****************************************************************************** * * - * Function: am_process_diag_top_sources * - * * * Purpose: processes top alert sources by queued alerts * * * * Parameters: manager - [IN] the manager * diff --git a/src/zabbix_server/alerter/alert_syncer.c b/src/zabbix_server/alerter/alert_syncer.c index e022224f727..9ef0265f26c 100644 --- a/src/zabbix_server/alerter/alert_syncer.c +++ b/src/zabbix_server/alerter/alert_syncer.c @@ -53,8 +53,6 @@ zbx_am_db_t; /****************************************************************************** * * - * Function: am_db_create_alert * - * * * Purpose: creates new alert object * * * * Parameters: ... - [IN] alert data * @@ -90,8 +88,6 @@ static zbx_am_db_alert_t *am_db_create_alert(zbx_uint64_t alertid, zbx_uint64_t /****************************************************************************** * * - * Function: am_db_init * - * * ******************************************************************************/ static int am_db_init(zbx_am_db_t *amdb, char **error) { @@ -105,8 +101,6 @@ static int am_db_init(zbx_am_db_t *amdb, char **error) /****************************************************************************** * * - * Function: am_db_clear * - * * ******************************************************************************/ static void am_db_clear(zbx_am_db_t *amdb) { @@ -122,8 +116,6 @@ static void am_db_clear(zbx_am_db_t *amdb) /****************************************************************************** * * - * Function: am_db_get_alerts * - * * * Purpose: reads the new alerts from database * * * * Parameters: alerts - [OUT] the new alerts * @@ -254,8 +246,6 @@ static int am_db_get_alerts(zbx_vector_ptr_t *alerts) /****************************************************************************** * * - * Function: am_db_update_mediatype * - * * * Purpose: updates media type object, creating one if necessary * * * * Return value: Updated mediatype or NULL, if the cached media was up to * @@ -315,8 +305,6 @@ static zbx_am_db_mediatype_t *am_db_update_mediatype(zbx_am_db_t *amdb, time_t n /****************************************************************************** * * - * Function: am_db_update_mediatypes * - * * * Purpose: updates alert manager media types * * * * Parameters: amdb - [IN] the alert manager cache * @@ -388,8 +376,6 @@ static void am_db_update_mediatypes(zbx_am_db_t *amdb, const zbx_uint64_t *media /****************************************************************************** * * - * Function: am_db_queue_alerts * - * * * Purpose: reads alerts/mediatypes from database and queues them in alert * * manager * * * @@ -504,8 +490,6 @@ static void event_tags_free(zbx_event_tags_t *event_tags) /****************************************************************************** * * - * Function: am_db_update_event_tags * - * * * Purpose: adds event tags to sql query * * * * Parameters: eventid - [IN] problem_tag update db event * @@ -604,8 +588,6 @@ out: /****************************************************************************** * * - * Function: am_db_validate_tags_for_update * - * * * Purpose: removes duplicate event tags and checks if problem tags need to * * be updated * * * @@ -692,8 +674,6 @@ static void am_service_add_event_tags(zbx_vector_events_tags_t *events_tags) /****************************************************************************** * * - * Function: am_db_flush_results * - * * * Purpose: retrieves alert updates from alert manager and flushes them into * * database * * * @@ -816,8 +796,6 @@ static int am_db_flush_results(zbx_am_db_t *amdb) } /****************************************************************************** * * - * Function: am_db_remove_expired_mediatypes * - * * * Purpose: removes cached media types used more than a day ago * * * * Parameters: amdb - [IN] the alert manager cache * @@ -864,8 +842,6 @@ static void am_db_remove_expired_mediatypes(zbx_am_db_t *amdb) /****************************************************************************** * * - * Function: am_db_update_watchdog * - * * * Purpose: updates watchdog recipients * * * * Parameters: amdb - [IN] the alert manager cache * diff --git a/src/zabbix_server/alerter/alerter.c b/src/zabbix_server/alerter/alerter.c index 346d094d6ae..099c6fc264a 100644 --- a/src/zabbix_server/alerter/alerter.c +++ b/src/zabbix_server/alerter/alerter.c @@ -44,8 +44,6 @@ static zbx_es_t es_engine; /****************************************************************************** * * - * Function: execute_script_alert * - * * * Purpose: execute script alert type * * * ******************************************************************************/ @@ -66,8 +64,6 @@ static int execute_script_alert(const char *command, char *error, size_t max_err /****************************************************************************** * * - * Function: alerter_register * - * * * Purpose: registers alerter with alert manager * * * * Parameters: socket - [IN] the connections socket * @@ -84,8 +80,6 @@ static void alerter_register(zbx_ipc_socket_t *socket) /****************************************************************************** * * - * Function: alerter_send_result * - * * * Purpose: sends alert sending result to alert manager * * * * Parameters: socket - [IN] the connections socket * @@ -108,8 +102,6 @@ static void alerter_send_result(zbx_ipc_socket_t *socket, const char *value, int /****************************************************************************** * * - * Function: create_email_inreplyto * - * * * Purpose: create email In-Reply_To field value to group related messages * * * ******************************************************************************/ @@ -142,8 +134,6 @@ static char *create_email_inreplyto(zbx_uint64_t mediatypeid, const char *sendto /****************************************************************************** * * - * Function: alerter_process_email * - * * * Purpose: processes email alert * * * * Parameters: socket - [IN] the connections socket * @@ -185,8 +175,6 @@ static void alerter_process_email(zbx_ipc_socket_t *socket, zbx_ipc_message_t *i /****************************************************************************** * * - * Function: alerter_process_sms * - * * * Purpose: processes SMS alert * * * * Parameters: socket - [IN] the connections socket * @@ -214,8 +202,6 @@ static void alerter_process_sms(zbx_ipc_socket_t *socket, zbx_ipc_message_t *ipc /****************************************************************************** * * - * Function: alerter_process_exec * - * * * Purpose: processes script alert * * * * Parameters: socket - [IN] the connections socket * @@ -240,8 +226,6 @@ static void alerter_process_exec(zbx_ipc_socket_t *socket, zbx_ipc_message_t *ip /****************************************************************************** * * - * Function: alerter_process_webhook * - * * * Purpose: processes webhook alert * * * * Parameters: socket - [IN] the connections socket * @@ -297,8 +281,6 @@ static void alerter_process_webhook(zbx_ipc_socket_t *socket, zbx_ipc_message_t /****************************************************************************** * * - * Function: main_alerter_loop * - * * * Purpose: periodically check table alerts and send notifications if needed * * * * Author: Alexei Vladishev * diff --git a/src/zabbix_server/alerter/alerter_protocol.c b/src/zabbix_server/alerter/alerter_protocol.c index f359e3575fa..ad4619e4c54 100644 --- a/src/zabbix_server/alerter/alerter_protocol.c +++ b/src/zabbix_server/alerter/alerter_protocol.c @@ -44,8 +44,6 @@ void zbx_am_db_mediatype_clear(zbx_am_db_mediatype_t *mediatype) /****************************************************************************** * * - * Function: zbx_am_db_alert_free * - * * * Purpose: frees the alert object * * * * Parameters: alert - [IN] the alert object * @@ -772,8 +770,6 @@ void zbx_alerter_deserialize_ids(const unsigned char *data, zbx_uint64_t **ids, /****************************************************************************** * * - * Function: zbx_alerter_serialize_diag_stats * - * * ******************************************************************************/ zbx_uint32_t zbx_alerter_serialize_diag_stats(unsigned char **data, zbx_uint64_t alerts_num) { @@ -788,8 +784,6 @@ zbx_uint32_t zbx_alerter_serialize_diag_stats(unsigned char **data, zbx_uint64_t /****************************************************************************** * * - * Function: zbx_alerter_deserialize_diag_stats * - * * ******************************************************************************/ static void zbx_alerter_deserialize_diag_stats(const unsigned char *data, zbx_uint64_t *alerts_num) { @@ -798,8 +792,6 @@ static void zbx_alerter_deserialize_diag_stats(const unsigned char *data, zbx_ui /****************************************************************************** * * - * Function: zbx_alerter_serialize_top_request * - * * ******************************************************************************/ static zbx_uint32_t zbx_alerter_serialize_top_request(unsigned char **data, int limit) { @@ -813,8 +805,6 @@ static zbx_uint32_t zbx_alerter_serialize_top_request(unsigned char **data, int /****************************************************************************** * * - * Function: zbx_alerter_deserialize_top_request * - * * ******************************************************************************/ void zbx_alerter_deserialize_top_request(const unsigned char *data, int *limit) { @@ -823,8 +813,6 @@ void zbx_alerter_deserialize_top_request(const unsigned char *data, int *limit) /****************************************************************************** * * - * Function: zbx_alerter_serialize_top_mediatypes_result * - * * ******************************************************************************/ zbx_uint32_t zbx_alerter_serialize_top_mediatypes_result(unsigned char **data, zbx_am_mediatype_t **mediatypes, int mediatypes_num) @@ -857,8 +845,6 @@ zbx_uint32_t zbx_alerter_serialize_top_mediatypes_result(unsigned char **data, z /****************************************************************************** * * - * Function: zbx_alerter_deserialize_top_mediatypes_result * - * * ******************************************************************************/ static void zbx_alerter_deserialize_top_mediatypes_result(const unsigned char *data, zbx_vector_uint64_pair_t *mediatypes) @@ -886,8 +872,6 @@ static void zbx_alerter_deserialize_top_mediatypes_result(const unsigned char *d /****************************************************************************** * * - * Function: zbx_alerter_serialize_top_sources_result * - * * ******************************************************************************/ zbx_uint32_t zbx_alerter_serialize_top_sources_result(unsigned char **data, zbx_am_source_stats_t **sources, int sources_num) @@ -924,8 +908,6 @@ zbx_uint32_t zbx_alerter_serialize_top_sources_result(unsigned char **data, zbx_ /****************************************************************************** * * - * Function: zbx_alerter_deserialize_top_sources_result * - * * ******************************************************************************/ static void zbx_alerter_deserialize_top_sources_result(const unsigned char *data, zbx_vector_ptr_t *sources) { @@ -953,8 +935,6 @@ static void zbx_alerter_deserialize_top_sources_result(const unsigned char *data /****************************************************************************** * * - * Function: zbx_alerter_get_diag_stats * - * * * Purpose: get alerter manager diagnostic statistics * * * ******************************************************************************/ @@ -976,8 +956,6 @@ int zbx_alerter_get_diag_stats(zbx_uint64_t *alerts_num, char **error) /****************************************************************************** * * - * Function: zbx_alerter_get_top_mediatypes * - * * * Purpose: get the top N mediatypes by the number of queued alerts * * * * Parameters limit - [IN] the number of top records to retrieve * @@ -1012,8 +990,6 @@ out: /****************************************************************************** * * - * Function: zbx_alerter_get_top_sources * - * * * Purpose: get the top N sources by the number of queued alerts * * * * Parameters limit - [IN] the number of top records to retrieve * @@ -1172,8 +1148,6 @@ void zbx_alerter_deserialize_send_dispatch(const unsigned char *data, DB_MEDIATY /****************************************************************************** * * - * Function: zbx_alerter_begin_dispatch * - * * * Purpose: begin data dispatch * * * * Parameters: dispatch - [IN] the dispatcher * @@ -1235,8 +1209,6 @@ out: /****************************************************************************** * * - * Function: zbx_alerter_send_dispatch * - * * * Purpose: dispatch data * * * * Parameters: dispatch - [IN] the dispatcher * @@ -1279,8 +1251,6 @@ out: /****************************************************************************** * * - * Function: zbx_alerter_end_dispatch * - * * * Purpose: finish data dispatch * * * * Parameters: dispatch - [IN] the dispatcher * diff --git a/src/zabbix_server/dbconfig/dbconfig.c b/src/zabbix_server/dbconfig/dbconfig.c index e8c0f13761e..537a8cc4e55 100644 --- a/src/zabbix_server/dbconfig/dbconfig.c +++ b/src/zabbix_server/dbconfig/dbconfig.c @@ -64,8 +64,6 @@ static void zbx_dbconfig_sigusr_handler(int flags) /****************************************************************************** * * - * Function: main_dbconfig_loop * - * * * Purpose: periodically synchronises database data with memory cache * * * * Parameters: * diff --git a/src/zabbix_server/dbsyncer/dbsyncer.c b/src/zabbix_server/dbsyncer/dbsyncer.c index 65aa4bfa6f0..dbe45000702 100644 --- a/src/zabbix_server/dbsyncer/dbsyncer.c +++ b/src/zabbix_server/dbsyncer/dbsyncer.c @@ -37,8 +37,6 @@ static sigset_t orig_mask; /****************************************************************************** * * - * Function: zbx_db_flush_timer_queue * - * * * Purpose: flush timer queue to the database * * * ******************************************************************************/ @@ -81,8 +79,6 @@ static void db_trigger_queue_cleanup(void) /****************************************************************************** * * - * Function: main_dbsyncer_loop * - * * * Purpose: periodically synchronises data in memory cache with database * * * * Author: Alexei Vladishev * diff --git a/src/zabbix_server/discoverer/discoverer.c b/src/zabbix_server/discoverer/discoverer.c index 40be2d13daf..83d454710d9 100644 --- a/src/zabbix_server/discoverer/discoverer.c +++ b/src/zabbix_server/discoverer/discoverer.c @@ -47,8 +47,6 @@ static volatile sig_atomic_t snmp_cache_reload_requested; /****************************************************************************** * * - * Function: proxy_update_service * - * * * Purpose: process new service status * * * * Parameters: service - service info * @@ -74,8 +72,6 @@ static void proxy_update_service(zbx_uint64_t druleid, zbx_uint64_t dcheckid, co /****************************************************************************** * * - * Function: proxy_update_host * - * * * Purpose: process new service status * * * * Parameters: service - service info * @@ -98,8 +94,6 @@ static void proxy_update_host(zbx_uint64_t druleid, const char *ip, const char * /****************************************************************************** * * - * Function: discover_service * - * * * Purpose: check if service is available * * * * Parameters: service type, ip address, port number * @@ -337,8 +331,6 @@ static int discover_service(const DB_DCHECK *dcheck, char *ip, int port, char ** /****************************************************************************** * * - * Function: process_check * - * * * Purpose: check if service is available and update database * * * * Parameters: service - service info * @@ -407,8 +399,6 @@ static void process_check(const DB_DCHECK *dcheck, int *host_status, char *ip, i /****************************************************************************** * * - * Function: process_checks * - * * ******************************************************************************/ static void process_checks(const DB_DRULE *drule, int *host_status, char *ip, int unique, int now, zbx_vector_ptr_t *services, zbx_vector_uint64_t *dcheckids) @@ -463,8 +453,6 @@ static void process_checks(const DB_DRULE *drule, int *host_status, char *ip, in /****************************************************************************** * * - * Function: process_services * - * * ******************************************************************************/ static int process_services(const DB_DRULE *drule, DB_DHOST *dhost, const char *ip, const char *dns, int now, const zbx_vector_ptr_t *services, zbx_vector_uint64_t *dcheckids) @@ -504,8 +492,6 @@ fail: /****************************************************************************** * * - * Function: process_rule * - * * * Purpose: process single discovery rule * * * ******************************************************************************/ @@ -644,8 +630,6 @@ out: /****************************************************************************** * * - * Function: discovery_clean_services * - * * * Purpose: clean dservices and dhosts not presenting in drule * * * ******************************************************************************/ @@ -876,8 +860,6 @@ static void zbx_discoverer_sigusr_handler(int flags) /****************************************************************************** * * - * Function: discoverer_thread * - * * * Purpose: periodically try to find new hosts and services * * * ******************************************************************************/ diff --git a/src/zabbix_server/escalator/escalator.c b/src/zabbix_server/escalator/escalator.c index 5b28d283861..957fea7be15 100644 --- a/src/zabbix_server/escalator/escalator.c +++ b/src/zabbix_server/escalator/escalator.c @@ -154,8 +154,6 @@ static int get_user_info(zbx_uint64_t userid, zbx_uint64_t *roleid, char **user_ /****************************************************************************** * * - * Function: get_hostgroups_permission * - * * * Purpose: Return user permissions for access to the host * * * * Parameters: * @@ -199,8 +197,6 @@ out: /****************************************************************************** * * - * Function: check_tag_based_permission * - * * * Purpose: Check user access to event by tags * * * * Parameters: userid - user id * @@ -293,8 +289,6 @@ static int check_tag_based_permission(zbx_uint64_t userid, zbx_vector_uint64_t * /****************************************************************************** * * - * Function: get_trigger_permission * - * * * Purpose: Return user permissions for access to trigger * * * * Return value: PERM_DENY - if host or user not found, * @@ -350,8 +344,6 @@ out: /****************************************************************************** * * - * Function: get_item_permission * - * * * Purpose: Return user permissions for access to item * * * * Return value: PERM_DENY - if host or user not found, * @@ -575,8 +567,6 @@ static void zbx_db_cache_service_role(zbx_service_role_t *role) /****************************************************************************** * * - * Function: get_service_permission * - * * * Purpose: Return user permissions for access to services * * * * Return value: PERM_DENY - if host or user not found, * @@ -889,8 +879,6 @@ clean: /****************************************************************************** * * - * Function: add_sentusers_msg * - * * * Purpose: adds message to be sent to all recipients of messages previously * * generated by action operations or acknowledgement operations, * * which is related with an event or recovery event * @@ -993,8 +981,6 @@ clean: /****************************************************************************** * * - * Function: add_sentusers_msg_esc_cancel * - * * * Purpose: adds message for the canceled escalation to be sent to all * * recipients of messages previously generated by action operations * * or acknowledgement operations, which is related with an event or * @@ -1094,8 +1080,6 @@ clean: /****************************************************************************** * * - * Function: add_sentusers_ack_msg * - * * * Purpose: adds message to be sent to all who added acknowlegment and * * involved in discussion * * * @@ -1209,8 +1193,6 @@ static void add_command_alert(zbx_db_insert_t *db_insert, int alerts_num, zbx_ui /****************************************************************************** * * - * Function: get_operation_groupids * - * * * Purpose: get groups (including nested groups) used by an operation * * * * Parameters: operationid - [IN] the operation id * @@ -1776,8 +1758,6 @@ err_alert: /****************************************************************************** * * - * Function: check_operation_conditions * - * * * Purpose: * * * * Parameters: event - event to check * @@ -1987,8 +1967,6 @@ static void escalation_execute_operations(DB_ESCALATION *escalation, const DB_EV /****************************************************************************** * * - * Function: escalation_execute_recovery_operations * - * * * Purpose: execute escalation recovery operations * * * * Parameters: event - [IN] the event * @@ -2054,8 +2032,6 @@ static void escalation_execute_recovery_operations(const DB_EVENT *event, const /****************************************************************************** * * - * Function: escalation_execute_update_operations * - * * * Purpose: execute escalation update operations * * * * Parameters: event - [IN] the event * @@ -2126,8 +2102,6 @@ static void escalation_execute_update_operations(const DB_EVENT *event, const DB /****************************************************************************** * * - * Function: check_escalation_trigger * - * * * Purpose: check whether the escalation trigger and related items, hosts are * * not deleted or disabled. * * * @@ -2293,8 +2267,6 @@ static int check_unfinished_alerts(const DB_ESCALATION *escalation) /****************************************************************************** * * - * Function: check_escalation * - * * * Purpose: check whether escalation must be cancelled, deleted, skipped or * * processed. * * * @@ -2411,8 +2383,6 @@ out: /****************************************************************************** * * - * Function: escalation_log_cancel_warning * - * * * Purpose: write escalation cancellation warning message into log file * * * * Parameters: escalation - [IN] the escalation * @@ -2427,8 +2397,6 @@ static void escalation_log_cancel_warning(const DB_ESCALATION *escalation, const /****************************************************************************** * * - * Function: escalation_cancel * - * * * Purpose: cancel escalation with the specified error message * * * * Parameters: escalation - [IN/OUT] the escalation to cancel * @@ -2462,8 +2430,6 @@ static void escalation_cancel(DB_ESCALATION *escalation, const DB_ACTION *action /****************************************************************************** * * - * Function: escalation_execute * - * * * Purpose: execute next escalation step * * * * Parameters: escalation - [IN/OUT] the escalation to execute * @@ -2484,8 +2450,6 @@ static void escalation_execute(DB_ESCALATION *escalation, const DB_ACTION *actio /****************************************************************************** * * - * Function: escalation_recover * - * * * Purpose: process escalation recovery * * * * Parameters: escalation - [IN/OUT] the escalation to recovery * @@ -2510,8 +2474,6 @@ static void escalation_recover(DB_ESCALATION *escalation, const DB_ACTION *actio /****************************************************************************** * * - * Function: escalation_acknowledge * - * * * Purpose: process escalation acknowledge * * * * Parameters: escalation - [IN/OUT] the escalation to recovery * @@ -2559,8 +2521,6 @@ static void escalation_acknowledge(DB_ESCALATION *escalation, const DB_ACTION *a /****************************************************************************** * * - * Function: escalation_update * - * * * Purpose: process update escalation * * * * Parameters: escalation - [IN/OUT] the escalation to recovery * @@ -2642,8 +2602,6 @@ static void escalation_update_diff(const DB_ESCALATION *escalation, zbx_escalati /****************************************************************************** * * - * Function: add_ack_escalation_r_eventids * - * * * Purpose: check if acknowledgement events of current escalation has related * * recovery events and add those recovery event IDs to array of * * event IDs if this escalation * @@ -3250,8 +3208,6 @@ out: /****************************************************************************** * * - * Function: process_escalations * - * * * Purpose: execute escalation steps and recovery operations; * * postpone escalations during maintenance and due to trigger dep.; * * delete completed escalations from the database; * @@ -3417,8 +3373,6 @@ static int process_escalations(int now, int *nextcheck, unsigned int escalation_ /****************************************************************************** * * - * Function: main_escalator_loop * - * * * Purpose: periodically check table escalations and generate alerts * * * * Parameters: * diff --git a/src/zabbix_server/events.c b/src/zabbix_server/events.c index a3fdc92e03b..45a3a2ff7c1 100644 --- a/src/zabbix_server/events.c +++ b/src/zabbix_server/events.c @@ -66,8 +66,6 @@ static zbx_correlation_rules_t correlation_rules; /****************************************************************************** * * - * Function: validate_event_tag * - * * * Purpose: Check that tag name is not empty and that tag is not duplicate. * * * ******************************************************************************/ @@ -169,8 +167,6 @@ static void get_item_tags_by_expression(const DB_TRIGGER *trigger, zbx_vector_pt /****************************************************************************** * * - * Function: zbx_add_event * - * * * Purpose: add event to an array * * * * Parameters: source - [IN] event source (EVENT_SOURCE_*) * @@ -312,8 +308,6 @@ DB_EVENT *zbx_add_event(unsigned char source, unsigned char object, zbx_uint64_t /****************************************************************************** * * - * Function: close_trigger_event * - * * * Purpose: add closing OK event for the specified problem event to an array * * * * Parameters: eventid - [IN] the problem eventid * @@ -362,8 +356,6 @@ static DB_EVENT *close_trigger_event(zbx_uint64_t eventid, zbx_uint64_t objectid /****************************************************************************** * * - * Function: save_events * - * * * Purpose: flushes the events into a database * * * ******************************************************************************/ @@ -442,8 +434,6 @@ static int save_events(void) /****************************************************************************** * * - * Function: save_problems * - * * * Purpose: generates problems from problem events (trigger and internal * * event sources) * * * @@ -553,8 +543,6 @@ static void save_problems(void) /****************************************************************************** * * - * Function: save_event_recovery * - * * * Purpose: saves event recovery data and removes recovered events from * * problem table * * * @@ -617,8 +605,6 @@ static void save_event_recovery(void) /****************************************************************************** * * - * Function: get_event_index_by_source_object_id * - * * * Purpose: find event index by its source object * * * * Parameters: source - [IN] the event source * @@ -646,8 +632,6 @@ static DB_EVENT *get_event_by_source_object_id(int source, int object, zbx_uint6 /****************************************************************************** * * - * Function: correlation_match_event_hostgroup * - * * * Purpose: checks if the event matches the specified host group * * (including nested groups) * * * @@ -695,8 +679,6 @@ static int correlation_match_event_hostgroup(const DB_EVENT *event, zbx_uint64_t /****************************************************************************** * * - * Function: correlation_condition_match_new_event * - * * * Purpose: checks if the correlation condition matches the new event * * * * Parameters: condition - [IN] the correlation condition to check * @@ -777,8 +759,6 @@ static const char *correlation_condition_match_new_event(zbx_corr_condition_t *c /****************************************************************************** * * - * Function: correlation_match_new_event * - * * * Purpose: checks if the correlation rule might match the new event * * * * Parameters: correlation - [IN] the correlation rule to check * @@ -848,8 +828,6 @@ out: /****************************************************************************** * * - * Function: correlation_has_old_event_operation * - * * * Purpose: checks if correlation has operations to change old events * * * * Parameters: correlation - [IN] the correlation to check * @@ -879,8 +857,6 @@ static int correlation_has_old_event_operation(const zbx_correlation_t *correlat /****************************************************************************** * * - * Function: correlation_condition_add_tag_match * - * * * Purpose: adds sql statement to match tag according to the defined * * matching operation * * * @@ -933,8 +909,6 @@ static void correlation_condition_add_tag_match(char **sql, size_t *sql_alloc, s /****************************************************************************** * * - * Function: correlation_condition_get_event_filter * - * * * Purpose: creates sql filter to find events matching a correlation * * condition * * * @@ -1025,8 +999,6 @@ static char *correlation_condition_get_event_filter(zbx_corr_condition_t *condit /****************************************************************************** * * - * Function: correlation_add_event_filter * - * * * Purpose: add sql statement to filter out correlation conditions and * * matching events * * * @@ -1090,8 +1062,6 @@ out: /****************************************************************************** * * - * Function: correlation_execute_operations * - * * * Purpose: execute correlation operations for the new event and matched * * old eventid * * * @@ -1176,8 +1146,6 @@ zbx_problem_state_t; /****************************************************************************** * * - * Function: correlate_event_by_global_rules * - * * * Purpose: find problem events that must be recovered by global correlation * * rules and check if the new event must be closed * * * @@ -1325,8 +1293,6 @@ static void correlate_event_by_global_rules(DB_EVENT *event, zbx_problem_state_t /****************************************************************************** * * - * Function: correlate_events_by_global_rules * - * * * Purpose: add events to the closing queue according to global correlation * * rules * * * @@ -1373,8 +1339,6 @@ out: /****************************************************************************** * * - * Function: flush_correlation_queue * - * * * Purpose: try flushing correlation close events queue, generated by * * correlation rules * * * @@ -1538,8 +1502,6 @@ out: /****************************************************************************** * * - * Function: update_trigger_problem_count * - * * * Purpose: update number of open problems * * * * Parameters: trigger_diff - [IN/OUT] the changeset of triggers that * @@ -1617,8 +1579,6 @@ out: /****************************************************************************** * * - * Function: update_trigger_changes * - * * * Purpose: update trigger value, problem count fields depending on problem * * and recovered events * * * @@ -1680,8 +1640,6 @@ static void update_trigger_changes(zbx_vector_ptr_t *trigger_diff) /****************************************************************************** * * - * Function: zbx_initialize_events * - * * * Purpose: initializes the data structures required for event processing * * * ******************************************************************************/ @@ -1696,8 +1654,6 @@ void zbx_initialize_events(void) /****************************************************************************** * * - * Function: zbx_uninitialize_events * - * * * Purpose: uninitializes the data structures required for event processing * * * ******************************************************************************/ @@ -1712,8 +1668,6 @@ void zbx_uninitialize_events(void) /****************************************************************************** * * - * Function: zbx_reset_event_recovery * - * * * Purpose: reset event_recovery data * * * ******************************************************************************/ @@ -1724,8 +1678,6 @@ void zbx_reset_event_recovery(void) /****************************************************************************** * * - * Function: zbx_clean_event * - * * * Purpose: cleans single event * * * ******************************************************************************/ @@ -1750,8 +1702,6 @@ static void zbx_clean_event(DB_EVENT *event) /****************************************************************************** * * - * Function: zbx_clean_events * - * * * Purpose: cleans all events and events recoveries * * * ******************************************************************************/ @@ -1764,8 +1714,6 @@ void zbx_clean_events(void) /****************************************************************************** * * - * Function: db_trigger_get_hosts * - * * * Purpose: get hosts that are associated with trigger expression/recovery * * expression * * * @@ -1782,8 +1730,6 @@ static void db_trigger_get_hosts(zbx_hashset_t *hosts, DB_TRIGGER *trigger) /****************************************************************************** * * - * Function: zbx_export_events * - * * * Purpose: export events * * * ******************************************************************************/ @@ -1962,8 +1908,6 @@ void zbx_events_update_itservices(void) /****************************************************************************** * * - * Function: add_event_suppress_data * - * * * Purpose: adds event suppress data for problem events matching active * * maintenance periods * * * @@ -2050,8 +1994,6 @@ static void add_event_suppress_data(zbx_vector_ptr_t *event_refs, zbx_vector_uin /****************************************************************************** * * - * Function: save_event_suppress_data * - * * * Purpose: retrieve running maintenances for each event and saves it in * * event_suppress table * * * @@ -2097,8 +2039,6 @@ out: /****************************************************************************** * * - * Function: flush_events * - * * * Purpose: flushes local event cache to database * * * ******************************************************************************/ @@ -2134,8 +2074,6 @@ static int flush_events(void) /****************************************************************************** * * - * Function: recover_event * - * * * Purpose: recover an event * * * * Parameters: eventid - [IN] the event to recover * @@ -2176,8 +2114,6 @@ static void recover_event(zbx_uint64_t eventid, int source, int object, zbx_uint /****************************************************************************** * * - * Function: process_internal_ok_events * - * * * Purpose: process internal recovery events * * * * Parameters: ok_events - [IN] the recovery events to process * @@ -2281,8 +2217,6 @@ out: /****************************************************************************** * * - * Function: process_internal_events_without_actions * - * * * Purpose: do not generate unnecessary internal events if there are no * * internal actions and no problem recovery from when actions were * * enabled * @@ -2314,8 +2248,6 @@ static void process_internal_events_without_actions(zbx_vector_ptr_t *internal_p /****************************************************************************** * * - * Function: get_open_problems * - * * * Purpose: gets open problems created by the specified triggers * * * * Parameters: triggerids - [IN] the trigger identifiers (sorted) * @@ -2395,8 +2327,6 @@ static void get_open_problems(const zbx_vector_uint64_t *triggerids, zbx_vector_ /****************************************************************************** * * - * Function: event_problem_free * - * * * Purpose: frees cached problem event * * * ******************************************************************************/ @@ -2409,8 +2339,6 @@ static void event_problem_free(zbx_event_problem_t *problem) /****************************************************************************** * * - * Function: trigger_dep_free * - * * * Purpose: frees trigger dependency * * * ******************************************************************************/ @@ -2423,8 +2351,6 @@ static void trigger_dep_free(zbx_trigger_dep_t *dep) /****************************************************************************** * * - * Function: event_check_dependency * - * * * Purpose: check event dependency based on cached and actual trigger values * * * * Parameters: event - [IN] the event to check * @@ -2473,8 +2399,6 @@ static int event_check_dependency(const DB_EVENT *event, const zbx_vector_ptr_t /****************************************************************************** * * - * Function: match_tag * - * * * Purpose: checks if the two tag sets have matching tag * * * * Parameters: name - [IN] the name of tag to match * @@ -2512,8 +2436,6 @@ static int match_tag(const char *name, const zbx_vector_ptr_t *tags1, const zbx_ /****************************************************************************** * * - * Function: process_trigger_events * - * * * Purpose: processes trigger events * * * * Parameters: trigger_events - [IN] the trigger events to process * @@ -2670,8 +2592,6 @@ static void process_trigger_events(zbx_vector_ptr_t *trigger_events, zbx_vector_ /****************************************************************************** * * - * Function: process_internal_events_dependency * - * * * Purpose: process internal trigger events * * to avoid trigger dependency * * * @@ -2741,8 +2661,6 @@ static void process_internal_events_dependency(zbx_vector_ptr_t *internal_events /****************************************************************************** * * - * Function: zbx_process_events * - * * * Purpose: processes cached events * * * * Parameters: trigger_diff - [IN/OUT] the changeset of triggers that * @@ -2860,8 +2778,6 @@ int zbx_process_events(zbx_vector_ptr_t *trigger_diff, zbx_vector_uint64_t *trig /****************************************************************************** * * - * Function: zbx_close_problem * - * * * Purpose: closes problem event * * * * Parameters: triggerid - [IN] the source trigger id * diff --git a/src/zabbix_server/ha/ha_manager.c b/src/zabbix_server/ha/ha_manager.c index 4b675f98f89..664a796a7df 100644 --- a/src/zabbix_server/ha/ha_manager.c +++ b/src/zabbix_server/ha/ha_manager.c @@ -105,8 +105,6 @@ static int ha_db_execute(zbx_ha_info_t *info, const char *sql, ...) __zbx_attr_f /****************************************************************************** * * - * Function: ha_manager_send_message * - * * * Purpose: connect, send message and receive response in a given timeout * * * * Parameters: service_name - [IN] the IPC service name * @@ -170,8 +168,6 @@ out: /****************************************************************************** * * - * Function: ha_update_parent * - * * * Purpose: update parent process with ha_status and failover delay * * * ******************************************************************************/ @@ -210,8 +206,6 @@ static void ha_update_parent(zbx_ipc_async_socket_t *rtc_socket, zbx_ha_info_t * /****************************************************************************** * * - * Function: ha_send_heartbeat * - * * * Purpose: send heartbeat message to main process * * * ******************************************************************************/ @@ -227,8 +221,6 @@ static void ha_send_heartbeat(zbx_ipc_async_socket_t *rtc_socket) /****************************************************************************** * * - * Function: zbx_ha_set_error * - * * * Purpose: set HA manager error * * * ******************************************************************************/ @@ -256,8 +248,6 @@ static void ha_set_error(zbx_ha_info_t *info, const char *fmt, ...) /****************************************************************************** * * - * Function: ha_db_begin * - * * * Purpose: start database transaction * * * * Comments: Sets error status on non-recoverable database error * @@ -279,8 +269,6 @@ static int ha_db_begin(zbx_ha_info_t *info) /****************************************************************************** * * - * Function: ha_db_rollback * - * * * Purpose: roll back database transaction * * * * Comments: Sets error status on non-recoverable database error * @@ -302,8 +290,6 @@ static int ha_db_rollback(zbx_ha_info_t *info) /****************************************************************************** * * - * Function: ha_db_commit * - * * * Purpose: commit/rollback database transaction depending on commit result * * * * Comments: Sets error status on non-recoverable database error * @@ -329,8 +315,6 @@ static int ha_db_commit(zbx_ha_info_t *info) /****************************************************************************** * * - * Function: ha_db_select * - * * * Purpose: perform database select sql query based on current database * * connection status * * * @@ -362,8 +346,6 @@ static DB_RESULT ha_db_select(zbx_ha_info_t *info, const char *sql, ...) /****************************************************************************** * * - * Function: ha_db_select * - * * * Purpose: perform database sql query based on current database * * connection status * * * @@ -385,8 +367,6 @@ static int ha_db_execute(zbx_ha_info_t *info, const char *sql, ...) /****************************************************************************** * * - * Function: ha_db_update_config * - * * * Purpose: update HA configuration from database * * * ******************************************************************************/ @@ -415,8 +395,6 @@ static int ha_db_update_config(zbx_ha_info_t *info) /****************************************************************************** * * - * Function: ha_db_get_nodes * - * * * Purpose: get all nodes from database * * * * Return value: SUCCEED - the nodes were retrieved from database * @@ -463,8 +441,6 @@ static int ha_db_get_nodes(zbx_ha_info_t *info, zbx_vector_ha_node_t *nodes, int /****************************************************************************** * * - * Function: ha_check_registered_node * - * * * Purpose: check if the node is registered in node table and get ID * * * ******************************************************************************/ @@ -483,8 +459,6 @@ static zbx_ha_node_t *ha_find_node_by_name(zbx_vector_ha_node_t *nodes, const ch /****************************************************************************** * * - * Function: ha_get_external_address * - * * * Purpose: get server external address and port from configuration * * * ******************************************************************************/ @@ -495,8 +469,6 @@ static void ha_get_external_address(char **address, unsigned short *port) /****************************************************************************** * * - * Function: ha_db_lock_nodes * - * * * Purpose: lock nodes in database * * * * Comments: To lock ha_node table it must have at least one node * @@ -516,8 +488,6 @@ static int ha_db_lock_nodes(zbx_ha_info_t *info) /****************************************************************************** * * - * Function: ha_is_available * - * * * Purpose: check availability based on lastaccess timestamp, database time * * and failover delay * * * @@ -535,8 +505,6 @@ static int ha_is_available(const zbx_ha_info_t *info, int lastaccess, int db_tim /****************************************************************************** * * - * Function: ha_check_standalone_config * - * * * Purpose: check if server can be started in standalone configuration * * * * Return value: SUCCEED - server can be started in active mode * @@ -568,8 +536,6 @@ static int ha_check_standalone_config(zbx_ha_info_t *info, zbx_vector_ha_node_t /****************************************************************************** * * - * Function: ha_check_cluster_config * - * * * Purpose: check if server can be started in cluster configuration * * * * Parameters: info - [IN] - the HA node information * @@ -625,8 +591,6 @@ static int ha_check_cluster_config(zbx_ha_info_t *info, zbx_vector_ha_node_t *no /****************************************************************************** * * - * Function: ha_db_get_time * - * * * Purpose: get current database time * * * ******************************************************************************/ @@ -658,8 +622,6 @@ out: /****************************************************************************** * * - * Function: ha_flush_audit * - * * * Purpose: flush audit taking in account database connection status * * * ******************************************************************************/ @@ -676,8 +638,6 @@ static void ha_flush_audit(zbx_ha_info_t *info) /****************************************************************************** * * - * Function: ha_db_create_node * - * * * Purpose: add new node record in ha_node table if necessary * * * * Return value: SUCCEED - node exists, was created or database is offline * @@ -761,8 +721,6 @@ finish: /****************************************************************************** * * - * Function: ha_db_register_node * - * * * Purpose: register server node * * * * Return value: SUCCEED - node was registered or database was offline * @@ -883,8 +841,6 @@ finish: /****************************************************************************** * * - * Function: ha_check_standby_nodes * - * * * Purpose: check for standby nodes being unavailable for failrover_delay * * seconds and mark them unavailable * * * @@ -943,8 +899,6 @@ static int ha_check_standby_nodes(zbx_ha_info_t *info, zbx_vector_ha_node_t *nod /****************************************************************************** * * - * Function: ha_check_active_node * - * * * Purpose: check for active nodes being unavailable for failover_delay * * seconds, mark them unavailable and set own status to active * * * @@ -998,8 +952,6 @@ static int ha_check_active_node(zbx_ha_info_t *info, zbx_vector_ha_node_t *nodes /****************************************************************************** * * - * Function: ha_check_nodes * - * * * Purpose: check HA status based on nodes * * * * Comments: Sets error status on critical errors forcing manager to exit * @@ -1113,8 +1065,6 @@ finish: /****************************************************************************** * * - * Function: ha_db_update_lastaccess * - * * * Purpose: update node lastaccess * * * ******************************************************************************/ @@ -1139,8 +1089,6 @@ out: /****************************************************************************** * * - * Function: ha_db_get_nodes_json * - * * * Purpose: get cluster status in lld compatible json format * * * ******************************************************************************/ @@ -1203,8 +1151,6 @@ out: /****************************************************************************** * * - * Function: ha_remove_node_impl * - * * * Purpose: remove node by its cuid or name * * * ******************************************************************************/ @@ -1292,8 +1238,6 @@ out: /****************************************************************************** * * - * Function: ha_report_cluster_status * - * * * Purpose: report cluster status in log file * * * ******************************************************************************/ @@ -1326,8 +1270,6 @@ static void ha_remove_node(zbx_ha_info_t *info, zbx_ipc_client_t *client, const /****************************************************************************** * * - * Function: ha_send_status * - * * * Purpose: reply to ha_status request * * * ******************************************************************************/ @@ -1359,8 +1301,6 @@ static void ha_send_status(zbx_ha_info_t *info, zbx_ipc_client_t *client) /****************************************************************************** * * - * Function: ha_set_failover_delay * - * * * Purpose: set failover delay * * * ******************************************************************************/ @@ -1416,8 +1356,6 @@ out: /****************************************************************************** * * - * Function: ha_get_failover_delay * - * * * Purpose: get failover delay * * * ******************************************************************************/ @@ -1433,8 +1371,6 @@ static void ha_get_failover_delay(zbx_ha_info_t *info, zbx_ipc_client_t *client) } /****************************************************************************** * * - * Function: ha_send_node_list * - * * * Purpose: reply to get nodes request * * * ******************************************************************************/ @@ -1468,8 +1404,6 @@ static void ha_send_node_list(zbx_ha_info_t *info, zbx_ipc_client_t *client) /****************************************************************************** * * - * Function: ha_db_update_exit_status * - * * * Purpose: update node status in database on shutdown * * * ******************************************************************************/ @@ -1502,8 +1436,6 @@ out: /****************************************************************************** * * - * Function: zbx_ha_get_status * - * * * Purpose: get HA manager status * * * ******************************************************************************/ @@ -1557,8 +1489,6 @@ int zbx_ha_get_status(int *ha_status, char **error) /****************************************************************************** * * - * Function: zbx_ha_dispatch_message * - * * * Purpose: handle HA manager notifications * * * * Comments: This function also monitors heartbeat notifications and * @@ -1621,8 +1551,6 @@ out: /****************************************************************************** * * - * Function: zbx_ha_start * - * * * Purpose: start HA manager * * * ******************************************************************************/ @@ -1691,8 +1619,6 @@ out: /****************************************************************************** * * - * Function: zbx_ha_pause * - * * * Purpose: pause HA manager * * * * Comments: HA manager must be paused before stopping it normally * @@ -1716,8 +1642,6 @@ int zbx_ha_pause(char **error) /****************************************************************************** * * - * Function: zbx_ha_stop * - * * * Purpose: stop HA manager * * * * Comments: This function is used to stop HA manager on normal shutdown * @@ -1759,8 +1683,6 @@ out: /****************************************************************************** * * - * Function: zbx_ha_kill * - * * * Purpose: kill HA manager * * * ******************************************************************************/ @@ -1773,8 +1695,6 @@ void zbx_ha_kill(void) /****************************************************************************** * * - * Function: zbx_ha_check_pid * - * * * Purpose: check if the pid is HA manager pid * * * ******************************************************************************/ diff --git a/src/zabbix_server/housekeeper/history_compress.c b/src/zabbix_server/housekeeper/history_compress.c index 68e21744cb7..43c31979de7 100644 --- a/src/zabbix_server/housekeeper/history_compress.c +++ b/src/zabbix_server/housekeeper/history_compress.c @@ -63,8 +63,6 @@ static int compress_older_cache = 0; /****************************************************************************** * * - * Function: hk_check_table_segmentation * - * * * Purpose: check that hypertables are segmented by itemid * * * * Parameters: table_name - [IN] hypertable name * @@ -114,8 +112,6 @@ static void hk_check_table_segmentation(const char *table_name, zbx_compress_tab /****************************************************************************** * * - * Function: hk_get_table_compression_age * - * * * Purpose: returns data compression age configured for hypertable * * * * Parameters: table_name - [IN] hypertable name * @@ -156,8 +152,6 @@ static int hk_get_table_compression_age(const char *table_name) /****************************************************************************** * * - * Function: hk_check_table_compression_age * - * * * Purpose: ensures that table compression is configured to specified age * * * * Parameters: table_name - [IN] hypertable name * @@ -192,8 +186,6 @@ static void hk_check_table_compression_age(const char *table_name, int age) /****************************************************************************** * * - * Function: hk_history_enable_compression * - * * * Purpose: turns table compression on for items older than specified age * * * * Parameters: age - [IN] compression age * @@ -218,8 +210,6 @@ static void hk_history_enable_compression(int age) /****************************************************************************** * * - * Function: hk_history_disable_compression * - * * * Purpose: turns table compression off * * * ******************************************************************************/ @@ -244,8 +234,6 @@ static void hk_history_disable_compression(void) /****************************************************************************** * * - * Function: hk_history_compression_init * - * * * Purpose: initializing compression for history/trends tables * * * ******************************************************************************/ @@ -319,8 +307,6 @@ void hk_history_compression_init(void) /****************************************************************************** * * - * Function: hk_history_compression_update * - * * * Purpose: history compression settings periodic update * * * * Parameters: cfg - [IN] database extension history compression settings * diff --git a/src/zabbix_server/housekeeper/housekeeper.c b/src/zabbix_server/housekeeper/housekeeper.c index f61b14bb34c..3069d269909 100644 --- a/src/zabbix_server/housekeeper/housekeeper.c +++ b/src/zabbix_server/housekeeper/housekeeper.c @@ -202,8 +202,6 @@ static void zbx_housekeeper_sigusr_handler(int flags) /****************************************************************************** * * - * Function: hk_item_update_cache_compare * - * * * Purpose: compare two delete queue items by their itemid * * * * Parameters: d1 - [IN] the first delete queue item to compare * @@ -230,8 +228,6 @@ static int hk_item_update_cache_compare(const void *d1, const void *d2) /****************************************************************************** * * - * Function: hk_history_delete_queue_append * - * * * Purpose: add item to the delete queue if necessary * * * * Parameters: rule - [IN/OUT] the history housekeeping rule * @@ -273,8 +269,6 @@ static void hk_history_delete_queue_append(zbx_hk_history_rule_t *rule, int now, /****************************************************************************** * * - * Function: hk_history_prepare * - * * * Purpose: prepares history housekeeping rule * * * * Parameters: rule - [IN/OUT] the history housekeeping rule * @@ -319,8 +313,6 @@ static void hk_history_prepare(zbx_hk_history_rule_t *rule) /****************************************************************************** * * - * Function: hk_history_release * - * * * Purpose: releases history housekeeping rule * * * * Parameters: rule - [IN/OUT] the history housekeeping rule * @@ -343,8 +335,6 @@ static void hk_history_release(zbx_hk_history_rule_t *rule) /****************************************************************************** * * - * Function: hk_history_item_update * - * * * Purpose: updates history housekeeping rule with item history setting and * * adds item to the delete queue if necessary * * * @@ -390,8 +380,6 @@ static void hk_history_item_update(zbx_hk_history_rule_t *rules, zbx_hk_history_ /****************************************************************************** * * - * Function: hk_history_update * - * * * Purpose: updates history housekeeping rule with the latest item history * * settings and prepares delete queue * * * @@ -488,8 +476,6 @@ static void hk_history_update(zbx_hk_history_rule_t *rules, int now) /****************************************************************************** * * - * Function: hk_history_delete_queue_prepare_all * - * * * Purpose: prepares history housekeeping delete queues for all defined * * history rules. * * * @@ -534,8 +520,6 @@ static void hk_history_delete_queue_prepare_all(zbx_hk_history_rule_t *rules, in /****************************************************************************** * * - * Function: hk_history_delete_queue_clear * - * * * Purpose: clears the history housekeeping delete queue * * * * Parameters: rule - [IN/OUT] the history housekeeping rule * @@ -551,8 +535,6 @@ static void hk_history_delete_queue_clear(zbx_hk_history_rule_t *rule) /****************************************************************************** * * - * Function: hk_drop_partition_for_rule * - * * * Purpose: drop appropriate partitions from the history and trends tables * * * * Parameters: rules - [IN/OUT] history housekeeping rules * @@ -614,8 +596,6 @@ out: /****************************************************************************** * * - * Function: housekeeping_history_and_trends * - * * * Purpose: performs housekeeping for history and trends tables * * * * Parameters: now - [IN] the current timestamp * @@ -675,8 +655,6 @@ static int housekeeping_history_and_trends(int now) /****************************************************************************** * * - * Function: housekeeping_process_rule * - * * * Purpose: removes old records from a table according to the specified rule * * * * Parameters: now - [IN] the current time in seconds * @@ -777,8 +755,6 @@ static int housekeeping_process_rule(int now, zbx_hk_rule_t *rule) /****************************************************************************** * * - * Function: DBdelete_from_table * - * * * Purpose: delete limited count of rows from table * * * * Return value: number of deleted rows or less than 0 if an error occurred * @@ -835,8 +811,6 @@ static int DBdelete_from_table(const char *tablename, const char *filter, int li /****************************************************************************** * * - * Function: hk_problem_cleanup * - * * * Purpose: perform problem table cleanup * * * * Parameters: table - [IN] the problem table name * @@ -867,8 +841,6 @@ static int hk_problem_cleanup(const char *table, int source, int object, zbx_uin /****************************************************************************** * * - * Function: hk_table_cleanup * - * * * Purpose: perform generic table cleanup * * * * Parameters: table - [IN] the table name * @@ -897,8 +869,6 @@ static int hk_table_cleanup(const char *table, const char *field, zbx_uint64_t i /****************************************************************************** * * - * Function: housekeeping_cleanup * - * * * Purpose: remove deleted items/triggers data * * * * Return value: number of rows deleted * diff --git a/src/zabbix_server/httppoller/httpmacro.c b/src/zabbix_server/httppoller/httpmacro.c index a70e2b81c30..db701bbb7e4 100644 --- a/src/zabbix_server/httppoller/httpmacro.c +++ b/src/zabbix_server/httppoller/httpmacro.c @@ -30,8 +30,6 @@ /****************************************************************************** * * - * Function: httpmacro_cmp_func * - * * * Purpose: compare two macros by name * * * * Parameters: d1 - [IN] the first macro * @@ -54,8 +52,6 @@ static int httpmacro_cmp_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: httpmacro_append_pair * - * * * Purpose: appends key/value pair to the http test macro cache. * * If the value format is 'regex:<pattern>', then regular expression * * match is performed against the supplied data value and specified * @@ -168,8 +164,6 @@ out: /****************************************************************************** * * - * Function: http_substitute_variables * - * * * Purpose: substitute variables in input string with their values from http * * test config * * * @@ -266,8 +260,6 @@ int http_substitute_variables(const zbx_httptest_t *httptest, char **data) /****************************************************************************** * * - * Function: http_process_variables * - * * * Purpose: parses http test/step variable string and stores results into * * httptest macro cache. * * The variables are specified as {<key>}=><value> pairs * diff --git a/src/zabbix_server/httppoller/httppoller.c b/src/zabbix_server/httppoller/httppoller.c index a9590d256f0..234e97ec448 100644 --- a/src/zabbix_server/httppoller/httppoller.c +++ b/src/zabbix_server/httppoller/httppoller.c @@ -34,8 +34,6 @@ extern ZBX_THREAD_LOCAL int server_num, process_num; /****************************************************************************** * * - * Function: get_minnextcheck * - * * * Purpose: calculate when we have to process earliest httptest * * * * Return value: timestamp of earliest check or -1 if not found * @@ -78,8 +76,6 @@ static int get_minnextcheck(void) /****************************************************************************** * * - * Function: main_httppoller_loop * - * * * Purpose: main loop of processing of httptests * * * * Parameters: * diff --git a/src/zabbix_server/httppoller/httptest.c b/src/zabbix_server/httppoller/httptest.c index 1cb995c1efe..32a2423c2eb 100644 --- a/src/zabbix_server/httppoller/httptest.c +++ b/src/zabbix_server/httppoller/httptest.c @@ -85,8 +85,6 @@ static size_t curl_ignore_cb(void *ptr, size_t size, size_t nmemb, void *userdat /****************************************************************************** * * - * Function: httptest_remove_macros * - * * * Purpose: remove all macro variables cached during http test execution * * * * Parameters: httptest - [IN] the http test data * @@ -203,8 +201,6 @@ static void process_test_data(zbx_uint64_t httptestid, int lastfailedstep, doubl /****************************************************************************** * * - * Function: httpstep_pairs_join * - * * * Purpose: performs concatenation of vector of pairs into delimited string * * * * Parameters: str - [IN/OUT] result string * @@ -238,8 +234,6 @@ static void httpstep_pairs_join(char **str, size_t *alloc_len, size_t *offset, c /****************************************************************************** * * - * Function: httppairs_free * - * * * Purpose: frees memory allocated for vector of pairs * * * * Parameters: pairs - [IN] vector of pairs * @@ -346,8 +340,6 @@ static void process_step_data(zbx_uint64_t httpstepid, zbx_httpstat_t *stat, zbx /****************************************************************************** * * - * Function: httpstep_load_pairs * - * * * Purpose: loads http fields of web scenario step * * * * Parameters: host - [IN] host to be used in macro expansion * @@ -500,8 +492,6 @@ out: /****************************************************************************** * * - * Function: add_http_headers * - * * * Purpose: adds HTTP headers to curl_slist and prepares cookie header string * * * * Parameters: headers - [IN] HTTP headers as string * @@ -533,8 +523,6 @@ static void add_http_headers(char *headers, struct curl_slist **headers_slist, c /****************************************************************************** * * - * Function: httptest_load_pairs * - * * * Purpose: loads http fields of web scenario * * * * Parameters: host - [IN] host to be used in macro expansion * @@ -623,8 +611,6 @@ out: /****************************************************************************** * * - * Function: process_httptest * - * * * Purpose: process single scenario of http test * * * * Parameters: * @@ -1055,8 +1041,6 @@ httptest_error: /****************************************************************************** * * - * Function: process_httptests * - * * * Purpose: process httptests * * * * Parameters: now - current timestamp * diff --git a/src/zabbix_server/ipmi/checks_ipmi.c b/src/zabbix_server/ipmi/checks_ipmi.c index 3e4e9e21502..160495a9bb4 100644 --- a/src/zabbix_server/ipmi/checks_ipmi.c +++ b/src/zabbix_server/ipmi/checks_ipmi.c @@ -189,8 +189,6 @@ static char *zbx_sensor_id_to_str(char *str, size_t str_sz, const char *id, enum /****************************************************************************** * * - * Function: zbx_get_ipmi_host * - * * * Purpose: Find element in the global list 'hosts' using parameters as * * search criteria * * * @@ -225,8 +223,6 @@ static zbx_ipmi_host_t *zbx_get_ipmi_host(const char *ip, const int port, int au /****************************************************************************** * * - * Function: zbx_allocate_ipmi_host * - * * * Purpose: create a new element in the global list 'hosts' * * * * Return value: pointer to the new list element with host data * @@ -330,8 +326,6 @@ static zbx_ipmi_sensor_t *zbx_get_ipmi_sensor_by_full_name(const zbx_ipmi_host_t /****************************************************************************** * * - * Function: get_domain_offset * - * * * Purpose: Check if an item name starts from domain name and find the domain * * name length * * * @@ -356,8 +350,6 @@ static size_t get_domain_offset(const zbx_ipmi_host_t *h, const char *full_name) } /****************************************************************************** * * - * Function: zbx_get_sensor_id * - * * * Purpose: Converts sensor id to printable string and return id_type * * * * Parameters: sensor - [IN] ipmi sensor * @@ -848,8 +840,6 @@ out: /****************************************************************************** * * - * Function: zbx_perform_openipmi_ops * - * * * Purpose: Pass control to OpenIPMI library to process events * * * * Return value: SUCCEED - no errors * @@ -885,8 +875,6 @@ static int zbx_perform_openipmi_ops(zbx_ipmi_host_t *h, const char *func_name) /****************************************************************************** * * - * Function: zbx_perform_all_openipmi_ops * - * * * Purpose: Pass control to OpenIPMI library to process all internal events * * * * Parameters: timeout - [IN] timeout (in seconds) for processing single * @@ -1683,8 +1671,6 @@ void zbx_delete_inactive_ipmi_hosts(time_t last_check) /****************************************************************************** * * - * Function: has_name_prefix * - * * * Purpose: Check if a string starts with one of predefined prefixes and * * set prefix length * * * diff --git a/src/zabbix_server/ipmi/ipmi.c b/src/zabbix_server/ipmi/ipmi.c index c65aba48df5..ba8098f136b 100644 --- a/src/zabbix_server/ipmi/ipmi.c +++ b/src/zabbix_server/ipmi/ipmi.c @@ -33,8 +33,6 @@ /****************************************************************************** * * - * Function: zbx_ipmi_port_expand_macros * - * * * Purpose: expands user macros in IPMI port value and converts the result to * * to unsigned short value * * * @@ -69,8 +67,6 @@ int zbx_ipmi_port_expand_macros(zbx_uint64_t hostid, const char *port_orig, unsi /****************************************************************************** * * - * Function: zbx_ipmi_execute_command * - * * * Purpose: executes IPMI command * * * * Parameters: host - [IN] the target host * @@ -161,8 +157,6 @@ out: /****************************************************************************** * * - * Function: zbx_ipmi_test_item * - * * * Purpose: test IPMI item * * * * Parameters: item - [IN] IPMI item * diff --git a/src/zabbix_server/ipmi/ipmi_manager.c b/src/zabbix_server/ipmi/ipmi_manager.c index b3d12dc432c..cd464dd810b 100644 --- a/src/zabbix_server/ipmi/ipmi_manager.c +++ b/src/zabbix_server/ipmi/ipmi_manager.c @@ -193,8 +193,6 @@ static int ipmi_request_compare(const void *d1, const void *d2) /****************************************************************************** * * - * Function: ipmi_request_create * - * * * Purpose: creates an IPMI request * * * * Parameters: hostid - [IN] the target hostid * @@ -215,8 +213,6 @@ static zbx_ipmi_request_t *ipmi_request_create(zbx_uint64_t hostid) /****************************************************************************** * * - * Function: ipmi_request_free * - * * * Purpose: frees IPMI request * * * ******************************************************************************/ @@ -228,8 +224,6 @@ static void ipmi_request_free(zbx_ipmi_request_t *request) /****************************************************************************** * * - * Function: ipmi_poller_pop_request * - * * * Purpose: pops the next queued request from IPMI poller request queue * * * * Parameters: poller - [IN] the IPMI poller * @@ -254,8 +248,6 @@ static zbx_ipmi_request_t *ipmi_poller_pop_request(zbx_ipmi_poller_t *poller) /****************************************************************************** * * - * Function: ipmi_poller_push_request * - * * * Purpose: pushes the requests into IPMI poller request queue * * * * Parameters: poller - [IN] the IPMI poller * @@ -272,8 +264,6 @@ static void ipmi_poller_push_request(zbx_ipmi_poller_t *poller, zbx_ipmi_request /****************************************************************************** * * - * Function: ipmi_poller_send_request * - * * * Purpose: sends request to IPMI poller * * * * Parameters: poller - [IN] the IPMI poller * @@ -294,8 +284,6 @@ static void ipmi_poller_send_request(zbx_ipmi_poller_t *poller, zbx_ipmi_request /****************************************************************************** * * - * Function: ipmi_poller_schedule_request * - * * * Purpose: schedules request to IPMI poller * * * * Parameters: poller - [IN] the IPMI poller * @@ -312,8 +300,6 @@ static void ipmi_poller_schedule_request(zbx_ipmi_poller_t *poller, zbx_ipmi_req /****************************************************************************** * * - * Function: ipmi_poller_free_request * - * * * Purpose: frees the current request processed by IPMI poller * * * * Parameters: poller - [IN] the IPMI poller * @@ -327,8 +313,6 @@ static void ipmi_poller_free_request(zbx_ipmi_poller_t *poller) /****************************************************************************** * * - * Function: ipmi_poller_free * - * * * Purpose: frees IPMI poller * * * ******************************************************************************/ @@ -348,8 +332,6 @@ static void ipmi_poller_free(zbx_ipmi_poller_t *poller) /****************************************************************************** * * - * Function: ipmi_manager_init * - * * * Purpose: initializes IPMI manager * * * * Parameters: manager - [IN] the manager to initialize * @@ -393,8 +375,6 @@ static void ipmi_manager_init(zbx_ipmi_manager_t *manager) /****************************************************************************** * * - * Function: ipmi_manager_destroy * - * * * Purpose: destroys IPMI manager * * * * Parameters: manager - [IN] the manager to destroy * @@ -411,8 +391,6 @@ static void ipmi_manager_destroy(zbx_ipmi_manager_t *manager) /****************************************************************************** * * - * Function: ipmi_manager_host_cleanup * - * * * Purpose: performs cleanup of monitored hosts cache * * * * Parameters: manager - [IN] the manager * @@ -451,8 +429,6 @@ static void ipmi_manager_host_cleanup(zbx_ipmi_manager_t *manager, int now) /****************************************************************************** * * - * Function: ipmi_manager_register_poller * - * * * Purpose: registers IPMI poller * * * * Parameters: manager - [IN] the manager * @@ -495,8 +471,6 @@ static zbx_ipmi_poller_t *ipmi_manager_register_poller(zbx_ipmi_manager_t *manag /****************************************************************************** * * - * Function: ipmi_manager_get_poller_by_client * - * * * Purpose: returns IPMI poller by connected client * * * * Parameters: manager - [IN] the manager * @@ -525,8 +499,6 @@ static zbx_ipmi_poller_t *ipmi_manager_get_poller_by_client(zbx_ipmi_manager_t * /****************************************************************************** * * - * Function: ipmi_manager_get_host_poller * - * * * Purpose: returns IPMI poller to be assigned to a new host * * * * Parameters: manager - [IN] the manager * @@ -554,8 +526,6 @@ static zbx_ipmi_poller_t *ipmi_manager_get_host_poller(zbx_ipmi_manager_t *manag /****************************************************************************** * * - * Function: ipmi_manager_process_poller_queue * - * * * Purpose: processes IPMI poller request queue * * * * Parameters: manager - [IN] the IPMI manager * @@ -605,8 +575,6 @@ static void ipmi_manager_process_poller_queue(zbx_ipmi_manager_t *manager, zbx_i /****************************************************************************** * * - * Function: ipmi_manager_cache_host * - * * * Purpose: caches host to keep local copy of its availability data * * * * Parameters: manager - [IN] the IPMI manager * @@ -638,8 +606,6 @@ static zbx_ipmi_manager_host_t *ipmi_manager_cache_host(zbx_ipmi_manager_t *mana /****************************************************************************** * * - * Function: ipmi_manager_update_host * - * * * Purpose: updates cached host * * * * Parameters: manager - [IN] the IPMI manager * @@ -663,8 +629,6 @@ static void ipmi_manager_update_host(zbx_ipmi_manager_t *manager, const DC_INTER /****************************************************************************** * * - * Function: ipmi_manager_activate_interface * - * * * Purpose: tries to activate item's interface after receiving response * * * * Parameters: manager - [IN] the IPMI manager * @@ -695,8 +659,6 @@ static void ipmi_manager_activate_interface(zbx_ipmi_manager_t *manager, zbx_uin /****************************************************************************** * * - * Function: ipmi_manager_deactivate_interface * - * * * Purpose: tries to deactivate item's interface after receiving * * host level error * * * @@ -730,8 +692,6 @@ static void ipmi_manager_deactivate_interface(zbx_ipmi_manager_t *manager, zbx_u /****************************************************************************** * * - * Function: ipmi_manager_serialize_request * - * * * Purpose: serializes IPMI poll and discovery requests * * * * Parameters: item - [IN] the item to poll * @@ -755,8 +715,6 @@ static void ipmi_manager_serialize_request(const DC_ITEM *item, zbx_ipc_message_ /****************************************************************************** * * - * Function: ipmi_manager_schedule_request * - * * * Purpose: schedules request to the host * * * * Parameters: manager - [IN] the IPMI manager * @@ -776,8 +734,6 @@ static void ipmi_manager_schedule_request(zbx_ipmi_manager_t *manager, zbx_uint6 /****************************************************************************** * * - * Function: ipmi_manager_schedule_requests * - * * * Purpose: either sends or queues IPMI poll requests from configuration * * cache IPMI poller queue * * * @@ -832,8 +788,6 @@ static int ipmi_manager_schedule_requests(zbx_ipmi_manager_t *manager, int now, /****************************************************************************** * * - * Function: ipmi_manager_process_client_request * - * * * Purpose: forwards IPMI request to the poller managing the specified host * * * * Parameters: manager - [IN] the IPMI manager * @@ -863,8 +817,6 @@ static void ipmi_manager_process_client_request(zbx_ipmi_manager_t *manager, zbx /****************************************************************************** * * - * Function: ipmi_manager_process_client_result * - * * * Purpose: forwards result of request to the client * * * * Parameters: manager - [IN] the IPMI manager * @@ -897,8 +849,6 @@ static void ipmi_manager_process_client_result(zbx_ipmi_manager_t *manager, zbx_ /****************************************************************************** * * - * Function: ipmi_manager_process_value_result * - * * * Purpose: processes IPMI check result received from IPMI poller * * * * Parameters: manager - [IN] the IPMI manager * diff --git a/src/zabbix_server/ipmi/ipmi_poller.c b/src/zabbix_server/ipmi/ipmi_poller.c index b2efef12b89..b4f72994ef5 100644 --- a/src/zabbix_server/ipmi/ipmi_poller.c +++ b/src/zabbix_server/ipmi/ipmi_poller.c @@ -40,8 +40,6 @@ extern ZBX_THREAD_LOCAL int server_num, process_num; /****************************************************************************** * * - * Function: ipmi_poller_register * - * * * Purpose: registers IPMI poller with IPMI manager * * * * Parameters: socket - [IN] the connections socket * @@ -58,8 +56,6 @@ static void ipmi_poller_register(zbx_ipc_async_socket_t *socket) /****************************************************************************** * * - * Function: ipmi_poller_send_result * - * * * Purpose: sends IPMI poll result to manager * * * * Parameters: socket - [IN] the connections socket * @@ -84,8 +80,6 @@ static void ipmi_poller_send_result(zbx_ipc_async_socket_t *socket, zbx_uint32_t /****************************************************************************** * * - * Function: ipmi_poller_process_value_request * - * * * Purpose: gets IPMI sensor value from the specified host * * * * Parameters: socket - [IN] the connections socket * @@ -135,8 +129,6 @@ static void ipmi_poller_process_value_request(zbx_ipc_async_socket_t *socket, zb /****************************************************************************** * * - * Function: ipmi_poller_process_command_request * - * * * Purpose:sets IPMI sensor value * * * * Parameters: socket - [IN] the connections socket * diff --git a/src/zabbix_server/lld/lld.c b/src/zabbix_server/lld/lld.c index b5995300683..b6513125a31 100644 --- a/src/zabbix_server/lld/lld.c +++ b/src/zabbix_server/lld/lld.c @@ -63,8 +63,6 @@ lld_override_t; /****************************************************************************** * * - * Function: lld_condition_free * - * * * Purpose: release resources allocated by filter condition * * * * Parameters: condition - [IN] the filter condition * @@ -82,8 +80,6 @@ static void lld_condition_free(lld_condition_t *condition) /****************************************************************************** * * - * Function: lld_conditions_free * - * * * Purpose: release resources allocated by filter conditions * * * * Parameters: conditions - [IN] the filter conditions * @@ -97,8 +93,6 @@ static void lld_conditions_free(zbx_vector_ptr_t *conditions) /****************************************************************************** * * - * Function: lld_condition_compare_by_macro * - * * * Purpose: compare two filter conditions by their macros * * * * Parameters: item1 - [IN] the first filter condition * @@ -115,8 +109,6 @@ static int lld_condition_compare_by_macro(const void *item1, const void *item2) /****************************************************************************** * * - * Function: lld_filter_init * - * * * Purpose: initializes lld filter * * * * Parameters: filter - [IN] the lld filter * @@ -131,8 +123,6 @@ static void lld_filter_init(lld_filter_t *filter) /****************************************************************************** * * - * Function: lld_filter_clean * - * * * Purpose: releases resources allocated by lld filter * * * * Parameters: filter - [IN] the lld filter * @@ -181,8 +171,6 @@ static int lld_filter_condition_add(zbx_vector_ptr_t *conditions, const char *id /****************************************************************************** * * - * Function: lld_filter_load * - * * * Purpose: loads lld filter data * * * * Parameters: filter - [IN] the lld filter * @@ -219,8 +207,6 @@ static int lld_filter_load(lld_filter_t *filter, zbx_uint64_t lld_ruleid, const /****************************************************************************** * * - * Function: filter_condition_match * - * * * Purpose: check if the lld data passes filter evaluation * * * * Parameters: jp_row - [IN] the lld data row * @@ -277,8 +263,6 @@ static int filter_condition_match(const struct zbx_json_parse *jp_row, const zbx /****************************************************************************** * * - * Function: filter_evaluate_and_or * - * * * Purpose: check if the lld data passes filter evaluation by and/or rule * * * * Parameters: filter - [IN] the lld filter * @@ -329,8 +313,6 @@ static int filter_evaluate_and_or(const lld_filter_t *filter, const struct zbx_j /****************************************************************************** * * - * Function: filter_evaluate_and * - * * * Purpose: check if the lld data passes filter evaluation by and rule * * * * Parameters: filter - [IN] the lld filter * @@ -366,8 +348,6 @@ static int filter_evaluate_and(const lld_filter_t *filter, const struct zbx_json /****************************************************************************** * * - * Function: filter_evaluate_or * - * * * Purpose: check if the lld data passes filter evaluation by or rule * * * * Parameters: filter - [IN] the lld filter * @@ -403,8 +383,6 @@ static int filter_evaluate_or(const lld_filter_t *filter, const struct zbx_json_ /****************************************************************************** * * - * Function: filter_evaluate_expression * - * * * Purpose: check if the lld data passes filter evaluation by custom * * expression * * * @@ -463,8 +441,6 @@ static int filter_evaluate_expression(const lld_filter_t *filter, const struct z /****************************************************************************** * * - * Function: filter_evaluate * - * * * Purpose: check if the lld data passes filter evaluation * * * * Parameters: filter - [IN] the lld filter * @@ -1108,8 +1084,6 @@ static void lld_row_free(zbx_lld_row_t *lld_row) /****************************************************************************** * * - * Function: lld_process_discovery_rule * - * * * Purpose: add or update items, triggers and graphs for discovery item * * * * Parameters: lld_ruleid - [IN] discovery item identifier from database * diff --git a/src/zabbix_server/lld/lld_common.c b/src/zabbix_server/lld/lld_common.c index a6b1c77870a..914661252f4 100644 --- a/src/zabbix_server/lld/lld_common.c +++ b/src/zabbix_server/lld/lld_common.c @@ -27,8 +27,6 @@ /****************************************************************************** * * - * Function: lld_field_str_rollback * - * * * Author: Alexander Vladishev * * * ******************************************************************************/ @@ -45,8 +43,6 @@ void lld_field_str_rollback(char **field, char **field_orig, zbx_uint64_t *flags /****************************************************************************** * * - * Function: lld_field_uint64_rollback * - * * * Author: Alexander Vladishev * * * ******************************************************************************/ @@ -62,8 +58,6 @@ void lld_field_uint64_rollback(zbx_uint64_t *field, zbx_uint64_t *field_orig, zb /****************************************************************************** * * - * Function: lld_end_of_life * - * * * Purpose: calculate when to delete lost resources in an overflow-safe way * * * ******************************************************************************/ @@ -74,8 +68,6 @@ int lld_end_of_life(int lastcheck, int lifetime) /****************************************************************************** * * - * Function: lld_remove_lost_objects * - * * * Purpose: updates lastcheck and ts_delete fields; removes lost resources * * * ******************************************************************************/ diff --git a/src/zabbix_server/lld/lld_graph.c b/src/zabbix_server/lld/lld_graph.c index 78de51511d5..bd0dc93384b 100644 --- a/src/zabbix_server/lld/lld_graph.c +++ b/src/zabbix_server/lld/lld_graph.c @@ -165,8 +165,6 @@ static void lld_graphs_free(zbx_vector_ptr_t *graphs) /****************************************************************************** * * - * Function: lld_graphs_get * - * * * Purpose: retrieve graphs which were created by the specified graph * * prototype * * * @@ -277,8 +275,6 @@ static void lld_graphs_get(zbx_uint64_t parent_graphid, zbx_vector_ptr_t *graphs /****************************************************************************** * * - * Function: lld_gitems_get * - * * * Purpose: retrieve graphs_items which are used by the graph prototype and * * by selected graphs * * * @@ -382,8 +378,6 @@ static void lld_gitems_get(zbx_uint64_t parent_graphid, zbx_vector_ptr_t *gitems /****************************************************************************** * * - * Function: lld_items_get * - * * * Purpose: returns the list of items which are related to the graph * * prototype * * * @@ -458,8 +452,6 @@ static void lld_items_get(const zbx_vector_ptr_t *gitems_proto, zbx_uint64_t ymi /****************************************************************************** * * - * Function: lld_graph_by_item * - * * * Purpose: finds already existing graph, using an item * * * * Return value: upon successful completion return pointer to the graph * @@ -492,8 +484,6 @@ static zbx_lld_graph_t *lld_graph_by_item(zbx_vector_ptr_t *graphs, zbx_uint64_t /****************************************************************************** * * - * Function: lld_graph_get * - * * * Purpose: finds already existing graph, using an item prototype and items * * already created by it * * * @@ -518,8 +508,6 @@ static zbx_lld_graph_t *lld_graph_get(zbx_vector_ptr_t *graphs, const zbx_vector /****************************************************************************** * * - * Function: lld_item_get * - * * * Purpose: finds already created item when itemid_proto is an item prototype * * or return itemid_proto as itemid if it's a normal item * * * @@ -669,8 +657,6 @@ out: /****************************************************************************** * * - * Function: lld_graph_make * - * * * Purpose: create a graph based on lld rule and add it to the list * * * ******************************************************************************/ @@ -789,8 +775,6 @@ static void lld_graphs_make(const zbx_vector_ptr_t *gitems_proto, zbx_vector_ptr /****************************************************************************** * * - * Function: lld_validate_graph_field * - * * ******************************************************************************/ static void lld_validate_graph_field(zbx_lld_graph_t *graph, char **field, char **field_orig, zbx_uint64_t flag, size_t field_len, char **error) @@ -829,8 +813,6 @@ static void lld_validate_graph_field(zbx_lld_graph_t *graph, char **field, char /****************************************************************************** * * - * Function: lld_graphs_validate * - * * * Parameters: graphs - [IN] sorted list of graphs * * * ******************************************************************************/ @@ -984,8 +966,6 @@ static void lld_graphs_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *graphs, c /****************************************************************************** * * - * Function: lld_graphs_save * - * * * Purpose: add or update graphs in database based on discovery rule * * * * Return value: SUCCEED - if graphs were successfully saved or saving * @@ -1470,8 +1450,6 @@ static void get_graph_info(const void *object, zbx_uint64_t *id, int *discovery_ /****************************************************************************** * * - * Function: lld_update_graphs * - * * * Purpose: add or update graphs for discovery item * * * * Parameters: hostid - [IN] host identifier from database * diff --git a/src/zabbix_server/lld/lld_host.c b/src/zabbix_server/lld/lld_host.c index fb8792b2a4c..adf4bdae8c9 100644 --- a/src/zabbix_server/lld/lld_host.c +++ b/src/zabbix_server/lld/lld_host.c @@ -331,8 +331,6 @@ static int zbx_ids_names_compare_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: lld_hosts_get_tags * - * * * Purpose: retrieves tags of the existing hosts * * * * Parameters: hosts - [IN/OUT] list of hosts * @@ -400,8 +398,6 @@ out: /****************************************************************************** * * - * Function: lld_hosts_get * - * * * Purpose: retrieves existing hosts for the specified host prototype * * * * Parameters: parent_hostid - [IN] host prototype identifier * @@ -551,8 +547,6 @@ static void lld_hosts_get(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *hosts, z /****************************************************************************** * * - * Function: lld_hosts_validate * - * * * Parameters: hosts - [IN] list of hosts; should be sorted by hostid * * * ******************************************************************************/ @@ -973,8 +967,6 @@ out: /****************************************************************************** * * - * Function: lld_simple_groups_get * - * * * Purpose: retrieve list of host groups which should be present on the each * * discovered host * * * @@ -1007,8 +999,6 @@ static void lld_simple_groups_get(zbx_uint64_t parent_hostid, zbx_vector_uint64_ /****************************************************************************** * * - * Function: lld_hostgroups_make * - * * * Parameters: groupids - [IN] sorted list of host group ids which * * should be present on the each * * discovered host (Groups) * @@ -1128,8 +1118,6 @@ static void lld_hostgroups_make(const zbx_vector_uint64_t *groupids, zbx_vector_ /****************************************************************************** * * - * Function: lld_group_prototypes_get * - * * * Purpose: retrieve list of group prototypes * * * * Parameters: parent_hostid - [IN] host prototype identifier * @@ -1169,8 +1157,6 @@ static void lld_group_prototypes_get(zbx_uint64_t parent_hostid, zbx_vector_ptr_ /****************************************************************************** * * - * Function: lld_groups_get * - * * * Purpose: retrieves existing groups for the specified host prototype * * * * Parameters: parent_hostid - [IN] host prototype identifier * @@ -1219,8 +1205,6 @@ static void lld_groups_get(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *groups) /****************************************************************************** * * - * Function: lld_group_make * - * * ******************************************************************************/ static zbx_lld_group_t *lld_group_make(zbx_vector_ptr_t *groups, zbx_uint64_t group_prototypeid, const char *name_proto, const struct zbx_json_parse *jp_row, const zbx_vector_ptr_t *lld_macros) @@ -1321,8 +1305,6 @@ out: /****************************************************************************** * * - * Function: lld_groups_make * - * * ******************************************************************************/ static void lld_groups_make(zbx_lld_host_t *host, zbx_vector_ptr_t *groups, const zbx_vector_ptr_t *group_prototypes, const struct zbx_json_parse *jp_row, const zbx_vector_ptr_t *lld_macros) @@ -1349,8 +1331,6 @@ static void lld_groups_make(zbx_lld_host_t *host, zbx_vector_ptr_t *groups, cons /****************************************************************************** * * - * Function: lld_validate_group_name * - * * * Purpose: validate group name * * * * Return value: SUCCEED - the group name is valid * @@ -1384,8 +1364,6 @@ static int lld_validate_group_name(const char *name) /****************************************************************************** * * - * Function: lld_groups_validate * - * * * Parameters: groups - [IN] list of groups; should be sorted by groupid * * * ******************************************************************************/ @@ -1540,8 +1518,6 @@ static void lld_groups_validate(zbx_vector_ptr_t *groups, char **error) /****************************************************************************** * * - * Function: lld_group_rights_compare * - * * * Purpose: sorting function to sort group rights vector by name * * * ******************************************************************************/ @@ -1555,8 +1531,6 @@ static int lld_group_rights_compare(const void *d1, const void *d2) /****************************************************************************** * * - * Function: lld_group_rights_append * - * * * Purpose: append a new item to group rights vector * * * * Return value: Index of the added item. * @@ -1578,8 +1552,6 @@ static int lld_group_rights_append(zbx_vector_ptr_t *group_rights, const char *n /****************************************************************************** * * - * Function: lld_group_rights_free * - * * * PUrpose: frees group rights data * * * ******************************************************************************/ @@ -1592,8 +1564,6 @@ static void lld_group_rights_free(zbx_lld_group_rights_t *rights) /****************************************************************************** * * - * Function: lld_groups_save_rights * - * * * Parameters: groups - [IN] list of new groups * * * ******************************************************************************/ @@ -1736,8 +1706,6 @@ out: /****************************************************************************** * * - * Function: lld_groups_save * - * * * Parameters: groups - [IN/OUT] list of groups; should be sorted * * by groupid * * group_prototypes - [IN] list of group prototypes; should be * @@ -1915,8 +1883,6 @@ out: /****************************************************************************** * * - * Function: lld_masterhostmacros_get * - * * * Purpose: retrieve list of host macros which should be present on the each * * discovered host * * * @@ -1961,8 +1927,6 @@ static void lld_masterhostmacros_get(zbx_uint64_t lld_ruleid, zbx_vector_ptr_t * /****************************************************************************** * * - * Function: macro_str_compare_func * - * * * Purpose: compare the name of host macros for search in vector * * * * Parameters: d1 - [IN] first zbx_lld_hostmacro_t * @@ -1981,8 +1945,6 @@ static int macro_str_compare_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: lld_hostmacros_get * - * * * Purpose: retrieve list of host macros which should be present on the each * * discovered host * * * @@ -2052,8 +2014,6 @@ static void lld_hostmacros_get(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *mas /****************************************************************************** * * - * Function: lld_hostmacro_make * - * * ******************************************************************************/ static void lld_hostmacro_make(zbx_vector_ptr_t *hostmacros, zbx_uint64_t hostmacroid, const char *macro, const char *value, const char *description, unsigned char type) @@ -2105,8 +2065,6 @@ static void lld_hostmacro_make(zbx_vector_ptr_t *hostmacros, zbx_uint64_t hostma /****************************************************************************** * * - * Function: lld_hostmacros_make * - * * * Parameters: hostmacros - [IN] list of host macros which * * should be present on the each * * discovered host * @@ -2207,8 +2165,6 @@ static void lld_hostmacros_make(const zbx_vector_ptr_t *hostmacros, zbx_vector_p /****************************************************************************** * * - * Function: lld_tags_get * - * * * Purpose: retrieve list of host tags which should be present on the each * * discovered host * * * @@ -2243,8 +2199,6 @@ static void lld_proto_tags_get(zbx_uint64_t parent_hostid, zbx_vector_db_tag_ptr /****************************************************************************** * * - * Function: lld_tag_validate_field * - * * * Purpose: validate host tag field * * * * Parameters: name - [IN] the field name (tag, value) * @@ -2278,8 +2232,6 @@ static int lld_tag_validate_field(const char *name, const char *field, size_t fi /****************************************************************************** * * - * Function: lld_tag_validate * - * * * Purpose: validate host tag * * * * Parameters: tags - [IN] the current host tags * @@ -2321,8 +2273,6 @@ static int lld_tag_validate(zbx_db_tag_t **tags, int tags_num, const char *name, /****************************************************************************** * * - * Function: lld_host_update_tags * - * * * Purpose: update host tags * * * * Parameters: host - [IN] a host with existing tags, sorted by tag + * @@ -2428,8 +2378,6 @@ static void lld_host_update_tags(zbx_lld_host_t *host, const zbx_vector_db_tag_p /****************************************************************************** * * - * Function: lld_templates_make * - * * * Purpose: gets templates from a host prototype * * * * Parameters: parent_hostid - [IN] host prototype identifier * @@ -2548,8 +2496,6 @@ static void lld_templates_make(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *hos /****************************************************************************** * * - * Function: lld_interface_snmp_prepare_sql * - * * * Purpose: prepare sql for update record of interface_snmp table * * * * Parameters: hostid - [IN] host identifier * @@ -2671,8 +2617,6 @@ static void lld_interface_snmp_prepare_sql(zbx_uint64_t hostid, const zbx_uint64 /****************************************************************************** * * - * Function: lld_hosts_save * - * * * Parameters: parent_hostid - [IN] parent host id * * hosts - [IN] list of hosts; * * host_proto - [IN] host proto * @@ -3571,8 +3515,6 @@ out: /****************************************************************************** * * - * Function: lld_templates_link * - * * ******************************************************************************/ static void lld_templates_link(const zbx_vector_ptr_t *hosts, char **error) { @@ -3614,8 +3556,6 @@ static void lld_templates_link(const zbx_vector_ptr_t *hosts, char **error) /****************************************************************************** * * - * Function: lld_hosts_remove * - * * * Purpose: updates host_discovery.lastcheck and host_discovery.ts_delete * * fields; removes lost resources * * * @@ -3749,8 +3689,6 @@ static void lld_hosts_remove(const zbx_vector_ptr_t *hosts, int lifetime, int la /****************************************************************************** * * - * Function: lld_groups_remove * - * * * Purpose: updates group_discovery.lastcheck and group_discovery.ts_delete * * fields; removes lost resources * * * @@ -3852,8 +3790,6 @@ static void lld_groups_remove(const zbx_vector_ptr_t *groups, int lifetime, int /****************************************************************************** * * - * Function: lld_interfaces_get * - * * * Purpose: retrieves either the list of interfaces from the lld rule's host * * or the list of custom interfaces defined for the host prototype * * * @@ -3954,8 +3890,6 @@ static void lld_interfaces_get(zbx_uint64_t id, zbx_vector_ptr_t *interfaces, un /****************************************************************************** * * - * Function: lld_interface_make * - * * ******************************************************************************/ static void lld_interface_make(zbx_vector_ptr_t *interfaces, zbx_uint64_t parent_interfaceid, zbx_uint64_t interfaceid, unsigned char type, unsigned char main, unsigned char useip, const char *ip, @@ -4107,8 +4041,6 @@ static void lld_interface_make(zbx_vector_ptr_t *interfaces, zbx_uint64_t parent /****************************************************************************** * * - * Function: lld_interfaces_make * - * * * Parameters: interfaces - [IN] sorted list of interfaces which * * should be present on the each * * discovered host * @@ -4283,8 +4215,6 @@ static void lld_interfaces_make(const zbx_vector_ptr_t *interfaces, zbx_vector_p /****************************************************************************** * * - * Function: another_main_interface_exists * - * * * Return value: SUCCEED if interface with same type exists in the list of * * interfaces; FAIL - otherwise * * * @@ -4319,8 +4249,6 @@ static int another_main_interface_exists(const zbx_vector_ptr_t *interfaces, con /****************************************************************************** * * - * Function: lld_interfaces_validate * - * * * Parameters: hosts - [IN/OUT] list of hosts * * * ******************************************************************************/ @@ -4495,8 +4423,6 @@ static void lld_interfaces_validate(zbx_vector_ptr_t *hosts, char **error) /****************************************************************************** * * - * Function: lld_update_hosts * - * * * Purpose: add or update low-level discovered hosts * * * ******************************************************************************/ diff --git a/src/zabbix_server/lld/lld_item.c b/src/zabbix_server/lld/lld_item.c index 61449dc40fd..21673529d2a 100644 --- a/src/zabbix_server/lld/lld_item.c +++ b/src/zabbix_server/lld/lld_item.c @@ -364,8 +364,6 @@ static void lld_item_free(zbx_lld_item_t *item) /****************************************************************************** * * - * Function: lld_items_get * - * * * Purpose: retrieves existing items for the specified item prototypes * * * * Parameters: item_prototypes - [IN] item prototypes * @@ -788,8 +786,6 @@ out: /****************************************************************************** * * - * Function: is_user_macro * - * * * Purpose: checks if string is user macro * * * * Parameters: str - [IN] string to validate * @@ -815,8 +811,6 @@ static int is_user_macro(const char *str) /****************************************************************************** * * - * Function: lld_validate_item_param * - * * ******************************************************************************/ static int lld_validate_item_param(zbx_uint64_t itemid, int type, size_t len, char *param, char **error) { @@ -846,8 +840,6 @@ static int lld_validate_item_param(zbx_uint64_t itemid, int type, size_t len, ch /****************************************************************************** * * - * Function: lld_validate_item_tag * - * * ******************************************************************************/ static int lld_validate_item_tag(zbx_uint64_t itemid, int type, char *tag, char **error) { @@ -885,8 +877,6 @@ static int lld_validate_item_tag(zbx_uint64_t itemid, int type, char *tag, char /****************************************************************************** * * - * Function: lld_validate_item_field * - * * ******************************************************************************/ static void lld_validate_item_field(zbx_lld_item_t *item, char **field, char **field_orig, zbx_uint64_t flag, size_t field_len, char **error) @@ -996,8 +986,6 @@ static void lld_validate_item_field(zbx_lld_item_t *item, char **field, char **f /****************************************************************************** * * - * Function: lld_item_dependence_add * - * * * Purpose: add a new dependency * * * * Parameters: item_dependencies - [IN\OUT] list of dependencies * @@ -1027,8 +1015,6 @@ static zbx_item_dependence_t *lld_item_dependence_add(zbx_vector_ptr_t *item_dep /****************************************************************************** * * - * Function: lld_item_dependencies_get * - * * * Purpose: recursively get dependencies with dependent items taking into * * account item prototypes * * * @@ -1161,8 +1147,6 @@ static void lld_item_dependencies_get(const zbx_vector_ptr_t *item_prototypes, z /****************************************************************************** * * - * Function: lld_item_dependencies_count * - * * * Purpose: recursively count the number of dependencies * * * * Parameters: itemid - [IN] item ID to be checked * @@ -1232,8 +1216,6 @@ out: /****************************************************************************** * * - * Function: lld_item_dependencies_check * - * * * Purpose: check the limits of dependent items * * * * Parameters: item - [IN] discovered item * @@ -1313,8 +1295,6 @@ out: /****************************************************************************** * * - * Function: lld_items_preproc_step_validate * - * * * Purpose: validation of a item preprocessing step expressions for discovery * * process * * * @@ -1517,8 +1497,6 @@ static int lld_items_preproc_step_validate(const zbx_lld_item_preproc_t * pp, zb /****************************************************************************** * * - * Function: lld_items_validate * - * * * Parameters: hostid - [IN] host id * * items - [IN] list of items * * item_prototypes - [IN] the item prototypes * @@ -1875,8 +1853,6 @@ static void lld_items_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *items, zbx /****************************************************************************** * * - * Function: substitute_formula_macros * - * * * Purpose: substitutes lld macros in calculated item formula expression * * * * Parameters: data - [IN/OUT] the expression * @@ -1902,8 +1878,6 @@ static int substitute_formula_macros(char **data, const struct zbx_json_parse *j /****************************************************************************** * * - * Function: lld_item_make * - * * * Purpose: creates a new item based on item prototype and lld data row * * * * Parameters: item_prototype - [IN] the item prototype * @@ -2134,8 +2108,6 @@ static zbx_lld_item_t *lld_item_make(const zbx_lld_item_prototype_t *item_protot /****************************************************************************** * * - * Function: lld_item_update * - * * * Purpose: updates an existing item based on item prototype and lld data row * * * * Parameters: item_prototype - [IN] the item prototype * @@ -2482,8 +2454,6 @@ static void lld_item_update(const zbx_lld_item_prototype_t *item_prototype, cons /****************************************************************************** * * - * Function: lld_items_make * - * * * Purpose: updates existing items and creates new ones based on item * * item prototypes and lld data * * * @@ -2596,8 +2566,6 @@ static void lld_items_make(const zbx_vector_ptr_t *item_prototypes, zbx_vector_p /****************************************************************************** * * - * Function: substitute_lld_macors_in_preproc_params * - * * * Purpose: escaping of a symbols in items preprocessing steps for discovery * * process * * * @@ -2683,8 +2651,6 @@ static void substitute_lld_macros_in_preproc_params(int type, const zbx_lld_row_ /****************************************************************************** * * - * Function: lld_items_preproc_make * - * * * Purpose: updates existing items preprocessing operations and create new * * based on item item prototypes * * * @@ -2803,8 +2769,6 @@ static void lld_items_preproc_make(const zbx_vector_ptr_t *item_prototypes, /****************************************************************************** * * - * Function: lld_items_param_make * - * * * Purpose: updates existing items parameters and create new based on item * * prototypes * * * @@ -2909,8 +2873,6 @@ static void lld_items_param_make(const zbx_vector_ptr_t *item_prototypes, /****************************************************************************** * * - * Function: lld_items_tags_make * - * * * Purpose: updates existing items tags and create new based on item * * prototypes * * * @@ -3030,8 +2992,6 @@ static void lld_items_tags_make(const zbx_vector_ptr_t *item_prototypes, const z /****************************************************************************** * * - * Function: lld_item_save * - * * * Purpose: recursively prepare LLD item bulk insert if any and * * update dependent items with their masters * * * @@ -3111,8 +3071,6 @@ static void lld_item_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *item_prot /****************************************************************************** * * - * Function: lld_item_prepare_update * - * * * Purpose: prepare sql to update LLD item * * * * Parameters: item_prototype - [IN] item prototype * @@ -3501,8 +3459,6 @@ static void lld_item_prepare_update(const zbx_lld_item_prototype_t *item_prototy /****************************************************************************** * * - * Function: lld_item_discovery_prepare_update * - * * * Purpose: prepare sql to update key in LLD item discovery * * * * Parameters: item_prototype - [IN] item prototype * @@ -3536,8 +3492,6 @@ static void lld_item_discovery_prepare_update(const zbx_lld_item_prototype_t *it /****************************************************************************** * * - * Function: lld_items_save * - * * * Parameters: hostid - [IN] parent host id * * item_prototypes - [IN] item prototypes * * items - [IN/OUT] items to save * @@ -3756,8 +3710,6 @@ out: /****************************************************************************** * * - * Function: lld_items_preproc_save * - * * * Purpose: saves/updates/removes item preprocessing operations * * * * Parameters: hostid - [IN] parent host id * @@ -3971,8 +3923,6 @@ out: /****************************************************************************** * * - * Function: lld_items_param_save * - * * * Purpose: saves/updates/removes item parameters * * * * Parameters: hostid - [IN] parent host id * @@ -4152,8 +4102,6 @@ out: /****************************************************************************** * * - * Function: lld_items_tags_save * - * * * Purpose: saves/updates/removes item tags * * * * Parameters: hostid - [IN] parent host id * @@ -4395,8 +4343,6 @@ void lld_item_links_sort(zbx_vector_ptr_t *lld_rows) /****************************************************************************** * * - * Function: lld_item_prototypes_get * - * * * Purpose: load discovery rule item prototypes * * * * Parameters: lld_ruleid - [IN] the discovery rule id * @@ -4609,8 +4555,6 @@ out: /****************************************************************************** * * - * Function: lld_link_dependent_items * - * * * Purpose: create dependent item index in master item data * * * * Parameters: items - [IN/OUT] the lld items * @@ -4647,8 +4591,6 @@ static void lld_link_dependent_items(zbx_vector_ptr_t *items, zbx_hashset_t *ite /****************************************************************************** * * - * Function: lld_update_items * - * * * Purpose: add or update discovered items * * * * Return value: SUCCEED - if items were successfully added/updated or * diff --git a/src/zabbix_server/lld/lld_manager.c b/src/zabbix_server/lld/lld_manager.c index 06be383ad2c..87ef9a68f42 100644 --- a/src/zabbix_server/lld/lld_manager.c +++ b/src/zabbix_server/lld/lld_manager.c @@ -114,8 +114,6 @@ static int rule_elem_compare_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: lld_data_free * - * * * Purpose: frees LLD data * * * ******************************************************************************/ @@ -128,8 +126,6 @@ static void lld_data_free(zbx_lld_data_t *data) /****************************************************************************** * * - * Function: lld_rule_clear * - * * * Purpose: clears LLD rule * * * ******************************************************************************/ @@ -147,8 +143,6 @@ static void lld_rule_clear(zbx_lld_rule_t *rule) /****************************************************************************** * * - * Function: lld_worker_free * - * * * Purpose: frees LLD worker * * * ******************************************************************************/ @@ -159,8 +153,6 @@ static void lld_worker_free(zbx_lld_worker_t *worker) /****************************************************************************** * * - * Function: lld_manager_init * - * * * Purpose: initializes LLD manager * * * * Parameters: manager - [IN] the manager to initialize * @@ -201,8 +193,6 @@ static void lld_manager_init(zbx_lld_manager_t *manager) /****************************************************************************** * * - * Function: lld_manager_destroy * - * * * Purpose: destroys LLD manager * * * * Parameters: manager - [IN] the manager to destroy * @@ -220,8 +210,6 @@ static void lld_manager_destroy(zbx_lld_manager_t *manager) /****************************************************************************** * * - * Function: lld_get_worker_by_client * - * * * Purpose: returns worker by connected IPC client data * * * * Parameters: manager - [IN] the manager * @@ -248,8 +236,6 @@ static zbx_lld_worker_t *lld_get_worker_by_client(zbx_lld_manager_t *manager, zb /****************************************************************************** * * - * Function: lld_register_worker * - * * * Purpose: registers worker * * * * Parameters: manager - [IN] the manager * @@ -292,8 +278,6 @@ static void lld_register_worker(zbx_lld_manager_t *manager, zbx_ipc_client_t *cl /****************************************************************************** * * - * Function: lld_queue_rule * - * * * Purpose: queues LLD rule * * * * Parameters: manager - [IN] the LLD manager * @@ -309,8 +293,6 @@ static void lld_queue_rule(zbx_lld_manager_t *manager, zbx_lld_rule_t *rule) /****************************************************************************** * * - * Function: lld_queue_request * - * * * Purpose: queues low level discovery request * * * * Parameters: manager - [IN] the LLD manager * @@ -379,8 +361,6 @@ out: /****************************************************************************** * * - * Function: lld_process_next_request * - * * * Purpose: processes next LLD request from queue * * * * Parameters: manager - [IN] the LLD manager * @@ -407,8 +387,6 @@ static void lld_process_next_request(zbx_lld_manager_t *manager, zbx_lld_worker_ /****************************************************************************** * * - * Function: lld_process_queue * - * * * Purpose: sends queued LLD rules to free workers * * * * Parameters: manager - [IN] the LLD manager * @@ -429,8 +407,6 @@ static void lld_process_queue(zbx_lld_manager_t *manager) /****************************************************************************** * * - * Function: lld_process_result * - * * * Purpose: processes LLD worker 'done' response * * * * Parameters: manager - [IN] the LLD manager * @@ -478,8 +454,6 @@ static void lld_process_result(zbx_lld_manager_t *manager, zbx_ipc_client_t *cli /****************************************************************************** * * - * Function: lld_process_diag_stats * - * * * Purpose: processes external diagnostic statistics request * * * * Parameters: manager - [IN] the LLD manager * @@ -498,8 +472,6 @@ static void lld_process_diag_stats(zbx_lld_manager_t *manager, zbx_ipc_client_t /****************************************************************************** * * - * Function: lld_diag_item_compare_values_desc * - * * * Purpose: sort lld manager cache item view by second value * * (number of values) in descending order * * * @@ -514,8 +486,6 @@ static int lld_diag_item_compare_values_desc(const void *d1, const void *d2) /****************************************************************************** * * - * Function: lld_process_diag_top * - * * * Purpose: processes external top items request * * * * Parameters: manager - [IN] the manager * @@ -579,8 +549,6 @@ static void lld_process_top_items(zbx_lld_manager_t *manager, zbx_ipc_client_t * /****************************************************************************** * * - * Function: lld_manager_thread * - * * * Purpose: main processing loop * * * ******************************************************************************/ diff --git a/src/zabbix_server/lld/lld_protocol.c b/src/zabbix_server/lld/lld_protocol.c index 71d79029204..f8ccac0cb10 100644 --- a/src/zabbix_server/lld/lld_protocol.c +++ b/src/zabbix_server/lld/lld_protocol.c @@ -28,8 +28,6 @@ /****************************************************************************** * * - * Function: zbx_lld_serialize_item_value * - * * ******************************************************************************/ zbx_uint32_t zbx_lld_serialize_item_value(unsigned char **data, zbx_uint64_t itemid, zbx_uint64_t hostid, const char *value, const zbx_timespec_t *ts, unsigned char meta, zbx_uint64_t lastlogsize, int mtime, @@ -71,8 +69,6 @@ zbx_uint32_t zbx_lld_serialize_item_value(unsigned char **data, zbx_uint64_t ite /****************************************************************************** * * - * Function: zbx_lld_deserialize_item_value * - * * ******************************************************************************/ void zbx_lld_deserialize_item_value(const unsigned char *data, zbx_uint64_t *itemid, zbx_uint64_t *hostid, char **value, zbx_timespec_t *ts, unsigned char *meta, zbx_uint64_t *lastlogsize, int *mtime, @@ -95,8 +91,6 @@ void zbx_lld_deserialize_item_value(const unsigned char *data, zbx_uint64_t *ite /****************************************************************************** * * - * Function: zbx_lld_serialize_diag_stats * - * * ******************************************************************************/ zbx_uint32_t zbx_lld_serialize_diag_stats(unsigned char **data, zbx_uint64_t items_num, zbx_uint64_t values_num) { @@ -117,8 +111,6 @@ zbx_uint32_t zbx_lld_serialize_diag_stats(unsigned char **data, zbx_uint64_t ite /****************************************************************************** * * - * Function: zbx_lld_deserialize_diag_stats * - * * ******************************************************************************/ static void zbx_lld_deserialize_diag_stats(const unsigned char *data, zbx_uint64_t *items_num, zbx_uint64_t *values_num) { @@ -128,8 +120,6 @@ static void zbx_lld_deserialize_diag_stats(const unsigned char *data, zbx_uint64 /****************************************************************************** * * - * Function: zbx_lld_serialize_top_request * - * * ******************************************************************************/ static zbx_uint32_t zbx_lld_serialize_top_items_request(unsigned char **data, int limit) { @@ -144,8 +134,6 @@ static zbx_uint32_t zbx_lld_serialize_top_items_request(unsigned char **data, in /****************************************************************************** * * - * Function: lld_deserialize_top_request * - * * ******************************************************************************/ void zbx_lld_deserialize_top_items_request(const unsigned char *data, int *limit) { @@ -154,8 +142,6 @@ void zbx_lld_deserialize_top_items_request(const unsigned char *data, int *limit /****************************************************************************** * * - * Function: zbx_lld_serialize_top_items_result * - * * ******************************************************************************/ zbx_uint32_t zbx_lld_serialize_top_items_result(unsigned char **data, const zbx_lld_rule_info_t **rule_infos, int num) @@ -188,8 +174,6 @@ zbx_uint32_t zbx_lld_serialize_top_items_result(unsigned char **data, const zbx_ /****************************************************************************** * * - * Function: zbx_lld_deserialize_top_result * - * * ******************************************************************************/ static void zbx_lld_deserialize_top_items_result(const unsigned char *data, zbx_vector_uint64_pair_t *items) { @@ -216,8 +200,6 @@ static void zbx_lld_deserialize_top_items_result(const unsigned char *data, zbx_ /****************************************************************************** * * - * Function: zbx_lld_process_value * - * * * Purpose: process low level discovery value/error * * * * Parameters: itemid - [IN] the LLD rule id * @@ -255,8 +237,6 @@ void zbx_lld_process_value(zbx_uint64_t itemid, zbx_uint64_t hostid, const char /****************************************************************************** * * - * Function: zbx_lld_process_agent_result * - * * * Purpose: process low level discovery agent result * * * * Parameters: itemid - [IN] the LLD rule id * @@ -293,8 +273,6 @@ void zbx_lld_process_agent_result(zbx_uint64_t itemid, zbx_uint64_t hostid, AGEN /****************************************************************************** * * - * Function: zbx_lld_get_queue_size * - * * * Purpose: get queue size (enqueued value count) of LLD manager * * * * Parameters: size - [OUT] the queue size * @@ -338,8 +316,6 @@ out: /****************************************************************************** * * - * Function: zbx_lld_get_diag_stats * - * * * Purpose: get lld manager diagnostic statistics * * * ******************************************************************************/ @@ -361,8 +337,6 @@ int zbx_lld_get_diag_stats(zbx_uint64_t *items_num, zbx_uint64_t *values_num, ch /****************************************************************************** * * - * Function: zbx_lld_get_top_items * - * * * Purpose: get the top N items by the number of queued values * * * * Parameters field - [IN] the sort field * diff --git a/src/zabbix_server/lld/lld_trigger.c b/src/zabbix_server/lld/lld_trigger.c index 23db73a4297..fbf9f5a1e9e 100644 --- a/src/zabbix_server/lld/lld_trigger.c +++ b/src/zabbix_server/lld/lld_trigger.c @@ -304,8 +304,6 @@ static void lld_trigger_free(zbx_lld_trigger_t *trigger) /****************************************************************************** * * - * Function: lld_trigger_prototypes_get * - * * * Purpose: retrieve trigger prototypes which are inherited from the * * discovery rule * * * @@ -392,8 +390,6 @@ static void lld_trigger_prototypes_get(zbx_uint64_t lld_ruleid, zbx_vector_ptr_t /****************************************************************************** * * - * Function: lld_triggers_get * - * * * Purpose: retrieve triggers which were created by the specified trigger * * prototypes * * * @@ -535,8 +531,6 @@ static void lld_triggers_get(const zbx_vector_ptr_t *trigger_prototypes, zbx_vec /****************************************************************************** * * - * Function: lld_functions_get * - * * * Purpose: retrieve functions which are used by all triggers in the host of * * the trigger prototype * * * @@ -656,8 +650,6 @@ static void lld_functions_get(zbx_vector_ptr_t *trigger_prototypes, zbx_vector_p /****************************************************************************** * * - * Function: lld_dependencies_get * - * * * Purpose: retrieve trigger dependencies * * * ******************************************************************************/ @@ -760,8 +752,6 @@ static void lld_dependencies_get(zbx_vector_ptr_t *trigger_prototypes, zbx_vecto /****************************************************************************** * * - * Function: lld_tags_get * - * * * Purpose: retrieve trigger tags * * * ******************************************************************************/ @@ -865,8 +855,6 @@ static void lld_tags_get(const zbx_vector_ptr_t *trigger_prototypes, zbx_vector_ /****************************************************************************** * * - * Function: lld_items_get * - * * * Purpose: returns the list of items which are related to the trigger * * prototypes * * * @@ -931,8 +919,6 @@ static void lld_items_get(zbx_vector_ptr_t *trigger_prototypes, zbx_vector_ptr_t /****************************************************************************** * * - * Function: lld_trigger_get * - * * * Purpose: finds already existing trigger, using an item prototype and items * * already created by it * * * @@ -961,8 +947,6 @@ static zbx_lld_trigger_t *lld_trigger_get(zbx_uint64_t parent_triggerid, zbx_has /****************************************************************************** * * - * Function: lld_eval_expression_index_functions * - * * * Purpose: set indexes for functionid tokens {<functionid>} from the * * specified function vector * * * @@ -1000,8 +984,6 @@ static void lld_eval_expression_index_functions(zbx_eval_context_t *ctx, zbx_vec /****************************************************************************** * * - * Function: lld_eval_expression_simplify * - * * * Purpose: simplify parsed expression by replacing {<functionid>} with * * {<function index>} * * * @@ -1029,8 +1011,6 @@ static void lld_eval_expression_simplify(zbx_eval_context_t *ctx, char **express /****************************************************************************** * * - * Function: lld_trigger_expression_simplify * - * * * Purpose: simplify trigger expression by replacing {<functionid>} with * * {<function index>} * * * @@ -1065,8 +1045,6 @@ static void lld_trigger_expression_simplify(const zbx_lld_trigger_t *trigger, ch /****************************************************************************** * * - * Function: lld_eval_expression_expand * - * * * Purpose: expand parsed expression function indexes with function strings * * in format itemid:func(params) * * * @@ -1124,8 +1102,6 @@ static char *lld_eval_expression_expand(zbx_eval_context_t *ctx, const zbx_vecto /****************************************************************************** * * - * Function: lld_trigger_expression_expand * - * * * Purpose: expand trigger expression function indexes with function strings * * in format itemid:func(params) * * * @@ -1160,8 +1136,6 @@ static char *lld_trigger_expression_expand(const zbx_lld_trigger_t *trigger, con /****************************************************************************** * * - * Function: lld_trigger_expression_simplify_and_expand * - * * * Purpose: set function indexes and expand them to function strings in * * format itemid:func(params) * * * @@ -1362,8 +1336,6 @@ out: /****************************************************************************** * * - * Function: lld_eval_get_expanded_expression * - * * * Purpose: return copy of the expression with expanded LLD macros * * * ******************************************************************************/ @@ -1416,8 +1388,6 @@ out: /****************************************************************************** * * - * Function: lld_trigger_make * - * * * Purpose: create a trigger based on lld rule and add it to the list * * * ******************************************************************************/ @@ -1713,8 +1683,6 @@ static void lld_triggers_make(const zbx_vector_ptr_t *trigger_prototypes, zbx_ve /****************************************************************************** * * - * Function: lld_trigger_dependency_make * - * * * Purpose: create a trigger dependencies * * * ******************************************************************************/ @@ -1921,8 +1889,6 @@ static void lld_trigger_dependencies_make(const zbx_vector_ptr_t *trigger_protot /****************************************************************************** * * - * Function: lld_trigger_tag_make * - * * * Purpose: create a trigger tag * * * ******************************************************************************/ @@ -2022,8 +1988,6 @@ out: /****************************************************************************** * * - * Function: lld_trigger_tags_make * - * * * Purpose: create a trigger tags * * * ******************************************************************************/ @@ -2095,8 +2059,6 @@ static void lld_trigger_tags_make(const zbx_vector_ptr_t *trigger_prototypes, zb /****************************************************************************** * * - * Function: lld_validate_trigger_field * - * * ******************************************************************************/ static void lld_validate_trigger_field(zbx_lld_trigger_t *trigger, char **field, char **field_orig, zbx_uint64_t flag, size_t field_len, char **error) @@ -2135,8 +2097,6 @@ static void lld_validate_trigger_field(zbx_lld_trigger_t *trigger, char **field, /****************************************************************************** * * - * Function: lld_trigger_changed * - * * * Return value: returns SUCCEED if a trigger description or expression has * * been changed; FAIL - otherwise * * * @@ -2174,8 +2134,6 @@ static int lld_trigger_changed(const zbx_lld_trigger_t *trigger) /****************************************************************************** * * - * Function: lld_triggers_equal * - * * * Return value: returns SUCCEED if descriptions and expressions of * * the triggers are identical; FAIL - otherwise * * * @@ -2210,8 +2168,6 @@ out: /****************************************************************************** * * - * Function: lld_triggers_validate * - * * * Parameters: triggers - [IN] sorted list of triggers * * * ******************************************************************************/ @@ -2427,8 +2383,6 @@ static void lld_triggers_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *trigger /****************************************************************************** * * - * Function: lld_validate_trigger_tag_field * - * * ******************************************************************************/ static void lld_validate_trigger_tag_field(zbx_lld_tag_t *tag, const char *field, zbx_uint64_t flag, size_t field_len, char **error) @@ -2467,8 +2421,6 @@ static void lld_validate_trigger_tag_field(zbx_lld_tag_t *tag, const char *field /****************************************************************************** * * - * Function: lld_trigger_tags_validate * - * * * Purpose: validate created or updated trigger tags * * * ******************************************************************************/ @@ -2526,8 +2478,6 @@ static void lld_trigger_tags_validate(zbx_vector_ptr_t *triggers, char **error) /****************************************************************************** * * - * Function: lld_expression_create * - * * * Purpose: transforms the simple trigger expression to the DB format * * * * Example: * @@ -2609,8 +2559,6 @@ out: /****************************************************************************** * * - * Function: lld_triggers_save * - * * * Purpose: add or update triggers in database based on discovery rule * * * * Parameters: hostid - [IN] parent host id * @@ -3332,8 +3280,6 @@ static int zbx_lld_trigger_node_compare_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: lld_trigger_cache_append * - * * * Purpose: adds a node to trigger cache * * * * Parameters: cache - [IN] the trigger cache * @@ -3361,8 +3307,6 @@ static zbx_lld_trigger_node_t *lld_trigger_cache_append(zbx_hashset_t *cache, zb /****************************************************************************** * * - * Function: lld_trigger_cache_add_trigger_node * - * * * Purpose: add trigger and all triggers related to it to trigger dependency * * validation cache. * * * @@ -3444,8 +3388,6 @@ static void lld_trigger_cache_add_trigger_node(zbx_hashset_t *cache, zbx_lld_tri /****************************************************************************** * * - * Function: lld_trigger_cache_init * - * * * Purpose: initializes trigger cache used to perform trigger dependency * * validation * * * @@ -3625,8 +3567,6 @@ static void lld_trigger_cache_init(zbx_hashset_t *cache, zbx_vector_ptr_t *trigg /****************************************************************************** * * - * Function: zbx_trigger_cache_clean * - * * * Purpose: releases resources allocated by trigger cache * * validation * * * @@ -3650,8 +3590,6 @@ static void zbx_trigger_cache_clean(zbx_hashset_t *cache) /****************************************************************************** * * - * Function: lld_trigger_dependency_delete * - * * * Purpose: removes trigger dependency * * * * Parameters: from - [IN] the reference to dependent trigger * @@ -3714,8 +3652,6 @@ static void lld_trigger_dependency_delete(zbx_lld_trigger_ref_t *from, zbx_lld_t /****************************************************************************** * * - * Function: lld_trigger_dependencies_iter * - * * * Purpose: iterates through trigger dependencies to find dependency loops * * * * Parameters: cache - [IN] the trigger cache * @@ -3792,8 +3728,6 @@ static int lld_trigger_dependencies_iter(zbx_hashset_t *cache, zbx_vector_ptr_t /****************************************************************************** * * - * Function: lld_trigger_dependencies_validate * - * * * Purpose: validate discovered trigger dependencies * * * * Parameters: triggers - [IN] the discovered triggers * @@ -3885,8 +3819,6 @@ static void get_trigger_info(const void *object, zbx_uint64_t *id, int *discover /****************************************************************************** * * - * Function: lld_update_triggers * - * * * Purpose: add or update triggers for discovered items * * * * Return value: SUCCEED - if triggers were successfully added/updated or * diff --git a/src/zabbix_server/lld/lld_worker.c b/src/zabbix_server/lld/lld_worker.c index e1a3aea5f2f..f6e8344be9d 100644 --- a/src/zabbix_server/lld/lld_worker.c +++ b/src/zabbix_server/lld/lld_worker.c @@ -36,8 +36,6 @@ extern ZBX_THREAD_LOCAL int server_num, process_num; /****************************************************************************** * * - * Function: lld_register_worker * - * * * Purpose: registers lld worker with lld manager * * * * Parameters: socket - [IN] the connections socket * @@ -54,8 +52,6 @@ static void lld_register_worker(zbx_ipc_socket_t *socket) /****************************************************************************** * * - * Function: lld_process_task * - * * * Purpose: processes lld task and updates rule state/error in configuration * * cache and database * * * diff --git a/src/zabbix_server/odbc/odbc.c b/src/zabbix_server/odbc/odbc.c index a4ebd87dd26..a95d7149e30 100644 --- a/src/zabbix_server/odbc/odbc.c +++ b/src/zabbix_server/odbc/odbc.c @@ -48,8 +48,6 @@ struct zbx_odbc_query_result /****************************************************************************** * * - * Function: zbx_odbc_rc_str * - * * * Purpose: get human readable representation of ODBC return code * * * * Parameters: rc - [IN] ODBC return code * @@ -83,8 +81,6 @@ static const char *zbx_odbc_rc_str(SQLRETURN rc) /****************************************************************************** * * - * Function: zbx_odbc_diag * - * * * Purpose: diagnose result of ODBC function call * * * * Parameters: h_type - [IN] type of handle call was executed on * @@ -149,8 +145,6 @@ static int zbx_odbc_diag(SQLSMALLINT h_type, SQLHANDLE h, SQLRETURN rc, char **d /****************************************************************************** * * - * Function: zbx_log_odbc_connection_info * - * * * Purpose: log details upon successful connection on behalf of caller * * * * Parameters: function - [IN] caller function name * @@ -205,8 +199,6 @@ static void zbx_log_odbc_connection_info(const char *function, SQLHDBC hdbc) /****************************************************************************** * * - * Function: zbx_odbc_connection_string_append * - * * * Purpose: Appends a new argument to ODBC connection string. * * Connection string is reallocated to fit new value. * * * @@ -232,8 +224,6 @@ static void zbx_odbc_connection_string_append(char **connection_str, const char /****************************************************************************** * * - * Function: zbx_odbc_connect * - * * * Purpose: connect to ODBC data source * * * * Parameters: dsn - [IN] data source name * @@ -344,8 +334,6 @@ out: /****************************************************************************** * * - * Function: zbx_odbc_data_source_free * - * * * Purpose: free resources allocated by successful zbx_odbc_connect() call * * * * Parameters: data_source - [IN] pointer to data source structure * @@ -364,8 +352,6 @@ void zbx_odbc_data_source_free(zbx_odbc_data_source_t *data_source) /****************************************************************************** * * - * Function: zbx_odbc_select * - * * * Purpose: execute a query to ODBC data source * * * * Parameters: data_source - [IN] pointer to data source structure * @@ -444,8 +430,6 @@ out: /****************************************************************************** * * - * Function: zbx_odbc_query_result_free * - * * * Purpose: free resources allocated by successful zbx_odbc_select() call * * * * Parameters: query_result - [IN] pointer to query result structure * @@ -469,8 +453,6 @@ void zbx_odbc_query_result_free(zbx_odbc_query_result_t *query_result) /****************************************************************************** * * - * Function: zbx_odbc_fetch * - * * * Purpose: fetch single row of ODBC query result * * * * Parameters: query_result - [IN] pointer to query result structure * @@ -549,8 +531,6 @@ out: /****************************************************************************** * * - * Function: zbx_odbc_query_result_to_string * - * * * Purpose: extract the first column of the first row of ODBC SQL query * * * * Parameters: query_result - [IN] result of SQL query * @@ -594,8 +574,6 @@ int zbx_odbc_query_result_to_string(zbx_odbc_query_result_t *query_result, char /****************************************************************************** * * - * Function: odbc_query_result_to_json * - * * * Purpose: convert ODBC SQL query result into JSON * * * * Parameters: query_result - [IN] result of SQL query * @@ -717,8 +695,6 @@ out: /****************************************************************************** * * - * Function: zbx_odbc_query_result_to_lld_json * - * * * Purpose: public wrapper for odbc_query_result_to_json * * * *****************************************************************************/ @@ -729,8 +705,6 @@ int zbx_odbc_query_result_to_lld_json(zbx_odbc_query_result_t *query_result, cha /****************************************************************************** * * - * Function: zbx_odbc_query_result_to_json * - * * * Purpose: public wrapper for odbc_query_result_to_json * * * *****************************************************************************/ diff --git a/src/zabbix_server/operations.c b/src/zabbix_server/operations.c index f29cf3007a0..9307d60bf62 100644 --- a/src/zabbix_server/operations.c +++ b/src/zabbix_server/operations.c @@ -39,8 +39,6 @@ zbx_dcheck_source_t; /****************************************************************************** * * - * Function: select_discovered_host * - * * * Purpose: select hostid of discovered host * * * * Parameters: event - [IN] source event data * @@ -130,8 +128,6 @@ exit: /****************************************************************************** * * - * Function: add_discovered_host_groups * - * * * Purpose: add group to host if not added already * * * * Parameters: hostid - [IN] host identifier * @@ -204,8 +200,6 @@ static void add_discovered_host_groups(zbx_uint64_t hostid, zbx_vector_uint64_t /****************************************************************************** * * - * Function: add_discovered_host * - * * * Purpose: add discovered host if it was not added already * * * * Parameters: event - [IN] the source event * @@ -644,8 +638,6 @@ clean: /****************************************************************************** * * - * Function: is_discovery_or_autoregistration * - * * * Purpose: checks if the event is discovery or autoregistration event * * * * Parameters: event - [IN] source event data * @@ -670,8 +662,6 @@ static int is_discovery_or_autoregistration(const DB_EVENT *event) /****************************************************************************** * * - * Function: op_host_add * - * * * Purpose: add discovered host * * * * Parameters: event - [IN] source event data * @@ -694,8 +684,6 @@ out: /****************************************************************************** * * - * Function: op_host_del * - * * * Purpose: delete host * * * * Parameters: event - [IN] source event data * @@ -735,8 +723,6 @@ out: /****************************************************************************** * * - * Function: op_host_enable * - * * * Purpose: enable discovered * * * * Parameters: event - [IN] the source event * @@ -771,8 +757,6 @@ out: /****************************************************************************** * * - * Function: op_host_disable * - * * * Purpose: disable host * * * * Parameters: event - [IN] the source event * @@ -807,8 +791,6 @@ out: /****************************************************************************** * * - * Function: op_host_inventory_mode * - * * * Purpose: sets host inventory mode * * * * Parameters: event - [IN] the source event * @@ -840,8 +822,6 @@ out: /****************************************************************************** * * - * Function: op_groups_add * - * * * Purpose: add groups to discovered host * * * * Parameters: event - [IN] the source event data * @@ -869,8 +849,6 @@ out: /****************************************************************************** * * - * Function: op_groups_del * - * * * Purpose: delete groups from discovered host * * * * Parameters: event - [IN] source event data * @@ -975,8 +953,6 @@ out: /****************************************************************************** * * - * Function: op_template_add * - * * * Purpose: link host with template * * * * Parameters: event - [IN] source event data * @@ -1009,8 +985,6 @@ out: /****************************************************************************** * * - * Function: op_template_del * - * * * Purpose: unlink and clear host from template * * * * Parameters: event - [IN] source event data * diff --git a/src/zabbix_server/pinger/pinger.c b/src/zabbix_server/pinger/pinger.c index 63a3018636e..a708b6f12a3 100644 --- a/src/zabbix_server/pinger/pinger.c +++ b/src/zabbix_server/pinger/pinger.c @@ -43,8 +43,6 @@ extern ZBX_THREAD_LOCAL int server_num, process_num; /****************************************************************************** * * - * Function: process_value * - * * * Purpose: process new item value * * * * Parameters: * @@ -107,8 +105,6 @@ clean: /****************************************************************************** * * - * Function: process_values * - * * * Purpose: process new item values * * * * Parameters: * @@ -394,8 +390,6 @@ static void add_icmpping_item(icmpitem_t **items, int *items_alloc, int *items_c /****************************************************************************** * * - * Function: get_pinger_hosts * - * * * Purpose: creates buffer which contains list of hosts to ping * * * * Parameters: * @@ -506,8 +500,6 @@ static void add_pinger_host(ZBX_FPING_HOST **hosts, int *hosts_alloc, int *hosts /****************************************************************************** * * - * Function: process_pinger_hosts * - * * * Purpose: * * * * Parameters: * @@ -561,8 +553,6 @@ static void process_pinger_hosts(icmpitem_t *items, int items_count) /****************************************************************************** * * - * Function: main_pinger_loop * - * * * Purpose: periodically perform ICMP pings * * * * Parameters: * diff --git a/src/zabbix_server/poller/checks_agent.c b/src/zabbix_server/poller/checks_agent.c index c3591170a60..8152c625920 100644 --- a/src/zabbix_server/poller/checks_agent.c +++ b/src/zabbix_server/poller/checks_agent.c @@ -30,8 +30,6 @@ extern unsigned char program_type; /****************************************************************************** * * - * Function: get_value_agent * - * * * Purpose: retrieve data from Zabbix agent * * * * Parameters: item - item we are interested in * diff --git a/src/zabbix_server/poller/checks_aggregate.c b/src/zabbix_server/poller/checks_aggregate.c index ba4d9178a98..aad6ec9dd96 100644 --- a/src/zabbix_server/poller/checks_aggregate.c +++ b/src/zabbix_server/poller/checks_aggregate.c @@ -33,8 +33,6 @@ /****************************************************************************** * * - * Function: evaluate_history_func_min * - * * * Purpose: calculate minimum value from the history value vector * * * * Parameters: values - [IN] a vector containing history values * @@ -65,8 +63,6 @@ static void evaluate_history_func_min(zbx_vector_history_record_t *values, int v /****************************************************************************** * * - * Function: evaluate_history_func_max * - * * * Purpose: calculate maximum value from the history value vector * * * * Parameters: values - [IN] a vector containing history values * @@ -97,8 +93,6 @@ static void evaluate_history_func_max(zbx_vector_history_record_t *values, int v /****************************************************************************** * * - * Function: evaluate_history_func_sum * - * * * Purpose: calculate sum of values from the history value vector * * * * Parameters: values - [IN] a vector containing history values * @@ -127,8 +121,6 @@ static void evaluate_history_func_sum(zbx_vector_history_record_t *values, int v /****************************************************************************** * * - * Function: evaluate_history_func_avg * - * * * Purpose: calculate average value of values from the history value vector * * * * Parameters: values - [IN] a vector containing history values * @@ -149,8 +141,6 @@ static void evaluate_history_func_avg(zbx_vector_history_record_t *values, int v /****************************************************************************** * * - * Function: evaluate_history_func_count * - * * * Purpose: calculate number of values in value vector * * * * Parameters: values - [IN] a vector containing history values * @@ -170,8 +160,6 @@ static void evaluate_history_func_count(zbx_vector_history_record_t *values, int /****************************************************************************** * * - * Function: evaluate_history_func_last * - * * * Purpose: calculate the last (newest) value in value vector * * * * Parameters: values - [IN] a vector containing history values * @@ -185,8 +173,6 @@ static void evaluate_history_func_last(zbx_vector_history_record_t *values, hist /****************************************************************************** * * - * Function: evaluate_history_func * - * * * Purpose: calculate function with values from value vector * * * * Parameters: values - [IN] a vector containing history values * @@ -228,8 +214,6 @@ static void evaluate_history_func(zbx_vector_history_record_t *values, int value /****************************************************************************** * * - * Function: quote_string * - * * * Purpose: quotes string by enclosing it in double quotes and escaping * * double quotes inside string with '\'. * * * @@ -264,8 +248,6 @@ static void quote_string(char **str, size_t sz_src) /****************************************************************************** * * - * Function: aggregate_quote_groups * - * * * Purpose: quotes the individual groups in the list if necessary * * * ******************************************************************************/ @@ -288,8 +270,6 @@ static void aggregate_quote_groups(char **str, size_t *str_alloc, size_t *str_of /****************************************************************************** * * - * Function: aggregate_get_items * - * * * Purpose: get array of items specified by key for selected groups * * (including nested groups) * * * @@ -378,8 +358,6 @@ out: /****************************************************************************** * * - * Function: evaluate_aggregate * - * * * Parameters: item - [IN] aggregated item * * grp_func - [IN] one of ZBX_GRP_FUNC_* * * groups - [IN] list of host groups * diff --git a/src/zabbix_server/poller/checks_db.c b/src/zabbix_server/poller/checks_db.c index 02f4df4cc80..81c58a6973e 100644 --- a/src/zabbix_server/poller/checks_db.c +++ b/src/zabbix_server/poller/checks_db.c @@ -26,8 +26,6 @@ /****************************************************************************** * * - * Function: get_value_db * - * * * Purpose: retrieve data from database * * * * Parameters: item - [IN] item we are interested in * diff --git a/src/zabbix_server/poller/checks_external.c b/src/zabbix_server/poller/checks_external.c index f4eff03eb44..e2f2a05a568 100644 --- a/src/zabbix_server/poller/checks_external.c +++ b/src/zabbix_server/poller/checks_external.c @@ -27,8 +27,6 @@ extern char *CONFIG_EXTERNALSCRIPTS; /****************************************************************************** * * - * Function: get_value_external * - * * * Purpose: retrieve data from script executed on Zabbix server * * * * Parameters: item - item we are interested in * diff --git a/src/zabbix_server/poller/checks_internal.c b/src/zabbix_server/poller/checks_internal.c index 3c844245eb6..daf36727504 100644 --- a/src/zabbix_server/poller/checks_internal.c +++ b/src/zabbix_server/poller/checks_internal.c @@ -58,8 +58,6 @@ static int compare_interfaces(const void *p1, const void *p2) /****************************************************************************** * * - * Function: zbx_host_interfaces_discovery * - * * * Purpose: get data of all network interfaces for a host from configuration * * cache and pack into JSON for LLD * * * @@ -172,8 +170,6 @@ static int zbx_host_interfaces_discovery(zbx_uint64_t hostid, struct zbx_json *j /****************************************************************************** * * - * Function: get_value_internal * - * * * Purpose: retrieve data from Zabbix server (internally supported items) * * * * Parameters: item - item we are interested in * diff --git a/src/zabbix_server/poller/checks_internal_proxy.c b/src/zabbix_server/poller/checks_internal_proxy.c index fedb1d900fa..b4dd526cd53 100644 --- a/src/zabbix_server/poller/checks_internal_proxy.c +++ b/src/zabbix_server/poller/checks_internal_proxy.c @@ -23,8 +23,6 @@ /****************************************************************************** * * - * Function: zbx_get_value_internal_ext * - * * * Purpose: processes program type (proxy) specific internal checks * * * * Parameters: param1 - [IN] the first parameter * diff --git a/src/zabbix_server/poller/checks_internal_server.c b/src/zabbix_server/poller/checks_internal_server.c index 5c9efac7699..847723d5bc2 100644 --- a/src/zabbix_server/poller/checks_internal_server.c +++ b/src/zabbix_server/poller/checks_internal_server.c @@ -26,8 +26,6 @@ /****************************************************************************** * * - * Function: zbx_get_value_internal_ext * - * * * Purpose: processes program type (server) specific internal checks * * * * Parameters: param1 - [IN] the first parameter * diff --git a/src/zabbix_server/poller/checks_simple.c b/src/zabbix_server/poller/checks_simple.c index 2e5c5413a16..3298347efd4 100644 --- a/src/zabbix_server/poller/checks_simple.c +++ b/src/zabbix_server/poller/checks_simple.c @@ -140,8 +140,6 @@ static zbx_vmcheck_t vmchecks[] = /****************************************************************************** * * - * Function: get_vmware_function * - * * * Purpose: Retrieves a handler of the item key * * * * Parameters: key - [IN] an item key (without parameters) * diff --git a/src/zabbix_server/poller/checks_simple_vmware.c b/src/zabbix_server/poller/checks_simple_vmware.c index 50e944c851b..dd6e1aa11cb 100644 --- a/src/zabbix_server/poller/checks_simple_vmware.c +++ b/src/zabbix_server/poller/checks_simple_vmware.c @@ -60,8 +60,6 @@ static int vmware_set_powerstate_result(AGENT_RESULT *result) /****************************************************************************** * * - * Function: hv_get * - * * * Purpose: return pointer to Hypervisor data from hashset with uuid * * * * Parameters: hvs - [IN] the hashset with all Hypervisors * @@ -86,8 +84,6 @@ static zbx_vmware_hv_t *hv_get(zbx_hashset_t *hvs, const char *uuid) /****************************************************************************** * * - * Function: ds_get * - * * * Purpose: return pointer to Datastore data from vector with id * * * * Parameters: dss - [IN] the vector with all Datastores * @@ -193,8 +189,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_counter_value_by_id * - * * * Purpose: gets vmware performance counter value by its identifier * * * * Parameters: service - [IN] the vmware service * @@ -334,8 +328,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_counter_value_by_path * - * * * Purpose: gets vmware performance counter value by the path * * * * Parameters: service - [IN] the vmware service * @@ -400,8 +392,6 @@ out: /****************************************************************************** * * - * Function: get_vmware_service * - * * * Purpose: gets vmware service object * * * * Parameters: url - [IN] the vmware service URL * @@ -460,8 +450,6 @@ out: /****************************************************************************** * * - * Function: get_vcenter_vmprop * - * * * Purpose: retrieves data from virtual machine details * * * * Parameters: request - [IN] the original request. The first parameter is * @@ -528,8 +516,6 @@ out: /****************************************************************************** * * - * Function: get_vcenter_hvprop * - * * * Purpose: retrieves hypervisor property * * * * Parameters: request - [IN] the original request. The first parameter is * diff --git a/src/zabbix_server/poller/checks_snmp.c b/src/zabbix_server/poller/checks_snmp.c index c93abbe1d90..45920772ac5 100644 --- a/src/zabbix_server/poller/checks_snmp.c +++ b/src/zabbix_server/poller/checks_snmp.c @@ -196,8 +196,6 @@ static char *get_item_security_name(const DC_ITEM *item) /****************************************************************************** * * - * Function: cache_get_snmp_index * - * * * Purpose: retrieve index that matches value from the relevant index cache * * * * Parameters: item - [IN] configuration of Zabbix item, contains * @@ -252,8 +250,6 @@ end: /****************************************************************************** * * - * Function: cache_put_snmp_index * - * * * Purpose: store the index-value pair in the relevant index cache * * * * Parameters: item - [IN] configuration of Zabbix item, contains * @@ -319,8 +315,6 @@ static void cache_put_snmp_index(const DC_ITEM *item, const char *snmp_oid, cons /****************************************************************************** * * - * Function: cache_del_snmp_index_subtree * - * * * Purpose: delete index-value mappings from the specified index cache * * * * Parameters: item - [IN] configuration of Zabbix item, contains * @@ -1028,8 +1022,6 @@ static int zbx_oid_is_new(zbx_hashset_t *hs, size_t root_len, const oid *p_oid, /****************************************************************************** * * - * Function: zbx_snmp_walk * - * * * Purpose: retrieve information by walking an OID tree * * * * Parameters: ss - [IN] SNMP session handle * @@ -1564,8 +1556,6 @@ out: /****************************************************************************** * * - * Function: zbx_snmp_translate * - * * * Purpose: translate well-known object identifiers into numeric form * * * * Author: Alexei Vladishev * @@ -1675,8 +1665,6 @@ static int zbx_snmp_dobject_compare(const void *d1, const void *d2) /****************************************************************************** * * - * Function: zbx_snmp_ddata_init * - * * * Purpose: initializes snmp discovery data object * * * * Parameters: data - [IN] snmp discovery data object * @@ -1747,8 +1735,6 @@ out: /****************************************************************************** * * - * Function: zbx_snmp_ddata_clean * - * * * Purpose: releases data allocated by snmp discovery * * * * Parameters: data - [IN] snmp discovery data object * diff --git a/src/zabbix_server/poller/poller.c b/src/zabbix_server/poller/poller.c index 563a057eedd..05619581d8c 100644 --- a/src/zabbix_server/poller/poller.c +++ b/src/zabbix_server/poller/poller.c @@ -57,8 +57,6 @@ static volatile sig_atomic_t snmp_cache_reload_requested; /****************************************************************************** * * - * Function: update_interface_availability * - * * * Purpose: write interface availability changes into database * * * * Parameters: data - [IN/OUT] the serialized availability data * @@ -83,8 +81,6 @@ static int update_interface_availability(unsigned char **data, size_t *data_allo /****************************************************************************** * * - * Function: interface_get_availability * - * * * Purpose: get interface availability data * * * * Parameters: dc_interface - [IN] the interface * @@ -107,8 +103,6 @@ static void interface_get_availability(const DC_INTERFACE *dc_interface, zbx_int /******************************************************************************** * * - * Function: interface_set_availability * - * * * Purpose: sets interface availability data * * * * Parameters: dc_interface - [IN/OUT] the interface * @@ -153,8 +147,6 @@ static int interface_availability_by_item_type(unsigned char item_type, unsigned /******************************************************************************** * * - * Function: zbx_activate_item_interface * - * * * Purpose: activate item interface * * * * Parameters: ts - [IN] the timestamp * @@ -208,8 +200,6 @@ out: /******************************************************************************** * * - * Function: zbx_deactivate_item_interface * - * * * Purpose: deactivate item interface * * * * Parameters: ts - [IN] the timestamp * @@ -784,8 +774,6 @@ void zbx_clean_items(DC_ITEM *items, int num, AGENT_RESULT *results) /****************************************************************************** * * - * Function: get_values * - * * * Purpose: retrieve values of metrics from monitored hosts * * * * Parameters: poller_type - [IN] poller type (ZBX_POLLER_TYPE_...) * diff --git a/src/zabbix_server/postinit.c b/src/zabbix_server/postinit.c index 7b9884d3124..91895a30198 100644 --- a/src/zabbix_server/postinit.c +++ b/src/zabbix_server/postinit.c @@ -31,8 +31,6 @@ /****************************************************************************** * * - * Function: get_trigger_count * - * * * Purpose: gets the total number of triggers on system * * * * Parameters: * @@ -58,8 +56,6 @@ static int get_trigger_count(void) /****************************************************************************** * * - * Function: is_historical_macro * - * * * Purpose: checks if this is historical macro that cannot be expanded for * * bulk event name update * * * @@ -81,8 +77,6 @@ static int is_historical_macro(const char *macro) /****************************************************************************** * * - * Function: convert_historical_macro * - * * * Purpose: translates historical macro to lld macro format * * * * Parameters: macro - [IN] the macro type (see ZBX_HIST_MACRO_* defines) * @@ -104,8 +98,6 @@ static const char *convert_historical_macro(int macro) /****************************************************************************** * * - * Function: preprocess_trigger_name * - * * * Purpose: pre-process trigger name(description) by expanding non historical * * macros * * * @@ -216,8 +208,6 @@ static void preprocess_trigger_name(DB_TRIGGER *trigger, int *historical) /****************************************************************************** * * - * Function: process_event_bulk_update * - * * * Purpose: update event/problem names for a trigger with bulk request * * * * Parameters: trigger - [IN] the trigger * @@ -267,8 +257,6 @@ static int process_event_bulk_update(const DB_TRIGGER *trigger, char **sql, size /****************************************************************************** * * - * Function: process_event_update * - * * * Purpose: update event/problem names for a trigger with separate requests * * for each event * * * @@ -352,8 +340,6 @@ static int process_event_update(const DB_TRIGGER *trigger, char **sql, size_t *s /****************************************************************************** * * - * Function: update_event_names * - * * * Purpose: update event names in events and problem tables * * * * Return value: SUCCEED - the update was successful * @@ -437,8 +423,6 @@ out: /****************************************************************************** * * - * Function: zbx_check_postinit_tasks * - * * * Purpose: process post initialization tasks * * * * Return value: SUCCEED - the update was successful * diff --git a/src/zabbix_server/preprocessor/item_preproc.c b/src/zabbix_server/preprocessor/item_preproc.c index 3d2c5222402..7feae968916 100644 --- a/src/zabbix_server/preprocessor/item_preproc.c +++ b/src/zabbix_server/preprocessor/item_preproc.c @@ -36,8 +36,6 @@ extern zbx_es_t es_engine; /****************************************************************************** * * - * Function: item_preproc_numeric_type_hint * - * * * Purpose: returns numeric type hint based on item value type * * * * Parameters: value_type - [IN] the item value type * @@ -60,8 +58,6 @@ static int item_preproc_numeric_type_hint(unsigned char value_type) /****************************************************************************** * * - * Function: item_preproc_convert_value * - * * * Purpose: convert variant value to the requested type * * * * Parameters: value - [IN/OUT] the value to convert * @@ -85,8 +81,6 @@ static int item_preproc_convert_value(zbx_variant_t *value, unsigned char type, /****************************************************************************** * * - * Function: zbx_item_preproc_convert_value_to_numeric * - * * * Purpose: converts variant value to numeric * * * * Parameters: value_num - [OUT] the converted value * @@ -131,8 +125,6 @@ int zbx_item_preproc_convert_value_to_numeric(zbx_variant_t *value_num, const zb /****************************************************************************** * * - * Function: item_preproc_multiplier_variant * - * * * Purpose: execute custom multiplier preprocessing operation on variant * * value type * * * @@ -180,8 +172,6 @@ static int item_preproc_multiplier_variant(unsigned char value_type, zbx_variant /****************************************************************************** * * - * Function: item_preproc_validate_notsupport * - * * * Purpose: executes during notsupported item preprocessing * * * * Return value: FAIL - for further error handling * @@ -195,8 +185,6 @@ static int item_preproc_validate_notsupport(char **errmsg) /****************************************************************************** * * - * Function: item_preproc_multiplier * - * * * Purpose: execute custom multiplier preprocessing operation * * * * Parameters: value_type - [IN] the item type * @@ -232,8 +220,6 @@ static int item_preproc_multiplier(unsigned char value_type, zbx_variant_t *valu /****************************************************************************** * * - * Function: item_preproc_delta_float * - * * * Purpose: execute delta type preprocessing operation * * * * Parameters: value - [IN/OUT] the value to process * @@ -272,8 +258,6 @@ static int item_preproc_delta_float(zbx_variant_t *value, const zbx_timespec_t * /****************************************************************************** * * - * Function: item_preproc_delta_uint64 * - * * * Purpose: execute delta type preprocessing operation * * * * Parameters: value - [IN/OUT] the value to process * @@ -312,8 +296,6 @@ static int item_preproc_delta_uint64(zbx_variant_t *value, const zbx_timespec_t /****************************************************************************** * * - * Function: item_preproc_delta * - * * * Purpose: execute delta type preprocessing operation * * * * Parameters: value_type - [IN] the item value type * @@ -371,8 +353,6 @@ static int item_preproc_delta(unsigned char value_type, zbx_variant_t *value, co /****************************************************************************** * * - * Function: item_preproc_delta_value * - * * * Purpose: execute delta (simple change) preprocessing operation * * * * Parameters: value_type - [IN] the item value type * @@ -407,8 +387,6 @@ static int item_preproc_delta_value(unsigned char value_type, zbx_variant_t *val /****************************************************************************** * * - * Function: item_preproc_delta_speed * - * * * Purpose: execute delta (speed per second) preprocessing operation * * * * Parameters: value_type - [IN] the item value type * @@ -443,8 +421,6 @@ static int item_preproc_delta_speed(unsigned char value_type, zbx_variant_t *val /****************************************************************************** * * - * Function: unescape_param * - * * * Purpose: copy first n chars from in to out, unescape escaped characters * * during copying * * * @@ -496,8 +472,6 @@ static void unescape_param(int op_type, const char *in, int len, char *out) /****************************************************************************** * * - * Function: item_preproc_trim * - * * * Purpose: execute trim type preprocessing operation * * * * Parameters: value - [IN/OUT] the value to process * @@ -529,8 +503,6 @@ static int item_preproc_trim(zbx_variant_t *value, unsigned char op_type, const /****************************************************************************** * * - * Function: item_preproc_rtrim * - * * * Purpose: execute right trim preprocessing operation * * * * Parameters: value - [IN/OUT] the value to process * @@ -560,8 +532,6 @@ static int item_preproc_rtrim(zbx_variant_t *value, const char *params, char **e /****************************************************************************** * * - * Function: item_preproc_ltrim * - * * * Purpose: execute left trim preprocessing operation * * * * Parameters: value - [IN/OUT] the value to process * @@ -591,8 +561,6 @@ static int item_preproc_ltrim(zbx_variant_t *value, const char *params, char **e /****************************************************************************** * * - * Function: item_preproc_lrtrim * - * * * Purpose: execute left and right trim preprocessing operation * * * * Parameters: value - [IN/OUT] the value to process * @@ -622,8 +590,6 @@ static int item_preproc_lrtrim(zbx_variant_t *value, const char *params, char ** /****************************************************************************** * * - * Function: item_preproc_2dec * - * * * Purpose: execute decimal value conversion operation * * * * Parameters: value - [IN/OUT] the value to convert * @@ -687,8 +653,6 @@ static int item_preproc_2dec(zbx_variant_t *value, unsigned char op_type, char * /****************************************************************************** * * - * Function: item_preproc_bool2dec * - * * * Purpose: execute boolean to decimal value conversion operation * * * * Parameters: value - [IN/OUT] the value to convert * @@ -715,8 +679,6 @@ static int item_preproc_bool2dec(zbx_variant_t *value, char **errmsg) /****************************************************************************** * * - * Function: item_preproc_oct2dec * - * * * Purpose: execute octal to decimal value conversion operation * * * * Parameters: value - [IN/OUT] the value to convert * @@ -743,8 +705,6 @@ static int item_preproc_oct2dec(zbx_variant_t *value, char **errmsg) /****************************************************************************** * * - * Function: item_preproc_hex2dec * - * * * Purpose: execute hexadecimal to decimal value conversion operation * * * * Parameters: value - [IN/OUT] the value to convert * @@ -771,8 +731,6 @@ static int item_preproc_hex2dec(zbx_variant_t *value, char **errmsg) /****************************************************************************** * * - * Function: item_preproc_regsub_op * - * * * Purpose: execute regular expression substitution operation * * * * Parameters: value - [IN/OUT] the value to process * @@ -827,8 +785,6 @@ static int item_preproc_regsub_op(zbx_variant_t *value, const char *params, char /****************************************************************************** * * - * Function: item_preproc_regsub * - * * * Purpose: execute regular expression substitution operation * * * * Parameters: value - [IN/OUT] the value to process * @@ -862,8 +818,6 @@ static int item_preproc_regsub(zbx_variant_t *value, const char *params, char ** /****************************************************************************** * * - * Function: item_preproc_jsonpath_op * - * * * Purpose: execute jsonpath query * * * * Parameters: value - [IN/OUT] the value to process * @@ -902,8 +856,6 @@ static int item_preproc_jsonpath_op(zbx_variant_t *value, const char *params, ch /****************************************************************************** * * - * Function: item_preproc_jsonpath * - * * * Purpose: execute jsonpath query * * * * Parameters: value - [IN/OUT] the value to process * @@ -930,8 +882,6 @@ static int item_preproc_jsonpath(zbx_variant_t *value, const char *params, char /****************************************************************************** * * - * Function: item_preproc_xpath * - * * * Purpose: execute xpath query * * * * Parameters: value - [IN/OUT] the value to process * @@ -960,8 +910,6 @@ static int item_preproc_xpath(zbx_variant_t *value, const char *params, char **e /****************************************************************************** * * - * Function: item_preproc_validate_range * - * * * Purpose: validates value to be within the specified range * * Parameters: value_type - [IN] the item type * * value - [IN/OUT] the value to process * @@ -1038,8 +986,6 @@ out: /****************************************************************************** * * - * Function: item_preproc_validate_regex * - * * * Purpose: validates value to match regular expression * * Parameters: value_type - [IN] the item type * * value - [IN/OUT] the value to process * @@ -1095,8 +1041,6 @@ out: /****************************************************************************** * * - * Function: item_preproc_validate_not_regex * - * * * Purpose: validates value to not match regular expression * * Parameters: value_type - [IN] the item type * * value - [IN/OUT] the value to process * @@ -1154,8 +1098,6 @@ out: /****************************************************************************** * * - * Function: item_preproc_get_error_from_json * - * * * Purpose: checks for presence of error field in json data * * * * Parameters: value - [IN/OUT] the value to process * @@ -1210,8 +1152,6 @@ out: /****************************************************************************** * * - * Function: item_preproc_get_error_from_xml * - * * * Purpose: checks for presence of error field in XML data * * * * Parameters: value - [IN/OUT] the value to process * @@ -1316,8 +1256,6 @@ out: /****************************************************************************** * * - * Function: item_preproc_get_error_from_regex * - * * * Purpose: checks for presence of error pattern matching regular expression * * * * Parameters: value - [IN/OUT] the value to process * @@ -1380,8 +1318,6 @@ out: /****************************************************************************** * * - * Function: item_preproc_throttle_value * - * * * Purpose: throttles value by suppressing identical values * * * * Parameters: value - [IN/OUT] the value to process * @@ -1414,8 +1350,6 @@ static int item_preproc_throttle_value(zbx_variant_t *value, const zbx_timespec_ /****************************************************************************** * * - * Function: item_preproc_throttle_timed_value * - * * * Purpose: throttles value by suppressing identical values * * * * Parameters: value - [IN/OUT] the value to process * @@ -1459,8 +1393,6 @@ static int item_preproc_throttle_timed_value(zbx_variant_t *value, const zbx_tim /****************************************************************************** * * - * Function: item_preproc_script * - * * * Purpose: executes script passed with params * * * * Parameters: value - [IN/OUT] the value to process * @@ -1523,8 +1455,6 @@ fail: /****************************************************************************** * * - * Function: item_preproc_prometheus_pattern * - * * * Purpose: parse Prometheus format metrics * * * * Parameters: value - [IN/OUT] the value to process * @@ -1604,8 +1534,6 @@ out: /****************************************************************************** * * - * Function: item_preproc_prometheus_to_json * - * * * Purpose: convert Prometheus format metrics to JSON format * * * * Parameters: value - [IN/OUT] the value to process * @@ -1638,8 +1566,6 @@ static int item_preproc_prometheus_to_json(zbx_variant_t *value, const char *par /****************************************************************************** * * - * Function: item_preproc_csv_to_json_add_field * - * * * Purpose: convert CSV format metrics to JSON format * * * * Parameters: json - [IN/OUT] json object * @@ -1714,8 +1640,6 @@ static int item_preproc_csv_to_json_add_field(struct zbx_json *json, char ***nam /****************************************************************************** * * - * Function: item_preproc_csv_to_json * - * * * Purpose: convert CSV format metrics to JSON format * * * * Parameters: value - [IN/OUT] the value to process * @@ -1972,8 +1896,6 @@ out: /****************************************************************************** * * - * Function: item_preproc_xml_to_json * - * * * Purpose: convert XML format value to JSON format * * * * Parameters: value - [IN/OUT] the value to process * @@ -2001,8 +1923,6 @@ static int item_preproc_xml_to_json(zbx_variant_t *value, char **errmsg) /****************************************************************************** * * - * Function: item_preproc_str_replace * - * * * Purpose: replace substrings in string * * * * Parameters: value - [IN/OUT] the value to process * @@ -2053,8 +1973,6 @@ static int item_preproc_str_replace(zbx_variant_t *value, const char *params, ch /****************************************************************************** * * - * Function: zbx_item_preproc * - * * * Purpose: execute preprocessing operation * * * * Parameters: cache - [IN/OUT] the preprocessing cache * @@ -2174,8 +2092,6 @@ int zbx_item_preproc(zbx_preproc_cache_t *cache, unsigned char value_type, zbx_v /****************************************************************************** * * - * Function: zbx_item_preproc_handle_error * - * * * Purpose: apply 'on fail' preprocessing error handler * * * * Parameters: value - [IN/OUT] the value * @@ -2212,8 +2128,6 @@ int zbx_item_preproc_handle_error(zbx_variant_t *value, const zbx_preproc_op_t * /****************************************************************************** * * - * Function: zbx_item_preproc_test * - * * * Purpose: test preprocessing steps * * * * Parameters: value_type - [IN] the item value type * diff --git a/src/zabbix_server/preprocessor/preproc_cache.c b/src/zabbix_server/preprocessor/preproc_cache.c index 347d5198b6f..674da06cc56 100644 --- a/src/zabbix_server/preprocessor/preproc_cache.c +++ b/src/zabbix_server/preprocessor/preproc_cache.c @@ -26,8 +26,6 @@ ZBX_VECTOR_IMPL(ppcache, zbx_preproc_cache_ref_t); /****************************************************************************** * * - * Function: zbx_preproc_cache_get * - * * * Purpose: get cache by preprocessing step type * * * * Parameters: cache - [IN] the preprocessing cache * @@ -52,8 +50,6 @@ void *zbx_preproc_cache_get(zbx_preproc_cache_t *cache, unsigned char type) /****************************************************************************** * * - * Function: zbx_preproc_cache_put * - * * * Purpose: put preprocessing step cache into preprocessing cache * * * * Parameters: cache - [IN] the preprocessing cache * @@ -76,8 +72,6 @@ void zbx_preproc_cache_put(zbx_preproc_cache_t *cache, unsigned char type, void /****************************************************************************** * * - * Function: zbx_preproc_cache_init * - * * * Purpose: initialize preprocessing cache * * * ******************************************************************************/ @@ -88,8 +82,6 @@ void zbx_preproc_cache_init(zbx_preproc_cache_t *cache) /****************************************************************************** * * - * Function: zbx_preproc_cache_clear * - * * * Purpose: free resources allocated by preprocessing cache * * * ******************************************************************************/ diff --git a/src/zabbix_server/preprocessor/preproc_manager.c b/src/zabbix_server/preprocessor/preproc_manager.c index 250336d23e8..849a6a1fd4b 100644 --- a/src/zabbix_server/preprocessor/preproc_manager.c +++ b/src/zabbix_server/preprocessor/preproc_manager.c @@ -184,8 +184,6 @@ static void request_free_steps(zbx_preprocessing_request_t *request) /****************************************************************************** * * - * Function: preprocessor_sync_configuration * - * * * Purpose: synchronize preprocessing manager with configuration cache data * * * * Parameters: manager - [IN] the manager to be synchronized * @@ -258,8 +256,6 @@ static void preprocessing_ar_to_variant(AGENT_RESULT *ar, zbx_variant_t *value) /****************************************************************************** * * - * Function: preprocessor_create_task * - * * * Purpose: create preprocessing task for request * * * * Parameters: manager - [IN] preprocessing manager * @@ -293,8 +289,6 @@ static zbx_uint32_t preprocessor_create_task(zbx_preprocessing_manager_t *manage /****************************************************************************** * * - * Function: preprocessor_set_request_state_done * - * * * Purpose: set request state to done and handle linked items * * * * Parameters: manager - [IN] preprocessing manager * @@ -338,8 +332,6 @@ static void preprocessor_set_request_state_done(zbx_preprocessing_manager_t *man /****************************************************************************** * * - * Function: preprocessor_create_dep_message * - * * * Purpose: create message(s) for dependent item bulk preprocessing * * * * Parameters: manager - [IN] preprocessing manager * @@ -406,8 +398,6 @@ static int preprocessor_create_dep_message(zbx_preprocessing_manager_t *manager, /****************************************************************************** * * - * Function: preprocessor_dep_request_next_message * - * * * Purpose: returns next dependent item preprocessing message * * * * Parameters: request - [IN] the dependent item preprocessing request * @@ -432,8 +422,6 @@ static int preprocessor_dep_request_next_message(zbx_preprocessing_dep_request_t /****************************************************************************** * * - * Function: preprocessor_get_next_task * - * * * Purpose: gets next task to be sent to worker * * * * Parameters: manager - [IN] preprocessing manager * @@ -525,8 +513,6 @@ out: /****************************************************************************** * * - * Function: preprocessor_get_worker_by_client * - * * * Purpose: get worker data by IPC client * * * * Parameters: manager - [IN] preprocessing manager * @@ -561,8 +547,6 @@ static zbx_preprocessing_worker_t *preprocessor_get_worker_by_client(zbx_preproc /****************************************************************************** * * - * Function: preprocessor_get_free_worker * - * * * Purpose: get worker without active preprocessing task * * * * Parameters: manager - [IN] preprocessing manager * @@ -585,8 +569,6 @@ static zbx_preprocessing_worker_t *preprocessor_get_free_worker(zbx_preprocessin /****************************************************************************** * * - * Function: preprocessor_assign_tasks * - * * * Purpose: assign available queued preprocessing tasks to free workers * * * * Parameters: manager - [IN] preprocessing manager * @@ -618,8 +600,6 @@ static void preprocessor_assign_tasks(zbx_preprocessing_manager_t *manager) /****************************************************************************** * * - * Function: preproc_item_value_clear * - * * * Purpose: frees resources allocated by preprocessor item value * * * * Parameters: value - [IN] value to be freed * @@ -639,8 +619,6 @@ static void preproc_item_value_clear(zbx_preproc_item_value_t *value) /****************************************************************************** * * - * Function: preprocessor_free_request * - * * * Purpose: free preprocessing request * * * * Parameters: base - [IN] request data to be freed * @@ -674,8 +652,6 @@ static void preprocessor_free_request(zbx_preprocessing_request_base_t *base) /****************************************************************************** * * - * Function: preprocessor_free_direct_request * - * * * Purpose: free preprocessing direct request * * * * Parameters: direct_request - [IN] forward data to be freed * @@ -690,8 +666,6 @@ static void preprocessor_free_direct_request(zbx_preprocessing_direct_request_t /****************************************************************************** * * - * Function: preprocessor_flush_value * - * * * Purpose: add new value to the local history cache or send to LLD manager * * * * Parameters: value - [IN] value to be added or sent * @@ -742,8 +716,6 @@ static void preprocessor_flush_dep_results(zbx_preprocessing_manager_t *manager, /****************************************************************************** * * - * Function: preprocessing_flush_queue * - * * * Purpose: add all sequential processed values from beginning of the queue * * to the local history cache * * * @@ -819,8 +791,6 @@ static void preproc_link_nodes(zbx_preprocessing_manager_t *manager, zbx_uint64_ /****************************************************************************** * * - * Function: preprocessor_link_items * - * * * Purpose: create relation between item values within value queue * * * * Parameters: manager - [IN] preprocessing manager * @@ -858,8 +828,6 @@ static void preprocessor_link_items(zbx_preprocessing_manager_t *manager, zbx_li /****************************************************************************** * * - * Function: preprocessor_enqueue_dependent_value * - * * * Purpose: enqueue dependent items (if any) by preproc value * * * * Parameters: manager - [IN] preprocessing manager * @@ -878,8 +846,6 @@ static void preprocessor_enqueue_dependent_value(zbx_preprocessing_manager_t *ma /****************************************************************************** * * - * Function: preprocessor_enqueue * - * * * Purpose: enqueue preprocessing request * * * * Parameters: manage - [IN] preprocessing manager * @@ -1008,8 +974,6 @@ out: /****************************************************************************** * * - * Function: preprocessor_enqueue_dependent * - * * * Purpose: enqueue dependent items (if any) * * * * Parameters: manager - [IN] preprocessing manager * @@ -1072,8 +1036,6 @@ static void preprocessor_enqueue_dependent(zbx_preprocessing_manager_t *manager, /****************************************************************************** * * - * Function: preprocessor_add_request * - * * * Purpose: handle new preprocessing request * * * * Parameters: manager - [IN] preprocessing manager * @@ -1103,8 +1065,6 @@ static void preprocessor_add_request(zbx_preprocessing_manager_t *manager, zbx_i /****************************************************************************** * * - * Function: preprocessor_add_test_request * - * * * Purpose: handle new preprocessing test request * * * * Parameters: manager - [IN] preprocessing manager * @@ -1132,8 +1092,6 @@ static void preprocessor_add_test_request(zbx_preprocessing_manager_t *manager, /****************************************************************************** * * - * Function: preprocessor_set_variant_result * - * * * Purpose: get result data from variant and error message * * * * Parameters: request - [IN/OUT] preprocessing request * @@ -1248,8 +1206,6 @@ out: /****************************************************************************** * * - * Function: preprocessor_add_result * - * * * Purpose: handle preprocessing result * * * * Parameters: manager - [IN] preprocessing manager * @@ -1327,8 +1283,6 @@ static void preprocessor_add_result(zbx_preprocessing_manager_t *manager, zbx_ip /****************************************************************************** * * - * Function: preprocessor_update_history * - * * * Purpose: handle preprocessing result * * * * Parameters: manager - [IN] preprocessing manager * @@ -1403,8 +1357,6 @@ static void preprocessor_finalize_dep_results(zbx_preprocessing_manager_t *manag /****************************************************************************** * * - * Function: preprocessor_add_dep_result * - * * * Purpose: handle dependent item batch preprocessing result * * * * Parameters: manager - [IN] preprocessing manager * @@ -1435,8 +1387,6 @@ static void preprocessor_process_dep_result(zbx_preprocessing_manager_t *manager /****************************************************************************** * * - * Function: preprocessor_add_dep_result * - * * * Purpose: handle next dependent item batch preprocessing result * * * * Parameters: manager - [IN] preprocessing manager * @@ -1467,8 +1417,6 @@ static void preprocessor_process_dep_result_cont(zbx_preprocessing_manager_t *ma /****************************************************************************** * * - * Function: preprocessor_next_dep_request * - * * * Purpose: handle dependent item batch preprocessing result * * * * Parameters: manager - [IN] preprocessing manager * @@ -1500,8 +1448,6 @@ static void preprocessor_next_dep_request(zbx_preprocessing_manager_t *manager, /****************************************************************************** * * - * Function: preprocessor_flush_test_result * - * * * Purpose: handle preprocessing result * * * * Parameters: manager - [IN] preprocessing manager * @@ -1648,8 +1594,6 @@ static void preprocessor_get_items_totals(zbx_preprocessing_manager_t *manager, /****************************************************************************** * * - * Function: preprocessor_get_diag_stats * - * * * Purpose: return diagnostic statistics * * * * Parameters: manager - [IN] preprocessing manager * @@ -1675,8 +1619,6 @@ static void preprocessor_get_diag_stats(zbx_preprocessing_manager_t *manager, zb /****************************************************************************** * * - * Function: preproc_sort_item_by_values_desc * - * * * Purpose: compare item statistics by value * * * ******************************************************************************/ @@ -1748,8 +1690,6 @@ static void preprocessor_get_items_view(zbx_preprocessing_manager_t *manager, zb /****************************************************************************** * * - * Function: preprocessor_get_top_items * - * * * Purpose: return diagnostic top view * * * * Parameters: manager - [IN] preprocessing manager * @@ -1856,8 +1796,6 @@ static int preproc_item_link_compare(const void *d1, const void *d2) /****************************************************************************** * * - * Function: preprocessor_init_manager * - * * * Purpose: initializes preprocessing manager * * * * Parameters: manager - [IN] the manager to initialize * @@ -1885,8 +1823,6 @@ static void preprocessor_init_manager(zbx_preprocessing_manager_t *manager) /****************************************************************************** * * - * Function: preprocessor_register_worker * - * * * Purpose: registers preprocessing worker * * * * Parameters: manager - [IN] the manager * @@ -1928,8 +1864,6 @@ static void preprocessor_register_worker(zbx_preprocessing_manager_t *manager, z /****************************************************************************** * * - * Function: preprocessor_destroy_manager * - * * * Purpose: destroy preprocessing manager * * * * Parameters: manager - [IN] the manager to destroy * diff --git a/src/zabbix_server/preprocessor/preproc_worker.c b/src/zabbix_server/preprocessor/preproc_worker.c index e5450f415b4..a015b6f9b8b 100644 --- a/src/zabbix_server/preprocessor/preproc_worker.c +++ b/src/zabbix_server/preprocessor/preproc_worker.c @@ -51,8 +51,6 @@ zbx_es_t es_engine; /****************************************************************************** * * - * Function: worker_format_value * - * * * Purpose: formats value in text format * * * * Parameters: value - [IN] the value to format * @@ -93,8 +91,6 @@ static void worker_format_value(const zbx_variant_t *value, char **value_str) /****************************************************************************** * * - * Function: worker_format_result * - * * * Purpose: formats one preprocessing step result * * * * Parameters: step - [IN] the preprocessing step number * @@ -124,8 +120,6 @@ static void worker_format_result(int step, const zbx_preproc_result_t *result, c /****************************************************************************** * * - * Function: worker_format_error * - * * * Purpose: formats preprocessing error message * * * * Parameters: value - [IN] the input value * @@ -203,8 +197,6 @@ static void worker_format_error(const zbx_variant_t *value, zbx_preproc_result_t /****************************************************************************** * * - * Function: worker_item_preproc_execute * - * * * Purpose: execute preprocessing steps * * * * Parameters: cache - [IN/OUT] the preprocessing cache * @@ -296,8 +288,6 @@ static int worker_item_preproc_execute(zbx_preproc_cache_t *cache, unsigned char /****************************************************************************** * * - * Function: worker_preprocess_value * - * * * Purpose: handle item value preprocessing task * * * * Parameters: socket - [IN] IPC socket * @@ -379,8 +369,6 @@ static void worker_preprocess_value(zbx_ipc_socket_t *socket, zbx_ipc_message_t /****************************************************************************** * * - * Function: worker_test_value * - * * * Purpose: handle item value test preprocessing task * * * * Parameters: socket - [IN] IPC socket * @@ -445,8 +433,6 @@ static void worker_test_value(zbx_ipc_socket_t *socket, zbx_ipc_message_t *messa /****************************************************************************** * * - * Function: worker_dep_request_clear * - * * ******************************************************************************/ static void worker_dep_request_clear(zbx_preproc_dep_request_t *request) { @@ -457,8 +443,6 @@ static void worker_dep_request_clear(zbx_preproc_dep_request_t *request) /****************************************************************************** * * - * Function: worker_preprocess_dep_items * - * * * Purpose: preprocess dependent items * * * * Parameters: socket - [IN] IPC socket * @@ -562,8 +546,6 @@ out: /****************************************************************************** * * - * Function: worker_process_dep_request * - * * * Purpose: handle item value preprocessing request * * * * Parameters: socket - [IN] IPC socket * @@ -582,8 +564,6 @@ static void worker_process_dep_request(zbx_ipc_socket_t *socket, zbx_ipc_message /****************************************************************************** * * - * Function: worker_process_dep_request_cont * - * * * Purpose: handle following item value preprocessing request * * * * Parameters: socket - [IN] IPC socket * diff --git a/src/zabbix_server/preprocessor/preprocessing.c b/src/zabbix_server/preprocessor/preprocessing.c index b938432272b..02d661e8bb8 100644 --- a/src/zabbix_server/preprocessor/preprocessing.c +++ b/src/zabbix_server/preprocessor/preprocessing.c @@ -106,8 +106,6 @@ static int message_pack_fields(zbx_ipc_message_t *message, const zbx_packed_fiel /****************************************************************************** * * - * Function: message_pack_data * - * * * Purpose: helper for data packing based on defined format * * * * Parameters: message - [OUT] IPC message, can be NULL for buffer size * @@ -137,8 +135,6 @@ static zbx_uint32_t message_pack_data(zbx_ipc_message_t *message, zbx_packed_fie /****************************************************************************** * * - * Function: preprocessor_pack_value * - * * * Purpose: pack item value data into a single buffer that can be used in IPC * * * * Parameters: message - [OUT] IPC message * @@ -200,8 +196,6 @@ static zbx_uint32_t preprocessor_pack_value(zbx_ipc_message_t *message, zbx_prep /****************************************************************************** * * - * Function: preprocessor_pack_variant * - * * * Purpose: packs variant value for serialization * * * * Parameters: fields - [OUT] the packed fields * @@ -243,8 +237,6 @@ static int preprocessor_pack_variant(zbx_packed_field_t *fields, const zbx_varia /****************************************************************************** * * - * Function: preprocessor_pack_history * - * * * Purpose: packs preprocessing history for serialization * * * * Parameters: fields - [OUT] the packed fields * @@ -277,8 +269,6 @@ static int preprocessor_pack_history(zbx_packed_field_t *fields, const zbx_vecto /****************************************************************************** * * - * Function: preprocessor_pack_step * - * * * Purpose: packs preprocessing step for serialization * * * * Parameters: fields - [OUT] the packed fields * @@ -303,8 +293,6 @@ static int preprocessor_pack_step(zbx_packed_field_t *fields, const zbx_preproc_ /****************************************************************************** * * - * Function: preprocessor_pack_steps * - * * * Purpose: packs preprocessing steps for serialization * * * * Parameters: fields - [OUT] the packed fields * @@ -330,8 +318,6 @@ static int preprocessor_pack_steps(zbx_packed_field_t *fields, const zbx_preproc /****************************************************************************** * * - * Function: preprocesser_unpack_variant * - * * * Purpose: unpacks serialized variant value * * * * Parameters: data - [IN] the serialized data * @@ -371,8 +357,6 @@ static int preprocesser_unpack_variant(const unsigned char *data, zbx_variant_t /****************************************************************************** * * - * Function: preprocesser_unpack_history * - * * * Purpose: unpacks serialized preprocessing history * * * * Parameters: data - [IN] the serialized data * @@ -412,8 +396,6 @@ static int preprocesser_unpack_history(const unsigned char *data, zbx_vector_ptr /****************************************************************************** * * - * Function: preprocessor_unpack_step * - * * * Purpose: unpacks serialized preprocessing step * * * * Parameters: data - [IN] the serialized data * @@ -437,8 +419,6 @@ static int preprocessor_unpack_step(const unsigned char *data, zbx_preproc_op_t /****************************************************************************** * * - * Function: preprocessor_unpack_steps * - * * * Purpose: unpacks serialized preprocessing steps * * * * Parameters: data - [IN] the serialized data * @@ -468,8 +448,6 @@ static int preprocessor_unpack_steps(const unsigned char *data, zbx_preproc_op_t /****************************************************************************** * * - * Function: zbx_preprocessor_pack_task * - * * * Purpose: pack preprocessing task data into a single buffer that can be * * used in IPC * * * @@ -528,8 +506,6 @@ zbx_uint32_t zbx_preprocessor_pack_task(unsigned char **data, zbx_uint64_t itemi /****************************************************************************** * * - * Function: preprocessor_append_packed_message * - * * * Purpose: pack fields into serialized message * * * * Parameters: fields - [IN] the fields to pack * @@ -567,8 +543,6 @@ static int preprocessor_append_packed_message(const zbx_packed_field_t *fields, /****************************************************************************** * * - * Function: zbx_preprocessor_pack_dep_request * - * * * Purpose: pack dependent item preprocessing fields into messages for * * sending to worker * * * @@ -661,8 +635,6 @@ out: /****************************************************************************** * * - * Function: zbx_preprocessor_pack_result * - * * * Purpose: pack preprocessing result data into a single buffer that can be * * used in IPC * * * @@ -704,8 +676,6 @@ zbx_uint32_t zbx_preprocessor_pack_result(unsigned char **data, zbx_variant_t *v /****************************************************************************** * * - * Function: zbx_preprocessor_free_dep_results * - * * * Purpose: free dependent item preprocessing response * * * * Parameters: results - [OUT] the preprocessing results * @@ -835,8 +805,6 @@ void zbx_preprocessor_result_append(zbx_preproc_result_buffer_t *buf, zbx_uint64 /****************************************************************************** * * - * Function: zbx_preprocessor_pack_test_result * - * * * Purpose: pack preprocessing result data into a single buffer that can be * * used in IPC * * * @@ -888,8 +856,6 @@ zbx_uint32_t zbx_preprocessor_pack_test_result(unsigned char **data, const zbx_p /****************************************************************************** * * - * Function: zbx_preprocessor_pack_diag_stats * - * * * Purpose: pack diagnostic statistics data into a single buffer that can be * * used in IPC * * Parameters: data - [OUT] memory buffer for packed data * @@ -933,8 +899,6 @@ zbx_uint32_t zbx_preprocessor_pack_diag_stats(unsigned char **data, int total, i /****************************************************************************** * * - * Function: zbx_preprocessor_pack_top_request * - * * * Purpose: pack top request data into a single buffer that can be used in IPC* * * * Parameters: data - [OUT] memory buffer for packed data * @@ -955,8 +919,6 @@ zbx_uint32_t zbx_preprocessor_pack_top_items_request(unsigned char **data, int l /****************************************************************************** * * - * Function: zbx_preprocessor_pack_top_result * - * * * Purpose: pack top result data into a single buffer that can be used in IPC * * * * Parameters: data - [OUT] memory buffer for packed data * @@ -997,8 +959,6 @@ zbx_uint32_t zbx_preprocessor_pack_top_items_result(unsigned char **data, zbx_pr /****************************************************************************** * * - * Function: zbx_preprocessor_unpack_value * - * * * Purpose: unpack item value data from IPC data buffer * * * * Parameters: value - [OUT] unpacked item value * @@ -1069,8 +1029,6 @@ zbx_uint32_t zbx_preprocessor_unpack_value(zbx_preproc_item_value_t *value, unsi /****************************************************************************** * * - * Function: zbx_preprocessor_unpack_task * - * * * Purpose: unpack preprocessing task data from IPC data buffer * * * * Parameters: itemid - [OUT] itemid * @@ -1112,8 +1070,6 @@ void zbx_preprocessor_unpack_task(zbx_uint64_t *itemid, unsigned char *value_typ /****************************************************************************** * * - * Function: free_steps * - * * * Purpose: free preprocessing steps * * * ******************************************************************************/ @@ -1131,8 +1087,6 @@ void zbx_preprocessor_free_steps(zbx_preproc_op_t *steps, int steps_num) /****************************************************************************** * * - * Function: zbx_preprocessor_free_deps * - * * * Purpose: free dependent item preprocessing request * * * * Parameters: deps - [OUT] the dependent items * @@ -1155,8 +1109,6 @@ void zbx_preprocessor_free_deps(zbx_preproc_dep_t *deps, int deps_num) /****************************************************************************** * * - * Function: preprocessor_unpack_dep * - * * * Purpose: unpack dependent item preprocessing request * * * * Parameters: data - [IN] serialized dependent item preprocessing data * @@ -1180,8 +1132,6 @@ static zbx_uint32_t preprocessor_unpack_dep(const unsigned char *data, zbx_prepr /****************************************************************************** * * - * Function: zbx_preprocessor_unpack_dep_task * - * * * Purpose: unpack initial dependent item preprocessing request * * * * Parameters: ts - [OUT] the value timestamp * @@ -1214,8 +1164,6 @@ void zbx_preprocessor_unpack_dep_task(zbx_timespec_t *ts, zbx_variant_t *value, /****************************************************************************** * * - * Function: zbx_preprocessor_unpack_dep_task_cont * - * * * Purpose: unpack following dependent item preprocessing request * * * * Parameters: ts - [OUT] the value timestamp * @@ -1242,8 +1190,6 @@ void zbx_preprocessor_unpack_dep_task_cont(zbx_preproc_dep_t *deps, int *deps_nu /****************************************************************************** * * - * Function: zbx_preprocessor_unpack_result * - * * * Purpose: unpack preprocessing task data from IPC data buffer * * * * Parameters: value - [OUT] result value * @@ -1266,8 +1212,6 @@ void zbx_preprocessor_unpack_result(zbx_variant_t *value, zbx_vector_ptr_t *hist /****************************************************************************** * * - * Function: agent_result_set_value * - * * * Purpose: convert variant value to AGENT_RESULT * * * * Parameters: value - [IN] the value to convert * @@ -1343,8 +1287,6 @@ static void agent_result_set_value(zbx_variant_t *value, zbx_item_value_type_t v /****************************************************************************** * * - * Function: preprocessor_unpack_dep_result * - * * * Purpose: unpack dependent item preprocessing result * * * * Parameters: data - [IN] IPC data buffer * @@ -1375,8 +1317,6 @@ static zbx_uint32_t preprocessor_unpack_dep_result(const unsigned char *data, zb /****************************************************************************** * * - * Function: zbx_preprocessor_unpack_dep_result * - * * * Purpose: unpack preprocessing results * * * * Parameters: total_num - [OUT] the total number of results * @@ -1403,8 +1343,6 @@ void zbx_preprocessor_unpack_dep_result(int *total_num, int *results_num, zbx_pr /****************************************************************************** * * - * Function: zbx_preprocessor_unpack_dep_result_cont * - * * * Purpose: unpack following preprocessing results * * * * Parameters: results_num - [OUT] the number of results in this batch * @@ -1429,8 +1367,6 @@ void zbx_preprocessor_unpack_dep_result_cont(int *results_num, zbx_preproc_dep_r } /****************************************************************************** * * - * Function: zbx_preprocessor_unpack_test_result * - * * * Purpose: unpack preprocessing test data from IPC data buffer * * * * Parameters: results - [OUT] the preprocessing step results * @@ -1467,8 +1403,6 @@ void zbx_preprocessor_unpack_test_result(zbx_vector_ptr_t *results, zbx_vector_p /****************************************************************************** * * - * Function: zbx_preprocessor_unpack_diag_stats * - * * * Purpose: unpack preprocessing test data from IPC data buffer * * * * Parameters: total - [OUT] the number of values * @@ -1499,8 +1433,6 @@ void zbx_preprocessor_unpack_diag_stats(int *total, int *queued, int *processing /****************************************************************************** * * - * Function: zbx_preprocessor_unpack_top_request * - * * * Purpose: unpack preprocessing test data from IPC data buffer * * * * Parameters: data - [OUT] memory buffer for packed data * @@ -1514,8 +1446,6 @@ void zbx_preprocessor_unpack_top_request(int *limit, const unsigned char *data) /****************************************************************************** * * - * Function: zbx_preprocessor_unpack_top_request * - * * * Purpose: unpack preprocessing test data from IPC data buffer * * * * Parameters: items - [OUT] the item diag data * @@ -1547,8 +1477,6 @@ void zbx_preprocessor_unpack_top_result(zbx_vector_ptr_t *items, const unsigned /****************************************************************************** * * - * Function: preprocessor_send * - * * * Purpose: sends command to preprocessor manager * * * * Parameters: code - [IN] message code * @@ -1587,8 +1515,6 @@ static void preprocessor_send(zbx_uint32_t code, unsigned char *data, zbx_uint32 /****************************************************************************** * * - * Function: zbx_preprocess_item_value * - * * * Purpose: perform item value preprocessing and dependent item processing * * * * Parameters: itemid - [IN] the itemid * @@ -1652,8 +1578,6 @@ void zbx_preprocess_item_value(zbx_uint64_t itemid, zbx_uint64_t hostid, unsigne /****************************************************************************** * * - * Function: zbx_preprocessor_flush * - * * * Purpose: send flush command to preprocessing manager * * * ******************************************************************************/ @@ -1671,8 +1595,6 @@ void zbx_preprocessor_flush(void) /****************************************************************************** * * - * Function: zbx_preprocessor_get_queue_size * - * * * Purpose: get queue size (enqueued value count) of preprocessing manager * * * * Return value: enqueued item count * @@ -1693,8 +1615,6 @@ zbx_uint64_t zbx_preprocessor_get_queue_size(void) /****************************************************************************** * * - * Function: zbx_preproc_op_free * - * * * Purpose: frees preprocessing step * * * ******************************************************************************/ @@ -1707,8 +1627,6 @@ void zbx_preproc_op_free(zbx_preproc_op_t *op) /****************************************************************************** * * - * Function: zbx_preproc_result_free * - * * * Purpose: frees preprocessing step test result * * * ******************************************************************************/ @@ -1721,8 +1639,6 @@ void zbx_preproc_result_free(zbx_preproc_result_t *result) /****************************************************************************** * * - * Function: preprocessor_pack_test_request * - * * * Purpose: packs preprocessing step request for serialization * * * * Return value: The size of packed data * @@ -1767,8 +1683,6 @@ static zbx_uint32_t preprocessor_pack_test_request(unsigned char **data, unsigne /****************************************************************************** * * - * Function: zbx_preprocessor_unpack_test_request * - * * * Purpose: unpack preprocessing test request data from IPC data buffer * * * * Parameters: value_type - [OUT] item value type * @@ -1798,8 +1712,6 @@ void zbx_preprocessor_unpack_test_request(unsigned char *value_type, char **valu /****************************************************************************** * * - * Function: zbx_preprocessor_test * - * * * Purpose: tests item preprocessing with the specified input value and steps * * * ******************************************************************************/ @@ -1832,8 +1744,6 @@ out: /****************************************************************************** * * - * Function: zbx_preprocessor_get_diag_stats * - * * * Purpose: get preprocessing manager diagnostic statistics * * * ******************************************************************************/ @@ -1856,8 +1766,6 @@ int zbx_preprocessor_get_diag_stats(int *total, int *queued, int *processing, in /****************************************************************************** * * - * Function: zbx_preprocessor_get_top_items * - * * * Purpose: get the top N items by the number of queued values * * * ******************************************************************************/ @@ -1885,8 +1793,6 @@ out: /****************************************************************************** * * - * Function: zbx_preprocessor_get_top_items * - * * * Purpose: get the top N items by the number of queued values * * * ******************************************************************************/ @@ -1897,8 +1803,6 @@ int zbx_preprocessor_get_top_items(int limit, zbx_vector_ptr_t *items, char **er /****************************************************************************** * * - * Function: zbx_preprocessor_get_top_oldest_preproc_items * - * * * Purpose: get the oldest items with preprocessing still in queue * * * ******************************************************************************/ diff --git a/src/zabbix_server/proxypoller/proxypoller.c b/src/zabbix_server/proxypoller/proxypoller.c index acfd7efbf99..211726b0d80 100644 --- a/src/zabbix_server/proxypoller/proxypoller.c +++ b/src/zabbix_server/proxypoller/proxypoller.c @@ -135,8 +135,6 @@ static void disconnect_proxy(zbx_socket_t *sock) /****************************************************************************** * * - * Function: get_data_from_proxy * - * * * Purpose: get historical data from proxy * * * * Parameters: proxy - [IN/OUT] proxy data * @@ -242,8 +240,6 @@ out: /****************************************************************************** * * - * Function: proxy_send_configuration * - * * * Purpose: sends configuration data to proxy * * * * Parameters: proxy - [IN/OUT] proxy data * @@ -347,8 +343,6 @@ out: /****************************************************************************** * * - * Function: proxy_process_proxy_data * - * * * Purpose: processes proxy data request * * * * Parameters: proxy - [IN/OUT] proxy data * @@ -413,8 +407,6 @@ out: /****************************************************************************** * * - * Function: proxy_get_data * - * * * Purpose: gets data from proxy ('proxy data' request) * * * * Parameters: proxy - [IN] proxy data * @@ -461,8 +453,6 @@ out: /****************************************************************************** * * - * Function: proxy_get_tasks * - * * * Purpose: gets data from proxy ('proxy data' request) * * * * Parameters: proxy - [IN/OUT] the proxy data * @@ -501,8 +491,6 @@ out: /****************************************************************************** * * - * Function: process_proxy * - * * * Purpose: retrieve values of metrics from monitored hosts * * * * Parameters: * diff --git a/src/zabbix_server/reporter/report_manager.c b/src/zabbix_server/reporter/report_manager.c index 2e0fe6f6a78..eaa25bbe146 100644 --- a/src/zabbix_server/reporter/report_manager.c +++ b/src/zabbix_server/reporter/report_manager.c @@ -176,8 +176,6 @@ zbx_rm_writer_t; /****************************************************************************** * * - * Function: rm_get_writer * - * * * Purpose: return writer with the specified client * * * ******************************************************************************/ @@ -198,8 +196,6 @@ static zbx_rm_writer_t *rm_get_writer(zbx_rm_t *manager, const zbx_ipc_client_t /****************************************************************************** * * - * Function: rm_writer_free * - * * ******************************************************************************/ static void rm_writer_free(zbx_rm_writer_t *writer) { @@ -209,8 +205,6 @@ static void rm_writer_free(zbx_rm_writer_t *writer) /****************************************************************************** * * - * Function: rm_report_compare_nextcheck * - * * ******************************************************************************/ static int rm_report_compare_nextcheck(const void *d1, const void *d2) { @@ -222,8 +216,6 @@ static int rm_report_compare_nextcheck(const void *d1, const void *d2) /****************************************************************************** * * - * Function: rm_report_clean * - * * ******************************************************************************/ static void rm_report_clean(zbx_rm_report_t *report) { @@ -240,8 +232,6 @@ static void rm_report_clean(zbx_rm_report_t *report) /****************************************************************************** * * - * Function: rm_job_free * - * * ******************************************************************************/ static void rm_job_free(zbx_rm_job_t *job) { @@ -260,8 +250,6 @@ static void rm_job_free(zbx_rm_job_t *job) /****************************************************************************** * * - * Function: rm_batch_clean * - * * ******************************************************************************/ static void rm_batch_clean(zbx_rm_batch_t *batch) { @@ -272,8 +260,6 @@ static void rm_batch_clean(zbx_rm_batch_t *batch) /****************************************************************************** * * - * Function: rm_init * - * * * Purpose: initializes report manager * * * * Parameters: manager - [IN] the manager to initialize * @@ -319,8 +305,6 @@ out: /****************************************************************************** * * - * Function: rm_destroy * - * * * Purpose: destroys report manager * * * * Parameters: manager - [IN] the manager to destroy * @@ -361,8 +345,6 @@ static void rm_destroy(zbx_rm_t *manager) /****************************************************************************** * * - * Function: rm_register_writer * - * * * Purpose: registers report writer * * * * Parameters: manager - [IN] the manager * @@ -403,8 +385,6 @@ static void rm_register_writer(zbx_rm_t *manager, zbx_ipc_client_t *client, zbx_ /****************************************************************************** * * - * Function: rm_time_to_urlfield * - * * * Purpose: convert timestamp to range format used in URL query fields * * * * Parameters: tm - [IN] the timestamp * @@ -424,8 +404,6 @@ static char *rm_time_to_urlfield(const struct tm *tm) /****************************************************************************** * * - * Function: report_create_cookie * - * * * Purpose: create zbx_session cookie for frontend authentication * * * * Parameters: manager - [IN] the manager * @@ -463,8 +441,6 @@ static char *report_create_cookie(zbx_rm_t *manager, const char *sessionid) /****************************************************************************** * * - * Function: rm_get_session * - * * * Purpose: get specified user session, creating one if necessary * * * * Parameters: manager - [IN] the manager * @@ -524,8 +500,6 @@ static zbx_rm_session_t *rm_get_session(zbx_rm_t *manager, zbx_uint64_t userid) /****************************************************************************** * * - * Function: rm_db_flush_sessions * - * * * Purpose: flushes session lastaccess changes to database * * * * Parameters: manager - [IN] the manager * @@ -568,8 +542,6 @@ static void rm_db_flush_sessions(zbx_rm_t *manager) /****************************************************************************** * * - * Function: rm_db_flush_reports * - * * * Purpose: flushes report state, lastaccess and error fields * * * * Parameters: manager - [IN] the manager * @@ -659,8 +631,6 @@ out: /****************************************************************************** * * - * Function: rm_get_report_range * - * * * Purpose: calculate report range from report time and period * * * * Parameters: report_time - [IN] the report writing time * @@ -692,8 +662,6 @@ static int rm_get_report_range(int report_time, unsigned char period, struct tm /****************************************************************************** * * - * Function: rm_get_report_name * - * * * Purpose: make report attachment name based on report name and timestamp * * * * Parameters: name - [IN] the report name * @@ -739,8 +707,6 @@ static char *rm_get_report_name(const char *name, int report_time) /****************************************************************************** * * - * Function: rm_create_job * - * * * Purpose: create new job to be processed by report writers * * * * Parameters: manager - [IN] the manager * @@ -814,8 +780,6 @@ static zbx_rm_job_t *rm_create_job(zbx_rm_t *manager, const char *report_name, z /****************************************************************************** * * - * Function: rm_update_report * - * * * Purpose: update report state, lastsent, error in cache * * * * Parameters: manager - [IN] the report manager * @@ -865,8 +829,6 @@ static void rm_update_report(zbx_rm_t *manager, zbx_rm_report_t *report, int sta /****************************************************************************** * * - * Function: rm_report_calc_nextcheck * - * * * Purpose: calculate time when report must be generated * * * * Parameters: report - [IN] the report * @@ -902,8 +864,6 @@ static int rm_report_calc_nextcheck(const zbx_rm_report_t *report, int now, char /****************************************************************************** * * - * Function: rm_report_update_params * - * * * Purpose: update report parameters * * * * Parameters: report - [IN] the report * @@ -961,8 +921,6 @@ static void rm_report_update_params(zbx_rm_report_t *report, zbx_vector_ptr_pair /****************************************************************************** * * - * Function: rm_report_update_users * - * * * Purpose: update report recipient users * * * * Parameters: report - [IN] the report * @@ -983,8 +941,6 @@ static void rm_report_update_users(zbx_rm_report_t *report, const zbx_vector_rec /****************************************************************************** * * - * Function: rm_report_update_usergroups * - * * * Purpose: update report recipient user groups * * * * Parameters: report - [IN] the report * @@ -999,8 +955,6 @@ static void rm_report_update_usergroups(zbx_rm_report_t *report, const zbx_vecto /****************************************************************************** * * - * Function: rm_update_cache_settings * - * * * Purpose: update general settings cache * * * * Parameters: manager - [IN] the manager * @@ -1032,8 +986,6 @@ static void rm_update_cache_settings(zbx_rm_t *manager) /****************************************************************************** * * - * Function: rm_is_report_active * - * * * Purpose: check if the report is active based on the specified time * * * * Parameters: report - [IN] the report * @@ -1056,8 +1008,6 @@ static int rm_is_report_active(const zbx_rm_report_t *report, int now) /****************************************************************************** * * - * Function: rm_dequeue_report * - * * * Purpose: remove report from queue if it was queued * * * * Parameters: manager - [IN] the manager * @@ -1075,8 +1025,6 @@ static void rm_dequeue_report(zbx_rm_t *manager, zbx_rm_report_t *report) /****************************************************************************** * * - * Function: rm_update_cache_reports * - * * * Purpose: update reports cache * * * * Parameters: manager - [IN] the manager * @@ -1234,8 +1182,6 @@ static void rm_update_cache_reports(zbx_rm_t *manager, int now) /****************************************************************************** * * - * Function: rm_update_cache_report_param * - * * * Purpose: update cached report parameters * * * * Parameters: manager - [IN] the manager * @@ -1297,8 +1243,6 @@ static void rm_update_cache_reports_params(zbx_rm_t *manager) /****************************************************************************** * * - * Function: rm_update_cache_reports_users * - * * * Purpose: update cached report recipient users * * * * Parameters: manager - [IN] the manager * @@ -1371,8 +1315,6 @@ static void rm_update_cache_reports_users(zbx_rm_t *manager) /****************************************************************************** * * - * Function: rm_update_cache_reports_usergroups * - * * * Purpose: update cached report recipient user groups * * * * Parameters: manager - [IN] the manager * @@ -1434,8 +1376,6 @@ static void rm_update_cache_reports_usergroups(zbx_rm_t *manager) /****************************************************************************** * * - * Function: rm_dump_cache * - * * * Purpose: dump cached reports into log * * * * Parameters: manager - [IN] the manager * @@ -1523,8 +1463,6 @@ static void rm_dump_cache(zbx_rm_t *manager) /****************************************************************************** * * - * Function: rm_update_cache * - * * * Purpose: update configuration and report cache * * * * Parameters: manager - [IN] the manager * @@ -1566,8 +1504,6 @@ static void zbx_report_dst_free(zbx_report_dst_t *dst) /****************************************************************************** * * - * Function: rm_get_report_dimensions * - * * * Purpose: calculate report dimensions based on dashboard contents * * * * Parameters: dashboardid - [IN] the dashboard id * @@ -1611,8 +1547,6 @@ static void rm_get_report_dimensions(zbx_uint64_t dashboardid, int *width, int * /****************************************************************************** * * - * Function: rm_writer_process_job * - * * * Purpose: process job by sending it to writer * * * * Parameters: writer - [IN] the writer * @@ -1778,8 +1712,6 @@ out: /****************************************************************************** * * - * Function: rm_report_create_jobs * - * * * Purpose: create jobs to process the report * * * * Parameters: manager - [IN] the manager * @@ -1832,8 +1764,6 @@ static int rm_jobs_add_user(zbx_rm_t *manager, zbx_rm_report_t *report, zbx_uint /****************************************************************************** * * - * Function: rm_report_create_usergroup_jobs * - * * * Purpose: create user group based jobs * * * * Parameters: manager - [IN] the manager * @@ -1910,8 +1840,6 @@ out: /****************************************************************************** * * - * Function: rm_report_create_jobs * - * * * Purpose: create jobs to process the report * * * * Parameters: manager - [IN] the manager * @@ -2025,8 +1953,6 @@ out: /****************************************************************************** * * - * Function: rm_schedule_jobs * - * * * Purpose: process queue * * * * Parameters: manager - [IN] the manager * @@ -2089,8 +2015,6 @@ static int rm_schedule_jobs(zbx_rm_t *manager, int now) /****************************************************************************** * * - * Function: rm_finish_job * - * * * Purpose: finish job * * * * Parameters: manager - [IN] the manager * @@ -2180,8 +2104,6 @@ static void rm_finish_job(zbx_rm_t *manager, zbx_rm_job_t *job, int status, cons /****************************************************************************** * * - * Function: rm_send_test_error_result * - * * * Purpose: send error result in response to test request * * * * Parameters: client - [IN] the connected trapper * @@ -2200,8 +2122,6 @@ static void rm_send_test_error_result(zbx_ipc_client_t *client, const char *erro /****************************************************************************** * * - * Function: rm_process_jobs * - * * * Purpose: process queue * * * * Parameters: manager - [IN] the manager * @@ -2252,8 +2172,6 @@ static int rm_process_jobs(zbx_rm_t *manager) /****************************************************************************** * * - * Function: rm_test_report * - * * * Purpose: test report * * * * Parameters: manager - [IN] the manager * @@ -2300,8 +2218,6 @@ static int rm_test_report(zbx_rm_t *manager, zbx_ipc_client_t *client, zbx_ipc_m /****************************************************************************** * * - * Function: rm_process_result * - * * * Purpose: process report result message * * * * Parameters: manager - [IN] the manager * diff --git a/src/zabbix_server/reporter/report_writer.c b/src/zabbix_server/reporter/report_writer.c index ea0fee3bb9b..f1c170b5910 100644 --- a/src/zabbix_server/reporter/report_writer.c +++ b/src/zabbix_server/reporter/report_writer.c @@ -81,8 +81,6 @@ static char *rw_curl_error(CURLcode err) /****************************************************************************** * * - * Function: rw_get_report * - * * * Purpose: get report from web service * * * * Parameters: url - [IN] the report url * @@ -243,8 +241,6 @@ out: /****************************************************************************** * * - * Function: rw_begin_report * - * * * Purpose: begin report dispatch * * * * Parameters: msg - [IN] the begin report request message * @@ -306,8 +302,6 @@ static int rw_begin_report(zbx_ipc_message_t *msg, zbx_alerter_dispatch_t *dispa /****************************************************************************** * * - * Function: rw_send_report * - * * * Purpose: send report to the recipients using specified media type * * * * Parameters: msg - [IN] the send report request message * @@ -348,8 +342,6 @@ static int rw_send_report(zbx_ipc_message_t *msg, zbx_alerter_dispatch_t *dispat /****************************************************************************** * * - * Function: rw_end_report * - * * * Purpose: finish report dispatch * * * * Parameters: dispatch - [IN] the alerter dispatch * @@ -374,8 +366,6 @@ static int rw_end_report(zbx_alerter_dispatch_t *dispatch, char **error) /****************************************************************************** * * - * Function: rw_send_result * - * * * Purpose: send report result back to manager * * * * Parameters: socket - [IN] the report manager IPC socket * @@ -399,8 +389,6 @@ static void rw_send_result(zbx_ipc_socket_t *socket, zbx_alerter_dispatch_t *dis /****************************************************************************** * * - * Function: report_writer_thread * - * * ******************************************************************************/ ZBX_THREAD_ENTRY(report_writer_thread, args) { diff --git a/src/zabbix_server/scripts/scripts.c b/src/zabbix_server/scripts/scripts.c index 04073e839cb..471a11afa27 100644 --- a/src/zabbix_server/scripts/scripts.c +++ b/src/zabbix_server/scripts/scripts.c @@ -284,8 +284,6 @@ void zbx_script_clean(zbx_script_t *script) /****************************************************************************** * * - * Function: zbx_webhook_params_pack_json * - * * * Purpose: pack webhook script parameters into JSON * * * * Parameters: params - [IN] vector of pairs of pointers to parameter * @@ -314,8 +312,6 @@ void zbx_webhook_params_pack_json(const zbx_vector_ptr_pair_t *params, char **pa /*********************************************************************************** * * - * Function: zbx_script_prepare * - * * * Purpose: prepares user script * * * * Parameters: script - [IN] the script to prepare * @@ -380,8 +376,6 @@ out: /****************************************************************************** * * - * Function: DBfetch_webhook_params * - * * * Purpose: fetch webhook parameters * * * * Parameters: scriptid - [IN] the id of script to be executed * @@ -427,8 +421,6 @@ out: /****************************************************************************** * * - * Function: zbx_script_execute * - * * * Purpose: executing user scripts or remote commands * * * * Parameters: script - [IN] the script to be executed * @@ -516,8 +508,6 @@ int zbx_script_execute(const zbx_script_t *script, const DC_HOST *host, const ch /****************************************************************************** * * - * Function: zbx_script_create_task * - * * * Purpose: creates remote command task from a script * * * * Return value: the identifier of the created task or 0 in the case of * diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c index 149cee9e7ae..43afdf8e036 100644 --- a/src/zabbix_server/server.c +++ b/src/zabbix_server/server.c @@ -538,8 +538,6 @@ int get_process_info_by_thread(int local_server_num, unsigned char *local_proces /****************************************************************************** * * - * Function: zbx_set_defaults * - * * * Purpose: set configuration defaults * * * * Author: Vladimir Levijev * @@ -611,8 +609,6 @@ static void zbx_set_defaults(void) /****************************************************************************** * * - * Function: zbx_validate_config * - * * * Purpose: validate configuration parameters * * * * Author: Vladimir Levijev * @@ -740,8 +736,6 @@ static void zbx_validate_config(ZBX_TASK_EX *task) /****************************************************************************** * * - * Function: zbx_load_config * - * * * Purpose: parse config file and update configuration parameters * * * * Parameters: * @@ -992,8 +986,6 @@ static void zbx_load_config(ZBX_TASK_EX *task) /****************************************************************************** * * - * Function: zbx_free_config * - * * * Purpose: free configuration memory * * * ******************************************************************************/ @@ -1004,8 +996,6 @@ static void zbx_free_config(void) /****************************************************************************** * * - * Function: main * - * * * Purpose: executes server processes * * * * Author: Eugene Grigorjev * @@ -1196,8 +1186,6 @@ static void zbx_check_db(void) /****************************************************************************** * * - * Function: server_startup * - * * * Purpose: initialize shared resources and start processes * * * ******************************************************************************/ @@ -1462,8 +1450,6 @@ static int server_restart_logger(char **error) /****************************************************************************** * * - * Function: server_teardown * - * * * Purpose: terminate processes and destroy shared resources * * * ******************************************************************************/ diff --git a/src/zabbix_server/service/service_actions.c b/src/zabbix_server/service/service_actions.c index c96d5b8db7f..afdb999d06f 100644 --- a/src/zabbix_server/service/service_actions.c +++ b/src/zabbix_server/service/service_actions.c @@ -23,8 +23,6 @@ /****************************************************************************** * * - * Function: condition_match_service * - * * * Purpose: match service update by service id * * * ******************************************************************************/ @@ -41,8 +39,6 @@ static int condition_match_service(const zbx_service_action_condition_t *conditi /****************************************************************************** * * - * Function: condition_match_service_name * - * * * Purpose: match service update by service name * * * ******************************************************************************/ @@ -54,8 +50,6 @@ static int condition_match_service_name(const zbx_service_action_condition_t *co /****************************************************************************** * * - * Function: match_tags * - * * * Purpose: match tag/tag+value using the specified operator * * * * Parameters: tags - [IN] the tags to match * @@ -109,8 +103,6 @@ static int match_tags(const zbx_vector_ptr_t *tags, const char *name, const char /****************************************************************************** * * - * Function: condition_match_service_tag * - * * * Purpose: match service update by service tag name * * * ******************************************************************************/ @@ -122,8 +114,6 @@ static int condition_match_service_tag(const zbx_service_action_condition_t *con /****************************************************************************** * * - * Function: condition_match_service_tag_value * - * * * Purpose: match service update by service tag and its value * * * ******************************************************************************/ @@ -135,8 +125,6 @@ static int condition_match_service_tag_value(const zbx_service_action_condition_ /****************************************************************************** * * - * Function: service_update_match_condition * - * * * Purpose: match service update by the specified condition * * * ******************************************************************************/ @@ -169,8 +157,6 @@ static const char *service_update_match_condition(const zbx_service_update_t *up /****************************************************************************** * * - * Function: service_update_match_action * - * * * Purpose: match service update against the specified action * * * ******************************************************************************/ @@ -237,8 +223,6 @@ static int service_update_match_action(const zbx_service_update_t *update, const /****************************************************************************** * * - * Function: service_update_process_actions * - * * * Purpose: match service update against service actions * * * * Parameters: update - [IN] the service update generated when service * diff --git a/src/zabbix_server/service/service_manager.c b/src/zabbix_server/service/service_manager.c index 486cccfcde3..9d3c80a988b 100644 --- a/src/zabbix_server/service/service_manager.c +++ b/src/zabbix_server/service/service_manager.c @@ -1215,8 +1215,6 @@ static void service_problems_index_clean(void *data) /****************************************************************************** * * - * Function: service_get_status * - * * * Purpose: get service status when calculating parent service status * * * * Parameters: service - [IN] the service * @@ -1266,8 +1264,6 @@ int service_get_status(const zbx_service_t *service, int *status) /****************************************************************************** * * - * Function: its_updates_append * - * * * Purpose: adds an update to the queue * * * * Parameters: updates - [OUT] the update queue * @@ -1313,8 +1309,6 @@ static zbx_service_update_t *update_service(zbx_hashset_t *service_updates, zbx_ /****************************************************************************** * * - * Function: its_updates_compare * - * * * Purpose: used to sort service updates by source id * * * ******************************************************************************/ @@ -1327,8 +1321,6 @@ static int its_updates_compare(const zbx_status_update_t **update1, const zbx_st /****************************************************************************** * * - * Function: its_write_status_and_alarms * - * * * Purpose: writes service status changes, generated service alarms, service * * problem changes into database * * * @@ -1521,8 +1513,6 @@ out: /****************************************************************************** * * - * Function: service_get_main_status * - * * * Purpose: get service status by applying the main service status algorithm * * * * Parameters: service - [IN] the service * @@ -1579,8 +1569,6 @@ int service_get_main_status(const zbx_service_t *service) /****************************************************************************** * * - * Function: service_get_children_by_status * - * * * Purpose: get children with status greater or equal to the specified * * * * Parameters: service - [IN] the service * @@ -1615,8 +1603,6 @@ static void service_get_children_by_status(const zbx_service_t *service, int sta /****************************************************************************** * * - * Function: services_get_weight * - * * * Purpose: get total weight of all specified services * * * ******************************************************************************/ @@ -1636,8 +1622,6 @@ static int services_get_weight(const zbx_vector_ptr_t *services) /****************************************************************************** * * - * Function: service_get_rule_status * - * * * Purpose: get service status according to the specified rule * * * * Parameters: service - [IN] the service * @@ -1760,8 +1744,6 @@ static void service_add_cause(zbx_vector_ptr_t *causes, zbx_service_t *service, /****************************************************************************** * * - * Function: service_get_causes * - * * * Purpose: get services that caused the target service to be in the * * specified severity state * * * @@ -1926,8 +1908,6 @@ static void service_get_causes(const zbx_service_t *service, int severity, zbx_v /****************************************************************************** * * - * Function: service_get_rootcause_eventids * - * * * Purpose: get root cause eventids for the service * * * * Parameters: parent - [IN] the service * @@ -1944,8 +1924,6 @@ void service_get_rootcause_eventids(const zbx_service_t *parent, zbx_vector_uint /****************************************************************************** * * - * Function: its_itservice_update_status * - * * * Purpose: updates service and its parents statuses * * * * Parameters: service - [IN] the service to update * @@ -2027,8 +2005,6 @@ static char *service_get_event_name(zbx_service_manager_t *manager, const char * /****************************************************************************** * * - * Function: db_create_service_events * - * * * Purpose: create service events based on service updates * * * * Parameters: manager - [IN] the service manager * @@ -2154,8 +2130,6 @@ static const zbx_service_update_t *get_update_by_serviceid(const zbx_vector_ptr_ /****************************************************************************** * * - * Function: db_get_service_problems * - * * * Purpose: get open problems for the specified services * * * * Parameters: manager - [IN] the service manager * @@ -2206,8 +2180,6 @@ zbx_service_recovery_t; /****************************************************************************** * * - * Function: db_resolve_service_events * - * * * Purpose: resolve service events based on service updates * * * * Parameters: manager - [IN] the service manager * @@ -2355,8 +2327,6 @@ static int compare_uint64_pair_second(const void *d1, const void *d2) /****************************************************************************** * * - * Function: db_update_service_events * - * * * Purpose: create update escalations based on service updates * * * * Parameters: manager - [IN] the service manager * @@ -2446,8 +2416,6 @@ out: /****************************************************************************** * * - * Function: db_manage_service_events * - * * * Purpose: generate and process service events in response to service * * updates * * * @@ -2929,8 +2897,6 @@ static void process_parentlist(const zbx_ipc_message_t *message, zbx_service_man /****************************************************************************** * * - * Function: service_update_event_severity * - * * * Purpose: update cached service problem and queue service for update * * * ******************************************************************************/ @@ -2963,8 +2929,6 @@ static void service_update_event_severity(zbx_service_manager_t *service_manager /****************************************************************************** * * - * Function: db_update_service_problems * - * * * Purpose: update service_problem table with the changed event severities * * * ******************************************************************************/ @@ -3005,8 +2969,6 @@ static int db_update_service_problems(const zbx_vector_ptr_t *event_severities) /****************************************************************************** * * - * Function: process_event_severities * - * * * Purpose: update event severities, service statuses in cache and database * * according to the event severity changes during acknowledgment * * * diff --git a/src/zabbix_server/snmptrapper/snmptrapper.c b/src/zabbix_server/snmptrapper/snmptrapper.c index 2c174e70575..d8c42885d1d 100644 --- a/src/zabbix_server/snmptrapper/snmptrapper.c +++ b/src/zabbix_server/snmptrapper/snmptrapper.c @@ -70,8 +70,6 @@ static void DBupdate_lastsize(void) /****************************************************************************** * * - * Function: process_trap_for_interface * - * * * Purpose: add trap to all matching items for the specified interface * * * * Return value: SUCCEED - a matching item was found * @@ -230,8 +228,6 @@ next: /****************************************************************************** * * - * Function: process_trap * - * * * Purpose: process a single trap * * * * Parameters: addr - [IN] address of the target interface(s) * @@ -277,8 +273,6 @@ static void process_trap(const char *addr, char *begin, char *end) /****************************************************************************** * * - * Function: parse_traps * - * * * Purpose: split traps and process them with process_trap() * * * * Author: Rudolfs Kreicbergs * @@ -387,8 +381,6 @@ static void parse_traps(int flag) /****************************************************************************** * * - * Function: delay_trap_logs * - * * * Purpose: delay SNMP trapper file related issue log entries for 60 seconds * * unless this is the first time this issue has occurred * * * @@ -416,8 +408,6 @@ static void delay_trap_logs(char *error, int log_level) /****************************************************************************** * * - * Function: read_traps * - * * * Purpose: read the traps and then parse them with parse_traps() * * * * Author: Rudolfs Kreicbergs * @@ -463,8 +453,6 @@ out: /****************************************************************************** * * - * Function: close_trap_file * - * * * Purpose: close trap file and reset lastsize * * * * Author: Rudolfs Kreicbergs * @@ -484,8 +472,6 @@ static void close_trap_file(void) /****************************************************************************** * * - * Function: open_trap_file * - * * * Purpose: open the trap file and get it's node number * * * * Return value: file descriptor of the opened file or -1 otherwise * @@ -528,8 +514,6 @@ out: /****************************************************************************** * * - * Function: get_latest_data * - * * * Purpose: Open the latest trap file. If the current file has been rotated, * * process that and then open the latest file. * * * @@ -607,8 +591,6 @@ static int get_latest_data(void) /****************************************************************************** * * - * Function: main_snmptrapper_loop * - * * * Purpose: SNMP trap reader's entry point * * * * Author: Rudolfs Kreicbergs * diff --git a/src/zabbix_server/taskmanager/proxy_tasks.c b/src/zabbix_server/taskmanager/proxy_tasks.c index 2d8b201660c..2730c07b72d 100644 --- a/src/zabbix_server/taskmanager/proxy_tasks.c +++ b/src/zabbix_server/taskmanager/proxy_tasks.c @@ -28,8 +28,6 @@ /****************************************************************************** * * - * Function: zbx_tm_get_remote_tasks * - * * * Purpose: get tasks scheduled to be executed on a proxy * * * * Parameters: tasks - [OUT] the tasks to execute * diff --git a/src/zabbix_server/taskmanager/taskmanager.c b/src/zabbix_server/taskmanager/taskmanager.c index 4d7d958651a..c88768e7289 100644 --- a/src/zabbix_server/taskmanager/taskmanager.c +++ b/src/zabbix_server/taskmanager/taskmanager.c @@ -41,8 +41,6 @@ extern ZBX_THREAD_LOCAL int server_num, process_num; /****************************************************************************** * * - * Function: tm_execute_task_close_problem * - * * * Purpose: close the specified problem event and remove task * * * * Parameters: triggerid - [IN] the source trigger id * @@ -73,8 +71,6 @@ static void tm_execute_task_close_problem(zbx_uint64_t taskid, zbx_uint64_t trig /****************************************************************************** * * - * Function: tm_try_task_close_problem * - * * * Purpose: try to close problem by event acknowledgement action * * * * Parameters: taskid - [IN] the task identifier * @@ -153,8 +149,6 @@ static int tm_try_task_close_problem(zbx_uint64_t taskid) /****************************************************************************** * * - * Function: tm_expire_remote_command * - * * * Purpose: process expired remote command task * * * ******************************************************************************/ @@ -195,8 +189,6 @@ static void tm_expire_remote_command(zbx_uint64_t taskid) /****************************************************************************** * * - * Function: tm_process_remote_command_result * - * * * Purpose: process remote command result task * * * * Return value: SUCCEED - the task was processed successfully * @@ -269,8 +261,6 @@ static int tm_process_remote_command_result(zbx_uint64_t taskid) /****************************************************************************** * * - * Function: tm_process_data_result * - * * * Purpose: process data task result * * * ******************************************************************************/ @@ -310,8 +300,6 @@ static void tm_process_data_result(zbx_uint64_t taskid) } /****************************************************************************** * * - * Function: notify_service_manager * - * * * Purpose: notify service manager about problem severity changes * * * ******************************************************************************/ @@ -353,8 +341,6 @@ static void notify_service_manager(const zbx_vector_ptr_t *ack_tasks) /****************************************************************************** * * - * Function: tm_process_acknowledgements * - * * * Purpose: process acknowledgements for alerts sending * * * * Return value: The number of successfully processed tasks * @@ -435,8 +421,6 @@ static int tm_process_acknowledgements(zbx_vector_uint64_t *ack_taskids) /****************************************************************************** * * - * Function: tm_process_check_now * - * * * Purpose: process check now tasks for item rescheduling * * * * Return value: The number of successfully processed tasks * @@ -581,8 +565,6 @@ static int tm_process_check_now(zbx_vector_uint64_t *taskids) /****************************************************************************** * * - * Function: tm_process_diaginfo * - * * * Purpose: process diaginfo task * * * ******************************************************************************/ @@ -610,8 +592,6 @@ static void tm_process_diaginfo(zbx_uint64_t taskid, const char *data) /****************************************************************************** * * - * Function: tm_process_data * - * * * Purpose: process data tasks * * * * Return value: The number of successfully processed tasks * @@ -689,8 +669,6 @@ static int tm_process_data(zbx_vector_uint64_t *taskids) /****************************************************************************** * * - * Function: tm_expire_generic_tasks * - * * * Purpose: expires tasks that don't require specific expiration handling * * * * Return value: The number of successfully expired tasks * @@ -711,8 +689,6 @@ static int tm_expire_generic_tasks(zbx_vector_uint64_t *taskids) /****************************************************************************** * * - * Function: tm_process_tasks * - * * * Purpose: process task manager tasks depending on task type * * * * Return value: The number of successfully processed tasks * @@ -814,8 +790,6 @@ static int tm_process_tasks(int now) /****************************************************************************** * * - * Function: tm_remove_old_tasks * - * * * Purpose: remove old done/expired tasks * * * ******************************************************************************/ diff --git a/src/zabbix_server/timer/timer.c b/src/zabbix_server/timer/timer.c index 24a99b9ed56..70954d61073 100644 --- a/src/zabbix_server/timer/timer.c +++ b/src/zabbix_server/timer/timer.c @@ -50,8 +50,6 @@ zbx_event_suppress_data_t; /****************************************************************************** * * - * Function: log_host_maintenance_update * - * * * Purpose: log host maintenance changes * * * ******************************************************************************/ @@ -96,8 +94,6 @@ static void log_host_maintenance_update(const zbx_host_maintenance_diff_t* diff) /****************************************************************************** * * - * Function: db_update_host_maintenances * - * * * Purpose: update host maintenance properties in database * * * ******************************************************************************/ @@ -172,8 +168,6 @@ static void db_update_host_maintenances(const zbx_vector_ptr_t *updates) /****************************************************************************** * * - * Function: db_remove_expired_event_suppress_data * - * * * Purpose: remove expired event_suppress records * * * ******************************************************************************/ @@ -186,8 +180,6 @@ static void db_remove_expired_event_suppress_data(int now) /****************************************************************************** * * - * Function: event_suppress_data_free * - * * * Purpose: free event suppress data structure * * * ******************************************************************************/ @@ -199,8 +191,6 @@ static void event_suppress_data_free(zbx_event_suppress_data_t *data) /****************************************************************************** * * - * Function: event_queries_fetch * - * * * Purpose: fetch events that need to be queried for maintenance * * * ******************************************************************************/ @@ -242,8 +232,6 @@ static void event_queries_fetch(DB_RESULT result, zbx_vector_ptr_t *event_querie /****************************************************************************** * * - * Function: db_get_query_events * - * * * Purpose: get open, recently resolved and resolved problems with suppress * * data from database and prepare event query, event data structures * * * @@ -361,8 +349,6 @@ static void db_get_query_events(zbx_vector_ptr_t *event_queries, zbx_vector_ptr_ /****************************************************************************** * * - * Function: db_update_event_suppress_data * - * * * Purpose: create/update event suppress data to reflect latest maintenance * * changes in cache * * * @@ -530,8 +516,6 @@ cleanup: /****************************************************************************** * * - * Function: db_update_host_maintenances * - * * * Purpose: update host maintenance parameters in cache and database * * * ******************************************************************************/ @@ -576,8 +560,6 @@ static int update_host_maintenances(void) /****************************************************************************** * * - * Function: timer_thread * - * * * Purpose: periodically processes maintenance * * * ******************************************************************************/ diff --git a/src/zabbix_server/trapper/active.c b/src/zabbix_server/trapper/active.c index 61a3c9e0e94..2fc072239c9 100644 --- a/src/zabbix_server/trapper/active.c +++ b/src/zabbix_server/trapper/active.c @@ -33,8 +33,6 @@ extern unsigned char program_type; /****************************************************************************** * * - * Function: db_register_host * - * * * Purpose: perform active agent auto registration * * * * Parameters: host - [IN] name of the host to be added or updated * @@ -140,8 +138,6 @@ out: /****************************************************************************** * * - * Function: get_hostid_by_host * - * * * Purpose: check for host name and return hostid * * * * Parameters: sock - [IN] open socket of server-agent connection * @@ -341,8 +337,6 @@ static void get_list_of_active_checks(zbx_uint64_t hostid, zbx_vector_uint64_t * /****************************************************************************** * * - * Function: send_list_of_active_checks * - * * * Purpose: send list of active checks to the host (older version agent) * * * * Parameters: sock - open socket of server-agent connection * @@ -452,8 +446,6 @@ out: /****************************************************************************** * * - * Function: zbx_vector_str_append_uniq * - * * * Purpose: append non duplicate string to the string vector * * * * Parameters: vector - [IN/OUT] the string vector * @@ -468,8 +460,6 @@ static void zbx_vector_str_append_uniq(zbx_vector_str_t *vector, const char *str /****************************************************************************** * * - * Function: zbx_itemkey_extract_global_regexps * - * * * Purpose: extract global regular expression names from item key * * * * Parameters: key - [IN] the item key to parse * @@ -522,8 +512,6 @@ out: /****************************************************************************** * * - * Function: send_list_of_active_checks_json * - * * * Purpose: send list of active checks to the host * * * * Parameters: sock - open socket of server-agent connection * diff --git a/src/zabbix_server/trapper/nodecommand.c b/src/zabbix_server/trapper/nodecommand.c index 3300e094214..13c5ffb19a1 100644 --- a/src/zabbix_server/trapper/nodecommand.c +++ b/src/zabbix_server/trapper/nodecommand.c @@ -33,8 +33,6 @@ /****************************************************************************** * * - * Function: execute_remote_script * - * * * Purpose: execute remote command and wait for the result * * * * Return value: SUCCEED - the remote command was executed successfully * @@ -187,8 +185,6 @@ fail: /****************************************************************************** * * - * Function: zbx_check_event_end_recovery_event * - * * * Purpose: check if the specified event id corresponds to a problem event * * caused by a trigger, find its recovery event (if it exists) * * * @@ -225,8 +221,6 @@ static int zbx_check_event_end_recovery_event(zbx_uint64_t eventid, zbx_uint64_t /****************************************************************************** * * - * Function: execute_script * - * * * Purpose: executing command * * * * Parameters: scriptid - [IN] the id of a script to be executed * @@ -491,8 +485,6 @@ fail: /****************************************************************************** * * - * Function: node_process_command * - * * * Purpose: process command received from the frontend * * * * Return value: SUCCEED - processed successfully * diff --git a/src/zabbix_server/trapper/proxyconfig.c b/src/zabbix_server/trapper/proxyconfig.c index b833f8e3476..8f937ae2fa7 100644 --- a/src/zabbix_server/trapper/proxyconfig.c +++ b/src/zabbix_server/trapper/proxyconfig.c @@ -30,8 +30,6 @@ /****************************************************************************** * * - * Function: send_proxyconfig * - * * * Purpose: send configuration tables to the proxy from server * * (for active proxies) * * * @@ -125,8 +123,6 @@ out: /****************************************************************************** * * - * Function: recv_proxyconfig * - * * * Purpose: receive configuration tables from server (passive proxies) * * * * Author: Alexander Vladishev * diff --git a/src/zabbix_server/trapper/proxydata.c b/src/zabbix_server/trapper/proxydata.c index 31ec9de6a22..99919b3ba38 100644 --- a/src/zabbix_server/trapper/proxydata.c +++ b/src/zabbix_server/trapper/proxydata.c @@ -93,8 +93,6 @@ int zbx_send_proxy_data_response(const DC_PROXY *proxy, zbx_socket_t *sock, cons /****************************************************************************** * * - * Function: zbx_recv_proxy_data * - * * * Purpose: receive 'proxy data' request from proxy * * * * Parameters: sock - [IN] the connection socket * @@ -184,8 +182,6 @@ out: /****************************************************************************** * * - * Function: send_data_to_server * - * * * Purpose: sends data from proxy to server * * * * Parameters: sock - [IN] the connection socket * @@ -213,8 +209,6 @@ static int send_data_to_server(zbx_socket_t *sock, char **buffer, size_t buffer_ /****************************************************************************** * * - * Function: zbx_send_proxy_data * - * * * Purpose: sends 'proxy data' request to server * * * * Parameters: sock - [IN] the connection socket * @@ -326,8 +320,6 @@ out: /****************************************************************************** * * - * Function: zbx_send_task_data * - * * * Purpose: sends 'proxy data' request to server * * * * Parameters: sock - [IN] the connection socket * diff --git a/src/zabbix_server/trapper/trapper.c b/src/zabbix_server/trapper/trapper.c index 0c7d2332c05..a27f36f672f 100644 --- a/src/zabbix_server/trapper/trapper.c +++ b/src/zabbix_server/trapper/trapper.c @@ -106,8 +106,6 @@ zbx_status_section_t; /****************************************************************************** * * - * Function: recv_agenthistory * - * * * Purpose: processes the received values from active agents * * * ******************************************************************************/ @@ -138,8 +136,6 @@ static void recv_agenthistory(zbx_socket_t *sock, struct zbx_json_parse *jp, zbx /****************************************************************************** * * - * Function: recv_senderhistory * - * * * Purpose: processes the received values from senders * * * ******************************************************************************/ @@ -170,8 +166,6 @@ static void recv_senderhistory(zbx_socket_t *sock, struct zbx_json_parse *jp, zb /****************************************************************************** * * - * Function: recv_proxy_heartbeat * - * * * Purpose: process heartbeat sent by proxy servers * * * * Return value: SUCCEED - processed successfully * @@ -238,8 +232,6 @@ zbx_queue_stats_t; /****************************************************************************** * * - * Function: queue_stats_update * - * * * Purpose: update queue stats with a new item delay * * * * Parameters: stats - [IN] the queue stats * @@ -264,8 +256,6 @@ static void queue_stats_update(zbx_queue_stats_t *stats, int delay) /****************************************************************************** * * - * Function: queue_stats_export * - * * * Purpose: export queue stats to JSON format * * * * Parameters: queue_stats - [IN] a hashset containing item stats * @@ -308,8 +298,6 @@ static int queue_compare_by_nextcheck_asc(zbx_queue_item_t **d1, zbx_queue_item_ /****************************************************************************** * * - * Function: recv_getqueue * - * * * Purpose: process queue request * * * * Parameters: sock - [IN] the request socket * @@ -782,8 +770,6 @@ static void status_stats_export(struct zbx_json *json, zbx_user_type_t access_le /****************************************************************************** * * - * Function: recv_getstatus * - * * * Purpose: process status request * * * * Parameters: sock - [IN] the request socket * @@ -874,8 +860,6 @@ out: /****************************************************************************** * * - * Function: send_internal_stats_json * - * * * Purpose: process Zabbix stats request * * * * Parameters: sock - [IN] the request socket * diff --git a/src/zabbix_server/trapper/trapper_auth.c b/src/zabbix_server/trapper/trapper_auth.c index 4b2d01d0ab1..c80fdf742ce 100644 --- a/src/zabbix_server/trapper/trapper_auth.c +++ b/src/zabbix_server/trapper/trapper_auth.c @@ -28,8 +28,6 @@ /****************************************************************************** * * - * Function: format_auth_token_hash * - * * * Purpose: takes a string token, hashes it with sha-512 and then formats the * * resulting binary into the printable hex string * * * @@ -59,8 +57,6 @@ static void format_auth_token_hash(const char *auth_token, char *hash_res_string /****************************************************************************** * * - * Function: zbx_get_user_from_json * - * * * Purpose: authenticate and initialize user data from the supplied json * * * * Parameters: jp - [IN] the request * diff --git a/src/zabbix_server/trapper/trapper_preproc.c b/src/zabbix_server/trapper/trapper_preproc.c index 7d7af04454b..6abab6d747d 100644 --- a/src/zabbix_server/trapper/trapper_preproc.c +++ b/src/zabbix_server/trapper/trapper_preproc.c @@ -32,8 +32,6 @@ extern int CONFIG_DOUBLE_PRECISION; /****************************************************************************** * * - * Function: trapper_parse_preproc_test * - * * * Purpose: parses preprocessing test request * * * * Parameters: jp - [IN] the request * @@ -229,8 +227,6 @@ out: /****************************************************************************** * * - * Function: trapper_preproc_test_run * - * * * Purpose: executes preprocessing test request * * * * Parameters: jp - [IN] the request * @@ -400,8 +396,6 @@ out: /****************************************************************************** * * - * Function: zbx_trapper_preproc_test * - * * * Purpose: processes preprocessing test request * * * * Parameters: sock - [IN] the request source socket (frontend) * diff --git a/src/zabbix_server/trapper/trapper_server.c b/src/zabbix_server/trapper/trapper_server.c index 2358412acdf..ac552610b8d 100644 --- a/src/zabbix_server/trapper/trapper_server.c +++ b/src/zabbix_server/trapper/trapper_server.c @@ -70,8 +70,6 @@ out: /****************************************************************************** * * - * Function: recv_alert_send * - * * * Purpose: process alert send request that is used to test media types * * * * Parameters: sock - [IN] the request socket * diff --git a/src/zabbix_server/vmware/vmware.c b/src/zabbix_server/vmware/vmware.c index 8057f20f001..9d2fee64b30 100644 --- a/src/zabbix_server/vmware/vmware.c +++ b/src/zabbix_server/vmware/vmware.c @@ -602,8 +602,6 @@ static size_t curl_header_cb(void *ptr, size_t size, size_t nmemb, void *userdat /****************************************************************************** * * - * Function: zbx_str_uint64_pair_free * - * * * Purpose: free memory of vector element * * * ******************************************************************************/ @@ -614,8 +612,6 @@ static void zbx_str_uint64_pair_free(zbx_str_uint64_pair_t data) /****************************************************************************** * * - * Function: zbx_str_uint64_pair_name_compare * - * * * Purpose: sorting function to sort zbx_str_uint64_pair_t vector by name * * * ******************************************************************************/ @@ -629,8 +625,6 @@ int zbx_str_uint64_pair_name_compare(const void *p1, const void *p2) /****************************************************************************** * * - * Function: zbx_http_post * - * * * Purpose: abstracts the curl_easy_setopt/curl_easy_perform call pair * * * * Parameters: easyhandle - [IN] the CURL handle * @@ -679,8 +673,6 @@ static int zbx_http_post(CURL *easyhandle, const char *request, ZBX_HTTPPAGE **r } /****************************************************************************** * * - * Function: zbx_soap_post * - * * * Purpose: unification of vmware web service call with SOAP error validation * * * * Parameters: fn_parent - [IN] the parent function name for Log records * @@ -781,8 +773,6 @@ static int vmware_perf_entity_compare_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: vmware_free_perfvalue * - * * * Purpose: frees perfvalue data structure * * * ******************************************************************************/ @@ -794,8 +784,6 @@ static void vmware_free_perfvalue(zbx_vmware_perf_value_t *value) /****************************************************************************** * * - * Function: vmware_free_perfdata * - * * * Purpose: frees perfdata data structure * * * ******************************************************************************/ @@ -812,8 +800,6 @@ static void vmware_free_perfdata(zbx_vmware_perf_data_t *data) /****************************************************************************** * * - * Function: xml_read_props * - * * * Purpose: reads the vmware object properties by their xpaths from xml data * * * * Parameters: xdoc - [IN] the xml document * @@ -877,8 +863,6 @@ static char **xml_read_props(xmlDoc *xdoc, const zbx_vmware_propmap_t *propmap, /****************************************************************************** * * - * Function: vmware_counters_shared_copy * - * * * Purpose: copies performance counter vector into shared memory hashset * * * * Parameters: dst - [IN] the destination hashset * @@ -910,8 +894,6 @@ static void vmware_counters_shared_copy(zbx_hashset_t *dst, const zbx_vector_ptr /****************************************************************************** * * - * Function: vmware_vector_str_uint64_pair_shared_clean * - * * * Purpose: frees shared resources allocated to store instance performance * * counter values * * * @@ -935,8 +917,6 @@ static void vmware_vector_str_uint64_pair_shared_clean(zbx_vector_str_uint64_pai /****************************************************************************** * * - * Function: vmware_perf_counter_shared_free * - * * * Purpose: frees shared resources allocated to store performance counter * * data * * * @@ -952,8 +932,6 @@ static void vmware_perf_counter_shared_free(zbx_vmware_perf_counter_t *counter) /****************************************************************************** * * - * Function: vmware_entities_shared_clean_stats * - * * * Purpose: removes statistics data from vmware entities * * * ******************************************************************************/ @@ -982,8 +960,6 @@ static void vmware_entities_shared_clean_stats(zbx_hashset_t *entities) /****************************************************************************** * * - * Function: vmware_diskextent_shared_free * - * * * Purpose: frees shared resources allocated to store diskextent data * * * * Parameters: diskextent - [IN] the diskextent * @@ -998,8 +974,6 @@ static void vmware_diskextent_shared_free(zbx_vmware_diskextent_t *diskextent) /****************************************************************************** * * - * Function: vmware_datastore_shared_free * - * * * Purpose: frees shared resources allocated to store datastore data * * * * Parameters: datastore - [IN] the datastore * @@ -1024,8 +998,6 @@ static void vmware_datastore_shared_free(zbx_vmware_datastore_t *datastore) /****************************************************************************** * * - * Function: vmware_datacenter_shared_free * - * * * Purpose: frees shared resources allocated to store datacenter data * * * * Parameters: datacenter - [IN] the datacenter * @@ -1041,8 +1013,6 @@ static void vmware_datacenter_shared_free(zbx_vmware_datacenter_t *datacenter) /****************************************************************************** * * - * Function: vmware_props_shared_free * - * * * Purpose: frees shared resources allocated to store properties list * * * * Parameters: props - [IN] the properties list * @@ -1067,8 +1037,6 @@ static void vmware_props_shared_free(char **props, int props_num) /****************************************************************************** * * - * Function: vmware_dev_shared_free * - * * * Purpose: frees shared resources allocated to store vm device data * * * * Parameters: dev - [IN] the vm device * @@ -1087,8 +1055,6 @@ static void vmware_dev_shared_free(zbx_vmware_dev_t *dev) /****************************************************************************** * * - * Function: vmware_fs_shared_free * - * * * Purpose: frees shared resources allocated to store file system object * * * * Parameters: fs - [IN] the file system * @@ -1104,8 +1070,6 @@ static void vmware_fs_shared_free(zbx_vmware_fs_t *fs) /****************************************************************************** * * - * Function: vmware_vm_shared_free * - * * * Purpose: frees shared resources allocated to store virtual machine * * * * Parameters: vm - [IN] the virtual machine * @@ -1132,8 +1096,6 @@ static void vmware_vm_shared_free(zbx_vmware_vm_t *vm) /****************************************************************************** * * - * Function: vmware_dsname_shared_free * - * * * Purpose: frees shared resources allocated to store datastore names data * * * * Parameters: dsname - [IN] the datastore name * @@ -1149,8 +1111,6 @@ static void vmware_dsname_shared_free(zbx_vmware_dsname_t *dsname) /****************************************************************************** * * - * Function: vmware_hv_shared_clean * - * * * Purpose: frees shared resources allocated to store vmware hypervisor * * * * Parameters: hv - [IN] the vmware hypervisor * @@ -1190,8 +1150,6 @@ static void vmware_hv_shared_clean(zbx_vmware_hv_t *hv) /****************************************************************************** * * - * Function: vmware_cluster_shared_free * - * * * Purpose: frees shared resources allocated to store vmware cluster * * * * Parameters: cluster - [IN] the vmware cluster * @@ -1213,8 +1171,6 @@ static void vmware_cluster_shared_free(zbx_vmware_cluster_t *cluster) /****************************************************************************** * * - * Function: vmware_event_shared_free * - * * * Purpose: frees shared resources allocated to store vmware event * * * * Parameters: event - [IN] the vmware event * @@ -1230,8 +1186,6 @@ static void vmware_event_shared_free(zbx_vmware_event_t *event) /****************************************************************************** * * - * Function: vmware_data_shared_free * - * * * Purpose: frees shared resources allocated to store vmware service data * * * * Parameters: data - [IN] the vmware service data * @@ -1272,8 +1226,6 @@ static void vmware_data_shared_free(zbx_vmware_data_t *data) /****************************************************************************** * * - * Function: vmware_shared_perf_entity_clean * - * * * Purpose: cleans resources allocated by vmware performance entity in vmware * * cache * * * @@ -1293,8 +1245,6 @@ static void vmware_shared_perf_entity_clean(zbx_vmware_perf_entity_t *entity) /****************************************************************************** * * - * Function: vmware_counter_shared_clean * - * * * Purpose: frees resources allocated by vmware performance counter * * * * Parameters: counter - [IN] the performance counter to free * @@ -1307,8 +1257,6 @@ static void vmware_counter_shared_clean(zbx_vmware_counter_t *counter) /****************************************************************************** * * - * Function: vmware_service_shared_free * - * * * Purpose: frees shared resources allocated to store vmware service * * * * Parameters: data - [IN] the vmware service data * @@ -1353,8 +1301,6 @@ static void vmware_service_shared_free(zbx_vmware_service_t *service) /****************************************************************************** * * - * Function: vmware_cluster_shared_dup * - * * * Purpose: copies vmware cluster object into shared memory * * * * Parameters: src - [IN] the vmware cluster object * @@ -1376,8 +1322,6 @@ static zbx_vmware_cluster_t *vmware_cluster_shared_dup(const zbx_vmware_cluster_ /****************************************************************************** * * - * Function: vmware_event_shared_dup * - * * * Purpose: copies vmware event object into shared memory * * * * Parameters: src - [IN] the vmware event object * @@ -1399,8 +1343,6 @@ static zbx_vmware_event_t *vmware_event_shared_dup(const zbx_vmware_event_t *src /****************************************************************************** * * - * Function: vmware_diskextent_shared_dup * - * * * Purpose: copies vmware hypervisor diskextent object into shared memory * * * * Parameters: src - [IN] the vmware diskextent object * @@ -1421,8 +1363,6 @@ static zbx_vmware_diskextent_t *vmware_diskextent_shared_dup(const zbx_vmware_di /****************************************************************************** * * - * Function: vmware_datastore_shared_dup * - * * * Purpose: copies vmware hypervisor datastore object into shared memory * * * * Parameters: src - [IN] the vmware datastore object * @@ -1468,8 +1408,6 @@ static zbx_vmware_datastore_t *vmware_datastore_shared_dup(const zbx_vmware_data /****************************************************************************** * * - * Function: vmware_datacenter_shared_dup * - * * * Purpose: copies vmware datacenter object into shared memory * * * * Parameters: src - [IN] the vmware datacenter object * @@ -1490,8 +1428,6 @@ static zbx_vmware_datacenter_t *vmware_datacenter_shared_dup(const zbx_vmware_da /****************************************************************************** * * - * Function: vmware_dev_shared_dup * - * * * Purpose: copies vmware virtual machine device object into shared memory * * * * Parameters: src - [IN] the vmware device object * @@ -1513,8 +1449,6 @@ static zbx_vmware_dev_t *vmware_dev_shared_dup(const zbx_vmware_dev_t *src) /****************************************************************************** * * - * Function: vmware_fs_shared_dup * - * * * Purpose: copies vmware virtual machine file system object into shared * * memory * * * @@ -1537,8 +1471,6 @@ static zbx_vmware_fs_t *vmware_fs_shared_dup(const zbx_vmware_fs_t *src) /****************************************************************************** * * - * Function: vmware_props_shared_dup * - * * * Purpose: copies object properties list into shared memory * * * * Parameters: src - [IN] the properties list * @@ -1562,8 +1494,6 @@ static char **vmware_props_shared_dup(char ** const src, int props_num) /****************************************************************************** * * - * Function: vmware_vm_shared_dup * - * * * Purpose: copies vmware virtual machine object into shared memory * * * * Parameters: src - [IN] the vmware virtual machine object * @@ -1598,8 +1528,6 @@ static zbx_vmware_vm_t *vmware_vm_shared_dup(const zbx_vmware_vm_t *src) /****************************************************************************** * * - * Function: vmware_dsname_shared_dup * - * * * Purpose: copies vmware hypervisor datastore name object into shared memory * * * * Parameters: src - [IN] the vmware datastore name object * @@ -1629,8 +1557,6 @@ static zbx_vmware_dsname_t *vmware_dsname_shared_dup(const zbx_vmware_dsname_t * /****************************************************************************** * * - * Function: vmware_hv_shared_copy * - * * * Purpose: copies vmware hypervisor object into shared memory * * * * Parameters: dst - [OUT] the vmware hypervisor object into shared memory * @@ -1665,8 +1591,6 @@ static void vmware_hv_shared_copy(zbx_vmware_hv_t *dst, const zbx_vmware_hv_t *s /****************************************************************************** * * - * Function: vmware_data_shared_dup * - * * * Purpose: copies vmware data object into shared memory * * * * Parameters: src - [IN] the vmware data object * @@ -1741,8 +1665,6 @@ static zbx_vmware_data_t *vmware_data_shared_dup(zbx_vmware_data_t *src) /****************************************************************************** * * - * Function: vmware_diskextent_free * - * * * Purpose: frees resources allocated to store diskextent data * * * * Parameters: diskextent - [IN] the diskextent * @@ -1756,8 +1678,6 @@ static void vmware_diskextent_free(zbx_vmware_diskextent_t *diskextent) /****************************************************************************** * * - * Function: vmware_datastore_free * - * * * Purpose: frees resources allocated to store datastore data * * * * Parameters: datastore - [IN] the datastore * @@ -1779,8 +1699,6 @@ static void vmware_datastore_free(zbx_vmware_datastore_t *datastore) /****************************************************************************** * * - * Function: vmware_datacenter_free * - * * * Purpose: frees resources allocated to store datacenter data * * * * Parameters: datacenter - [IN] the datacenter * @@ -1795,8 +1713,6 @@ static void vmware_datacenter_free(zbx_vmware_datacenter_t *datacenter) /****************************************************************************** * * - * Function: vmware_props_free * - * * * Purpose: frees shared resources allocated to store properties list * * * * Parameters: props - [IN] the properties list * @@ -1818,8 +1734,6 @@ static void vmware_props_free(char **props, int props_num) /****************************************************************************** * * - * Function: vmware_dev_free * - * * * Purpose: frees resources allocated to store vm device object * * * * Parameters: dev - [IN] the vm device * @@ -1834,8 +1748,6 @@ static void vmware_dev_free(zbx_vmware_dev_t *dev) /****************************************************************************** * * - * Function: vmware_fs_free * - * * * Purpose: frees resources allocated to store vm file system object * * * * Parameters: fs - [IN] the file system * @@ -1849,8 +1761,6 @@ static void vmware_fs_free(zbx_vmware_fs_t *fs) /****************************************************************************** * * - * Function: vmware_vm_free * - * * * Purpose: frees resources allocated to store virtual machine * * * * Parameters: vm - [IN] the virtual machine * @@ -1872,8 +1782,6 @@ static void vmware_vm_free(zbx_vmware_vm_t *vm) /****************************************************************************** * * - * Function: vmware_dsname_free * - * * * Purpose: frees resources allocated to store Datastore name data * * * * Parameters: dsname - [IN] the Datastore name * @@ -1888,8 +1796,6 @@ static void vmware_dsname_free(zbx_vmware_dsname_t *dsname) /****************************************************************************** * * - * Function: vmware_hv_clean * - * * * Purpose: frees resources allocated to store vmware hypervisor * * * * Parameters: hv - [IN] the vmware hypervisor * @@ -1915,8 +1821,6 @@ static void vmware_hv_clean(zbx_vmware_hv_t *hv) /****************************************************************************** * * - * Function: vmware_cluster_free * - * * * Purpose: frees resources allocated to store vmware cluster * * * * Parameters: cluster - [IN] the vmware cluster * @@ -1932,8 +1836,6 @@ static void vmware_cluster_free(zbx_vmware_cluster_t *cluster) /****************************************************************************** * * - * Function: vmware_event_free * - * * * Purpose: frees resources allocated to store vmware event * * * * Parameters: event - [IN] the vmware event * @@ -1947,8 +1849,6 @@ static void vmware_event_free(zbx_vmware_event_t *event) /****************************************************************************** * * - * Function: vmware_data_free * - * * * Purpose: frees resources allocated to store vmware service data * * * * Parameters: data - [IN] the vmware service data * @@ -1983,8 +1883,6 @@ static void vmware_data_free(zbx_vmware_data_t *data) /****************************************************************************** * * - * Function: vmware_counter_free * - * * * Purpose: frees vmware performance counter and the resources allocated by * * it * * * @@ -1999,8 +1897,6 @@ static void vmware_counter_free(zbx_vmware_counter_t *counter) /****************************************************************************** * * - * Function: vmware_service_authenticate * - * * * Purpose: authenticates vmware service * * * * Parameters: service - [IN] the vmware service * @@ -2121,8 +2017,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_logout * - * * * Purpose: Close unused connection with vCenter * * * * Parameters: service - [IN] the vmware service * @@ -2218,8 +2112,6 @@ static void zbx_property_collection_free(zbx_property_collection_iter *iter) /****************************************************************************** * * - * Function: vmware_service_get_contents * - * * * Purpose: retrieves vmware service instance contents * * * * Parameters: easyhandle - [IN] the CURL handle * @@ -2265,8 +2157,6 @@ static int vmware_service_get_contents(CURL *easyhandle, char **version, char ** /****************************************************************************** * * - * Function: vmware_service_get_perf_counter_refreshrate * - * * * Purpose: get the performance counter refreshrate for the specified entity * * * * Parameters: service - [IN] the vmware service * @@ -2337,8 +2227,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_perf_counters * - * * * Purpose: get the performance counter ids * * * * Parameters: service - [IN] the vmware service * @@ -2516,8 +2404,6 @@ out: /****************************************************************************** * * - * Function: vmware_vm_get_nic_devices * - * * * Purpose: gets virtual machine network interface devices * * * * Parameters: vm - [OUT] the virtual machine * @@ -2575,8 +2461,6 @@ clean: /****************************************************************************** * * - * Function: vmware_vm_get_disk_devices * - * * * Purpose: gets virtual machine virtual disk devices * * * * Parameters: vm - [OUT] the virtual machine * @@ -2706,8 +2590,6 @@ clean: /****************************************************************************** * * - * Function: vmware_vm_get_file_systems * - * * * Purpose: gets the parameters of virtual machine disks * * * * Parameters: vm - [OUT] the virtual machine * @@ -2769,8 +2651,6 @@ clean: /****************************************************************************** * * - * Function: vmware_service_get_vm_data * - * * * Purpose: gets the virtual machine data * * * * Parameters: service - [IN] the vmware service * @@ -2864,8 +2744,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_vm_folder * - * * * Purpose: convert vm folder id to chain of folder names divided by '/' * * * * Parameters: xdoc - [IN] the xml with all vm details * @@ -2922,8 +2800,6 @@ static int vmware_service_get_vm_folder(xmlDoc *xdoc, char **vm_folder) /****************************************************************************** * * - * Function: vmware_service_create_vm * - * * * Purpose: create virtual machine object * * * * Parameters: service - [IN] the vmware service * @@ -2995,8 +2871,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_refresh_datastore_info * - * * * Purpose: Refreshes all storage related information including free-space, * * capacity, and detailed usage of virtual machines. * * * @@ -3032,8 +2906,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_diskextents_list * - * * * Purpose: retrieves a list of vmware service datastore diskextents * * * * Parameters: doc - [IN] XML document * @@ -3099,8 +2971,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_create_datastore * - * * * Purpose: create vmware hypervisor datastore object * * * * Parameters: service - [IN] the vmware service * @@ -3227,8 +3097,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_hv_data * - * * * Purpose: gets the vmware hypervisor data * * * * Parameters: service - [IN] the vmware service * @@ -3317,8 +3185,6 @@ out: /****************************************************************************** * * - * Function: vmware_hv_get_parent_data * - * * * Purpose: gets the vmware hypervisor datacenter, parent folder or cluster * * name * * * @@ -3458,8 +3324,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_hv_get_multipath_data * - * * * Purpose: gets the vmware hypervisor data about ds multipath * * * * Parameters: service - [IN] the vmware service * @@ -3541,8 +3405,6 @@ static int vmware_service_hv_get_multipath_data(const zbx_vmware_service_t *serv /****************************************************************************** * * - * Function: vmware_ds_name_compare * - * * * Purpose: sorting function to sort Datastore vector by name * * * ******************************************************************************/ @@ -3556,8 +3418,6 @@ int vmware_ds_name_compare(const void *d1, const void *d2) /****************************************************************************** * * - * Function: vmware_ds_id_compare * - * * * Purpose: sorting function to sort Datastore vector by id * * * ******************************************************************************/ @@ -3571,8 +3431,6 @@ static int vmware_ds_id_compare(const void *d1, const void *d2) /****************************************************************************** * * - * Function: vmware_dc_id_compare * - * * * Purpose: sorting function to sort Datacenter vector by id * * * ******************************************************************************/ @@ -3585,8 +3443,6 @@ static int vmware_dc_id_compare(const void *d1, const void *d2) } /****************************************************************************** - * Function: vmware_hv_get_ds_access * - * * * Purpose: populate array of values from a xml data * * * * Parameters: xdoc - [IN] XML document * @@ -3667,8 +3523,6 @@ clean: /****************************************************************************** * * - * Function: vmware_dsname_compare * - * * * Purpose: sorting function to sort Datastore names vector by name * * * ******************************************************************************/ @@ -3682,8 +3536,6 @@ int vmware_dsname_compare(const void *d1, const void *d2) /****************************************************************************** * * - * Function: vmware_service_init_hv * - * * * Purpose: initialize vmware hypervisor object * * * * Parameters: service - [IN] the vmware service * @@ -3856,8 +3708,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_datacenters_list * - * * * Purpose: retrieves a list of vmware service datacenters * * * * Parameters: doc - [IN] XML document * @@ -3926,8 +3776,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_hv_ds_dc_list * - * * * Purpose: retrieves a list of all vmware service hypervisor ids * * * * Parameters: service - [IN] the vmware service * @@ -4121,8 +3969,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_event_session * - * * * Purpose: retrieves event session name * * * * Parameters: service - [IN] the vmware service * @@ -4174,8 +4020,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_reset_event_history_collector * - * * * Purpose: resets "scrollable view" to the latest events * * * * Parameters: easyhandle - [IN] the CURL handle * @@ -4221,8 +4065,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_read_previous_events * - * * * Purpose: reads events from "scrollable view" and moves it back in time * * * * Parameters: easyhandle - [IN] the CURL handle * @@ -4270,8 +4112,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_event_latestpage * - * * * Purpose: reads events from "latest page" and moves it back in time * * * * Parameters: service - [IN] the vmware service * @@ -4331,8 +4171,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_destroy_event_session * - * * * Purpose: destroys event session * * * * Parameters: easyhandle - [IN] the CURL handle * @@ -4376,8 +4214,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_put_event_data * - * * * Purpose: read event data by id from xml and put to array of events * * * * Parameters: events - [IN/OUT] the array of parsed events * @@ -4495,8 +4331,6 @@ static int vmware_service_put_event_data(zbx_vector_ptr_t *events, zbx_id_xmlnod /****************************************************************************** * * - * Function: vmware_service_parse_event_data * - * * * Purpose: parse multiple events data * * * * Parameters: events - [IN/OUT] the array of parsed events * @@ -4632,8 +4466,6 @@ clean: /****************************************************************************** * * - * Function: vmware_service_get_event_data * - * * * Purpose: retrieves event data * * * * Parameters: service - [IN] the vmware service * @@ -4749,8 +4581,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_last_event_data * - * * * Purpose: retrieves data only last event * * * * Parameters: service - [IN] the vmware service * @@ -4854,8 +4684,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_clusters * - * * * Purpose: retrieves a list of vmware service clusters * * * * Parameters: easyhandle - [IN] the CURL handle * @@ -5006,8 +4834,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_cluster_status * - * * * Purpose: retrieves status of the specified vmware cluster * * * * Parameters: easyhandle - [IN] the CURL handle * @@ -5068,8 +4894,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_cluster_list * - * * * Purpose: creates list of vmware cluster objects * * * * Parameters: easyhandle - [IN] the CURL handle * @@ -5136,8 +4960,6 @@ out: /****************************************************************************** * * - * Function: get_default_maxquerymetrics_for_vcenter * - * * * Purpose: get statically defined default value for maxquerymetrics for * * vcenter when it could not be retrieved from soap, depending on * * vcenter version (https://kb.vmware.com/s/article/2107096) * @@ -5159,8 +4981,6 @@ static unsigned int get_default_maxquerymetrics_for_vcenter(const zbx_vmware_ser /****************************************************************************** * * - * Function: vmware_service_get_maxquerymetrics * - * * * Purpose: get vpxd.stats.maxquerymetrics parameter from vcenter only * * * * Parameters: easyhandle - [IN] the CURL handle * @@ -5236,8 +5056,6 @@ out: } /****************************************************************************** * * - * Function: vmware_counters_add_new * - * * * Purpose: creates a new performance counter object in shared memory and * * adds to the specified vector * * * @@ -5262,8 +5080,6 @@ static void vmware_counters_add_new(zbx_vector_ptr_t *counters, zbx_uint64_t cou /****************************************************************************** * * - * Function: vmware_service_initialize * - * * * Purpose: initializes vmware service object * * * * Parameters: service - [IN] the vmware service * @@ -5364,8 +5180,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_add_perf_entity * - * * * Purpose: adds entity to vmware service performance entity list * * * * Parameters: service - [IN] the vmware service * @@ -5421,8 +5235,6 @@ static void vmware_service_add_perf_entity(zbx_vmware_service_t *service, const /****************************************************************************** * * - * Function: vmware_service_update_perf_entities * - * * * Purpose: adds new or remove old entities (hypervisors, virtual machines) * * from service performance entity list * * * @@ -5504,8 +5316,6 @@ static void vmware_service_update_perf_entities(zbx_vmware_service_t *service) /****************************************************************************** * * - * Function: vmware_service_update * - * * * Purpose: updates object with a new data from vmware service * * * * Parameters: service - [IN] the vmware service * @@ -5804,8 +5614,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_process_perf_entity_data * - * * * Purpose: updates vmware performance statistics data * * * * Parameters: perfdata - [OUT] the performance counter values * @@ -5895,8 +5703,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_parse_perf_data * - * * * Purpose: updates vmware performance statistics data * * * * Parameters: perfdata - [OUT] performance entity data * @@ -5951,8 +5757,6 @@ clean: /****************************************************************************** * * - * Function: vmware_perf_data_add_error * - * * * Purpose: adds error for the specified perf entity * * * * Parameters: perfdata - [OUT] the collected performance counter data * @@ -5982,8 +5786,6 @@ static void vmware_perf_data_add_error(zbx_vector_ptr_t *perfdata, const char *t /****************************************************************************** * * - * Function: vmware_service_copy_perf_data * - * * * Purpose: copies vmware performance statistics of specified service * * * * Parameters: service - [IN] the vmware service * @@ -6038,8 +5840,6 @@ static void vmware_service_copy_perf_data(zbx_vmware_service_t *service, zbx_vec /****************************************************************************** * * - * Function: vmware_service_retrieve_perf_counters * - * * * Purpose: retrieves performance counter values from vmware service * * * * Parameters: service - [IN] the vmware service * @@ -6172,8 +5972,6 @@ static void vmware_service_retrieve_perf_counters(zbx_vmware_service_t *service, /****************************************************************************** * * - * Function: vmware_service_update_perf * - * * * Purpose: updates vmware statistics data * * * * Parameters: service - [IN] the vmware service * @@ -6336,8 +6134,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_remove * - * * * Purpose: removes vmware service * * * * Parameters: service - [IN] the vmware service * @@ -6368,8 +6164,6 @@ static void vmware_service_remove(zbx_vmware_service_t *service) /****************************************************************************** * * - * Function: zbx_vmware_get_service * - * * * Purpose: gets vmware service object * * * * Parameters: url - [IN] the vmware service URL * @@ -6451,8 +6245,6 @@ out: /****************************************************************************** * * - * Function: zbx_vmware_service_get_counterid * - * * * Purpose: gets vmware performance counter id and unit info by the path * * * * Parameters: service - [IN] the vmware service * @@ -6495,8 +6287,6 @@ out: /****************************************************************************** * * - * Function: zbx_vmware_service_add_perf_counter * - * * * Purpose: start monitoring performance counter of the specified entity * * * * Parameters: service - [IN] the vmware service * @@ -6549,8 +6339,6 @@ int zbx_vmware_service_add_perf_counter(zbx_vmware_service_t *service, const cha /****************************************************************************** * * - * Function: zbx_vmware_service_get_perf_entity * - * * * Purpose: gets performance entity by type and id * * * * Parameters: service - [IN] the vmware service * @@ -6577,8 +6365,6 @@ zbx_vmware_perf_entity_t *zbx_vmware_service_get_perf_entity(zbx_vmware_service_ /****************************************************************************** * * - * Function: zbx_vmware_init * - * * * Purpose: initializes vmware collector service * * * * Comments: This function must be called before worker threads are forked. * @@ -6624,8 +6410,6 @@ out: /****************************************************************************** * * - * Function: zbx_vmware_destroy * - * * * Purpose: destroys vmware collector service * * * ******************************************************************************/ @@ -6653,8 +6437,6 @@ void zbx_vmware_destroy(void) /****************************************************************************** * * - * Function: main_vmware_loop * - * * * Purpose: the vmware collector main loop * * * ******************************************************************************/ @@ -6816,8 +6598,6 @@ ZBX_THREAD_ENTRY(vmware_thread, args) /****************************************************************************** * * - * Function: zbx_vmware_lock * - * * * Purpose: locks vmware collector * * * ******************************************************************************/ @@ -6828,8 +6608,6 @@ void zbx_vmware_lock(void) /****************************************************************************** * * - * Function: zbx_vmware_unlock * - * * * Purpose: unlocks vmware collector * * * ******************************************************************************/ @@ -6840,8 +6618,6 @@ void zbx_vmware_unlock(void) /****************************************************************************** * * - * Function: zbx_vmware_get_statistics * - * * * Purpose: gets vmware collector statistics * * * * Parameters: stats - [OUT] the vmware collector statistics * @@ -6872,8 +6648,6 @@ int zbx_vmware_get_statistics(zbx_vmware_stats_t *stats) */ /****************************************************************************** * * - * Function: libxml_handle_error * - * * * Purpose: libxml2 callback function for error handle * * * * Parameters: user_data - [IN/OUT] the user context * @@ -6888,8 +6662,6 @@ static void libxml_handle_error(void *user_data, xmlErrorPtr err) /****************************************************************************** * * - * Function: zbx_xml_try_read_value * - * * * Purpose: retrieve a value from xml data and return status of operation * * * * Parameters: data - [IN] XML data * @@ -6960,8 +6732,6 @@ out: /****************************************************************************** * * - * Function: zbx_xml_read_node_value * - * * * Purpose: retrieve a value from xml data relative to the specified node * * * * Parameters: doc - [IN] the XML document * @@ -7012,8 +6782,6 @@ clean: /****************************************************************************** * * - * Function: zbx_xml_read_doc_value * - * * * Purpose: retrieve a value from xml document relative to the root node * * * * Parameters: xdoc - [IN] the XML document * @@ -7033,8 +6801,6 @@ static char *zbx_xml_read_doc_value(xmlDoc *xdoc, const char *xpath) /****************************************************************************** * * - * Function: zbx_xml_read_doc_num * - * * * Purpose: retrieves numeric xpath value * * * * Parameters: xdoc - [IN] xml document * @@ -7071,8 +6837,6 @@ out: /****************************************************************************** * * - * Function: zbx_xml_read_values * - * * * Purpose: populate array of values from a xml data * * * * Parameters: xdoc - [IN] XML document * |