diff --git a/plugins/disk/btrfs_device_stats b/plugins/disk/btrfs_device_stats index bd145024..533a911f 100755 --- a/plugins/disk/btrfs_device_stats +++ b/plugins/disk/btrfs_device_stats @@ -95,7 +95,8 @@ def munin_config(fs): for this_device in devices: this_dev_info = fs.dev_info(this_device.devid) this_dev_name = this_dev_info.path.replace('/dev/', '') - print("multigraph btrfs_device_stats_" + fsid + "." + str(this_device.devid)) + print("multigraph btrfs_device_stats_" + fsid + "." + + str(this_device.devid)) print("graph_args --base 1000 -l 0") print("graph_vlabel btrfs attribute value") print("graph_title btrfs device stats for " + this_dev_name) @@ -103,36 +104,50 @@ def munin_config(fs): print("graph_info This graph shows stats of devices used by btrfs") print("corruption_errs.label Corruption Errors") - print("corruption_errs.warning " + os.getenv('corruption_errs_warning', default = str(warning))) + print("corruption_errs.warning " + os.getenv('corruption_errs_warning', + default = str(warning))) if os.getenv('corruption_errs_critical', default = critical) != False: - print("corruption_errs.critical " + os.getenv('corruption_errs_critical', default = str(critical))) + print("corruption_errs.critical " + + os.getenv('corruption_errs_critical', + default = str(critical))) print("flush_errs.label Flush Errors") - print("flush_errs.warning " + os.getenv('flush_errs_warning', default = str(warning))) + print("flush_errs.warning " + os.getenv('flush_errs_warning', + default = str(warning))) if os.getenv('flush_errs_critical', default = critical) != False: - print("flush_errs.critical " + os.getenv('flush_errs_critical', default = str(critical))) + print("flush_errs.critical " + os.getenv('flush_errs_critical', + default = str(critical))) print("generation_errs.label Generation Errors") - print("generation_errs.warning " + os.getenv('generation_errs_warning', default = str(warning))) + print("generation_errs.warning " + os.getenv('generation_errs_warning', + default = str(warning))) if os.getenv('generation_errs_critical', default = critical) != False: - print("generation_errs.critical " + os.getenv('generation_errs_critical', default = str(critical))) + print("generation_errs.critical " + + os.getenv('generation_errs_critical', + default = str(critical))) print("read_errs.label Read Errors") - print("read_errs.warning " + os.getenv('read_errs_warning', default = str(warning))) + print("read_errs.warning " + os.getenv('read_errs_warning', + default = str(warning))) if os.getenv('read_errs_critical', default = critical) != False: - print("read_errs.critical " + os.getenv('read_errs_critical', default = str(critical))) + print("read_errs.critical " + os.getenv('read_errs_critical', + default = str(critical))) print("write_errs.label Write Errors") - print("write_errs.warning " + os.getenv('write_errs_warning', default = str(warning))) + print("write_errs.warning " + os.getenv('write_errs_warning', + default = str(warning))) if os.getenv('write_errs_critical', default = critical) != False: - print("write_errs.critical " + os.getenv('write_errs_critical', default = str(critical))) + print("write_errs.critical " + os.getenv('write_errs_critical', + default = str(critical))) print("nr_items.label Nr. of Items") print("flags.label Nr. of Flags") - print("flags.warning " + os.getenv('flags_warning', default = str(warning))) + print("flags.warning " + os.getenv('flags_warning', + default = str(warning))) if os.getenv('flags_critical', default = critical) != False: - print("flags.critical " + os.getenv('flags_critical', default = str(critical))) + print("flags.critical " + os.getenv('flags_critical', + default = str(critical))) print("") @@ -168,7 +183,8 @@ def munin_values(fs): nr_items_total = nr_items_total + nr_items flags_total = flags_total + flags - print("multigraph btrfs_device_stats_" + fsid + "." + str(this_device.devid)) + print("multigraph btrfs_device_stats_" + fsid + "." + + str(this_device.devid)) print("corruption_errs.value " + str(corruption_errs)) print("flush_errs.value " + str(flush_errs)) diff --git a/plugins/disk/btrfs_device_usage b/plugins/disk/btrfs_device_usage index d422120a..9cf91217 100755 --- a/plugins/disk/btrfs_device_usage +++ b/plugins/disk/btrfs_device_usage @@ -77,13 +77,17 @@ def munin_config(fs): byte_warning = os.getenv('byte_warning', default = False) byte_critical = os.getenv('byte_critical', default = False) - byte_warning = os.getenv('byte_' + fsid + '_warning', default = byte_warning) - byte_critical = os.getenv('byte_' + fsid + '_critical', default = byte_critical) + byte_warning = os.getenv('byte_' + fsid + '_warning', + default = byte_warning) + byte_critical = os.getenv('byte_' + fsid + '_critical', + default = byte_critical) percent_warning = os.getenv('percent_warning', default = 95) percent_critical = os.getenv('percent_critical', default = 98) - percent_warning = os.getenv('percent_' + fsid + '_warning', default = percent_warning) - percent_critical = os.getenv('percent_' + fsid + '_critical', default = percent_critical) + percent_warning = os.getenv('percent_' + fsid + '_warning', + default = percent_warning) + percent_critical = os.getenv('percent_' + fsid + '_critical', + default = percent_critical) print("multigraph btrfs_device_usage_byte_" + fsid) print("graph_title btrfs usage by device in bytes on " + fs.path)