X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fdrbd.c;h=40a3eb22fa851b9d969683e8413c37053a640b79;hb=9d9678b9e753ea0936612021f4f87f8092ab4e31;hp=2c80ca2f6fe92b4ef0181c8c12bbf550fce8841d;hpb=f38e0a7e270346cf1f53f4599ddc36b87eceff11;p=collectd.git

diff --git a/src/drbd.c b/src/drbd.c
index 2c80ca2f..40a3eb22 100644
--- a/src/drbd.c
+++ b/src/drbd.c
@@ -2,18 +2,23 @@
  * collectd - src/drbd.c
  * Copyright (C) 2014  Tim Laszlo
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; only version 2 of the License is applicable.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  *
  * Authors:
  *   Tim Laszlo <tim.laszlo at gmail.com>
@@ -23,13 +28,14 @@
  See: http://www.drbd.org/users-guide/ch-admin.html#s-performance-indicators
 
  version: 8.3.11 (api:88/proto:86-96)
- srcversion: 71955441799F513ACA6DA60 
+ srcversion: 71955441799F513ACA6DA60
   0: cs:Connected ro:Primary/Secondary ds:UpToDate/UpToDate B r-----
 	 ns:64363752 nr:0 dw:357799284 dr:846902273 al:34987022 bm:18062 lo:0 \
 						pe:0 ua:0 ap:0 ep:1 wo:f oos:0
  */
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
@@ -64,7 +70,6 @@ static int drbd_submit_fields (long int resource,
 	char plugin_instance[DATA_MAX_NAME_LEN];
 	value_t values[fields_num];
 	value_list_t vl = VALUE_LIST_INIT;
-	size_t i;
 
 	if (resource < 0)
 	{
@@ -83,7 +88,7 @@ static int drbd_submit_fields (long int resource,
 	ssnprintf (plugin_instance, sizeof (plugin_instance), "r%ld",
 			resource);
 
-	for (i = 0; i < drbd_names_num; i++)
+	for (size_t i = 0; i < drbd_names_num; i++)
 	{
 		char *data;
 		/* skip non numeric wo */
@@ -96,13 +101,12 @@ static int drbd_submit_fields (long int resource,
 	}
 
 	vl.values_len = 1;
-	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "drbd", sizeof (vl.plugin));
 	sstrncpy (vl.plugin_instance, plugin_instance,
 			sizeof (vl.plugin_instance));
 	sstrncpy (vl.type, "drbd_resource", sizeof (vl.type));
 
-	for (i = 0; i < fields_num; i++)
+	for (size_t i = 0; i < fields_num; i++)
 	{
 		if (drbd_names[i] == NULL)
 			continue;
@@ -127,7 +131,7 @@ static int drbd_read (void)
 	fh = fopen (drbd_stats, "r");
 	if (fh == NULL)
 	{
-		WARNING ("Unable to open%s", drbd_stats);
+		WARNING ("drbd plugin: Unable to open %s", drbd_stats);
 		return (EINVAL);
 	}
 
@@ -136,18 +140,24 @@ static int drbd_read (void)
 		fields_num = strsplit (buffer,
 				fields, STATIC_ARRAY_SIZE (fields));
 
-		/* ignore headers */
-		if (fields_num < 4)
+		/* ignore headers (first two iterations) */
+		if ((strcmp(fields[0], "version:") == 0) ||
+				(strcmp(fields[0], "srcversion:") == 0) ||
+				(strcmp(fields[0], "GIT-hash:") == 0))
+		{
 			continue;
+		}
 
 		if (isdigit(fields[0][0]))
 		{
-			/* parse the resource line */
+			/* parse the resource line, next loop iteration
+			   will submit values for this resource */
 			resource = strtol(fields[0], NULL, 10);
 		}
 		else
 		{
-			/* handle stats data */
+			/* handle stats data for the resource defined in the
+			   previous iteration */
 			drbd_submit_fields(resource, fields, fields_num);
 		}
 	} /* while (fgets) */