Merge pull request #1564 from rpv-tomsk/disk-plugin

disk plugin: send disk_merged,disk_io_time,pending_operations only when real data exists for device

diff --combined src/disk.c
index bafc82e,e3bd761..0aac2db
--- 1/src/disk.c
--- 2/src/disk.c
+++ b/src/disk.c
@@@ -106,6 -106,10 +106,10 @@@ typedef struct diskstat
        derive_t avg_read_time;
        derive_t avg_write_time;
  
+       _Bool has_merged;
+       _Bool has_in_progress;
+       _Bool has_io_time;
+ 
        struct diskstats *next;
  } diskstats_t;
  
@@@ -293,46 -297,44 +297,46 @@@ static void disk_submit (const char *pl
        plugin_dispatch_values (&vl);
  } /* void disk_submit */
  
 -#if KERNEL_LINUX
 -static void submit_in_progress (char const *disk_name, gauge_t in_progress)
 +#if KERNEL_FREEBSD || KERNEL_LINUX
 +static void submit_io_time (char const *plugin_instance, derive_t io_time, derive_t weighted_time)
  {
 -      value_t v;
 +      value_t values[2];
        value_list_t vl = VALUE_LIST_INIT;
  
 -      if (ignorelist_match (ignorelist, disk_name) != 0)
 +      if (ignorelist_match (ignorelist, plugin_instance) != 0)
          return;
  
 -      v.gauge = in_progress;
 +      values[0].derive = io_time;
 +      values[1].derive = weighted_time;
  
 -      vl.values = &v;
 -      vl.values_len = 1;
 +      vl.values = values;
 +      vl.values_len = 2;
        sstrncpy (vl.host, hostname_g, sizeof (vl.host));
        sstrncpy (vl.plugin, "disk", sizeof (vl.plugin));
 -      sstrncpy (vl.plugin_instance, disk_name, sizeof (vl.plugin_instance));
 -      sstrncpy (vl.type, "pending_operations", sizeof (vl.type));
 +      sstrncpy (vl.plugin_instance, plugin_instance, sizeof (vl.plugin_instance));
 +      sstrncpy (vl.type, "disk_io_time", sizeof (vl.type));
  
        plugin_dispatch_values (&vl);
 -}
 +} /* void submit_io_time */
 +#endif /* KERNEL_FREEBSD || KERNEL_LINUX */
  
 -static void submit_io_time (char const *plugin_instance, derive_t io_time, derive_t weighted_time)
 +#if KERNEL_LINUX
 +static void submit_in_progress (char const *disk_name, gauge_t in_progress)
  {
 -      value_t values[2];
 +      value_t v;
        value_list_t vl = VALUE_LIST_INIT;
  
 -      if (ignorelist_match (ignorelist, plugin_instance) != 0)
 +      if (ignorelist_match (ignorelist, disk_name) != 0)
          return;
  
 -      values[0].derive = io_time;
 -      values[1].derive = weighted_time;
 +      v.gauge = in_progress;
  
 -      vl.values = values;
 -      vl.values_len = 2;
 +      vl.values = &v;
 +      vl.values_len = 1;
        sstrncpy (vl.host, hostname_g, sizeof (vl.host));
        sstrncpy (vl.plugin, "disk", sizeof (vl.plugin));
 -      sstrncpy (vl.plugin_instance, plugin_instance, sizeof (vl.plugin_instance));
 -      sstrncpy (vl.type, "disk_io_time", sizeof (vl.type));
 +      sstrncpy (vl.plugin_instance, disk_name, sizeof (vl.plugin_instance));
 +      sstrncpy (vl.type, "pending_operations", sizeof (vl.type));
  
        plugin_dispatch_values (&vl);
  }
@@@ -391,7 -393,7 +395,7 @@@ static signed long long dict_get_value 
                DEBUG ("CFStringCreateWithCString (%s) failed.", key);
                return (-1LL);
        }
 -      
 +
        /* get => we don't need to release (== free) the object */
        val_obj = (CFNumberRef) CFDictionaryGetValue (dict, key_obj);
  
