Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/43821/?format=api
{ "id": 43821, "url": "http://patches.dpdk.org/api/patches/43821/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1535026093-101872-12-git-send-email-ciara.power@intel.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1535026093-101872-12-git-send-email-ciara.power@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1535026093-101872-12-git-send-email-ciara.power@intel.com", "date": "2018-08-23T12:08:13", "name": "[11/11] telemetry: add collectd plugin patch", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "0b8ec394d6f33d3b9b031ec5949986a91a4766d2", "submitter": { "id": 978, "url": "http://patches.dpdk.org/api/people/978/?format=api", "name": "Power, Ciara", "email": "ciara.power@intel.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1535026093-101872-12-git-send-email-ciara.power@intel.com/mbox/", "series": [ { "id": 1038, "url": "http://patches.dpdk.org/api/series/1038/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=1038", "date": "2018-08-23T12:08:02", "name": "introduce telemetry library", "version": 1, "mbox": "http://patches.dpdk.org/series/1038/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/43821/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/43821/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 081BD5B2E;\n\tThu, 23 Aug 2018 14:08:48 +0200 (CEST)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby dpdk.org (Postfix) with ESMTP id C56CA548B\n\tfor <dev@dpdk.org>; Thu, 23 Aug 2018 14:08:40 +0200 (CEST)", "from fmsmga005.fm.intel.com ([10.253.24.32])\n\tby orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t23 Aug 2018 05:08:40 -0700", "from silpixa00399503.ir.intel.com ([10.237.222.102])\n\tby fmsmga005.fm.intel.com with ESMTP; 23 Aug 2018 05:08:39 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.53,278,1531810800\"; d=\"scan'208\";a=\"256613894\"", "From": "Ciara Power <ciara.power@intel.com>", "To": "harry.van.haaren@intel.com, brian.archbold@intel.com,\n\temma.kenny@intel.com, ciara.power@intel.com", "Cc": "dev@dpdk.org", "Date": "Thu, 23 Aug 2018 13:08:13 +0100", "Message-Id": "<1535026093-101872-12-git-send-email-ciara.power@intel.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1535026093-101872-1-git-send-email-ciara.power@intel.com>", "References": "<1535026093-101872-1-git-send-email-ciara.power@intel.com>", "Subject": "[dpdk-dev] [PATCH 11/11] telemetry: add collectd plugin patch", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "This patch adds the patch for the collectd plugin developed for use\nwith the DPDK Telemetry library. The patch is included here to allow\nusers to apply the patch to collectd when using DPDK Telemetry.\nFurther details on applying the collectd patch can be found in the\ncollectd patch commit message.\n\nThe collectd plugin will be upstreamed to collectd at a later stage.\n\nSigned-off-by: Brian Archbold <brian.archbold@intel.com>\nSigned-off-by: Emma Kenny <emma.kenny@intel.com>\n---\n ...emetry-add-plugin-for-DPDK-metrics-via-DP.patch | 578 +++++++++++++++++++++\n 1 file changed, 578 insertions(+)\n create mode 100644 lib/librte_telemetry/collectd_plugin/v1-0001-dpdk_telemetry-add-plugin-for-DPDK-metrics-via-DP.patch", "diff": "diff --git a/lib/librte_telemetry/collectd_plugin/v1-0001-dpdk_telemetry-add-plugin-for-DPDK-metrics-via-DP.patch b/lib/librte_telemetry/collectd_plugin/v1-0001-dpdk_telemetry-add-plugin-for-DPDK-metrics-via-DP.patch\nnew file mode 100644\nindex 0000000..e81d463\n--- /dev/null\n+++ b/lib/librte_telemetry/collectd_plugin/v1-0001-dpdk_telemetry-add-plugin-for-DPDK-metrics-via-DP.patch\n@@ -0,0 +1,578 @@\n+From 4c7660827b471ecd862122aa0e2a90c0a0f8ec97 Mon Sep 17 00:00:00 2001\n+From: Emma Kenny <emma.kenny@intel.com>\n+Date: Tue, 21 Aug 2018 15:49:15 +0100\n+Subject: [PATCH v1] dpdk_telemetry: add plugin for DPDK metrics via DPDK\n+ Telemetry library\n+\n+This patch introduces a new plugin for collectd, which consumes DPDK metrics\n+via the dpdk_telemetry library. The collectd plugin here provides an\n+easy way to use the DPDK telemetry API to query ethernet device metrics.\n+\n+The collectd plugin retrieves metrics from a DPDK packet forwarding\n+application by sending a JSON formatted message via a UNIX domain\n+socket. The DPDK telemetry component will respond with a JSON formatted\n+reply, delivering the requested metrics. The dpdk_telemetry collectd\n+plugin parses the JSON data, and publishes the metric values to collectd\n+for further use.\n+\n+This plugin has a dependency on the DPDK Telemetry library, as it must be\n+\"in sync\" with the DPDK Telemetry implementation.\n+\n+This patch should be applied on the following collectd commit:\n+fff795c9846bd8fe4bc7f76bcd83a2b8cefb4525\n+\n+Signed-off-by: Emma Kenny <emma.kenny@intel.com>\n+Signed-off-by: Brian Archbold <brian.archbold@intel.com>\n+---\n+ Makefile.am | 7 +\n+ configure.ac | 4 +\n+ src/collectd.conf.in | 26 ++--\n+ src/collectd.conf.pod | 35 +++++\n+ src/dpdk_telemetry.c | 364 ++++++++++++++++++++++++++++++++++++++++++++++++++\n+ src/types.db | 1 +\n+ 6 files changed, 427 insertions(+), 10 deletions(-)\n+ create mode 100755 src/dpdk_telemetry.c\n+\n+diff --git a/Makefile.am b/Makefile.am\n+index cb40148..66885e2 100644\n+--- a/Makefile.am\n++++ b/Makefile.am\n+@@ -884,6 +884,13 @@ dpdkstat_la_CFLAGS = $(AM_CFLAGS) $(LIBDPDK_CFLAGS)\n+ dpdkstat_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBDPDK_LDFLAGS)\n+ dpdkstat_la_LIBADD = $(LIBDPDK_LIBS)\n+ endif\n++if BUILD_PLUGIN_DPDK_TELEMETRY\n++pkglib_LTLIBRARIES += dpdk_telemetry.la\n++dpdk_telemetry_la_SOURCES = src/dpdk_telemetry.c\n++dpdk_telemetry_la_CFLAGS = $(AM_CFLAGS)\n++dpdk_telemetry_la_LDFLAGS = $(PLUGIN_LDFLAGS)\n++dpdk_telemetry_la_LIBADD = -ljansson\n++endif\n+ \n+ if BUILD_PLUGIN_DRBD\n+ pkglib_LTLIBRARIES += drbd.la\n+diff --git a/configure.ac b/configure.ac\n+index 7bf3718..93ee1a0 100644\n+--- a/configure.ac\n++++ b/configure.ac\n+@@ -6289,6 +6289,7 @@ plugin_disk=\"no\"\n+ plugin_drbd=\"no\"\n+ plugin_dpdkevents=\"no\"\n+ plugin_dpdkstat=\"no\"\n++plugin_dpdk_telemetry=\"no\"\n+ plugin_entropy=\"no\"\n+ plugin_ethstat=\"no\"\n+ plugin_fhcount=\"no\"\n+@@ -6349,6 +6350,7 @@ if test \"x$ac_system\" = \"xLinux\"; then\n+ plugin_cpufreq=\"yes\"\n+ plugin_disk=\"yes\"\n+ plugin_drbd=\"yes\"\n++ plugin_dpdk_telemetry=\"yes\"\n+ plugin_entropy=\"yes\"\n+ plugin_fhcount=\"yes\"\n+ plugin_fscache=\"yes\"\n+@@ -6710,6 +6712,7 @@ AC_PLUGIN([dns], [$with_libpcap], [DNS traffic analysi\n+ AC_PLUGIN([dpdkevents], [$plugin_dpdkevents], [Events from DPDK])\n+ AC_PLUGIN([dpdkstat], [$plugin_dpdkstat], [Stats from DPDK])\n+ AC_PLUGIN([drbd], [$plugin_drbd], [DRBD statistics])\n++AC_PLUGIN([dpdk_telemetry], [$plugin_dpdk_telemetry], [Metrics from DPDK Telemetry])\n+ AC_PLUGIN([email], [yes], [EMail statistics])\n+ AC_PLUGIN([entropy], [$plugin_entropy], [Entropy statistics])\n+ AC_PLUGIN([ethstat], [$plugin_ethstat], [Stats from NIC driver])\n+@@ -7132,6 +7135,7 @@ AC_MSG_RESULT([ dns . . . . . . . . . $enable_dns])\n+ AC_MSG_RESULT([ dpdkevents. . . . . . $enable_dpdkevents])\n+ AC_MSG_RESULT([ dpdkstat . . . . . . $enable_dpdkstat])\n+ AC_MSG_RESULT([ drbd . . . . . . . . $enable_drbd])\n++AC_MSG_RESULT([ dpdk_telemetry. . . . $enable_dpdk_telemetry])\n+ AC_MSG_RESULT([ email . . . . . . . . $enable_email])\n+ AC_MSG_RESULT([ entropy . . . . . . . $enable_entropy])\n+ AC_MSG_RESULT([ ethstat . . . . . . . $enable_ethstat])\n+diff --git a/src/collectd.conf.in b/src/collectd.conf.in\n+index af65214..8e9d500 100644\n+--- a/src/collectd.conf.in\n++++ b/src/collectd.conf.in\n+@@ -62,12 +62,12 @@\n+ @LOAD_PLUGIN_LOGFILE@LoadPlugin logfile\n+ @LOAD_PLUGIN_LOG_LOGSTASH@LoadPlugin log_logstash\n+ \n+-#<Plugin logfile>\n+-#\tLogLevel @DEFAULT_LOG_LEVEL@\n+-#\tFile STDOUT\n+-#\tTimestamp true\n+-#\tPrintSeverity false\n+-#</Plugin>\n++<Plugin logfile>\n++\tLogLevel @DEFAULT_LOG_LEVEL@\n++\tFile STDOUT\n++\tTimestamp true\n++\tPrintSeverity false\n++</Plugin>\n+ \n+ #<Plugin log_logstash>\n+ #\tLogLevel @DEFAULT_LOG_LEVEL@\n+@@ -117,6 +117,7 @@\n+ #@BUILD_PLUGIN_DNS_TRUE@LoadPlugin dns\n+ #@BUILD_PLUGIN_DPDKEVENTS_TRUE@LoadPlugin dpdkevents\n+ #@BUILD_PLUGIN_DPDKSTAT_TRUE@LoadPlugin dpdkstat\n++@BUILD_PLUGIN_DPDK_TELEMETRY_TRUE@LoadPlugin dpdk_telemetry\n+ #@BUILD_PLUGIN_DRBD_TRUE@LoadPlugin drbd\n+ #@BUILD_PLUGIN_EMAIL_TRUE@LoadPlugin email\n+ #@BUILD_PLUGIN_ENTROPY_TRUE@LoadPlugin entropy\n+@@ -394,10 +395,10 @@\n+ # SubtractGuestState true\n+ #</Plugin>\n+ #\n+-#<Plugin csv>\n+-#\tDataDir \"@localstatedir@/lib/@PACKAGE_NAME@/csv\"\n+-#\tStoreRates false\n+-#</Plugin>\n++<Plugin csv>\n++\tDataDir \"@localstatedir@/lib/@PACKAGE_NAME@/csv\"\n++\tStoreRates false\n++</Plugin>\n+ \n+ #<Plugin curl>\n+ # <Page \"stock_quotes\">\n+@@ -595,6 +596,11 @@\n+ # PortName \"interface2\"\n+ #</Plugin>\n+ \n++<Plugin dpdk_telemetry>\n++\tClientSocketPath \"/var/run/.client\"\n++\tDpdkSocketPath \"/var/run/.rte_telemetry\"\n++</Plugin>\n++\n+ #<Plugin email>\n+ #\tSocketFile \"@localstatedir@/run/@PACKAGE_NAME@-email\"\n+ #\tSocketGroup \"collectd\"\n+diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod\n+index 6e6d6ea..3cc062f 100644\n+--- a/src/collectd.conf.pod\n++++ b/src/collectd.conf.pod\n+@@ -2822,6 +2822,41 @@ convention will be used for the additional ports.\n+ \n+ =back\n+ \n++=head2 Plugin C<dpdk_telemetry>\n++\n++\n++The I< dpdk_telemetry > plugin collects DPDK metrics via the dpdk_telemetry library.\n++\n++\n++B<Synopsis:>\n++\n++\n++ <Plugin dpdk_telemetry>\n++ ClientSocketPath \"/var/run/.client\"\n++ DpdkSocketPath \"/var/run/.rte_telemetry\"\n++ </Plugin>\n++\n++\n++B<Options:>\n++\n++\n++=over 2\n++\n++\n++=item B<ClientSocketPath> I<Client_Path>\n++\n++\n++The path to the client socket.\n++\n++\n++=item B<DpdkSocketPath> I<Dpdk_Path>\n++\n++\n++The path to DPDK Telemetry.\n++\n++\n++=back\n++\n+ =head2 Plugin C<email>\n+ \n+ =over 4\n+diff --git a/src/dpdk_telemetry.c b/src/dpdk_telemetry.c\n+new file mode 100755\n+index 0000000..773256e\n+--- /dev/null\n++++ b/src/dpdk_telemetry.c\n+@@ -0,0 +1,364 @@\n++/*-\n++ * collectd - src/dpdk_telemetry.c\n++ * MIT License\n++ *\n++ * Copyright(c) 2018 Intel Corporation. All rights reserved.\n++ *\n++ * Permission is hereby granted, free of charge, to any person obtaining a copy\n++ * of\n++ * this software and associated documentation files (the \"Software\"), to deal in\n++ * the Software without restriction, including without limitation the rights to\n++ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies\n++ * of the Software, and to permit persons to whom the Software is furnished to\n++ * do\n++ * so, subject to the following conditions:\n++ *\n++ * The above copyright notice and this permission notice shall be included in\n++ * all\n++ * copies or substantial portions of the Software.\n++ *\n++ * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n++ * SOFTWARE.\n++ *\n++ */\n++\n++#include \"collectd.h\"\n++#include \"common.h\"\n++#include \"plugin.h\"\n++#include \"utils_time.h\"\n++\n++#include <errno.h>\n++#include <jansson.h>\n++#include <stdio.h>\n++#include <stdlib.h>\n++#include <string.h>\n++#include <sys/queue.h>\n++#include <sys/socket.h>\n++#include <sys/un.h>\n++#include <sys/unistd.h>\n++\n++#define BUF_SIZE 1000000\n++#define PLUGIN_NAME \"dpdk_telemetry\"\n++#define DEFAULT_DPDK_PATH \"/var/run/.rte_telemetry\"\n++#define DEFAULT_CLIENT_PATH \"/var/run/.client\"\n++\n++struct client_info {\n++ int s_send;\n++ int s_recv;\n++ int fd;\n++ const char *dpdk_path;\n++ const char *client_path;\n++ struct sockaddr_un addr;\n++ struct sockaddr_un addrs;\n++};\n++\n++static struct client_info *client = NULL;\n++static char g_client_path[BUF_SIZE];\n++static char g_dpdk_path[BUF_SIZE];\n++\n++static int dpdk_telemetry_config(oconfig_item_t *ci) {\n++ int ret, i;\n++\n++ INFO(PLUGIN_NAME \": %s:%d\", __FUNCTION__, __LINE__);\n++\n++ for (i = 0; i < ci->children_num; i++) {\n++ oconfig_item_t *child = ci->children + i;\n++\n++ if (strcasecmp(\"ClientSocketPath\", child->key) == 0) {\n++ ret = cf_util_get_string_buffer(child, g_client_path,\n++ sizeof(g_client_path));\n++ } else if (strcasecmp(\"DpdkSocketPath\", child->key) == 0) {\n++ ret = cf_util_get_string_buffer(child, g_dpdk_path, sizeof(g_dpdk_path));\n++ } else {\n++ ERROR(PLUGIN_NAME \": Unknown configuration parameter\"\n++ \"\\\"%s\\\"\",\n++ child->key);\n++ ret = -1;\n++ }\n++\n++ if (ret < 0) {\n++ INFO(PLUGIN_NAME \": %s:%d ret =%d\", __FUNCTION__, __LINE__, ret);\n++ return ret;\n++ }\n++ }\n++ return 0;\n++}\n++\n++static int dpdk_telemetry_parse(json_t *stats, json_t *port, int portid) {\n++ json_t *statsArrayObj;\n++ if (!stats) {\n++ ERROR(\"dpdk_telemetry: Stats pointer is invalid\\n\");\n++ return -1;\n++ }\n++\n++ if (!port) {\n++ ERROR(\"dpdk_telemetry: Port pointer is invalid\\n\");\n++ return -1;\n++ }\n++\n++ if (portid < 0) {\n++ ERROR(\"dpdk_telemetry: portid is invalid\\n\");\n++ return -1;\n++ }\n++\n++ json_t *name, *value;\n++ const char *name_string;\n++ int value_int, statslen, i;\n++ statslen = json_array_size(stats);\n++ for (i = 0; i < statslen; i++) {\n++ statsArrayObj = json_array_get(stats, i);\n++ name = json_object_get(statsArrayObj, \"name\");\n++ value = json_object_get(statsArrayObj, \"value\");\n++ if (!name) {\n++ ERROR(\"dpdk_telemetry: Request does not have name field\\n\");\n++ return -1;\n++ }\n++ if (!json_is_string(name)) {\n++ ERROR(\"dpdk_telemetry: Stat name value is not a string\\n\");\n++ return -1;\n++ }\n++ name_string = json_string_value(name);\n++ if (!value) {\n++ ERROR(\"dpdk_telemetry: Request does not have value name\\n\");\n++ return -1;\n++ }\n++ if (!json_is_integer(value)) {\n++ ERROR(\"dpdk_telemetry: Stat value is not an integer\\n\");\n++ return -1;\n++ }\n++\n++ char dev_name[BUF_SIZE];\n++ snprintf(dev_name, sizeof(dev_name), \"%s.%d\", name_string, portid);\n++ value_int = json_integer_value(value);\n++ value_t dpdk_telemetry_values[1];\n++ value_list_t dpdk_telemetry_vl = VALUE_LIST_INIT;\n++ dpdk_telemetry_values[0].counter = value_int;\n++ dpdk_telemetry_vl.values = dpdk_telemetry_values;\n++ dpdk_telemetry_vl.values_len = 1;\n++ dpdk_telemetry_vl.time = cdtime();\n++ snprintf(dpdk_telemetry_vl.host, sizeof(dpdk_telemetry_vl.host), \"%s\",\n++ hostname_g);\n++ snprintf(dpdk_telemetry_vl.plugin, sizeof(dpdk_telemetry_vl.plugin),\n++ \"dpdk_telemetry\");\n++ snprintf(dpdk_telemetry_vl.plugin_instance,\n++ sizeof(dpdk_telemetry_vl.plugin_instance), \"%s\", dev_name);\n++ snprintf(dpdk_telemetry_vl.type, sizeof(dpdk_telemetry_vl.type),\n++ \"dpdk_telemetry\");\n++ snprintf(dpdk_telemetry_vl.type_instance,\n++ sizeof(dpdk_telemetry_vl.type_instance), \"%s\", name_string);\n++\n++ int ret = plugin_dispatch_values(&dpdk_telemetry_vl);\n++ if (ret < 0) {\n++ ERROR(\"dpdk_telemetry: Failed to dispatch values\");\n++ return -1;\n++ }\n++ }\n++ return 0;\n++}\n++\n++static int parse_json(char *buf) {\n++\n++ if (!buf) {\n++ ERROR(\"dpdk_telemetry: buf pointer is invalid\\n\");\n++ return -1;\n++ }\n++ json_error_t error;\n++ json_t *root = json_loads(buf, 0, &error);\n++ int arraylen, i;\n++ json_t *status, *dataArray, *stats, *dataArrayObj;\n++ stats = NULL;\n++\n++ if (!root) {\n++ ERROR(\"dpdk_telemetry: Could not load JSON object from data passed in\"\n++ \" : %s\\n\",\n++ error.text);\n++ return -1;\n++ } else if (!json_is_object(root)) {\n++ ERROR(\"dpdk_telemetry: JSON Request is not a JSON object\\n\");\n++ json_decref(root);\n++ return -1;\n++ }\n++\n++ status = json_object_get(root, \"status_code\");\n++ if (!status) {\n++ ERROR(\"dpdk_telemetry: Request does not have status field\\n\");\n++ return -1;\n++ } else if (!json_is_string(status)) {\n++ ERROR(\"dpdk_telemetry: Status value is not a string\\n\");\n++ return -1;\n++ }\n++ dataArray = json_object_get(root, \"data\");\n++ if (!dataArray) {\n++ ERROR(\"dpdk_telemetry: Request does not have data field\\n\");\n++ return -1;\n++ }\n++ arraylen = json_array_size(dataArray);\n++ if (!arraylen) {\n++ ERROR(\"dpdk_telemetry: No data to get\\n\");\n++ return -1;\n++ }\n++\n++ for (i = 0; i < arraylen; i++) {\n++ json_t *port;\n++ dataArrayObj = json_array_get(dataArray, i);\n++ port = json_object_get(dataArrayObj, \"port\");\n++ stats = json_object_get(dataArrayObj, \"stats\");\n++ if (!port) {\n++ ERROR(\"dpdk_telemetry: Request does not have port field\\n\");\n++ return -1;\n++ }\n++ if (!json_is_integer(port)) {\n++ ERROR(\"dpdk_telemetry: Port value is not an integer\\n\");\n++ return -1;\n++ }\n++\n++ if (!stats) {\n++ ERROR(\"dpdk_telemetry: Request does not have stats field\\n\");\n++ return -1;\n++ }\n++ dpdk_telemetry_parse(stats, port, i);\n++ }\n++ return 0;\n++}\n++\n++static int dpdk_telemetry_cleanup(void) {\n++ if (!client) {\n++ WARNING(\"dpdk_telemetry: instance pointer is NULL, cleanup() has already \"\n++ \"been called\\n\");\n++ return -1;\n++ }\n++ close(client->s_send);\n++ close(client->s_recv);\n++ close(client->fd);\n++ free(client);\n++ client = NULL;\n++ return 0;\n++}\n++\n++static int dpdk_telemetry_read(user_data_t *ud) {\n++ INFO(PLUGIN_NAME \": %s:%d\", __FUNCTION__, __LINE__);\n++ struct client_info *client = (struct client_info *)ud->data;\n++ char buffer[BUF_SIZE];\n++ int bytes, ret;\n++ char *json_string = \"{\\\"action\\\":0,\\\"command\\\":\"\n++ \"\\\"ports_all_stat_values\\\",\\\"data\\\":null}\";\n++ if (send(client->fd, json_string, strlen(json_string), 0) < 0) {\n++ ERROR(\"dpdk_telemetry: Could not send stats\\n\");\n++ return -1;\n++ }\n++ bytes = recv(client->fd, buffer, sizeof(buffer), 0);\n++ buffer[bytes] = '\\0';\n++ if (bytes < 0) {\n++ ERROR(\"dpdk_telemetry: Could not receive stats\\n\");\n++ return -1;\n++ }\n++ ret = parse_json(buffer);\n++ if (ret < 0) {\n++ ERROR(\"dpdk_telemetry: Parsing failed\\n\");\n++ return -1;\n++ }\n++ return 0;\n++}\n++\n++static int dpdk_telemetry_init(void) {\n++ INFO(PLUGIN_NAME \": %s:%d\", __FUNCTION__, __LINE__);\n++ char message[BUF_SIZE];\n++\n++ client = calloc(1, sizeof(struct client_info));\n++ if (!client) {\n++ ERROR(\"dpdk_telemetry: Memory could not be allocated\\n\");\n++ return -1;\n++ }\n++ /*Here we look up the length of the g_dpdk_path string\n++ * If it has a length we use it, otherwise we fall back to default\n++ * See dpdk_telemetry_config() for details\n++ */\n++ client->dpdk_path = (strlen(g_dpdk_path)) ? g_dpdk_path : DEFAULT_DPDK_PATH;\n++ client->client_path =\n++ (strlen(g_client_path)) ? g_client_path : DEFAULT_CLIENT_PATH;\n++ client->s_send = socket(AF_UNIX, SOCK_STREAM, 0);\n++ if (client->s_send < 0) {\n++ ERROR(\"dpdk_telemetry: Failed to open socket\\n\");\n++ dpdk_telemetry_cleanup();\n++ return -1;\n++ }\n++ client->s_recv = socket(AF_UNIX, SOCK_STREAM, 0);\n++ if (client->s_recv < 0) {\n++ ERROR(\"dpdk_telemetry: Failed to open message socket\\n\");\n++ dpdk_telemetry_cleanup();\n++ return -1;\n++ }\n++ client->addr.sun_family = AF_UNIX;\n++ snprintf(client->addr.sun_path, sizeof(client->addr.sun_path), \"%s\",\n++ client->dpdk_path);\n++ if (connect(client->s_send, (struct sockaddr *)&client->addr,\n++ sizeof(client->addr)) < 0) {\n++ ERROR(\"dpdk_telemetry: Failed to connect\\n\");\n++ dpdk_telemetry_cleanup();\n++ return -1;\n++ }\n++ client->addrs.sun_family = AF_UNIX;\n++ snprintf(client->addrs.sun_path, sizeof(client->addrs.sun_path), \"%s\",\n++ client->client_path);\n++ unlink(client->client_path);\n++ if (bind(client->s_recv, (struct sockaddr *)&client->addrs,\n++ sizeof(client->addrs)) < 0) {\n++ ERROR(\"dpdk_telemetry: Failed to bind\\n\");\n++ dpdk_telemetry_cleanup();\n++ return -1;\n++ }\n++ if (listen(client->s_recv, 1) < 0) {\n++ ERROR(\"dpdk_telemetry: Listen failed\\n\");\n++ dpdk_telemetry_cleanup();\n++ return -1;\n++ }\n++ snprintf(message, sizeof(message), \"{\\\"action\\\":1,\\\"command\\\":\\\"clients\\\"\"\n++ \",\\\"data\\\":{\\\"client_path\\\":\\\"%s\\\"}}\",\n++ client->client_path);\n++ if (send(client->s_send, message, strlen(message), 0) < 0) {\n++ ERROR(\"dpdk_telemetry: Could not send register message\\n\");\n++ dpdk_telemetry_cleanup();\n++ return -1;\n++ }\n++ client->fd = accept(client->s_recv, NULL, NULL);\n++ if (client->fd < 0) {\n++ ERROR(\"dpdk_telemetry: Failed to accept\\n\");\n++ dpdk_telemetry_cleanup();\n++ return -1;\n++ }\n++ user_data_t ud;\n++ memset(&ud, 0, sizeof(ud));\n++ ud.data = (void *)client;\n++ plugin_register_complex_read(NULL, \"dpdk_telemetry\", dpdk_telemetry_read, 0,\n++ &ud);\n++ return 0;\n++}\n++\n++static int dpdk_telemetry_shutdown(void) {\n++ INFO(PLUGIN_NAME \": %s:%d\", __FUNCTION__, __LINE__);\n++ char msg[BUF_SIZE];\n++ int ret;\n++\n++ snprintf(msg, sizeof(msg), \"{\\\"action\\\":2,\\\"command\\\":\\\"clients\\\"\"\n++ \",\\\"data\\\":{\\\"client_path\\\":\\\"%s\\\"}}\",\n++ client->client_path);\n++ ret = send(client->fd, msg, strlen(msg), 0);\n++ if (ret < 0) {\n++ ERROR(\"dpdk_telemetry: Could not send unregister message\\n\");\n++ dpdk_telemetry_cleanup();\n++ return -1;\n++ }\n++ dpdk_telemetry_cleanup();\n++ return 0;\n++}\n++\n++void module_register(void) {\n++ plugin_register_init(\"dpdk_telemetry\", dpdk_telemetry_init);\n++ plugin_register_complex_config(\"dpdk_telemetry\", dpdk_telemetry_config);\n++ plugin_register_shutdown(\"dpdk_telemetry\", dpdk_telemetry_shutdown);\n++}\n+diff --git a/src/types.db b/src/types.db\n+index f4933ee..4517b3c 100644\n+--- a/src/types.db\n++++ b/src/types.db\n+@@ -76,6 +76,7 @@ dns_transfer value:DERIVE:0:U\n+ dns_update value:DERIVE:0:U\n+ dns_zops value:DERIVE:0:U\n+ domain_state state:GAUGE:0:U, reason:GAUGE:0:U\n++dpdk_telemetry\t\tvalue:DERIVE:0:U\n+ drbd_resource value:DERIVE:0:U\n+ duration seconds:GAUGE:0:U\n+ email_check value:GAUGE:0:U\n+-- \n+2.9.5\n+\n", "prefixes": [ "11/11" ] }