X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fpowerdns.c;h=d91ce5baada860dc1820c804425fc3c959da0519;hb=ebdc9011b75c4c1478fbe02eb1cb9c69795288f9;hp=9caa77086535de7352dbad1c8368b0967c23d665;hpb=63c8e3eaa6260e4bf52dfe7b1927ed69447c3b93;p=collectd.git diff --git a/src/powerdns.c b/src/powerdns.c index 9caa7708..d91ce5ba 100644 --- a/src/powerdns.c +++ b/src/powerdns.c @@ -65,9 +65,18 @@ typedef struct list_item_s list_item_t; struct list_item_s { + enum + { + SRV_AUTHORATIVE, + SRV_RECURSOR + } server_type; int (*func) (list_item_t *item); char *instance; + + char **fields; + int fields_num; char *command; + struct sockaddr_un sockaddr; int socktype; }; @@ -121,44 +130,45 @@ user-msec number of CPU milliseconds spent in 'user' mode statname_lookup_t lookup_table[] = /* {{{ */ { - /* - * Recursor statistics - */ - /* - * corrupt-packets - * deferred-cache-inserts - * deferred-cache-lookup - * qsize-q - * servfail-packets - * timedout-packets - * udp4-answers - * udp4-queries - * udp6-answers - * udp6-queries - */ + /********************* + * Server statistics * + *********************/ /* Questions */ - {"recursing-questions", "dns_question", "recurse"}, - {"tcp-queries", "dns_question", "tcp"}, - {"udp-queries", "dns_question", "udp"}, + {"recursing-questions", "dns_question", "recurse"}, + {"tcp-queries", "dns_question", "tcp"}, + {"udp-queries", "dns_question", "udp"}, /* Answers */ - {"recursing-answers", "dns_answer", "recurse"}, - {"tcp-answers", "dns_answer", "tcp"}, - {"udp-answers", "dns_answer", "udp"}, + {"recursing-answers", "dns_answer", "recurse"}, + {"tcp-answers", "dns_answer", "tcp"}, + {"udp-answers", "dns_answer", "udp"}, /* Cache stuff */ - {"packetcache-hit", "cache_result", "packet-hit"}, - {"packetcache-miss", "cache_result", "packet-miss"}, - {"packetcache-size", "cache_size", "packet"}, - {"query-cache-hit", "cache_result", "query-hit"}, - {"query-cache-miss", "cache_result", "query-miss"}, + {"packetcache-hit", "cache_result", "packet-hit"}, + {"packetcache-miss", "cache_result", "packet-miss"}, + {"packetcache-size", "cache_size", "packet"}, + {"query-cache-hit", "cache_result", "query-hit"}, + {"query-cache-miss", "cache_result", "query-miss"}, /* Latency */ - {"latency", "latency", NULL}, - - /* - * Recursor statistics - */ + {"latency", "latency", NULL}, + + /* Other stuff.. */ + {"corrupt-packets", "io_packets", "corrupt"}, + {"deferred-cache-inserts", "counter", "cache-deferred_insert"}, + {"deferred-cache-lookup", "counter", "cache-deferred_lookup"}, + {"qsize-a", "cache_size", "answers"}, + {"qsize-q", "cache_size", "questions"}, + {"servfail-packets", "io_packets", "servfail"}, + {"timedout-packets", "io_packets", "timeout"}, + {"udp4-answers", "dns_answer", "udp4"}, + {"udp4-queries", "dns_question", "queries-udp4"}, + {"udp6-answers", "dns_answer", "udp6"}, + {"udp6-queries", "dns_question", "queries-udp6"}, + + /*********************** + * Recursor statistics * + ***********************/ /* Answers by return code */ {"noerror-answers", "dns_rcode", "NOERROR"}, {"nxdomain-answers", "dns_rcode", "NXDOMAIN"}, @@ -178,6 +188,8 @@ statname_lookup_t lookup_table[] = /* {{{ */ /* Total number of questions.. */ {"questions", "dns_qtype", "total"} + + /* TODO: Add all recursor metrics here */ }; /* }}} */ int lookup_table_length = STATIC_ARRAY_SIZE (lookup_table); @@ -186,6 +198,14 @@ static llist_t *list = NULL; #define PDNS_LOCAL_SOCKPATH LOCALSTATEDIR"/run/"PACKAGE_NAME"-powerdns" static char *local_sockpath = NULL; +/* TODO: Do this before 4.4: + * - Recursor: + * - Complete list of known pdns -> collectd mappings. + * - Update the collectd.conf(5) manpage. + * + * -octo + */ + /* */ static void submit (const char *plugin_instance, /* {{{ */ const char *pdns_type, const char *value) @@ -478,6 +498,14 @@ static int powerdns_read_server (list_item_t *item) /* {{{ */ char *key; char *value; + if (item->command == NULL) + item->command = strdup ("SHOW *"); + if (item->command == NULL) + { + ERROR ("powerdns plugin: strdup failed."); + return (-1); + } + status = powerdns_get_data (item, &buffer, &buffer_size); if (status != 0) return (-1); @@ -487,6 +515,8 @@ static int powerdns_read_server (list_item_t *item) /* {{{ */ saveptr = NULL; while ((key = strtok_r (dummy, ",", &saveptr)) != NULL) { + int i; + dummy = NULL; value = strchr (key, '='); @@ -499,6 +529,13 @@ static int powerdns_read_server (list_item_t *item) /* {{{ */ if (value[0] == '\0') continue; + /* Check if this item was requested. */ + for (i = 0; i < item->fields_num; i++) + if (strcasecmp (key, item->fields[i]) == 0) + break; + if (i >= item->fields_num) + continue; + submit (item->instance, key, value); } /* while (strtok_r) */ @@ -507,6 +544,41 @@ static int powerdns_read_server (list_item_t *item) /* {{{ */ return (0); } /* }}} int powerdns_read_server */ +/* + * powerdns_update_recursor_command + * + * Creates a string that holds the command to be sent to the recursor. This + * string is stores in the `command' member of the `list_item_t' passed to the + * function. This function is called by `powerdns_read_recursor'. + */ +static int powerdns_update_recursor_command (list_item_t *li) /* {{{ */ +{ + char buffer[4096]; + int status; + + if (li != NULL) + return (0); + + strcpy (buffer, "get "); + status = strjoin (&buffer[4], sizeof (buffer) - strlen ("get "), + li->fields, li->fields_num, + /* seperator = */ " "); + if (status < 0) + { + ERROR ("powerdns plugin: strjoin failed."); + return (-1); + } + + li->command = strdup (buffer); + if (li->command == NULL) + { + ERROR ("powerdns plugin: strdup failed."); + return (-1); + } + + return (0); +} /* }}} int powerdns_update_recursor_command */ + static int powerdns_read_recursor (list_item_t *item) /* {{{ */ { char *buffer = NULL; @@ -521,6 +593,17 @@ static int powerdns_read_recursor (list_item_t *item) /* {{{ */ char *value; char *value_saveptr; + if (item->command == NULL) + { + status = powerdns_update_recursor_command (item); + if (status != 0) + { + ERROR ("powerdns plugin: powerdns_update_recursor_command failed."); + return (-1); + } + } + assert (item->command != NULL); + status = powerdns_get_data (item, &buffer, &buffer_size); if (status != 0) return (-1); @@ -574,7 +657,54 @@ static int powerdns_config_add_string (const char *name, /* {{{ */ return (-1); return (0); -} /* }}} int ctail_config_add_string */ +} /* }}} int powerdns_config_add_string */ + +static int powerdns_config_add_collect (list_item_t *li, /* {{{ */ + oconfig_item_t *ci) +{ + int i; + char **temp; + + if (ci->values_num < 1) + { + WARNING ("powerdns plugin: The `Collect' option needs " + "at least one argument."); + return (-1); + } + + for (i = 0; i < ci->values_num; i++) + if (ci->values[i].type != OCONFIG_TYPE_STRING) + { + WARNING ("powerdns plugin: Only string arguments are allowed to " + "the `Collect' option."); + return (-1); + } + + temp = (char **) realloc (li->fields, + sizeof (char *) * (li->fields_num + ci->values_num)); + if (temp == NULL) + { + WARNING ("powerdns plugin: realloc failed."); + return (-1); + } + li->fields = temp; + + for (i = 0; i < ci->values_num; i++) + { + li->fields[li->fields_num] = strdup (ci->values[i].value.string); + if (li->fields[li->fields_num] == NULL) + { + WARNING ("powerdns plugin: strdup failed."); + continue; + } + li->fields_num++; + } + + /* Invalidate a previously computed command */ + sfree (li->command); + + return (0); +} /* }}} int powerdns_config_add_collect */ static int powerdns_config_add_server (oconfig_item_t *ci) /* {{{ */ { @@ -612,26 +742,32 @@ static int powerdns_config_add_server (oconfig_item_t *ci) /* {{{ */ */ if (strcasecmp ("Server", ci->key) == 0) { + item->server_type = SRV_AUTHORATIVE; item->func = powerdns_read_server; - item->command = strdup (SERVER_COMMAND); item->socktype = SOCK_STREAM; socket_temp = strdup (SERVER_SOCKET); } else if (strcasecmp ("Recursor", ci->key) == 0) { + item->server_type = SRV_RECURSOR; item->func = powerdns_read_recursor; - item->command = strdup (RECURSOR_COMMAND); item->socktype = SOCK_DGRAM; socket_temp = strdup (RECURSOR_SOCKET); } + else + { + /* We must never get here.. */ + assert (0); + return (-1); + } status = 0; for (i = 0; i < ci->children_num; i++) { oconfig_item_t *option = ci->children + i; - if (strcasecmp ("Command", option->key) == 0) - status = powerdns_config_add_string ("Command", &item->command, option); + if (strcasecmp ("Collect", option->key) == 0) + status = powerdns_config_add_collect (item, option); else if (strcasecmp ("Socket", option->key) == 0) status = powerdns_config_add_string ("Socket", &socket_temp, option); else