@@@ -538,7 -540,7 +542,7 @@@ static int disk_read (void
        struct gident *geom_id;
  
        const char *disk_name;
 -      long double read_time, write_time;
 +      long double read_time, write_time, busy_time, total_duration;
  
        for (retry = 0, dirty = 1; retry < 5 && dirty == 1; retry++) {
                if (snap != NULL)
@@@ -633,23 -635,13 +637,23 @@@
                        disk_submit (disk_name, "disk_time",
                                        (derive_t)(read_time*1000), (derive_t)(write_time*1000));
                }
 +              if (devstat_compute_statistics(snap_iter, NULL, 1.0,
 +                  DSM_TOTAL_BUSY_TIME, &busy_time,
 +                  DSM_TOTAL_DURATION, &total_duration,
 +                  DSM_NONE) != 0) {
 +                      WARNING("%s", devstat_errbuf);
 +              }
 +              else
 +              {
 +                      submit_io_time(disk_name, busy_time, total_duration);
 +              }
        }
        geom_stats_snapshot_free(snap);
  
  #elif KERNEL_LINUX
        FILE *fh;
        char buffer[1024];
 -      
 +
        char *fields[32];
        int numfields;
        int fieldshift = 0;
@@@ -830,6 -822,16 +834,16 @@@
                        ds->read_time = read_time;
                        ds->write_ops = write_ops;
                        ds->write_time = write_time;
+ 
+                       if (read_merged || write_merged)
+                               ds->has_merged = 1;
+ 
+                       if (in_progress)
+                               ds->has_in_progress = 1;
+ 
+                       if (io_time)
+                               ds->has_io_time = 1;
+               
                } /* if (is_disk) */
  
                /* Don't write to the RRDs if we've just started.. */
@@@ -871,10 -873,13 +885,13 @@@
  
                if (is_disk)
                {
-                       disk_submit (output_name, "disk_merged",
+                       if (ds->has_merged)
+                               disk_submit (output_name, "disk_merged",
                                        read_merged, write_merged);
-                       submit_in_progress (output_name, in_progress);
-                       submit_io_time (output_name, io_time, weighted_time);
+                       if (ds->has_in_progress)
+                               submit_in_progress (output_name, in_progress);
+                       if (ds->has_io_time)
+                               submit_io_time (output_name, io_time, weighted_time);
                } /* if (is_disk) */
  
  #if HAVE_LIBUDEV
@@@ -948,10 -953,10 +965,10 @@@
  #endif
        int counter;
        char name[DATA_MAX_NAME_LEN];
 -      
 +
        if ((ds = sg_get_disk_io_stats(&disks)) == NULL)
                return (0);
 -              
 +
        for (counter=0; counter < disks; counter++) {
                strncpy(name, ds->disk_name, sizeof(name));
                name[sizeof(name)-1] = '\0'; /* strncpy doesn't terminate longer strings */
@@@ -971,7 -976,7 +988,7 @@@
        int rnumdisk;
        int i;
  
 -      if ((numdisk = perfstat_disk(NULL, NULL, sizeof(perfstat_disk_t), 0)) < 0) 
 +      if ((numdisk = perfstat_disk(NULL, NULL, sizeof(perfstat_disk_t), 0)) < 0)
        {
                char errbuf[1024];
                WARNING ("disk plugin: perfstat_disk: %s",
@@@ -980,14 -985,14 +997,14 @@@
        }
  
        if (numdisk != pnumdisk || stat_disk==NULL) {
 -              if (stat_disk!=NULL) 
 +              if (stat_disk!=NULL)
                        free(stat_disk);
                stat_disk = (perfstat_disk_t *)calloc(numdisk, sizeof(perfstat_disk_t));
 -      } 
 +      }
        pnumdisk = numdisk;
  
        firstpath.name[0]='\0';
 -      if ((rnumdisk = perfstat_disk(&firstpath, stat_disk, sizeof(perfstat_disk_t), numdisk)) < 0) 
 +      if ((rnumdisk = perfstat_disk(&firstpath, stat_disk, sizeof(perfstat_disk_t), numdisk)) < 0)
        {
                char errbuf[1024];
                WARNING ("disk plugin: perfstat_disk : %s",
@@@ -995,7 -1000,7 +1012,7 @@@
                return (-1);
        }
  
 -      for (i = 0; i < rnumdisk; i++) 
 +      for (i = 0; i < rnumdisk; i++)
        {
                read_sectors = stat_disk[i].rblks*stat_disk[i].bsize;
                write_sectors = stat_disk[i].wblks*stat_disk[i].bsize;