Advertising:

Patch1

From Zabbix-ES
Revision as of 12:21, 5 June 2020 by Unknown user (talk)
Jump to navigation Jump to search

--- zabbix_module_docker.c.1 2020-05-29 21:28:05.394525029 -0300 +++ zabbix_module_docker.c 2020-05-29 21:28:50.633956292 -0300 @@ -552,9 +552,9 @@

  AGENT_REQUEST request2;
  init_request(&request2);

- add_request_param(&request2, zbx_strdup(NULL, container)); - add_request_param(&request2, zbx_strdup(NULL, "HostConfig")); - add_request_param(&request2, zbx_strdup(NULL, "PortBindings")); + add_request_param(&request2, zbx_strdup(NULL, container), REQUEST_PARAMETER_TYPE_STRING); + add_request_param(&request2, zbx_strdup(NULL, "HostConfig"), REQUEST_PARAMETER_TYPE_STRING); + add_request_param(&request2, zbx_strdup(NULL, "PortBindings"), REQUEST_PARAMETER_TYPE_STRING);

  struct inspect_result iresult;
  iresult = zbx_module_docker_inspect_exec(&request2);
  free_request(&request2);

@@ -651,8 +651,8 @@

        zabbix_log(LOG_LEVEL_DEBUG, "Translating container name to fci by using docker.inspect");
        AGENT_REQUEST  request;
        init_request(&request);

- add_request_param(&request, zbx_strdup(NULL, fci)); - add_request_param(&request, zbx_strdup(NULL, "Id")); + add_request_param(&request, zbx_strdup(NULL, fci), REQUEST_PARAMETER_TYPE_STRING); + add_request_param(&request, zbx_strdup(NULL, "Id"), REQUEST_PARAMETER_TYPE_STRING);

        // TODO dynamic iresult
        struct inspect_result iresult;
        iresult = zbx_module_docker_inspect_exec(&request);

@@ -1809,12 +1809,12 @@

                   // custom item for HCONTAINERID
                    AGENT_REQUEST      request2;
                    init_request(&request2);

- add_request_param(&request2, zbx_strdup(NULL, cid)); + add_request_param(&request2, zbx_strdup(NULL, cid), REQUEST_PARAMETER_TYPE_STRING);

                    int n;
                    struct inspect_result iresult;
                    for(n = 0; n < request->nparam; n++)
                    {

- add_request_param(&request2, zbx_strdup(NULL, (request)->params[n])); + add_request_param(&request2, zbx_strdup(NULL, (request)->params[n]), REQUEST_PARAMETER_TYPE_STRING);

                    }
                    iresult = zbx_module_docker_inspect_exec(&request2);
                    free_request(&request2);