Checkmk git commits November 2011

checkmk-commits@lists.checkmk.com

2 participants
196 discussions

Check_MK Git: check_mk: Little facelift for speedometer

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7055ca3d9ac9aa63a07d313369aac08a09c71b6d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7055ca3d9ac9aa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 6 19:16:34 2011 +0100 Little facelift for speedometer --- doc/treasures/speedometer.xcf | Bin 0 -> 439348 bytes web/htdocs/images/speedometer.png | Bin 97346 -> 97031 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/doc/treasures/speedometer.xcf b/doc/treasures/speedometer.xcf new file mode 100644 index 0000000..2acea09 Binary files /dev/null and b/doc/treasures/speedometer.xcf differ diff --git a/web/htdocs/images/speedometer.png b/web/htdocs/images/speedometer.png index 02df9f1..617568f 100644 Binary files a/web/htdocs/images/speedometer.png and b/web/htdocs/images/speedometer.png differ

12 years, 11 months

Check_MK Git: check_mk: New snapin "Speed-O-Meter" :-)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 353068e4a661838400dbd0379621ecdcc6865ea9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=353068e4a66183… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 6 19:05:14 2011 +0100 New snapin "Speed-O-Meter" :-) --- ChangeLog | 1 + livestatus/src/global_counters.c | 2 +- web/htdocs/dashboard.py | 12 +-- web/htdocs/images/speedometer.png | Bin 0 -> 97346 bytes web/htdocs/js/check_mk.js | 9 ++ web/plugins/pages/shipped.py | 59 +++++----- web/plugins/sidebar/shipped.py | 212 ++++++++++++++++++++++++++++++++++--- 7 files changed, 240 insertions(+), 55 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=353068e4a6…

12 years, 11 months

