[checkmk-commits] New option --delete-rrds for RRD module of CMC

Module: check_mk Branch: master Commit: 746f0e21c9b90981ec89ab0ebac6bc119ef053f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=746f0e21c9b909… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 11 15:36:34 2015 +0100 New option --delete-rrds for RRD module of CMC --- checks/cpu_load.include | 2 ++ modules/check_mk.py | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/checks/cpu_load.include b/checks/cpu_load.include index b4698e6..4b6db43 100644 --- a/checks/cpu_load.include +++ b/checks/cpu_load.include @@ -41,6 +41,8 @@ def check_cpu_load_generic(params, load, num_cpus=1): perfdata = [ ('load' + str(z), l, warn, crit, 0, num_cpus ) for (z,l) in [ (1,load[0]), (5,load[1]), (15, load[2]) ] ] + perfdata.append( ('sepp', 17) ) + state, text, perf = check_levels(load[2], 'load15', params, factor = num_cpus) perfdata += perf infotext = "15 min load %.2f" % load[2] diff --git a/modules/check_mk.py b/modules/check_mk.py index 6ed4325..fbc7274 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4880,6 +4880,7 @@ load_checks() opt_nowiki = False opt_split_rrds = False +opt_delete_rrds = False # Do option parsing and execute main function - short_options = 'ASHVLCURODMmd:Ic:nhvpXPNBilf' @@ -4889,7 +4890,7 @@ long_options = [ "help", "version", "verbose", "compile", "debug", "interactive" "snmptranslate", "bake-agents", "force", "show-snmp-stats", "usewalk", "scan-parents", "procs=", "automation=", "handle-alerts", "notify", "snmpget=", "profile", "keepalive", "keepalive-fd=", "create-rrd", - "convert-rrds", "compress-history", "split-rrds", + "convert-rrds", "compress-history", "split-rrds", "delete-rrds", "no-cache", "update", "restart", "reload", "dump", "fake-dns=", "man", "nowiki", "config-check", "backup=", "restore=", "check-inventory=", "check-discovery=", "discover-marked-hosts", "paths", @@ -4970,6 +4971,8 @@ for o,a in opts: opt_cmc_relfilename = a elif o == "--split-rrds": opt_split_rrds = True + elif o == "--delete-rrds": + opt_delete_rrds = True elif o == "--hw-changes": opt_inv_hw_changes = int(a) elif o == "--sw-changes":