From de2d81b459e8674e49d4993b15b5d383f72c301e Mon Sep 17 00:00:00 2001 From: ndarshan Date: Fri, 21 Nov 2014 17:02:40 +0530 Subject: brick plugin: set rrd configuration to multiple. By default perfdata is created in single rrd file which causes failure of fetching DS in upgrade scenario. Because earlier brick utilization had only one DS. Now with thin LV monitoring included in brick utilization, It will be having two DS. The graph templates wont be able to read them in single rrd file. So in case of upgrade we run the script rrd_convert as a pre step to migrate the old data to new rrd files.and this patch also sets pnp4nagios rrd configuration to multiple rrd file for each DS. Change-Id: Iadb50250b2e93d73b61e25be90a0770dae0780f3 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1143995 Signed-off-by: ndarshan Reviewed-on: http://review.gluster.org/9188 Reviewed-by: Sahina Bose --- templates/Makefile.am | 1 + templates/check_brick_usage.cfg | 1 + templates/check_brick_usage.php | 3 --- 3 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 templates/check_brick_usage.cfg (limited to 'templates') diff --git a/templates/Makefile.am b/templates/Makefile.am index 78b81b4..6d93fd7 100644 --- a/templates/Makefile.am +++ b/templates/Makefile.am @@ -1,5 +1,6 @@ pnp4nagioscheckcommanddir = $(sysconfdir)/pnp4nagios/check_commands pnp4nagioscheckcommand_DATA = \ + check_brick_usage.cfg \ check_disk_and_inode.cfg \ check_interfaces.cfg \ $(NULL) diff --git a/templates/check_brick_usage.cfg b/templates/check_brick_usage.cfg new file mode 100644 index 0000000..718dc42 --- /dev/null +++ b/templates/check_brick_usage.cfg @@ -0,0 +1 @@ +RRD_STORAGE_TYPE = MULTIPLE diff --git a/templates/check_brick_usage.php b/templates/check_brick_usage.php index 5f00b87..9c926b8 100644 --- a/templates/check_brick_usage.php +++ b/templates/check_brick_usage.php @@ -24,9 +24,6 @@ foreach ($this->DS as $KEY=>$VAL) { # $VAL['NAME'] = str_replace("_","/",$VAL['NAME']); $ds_name[$KEY] = "Brick Utilization "; $graph_type = $VAL['LABEL']; - if ($graph_type == "Virtual" ) { - $ds_name[$KEY] .= "(virtual)"; - } if ($graph_type == "Thin-pool" ) { $ds_name[$KEY] .= "(Thin-pool)"; } -- cgit