Check_MK Git: check_mk: Livestatus: New aggregation functions suminv and avginv

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 39ea41ac55570b399e8afc139886f219324e30b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39ea41ac55570b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 5 16:40:36 2011 +0100 Livestatus: New aggregation functions suminv and avginv --- ChangeLog | 1 + livestatus/src/DoubleAggregator.cc | 7 +++++++ livestatus/src/DoubleColumn.cc | 7 +++++++ livestatus/src/DoubleColumn.h | 1 + livestatus/src/IntAggregator.cc | 13 +++++++++++++ livestatus/src/PerfdataAggregator.cc | 10 +++++++++- livestatus/src/Query.cc | 4 ++++ livestatus/src/StatsColumn.h | 14 ++++++++------ 8 files changed, 50 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ad2a94..95438b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ Livestatus: * New columns num_hosts and num_services in status table + * New aggregation functions suminv and avginv (see Documentation) 1.1.12p1: diff --git a/livestatus/src/DoubleAggregator.cc b/livestatus/src/DoubleAggregator.cc index 4b51947..7ee74b5 100644 --- a/livestatus/src/DoubleAggregator.cc +++ b/livestatus/src/DoubleAggregator.cc @@ -60,6 +60,11 @@ void DoubleAggregator::consume(void *data, Query *) _aggr += value; _sumq += value * value; break; + + case STATS_OP_SUMINV: + case STATS_OP_AVGINV: + _aggr += 1.0 / value; + break; } } @@ -70,10 +75,12 @@ void DoubleAggregator::output(Query *q) case STATS_OP_SUM: case STATS_OP_MIN: case STATS_OP_MAX: + case STATS_OP_SUMINV: q->outputDouble(_aggr); break; case STATS_OP_AVG: + case STATS_OP_AVGINV: if (_count == 0) q->outputDouble(0.0); else diff --git a/livestatus/src/DoubleColumn.cc b/livestatus/src/DoubleColumn.cc index 21e9590..02adadd 100644 --- a/livestatus/src/DoubleColumn.cc +++ b/livestatus/src/DoubleColumn.cc @@ -35,3 +35,10 @@ Filter *DoubleColumn::createFilter(int operator_id, char *value) { return new DoubleColumnFilter(this, operator_id, value); } + +string DoubleColumn::valueAsString(void *data, Query *query) +{ + char buf[64]; + snprintf(buf, sizeof(buf), "%.10e", getValue(data)); + return buf; +} diff --git a/livestatus/src/DoubleColumn.h b/livestatus/src/DoubleColumn.h index 55bd934..3c66df8 100644 --- a/livestatus/src/DoubleColumn.h +++ b/livestatus/src/DoubleColumn.h @@ -37,6 +37,7 @@ public: virtual double getValue(void *data) = 0; void output(void *, Query *); int type() { return COLTYPE_DOUBLE; } + string valueAsString(void *data, Query *); Filter *createFilter(int operator_id, char *value); }; diff --git a/livestatus/src/IntAggregator.cc b/livestatus/src/IntAggregator.cc index e9f82a3..2fbdbb8 100644 --- a/livestatus/src/IntAggregator.cc +++ b/livestatus/src/IntAggregator.cc @@ -37,6 +37,11 @@ void IntAggregator::consume(void *data, Query *query) case STATS_OP_AVG: _aggr += value; break; + case STATS_OP_SUMINV: + case STATS_OP_AVGINV: + _sumq += 1.0 / (double)value; + break; + case STATS_OP_MIN: if (_count == 1) _aggr = value; @@ -68,10 +73,18 @@ void IntAggregator::output(Query *q) q->outputInteger64(_aggr); break; + case STATS_OP_SUMINV: + q->outputInteger64(_sumq); + break; + case STATS_OP_AVG: q->outputDouble(double(_aggr) / _count); break; + case STATS_OP_AVGINV: + q->outputInteger64(_sumq / _count); + break; + case STATS_OP_STD: if (_count <= 1) q->outputDouble(0.0); diff --git a/livestatus/src/PerfdataAggregator.cc b/livestatus/src/PerfdataAggregator.cc index 837ecb9..a0c67c6 100644 --- a/livestatus/src/PerfdataAggregator.cc +++ b/livestatus/src/PerfdataAggregator.cc @@ -76,7 +76,13 @@ void PerfdataAggregator::consumeVariable(const char *varname, double value) switch (_operation) { case STATS_OP_SUM: case STATS_OP_AVG: - it->second._aggr += value; break; + it->second._aggr += value; + break; + + case STATS_OP_SUMINV: + case STATS_OP_AVGINV: + it->second._aggr += 1.0 / value; + break; case STATS_OP_MIN: if (value < it->second._aggr) @@ -110,10 +116,12 @@ void PerfdataAggregator::output(Query *q) case STATS_OP_SUM: case STATS_OP_MIN: case STATS_OP_MAX: + case STATS_OP_SUMINV: value = it->second._aggr; break; case STATS_OP_AVG: + case STATS_OP_AVGINV: if (it->second._count == 0) value = 0.00; else diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index d1142d0..a80725c 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -377,6 +377,10 @@ void Query::parseStatsLine(char *line) operation = STATS_OP_AVG; else if (!strcmp(col_or_op, "std")) operation = STATS_OP_STD; + else if (!strcmp(col_or_op, "suminv")) + operation = STATS_OP_SUMINV; + else if (!strcmp(col_or_op, "avginv")) + operation = STATS_OP_AVGINV; char *column_name; if (operation == STATS_OP_COUNT) diff --git a/livestatus/src/StatsColumn.h b/livestatus/src/StatsColumn.h index e4e95b7..526b313 100644 --- a/livestatus/src/StatsColumn.h +++ b/livestatus/src/StatsColumn.h @@ -25,12 +25,14 @@ #ifndef StatsColumn_h #define StatsColumn_h -#define STATS_OP_COUNT 0 -#define STATS_OP_SUM 1 -#define STATS_OP_MIN 2 -#define STATS_OP_MAX 3 -#define STATS_OP_AVG 4 -#define STATS_OP_STD 5 +#define STATS_OP_COUNT 0 +#define STATS_OP_SUM 1 +#define STATS_OP_MIN 2 +#define STATS_OP_MAX 3 +#define STATS_OP_AVG 4 +#define STATS_OP_STD 5 +#define STATS_OP_SUMINV 6 +#define STATS_OP_AVGINV 7 class Aggregator; class Column;

12 years, 11 months

Check_MK Git: check_mk: Handle None-parameter for checks with factory_settings

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ab8b6c6565e787df7984f859c1c9876171fe12e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab8b6c6565e787… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 5 12:08:46 2011 +0100 Handle None-parameter for checks with factory_settings If a check created by inventory has None as a parameter but for that check type exists factory settings, then we automatically change the None into an empty dictionary so that the factory settings will apply. This helps in cases where an earlier version of the check works without parameters and a later implementation uses a dictionary. --- modules/check_mk.py | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 5162bd8..b03f8aa 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4110,6 +4110,21 @@ def compute_check_parameters(host, checktype, item, params): def_levels_varname = check_default_levels.get(checktype) if def_levels_varname: vars_before_config.add(def_levels_varname) + + # Handle case where parameter is None but the type of the + # default value is a dictionary. This is for example the + # case if a check type has gotten parameters in a new version + # but inventory of the old version left None as a parameter. + # Also from now on we support that the inventory simply puts + # None as a parameter. We convert that to an empty dictionary + # that will be updated with the factory settings and default + # levels, if possible. + if params == None and def_levels_varname: + fs = factory_settings.get(def_levels_varname) + if type(fs) == dict: + params = {} + + # Honor factory settings for dict-type checks if def_levels_varname and type(params) == dict: # Start with factory settings @@ -4133,7 +4148,6 @@ def compute_check_parameters(host, checktype, item, params): # Get parameters configured via check_parameters entries += service_extra_conf(host, descr, check_parameters) - if len(entries) > 0: # loop from last to first (first must have precedence) for entry in entries[::-1]:

12 years, 11 months

Check_MK Git: check_mk: WATO: layout fix for "Save" button in sites

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1d662ef92257fcff6515b8a5ac9d5e327fb4ac95 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d662ef92257fc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 4 20:29:12 2011 +0100 WATO: layout fix for "Save" button in sites --- web/htdocs/wato.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f783709..9acf5a0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6239,10 +6239,11 @@ def mode_edit_site(phase): "site itself, whilst the URL-Prefix is used by your local Browser."))) html.text_input("multisiteurl", site.get("multisiteurl", ""), size=60) html.write("</td></tr>") - + html.write("<tr><td colspan=2 class=buttons>") + html.button("save", _("Save")) + html.write("</td></tr>") html.write("</table>") html.hidden_fields() - html.button("save", _("Save")) html.end_form()

12 years, 11 months

Check_MK Git: check_mk: WATO: fix replication state for local site

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 83e610f672afe34cff0c4031b039aaf1a02decda URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83e610f672afe3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 4 16:17:57 2011 +0100 WATO: fix replication state for local site local site must never have the flag need_sync. --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f5fbdcc..f783709 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6539,7 +6539,7 @@ def mark_affected_sites_dirty(folder, hostname=None, sync = True, restart = True find_folder_sites(site_ids, folder) for site_id in site_ids: changes = {} - if sync: + if sync and not site_is_local(site_id): changes["need_sync"] = True if restart: changes["need_restart"] = True

12 years, 11 months

Check_MK Git: check_mk: WATO: Fix move to imported folders

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7452270837aeffb40f3b7c1f8171a974abd3ca1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7452270837aeff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 4 16:11:24 2011 +0100 WATO: Fix move to imported folders key .siteid was missing in new folder --- web/htdocs/wato.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9c24fbb..f5fbdcc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2049,13 +2049,15 @@ def create_target_folder_from_aliaspath(aliaspath): "attributes" : {}, ".folders" : {}, ".files" : {}, - ".parent" : folder + ".parent" : folder, + ".siteid" : folder[".siteid"], } folder[".folders"][name] = new_folder g_folders[new_path] = new_folder folder = new_folder parts = parts[1:] save_folder(folder) # make sure, directory is created + reload_folder(folder) return folder

12 years, 11 months

Check_MK Git: check_mk: WATO: new feature: factory reset

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 719913eb2be94bfd33d7a28e186aaf585467fd03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=719913eb2be94b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 4 15:00:32 2011 +0100 WATO: new feature: factory reset --- web/htdocs/images/icon_factoryreset.png | Bin 0 -> 2484 bytes web/htdocs/wato.py | 47 ++++++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/web/htdocs/images/icon_factoryreset.png b/web/htdocs/images/icon_factoryreset.png new file mode 100644 index 0000000..321e824 Binary files /dev/null and b/web/htdocs/images/icon_factoryreset.png differ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7308274..9c24fbb 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3858,7 +3858,10 @@ def mode_snapshot(phase): changelog_button() html.context_button(_("Create Snapshot"), make_action_link([("mode", "snapshot"),("_create_snapshot","Yes")]), "snapshot") + html.context_button(_("Factory Reset"), + make_action_link([("mode", "snapshot"),("_factory_reset","Yes")]), "factoryreset") return + elif phase == "action": if html.has_var("_download_file"): download_file = html.var("_download_file") @@ -3932,7 +3935,26 @@ def mode_snapshot(phase): return "" else: return None # browser reload - return False + + elif html.has_var("_factory_reset"): + c = wato_confirm(_("Confirm factory reset"), + _("If you proceed now, all hosts, folders, rules and other configurations " + "done with WATO will be deleted! Please consider making a snapshot before " + "you do this. Snapshots will not be deleted. Also the password of the currently " + "logged in user (%s) will be kept.<br><br>" + "Do you really want to delete all or your configuration data?") % config.user_id) + if c: + factory_reset() + return None, _("Resetted WATO, wiped all configuration.") + elif c == False: # not yet confirmed + return "" + else: + return None # browser reload + + + else: + return False + else: snapshots = [] if os.path.exists(snapshot_dir): @@ -4006,6 +4028,21 @@ def create_snapshot(): return snapshot_name +def factory_reset(): + # Darn. What makes things complicated here is that we need to conserve htpasswd, + # at least the account of the currently logged in user. + users = load_users() + for id in users.keys(): + if id != config.user_id: + del users[id] + save_users(users) # this will cleanup htpasswd + + for path in [ root_dir, multisite_dir, sites_mk, log_dir ]: + if os.path.exists(path): + shutil.rmtree(path) + + log_pending(SYNCRESTART, None, "factory-reset", _("Complete reset to factory settings.")) + #. # .-Value-Editor---------------------------------------------------------. @@ -9905,8 +9942,10 @@ def load_plugins(): config.declare_permission("wato.snapshots", _("Backup & Restore"), - _("Access to the module <i>Backup & Restore</i>. Please note: a user with write access to this module " - "can make arbitrary changes to the configuration by restoring uploaded snapshots!"), - [ "admin", ]) + _("Access to the module <i>Backup & Restore</i>. Please note: a user with " + "write access to this module " + "can make arbitrary changes to the configuration by restoring uploaded snapshots " + "and even do a complete factory reset!"), + [ "admin", ]) load_web_plugins("wato", globals())

12 years, 11 months

Check_MK Git: check_mk: WATO: add rule for datasource_programs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c20c7a2b02dcb14cb310d900f340d3fd2dcc0bc8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c20c7a2b02dcb1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 4 14:09:02 2011 +0100 WATO: add rule for datasource_programs --- web/plugins/wato/check_mk_configuration.py | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 8d72eeb..b5b72b8 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -710,3 +710,15 @@ register_rule(group, "a host is connected to, e.g. when the IP address of the host is dynamic " "and can change.")) +register_rule(group, + "datasource_programs", + TextAscii( + title = _("Individual program call instead of agent access"), + help = _("For agent based checks Check_MK allows you to specify an alternative " + "program that should be called by Check_MK instead of connecting the agent " + "via TCP. That program must output the agent's data on standard output in " + "the same format the agent would do. This is for example useful for monitoring " + "via SSH. The command line may contain the placeholders <tt><IP></tt> and " + "<tt><HOST></tt>."), + label = _("Command line to execute"))) +

12 years, 11 months

Check_MK Git: check_mk: WATO: fix inventory with 1000 hosts

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2449b159b928571ef25d0a6e8eba5294f29afdb1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2449b159b92857… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 4 14:01:41 2011 +0100 WATO: fix inventory with 1000 hosts --- web/htdocs/htmllib.py | 3 ++- web/htdocs/wato.py | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 59b0495..68f10a8 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -314,7 +314,8 @@ class html: def jsbutton(self, varname, text, onclick, style=''): if style: style = ' style="%s"' % style - self.write("<input type=button name=%s id=%s onclick=\"%s\" class=button%s value=\"%s\" />" % (varname, varname, onclick, style, text)) + self.write("<input type=button name=%s id=%s onclick=\"%s\" " + "class=button%s value=\"%s\" />" % (varname, varname, onclick, style, text)) def begin_context_buttons(self): self.write("<table class=contextlinks><tr><td>\n") diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index eb17ac5..7308274 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3174,8 +3174,12 @@ def interactive_progress(items, title, stats, finishvars, timewait, success_stat # They are just needed for the Abort/Finish links. Those must be converted # to POST. base_url = html.makeuri([], remove_prefix = "sel") + finish_url = make_link([("mode", "folder")] + finishvars) + term_url = make_link([("mode", "folder")] + termvars) + html.javascript(('progress_scheduler("%s", "%s", 50, %s, "%s", %s, "%s", "' + _("FINISHED.") + '");') % - (html.var('mode'), base_url, json_items, html.makeuri(finishvars), success_stats, html.makeuri(termvars),)) + (html.var('mode'), base_url, json_items, finish_url, + success_stats, term_url)) #.

12 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2011