Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64454 discussions

Check_MK Git: check_mk: Livestatus: fix some compile problems on lenny

by Mathias Kettner

Module: check_mk Branch: master Commit: b327fcd4f845010bca9b89b300f5e7f2de499eeb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b327fcd4f84501… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 1 12:51:54 2013 +0200 Livestatus: fix some compile problems on lenny --- livestatus/src/LogCache.cc | 1 + livestatus/src/PerfdataAggregator.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 7d6cca4..9f5b025 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -28,6 +28,7 @@ #include <unistd.h> #include <stddef.h> #include <stdarg.h> +#include <stdlib.h> #include "nagios.h" #include "logger.h" diff --git a/livestatus/src/PerfdataAggregator.cc b/livestatus/src/PerfdataAggregator.cc index 45a2576..3f1fd40 100644 --- a/livestatus/src/PerfdataAggregator.cc +++ b/livestatus/src/PerfdataAggregator.cc @@ -24,6 +24,7 @@ #include <string.h> #include <math.h> +#include <stdlib.h> #include "strutil.h" #include "logger.h"

11 years, 4 months

Check_MK Git: check_mk: Removed old obsolete Makefile

by Mathias Kettner

Module: check_mk Branch: master Commit: bbc61b648789e6e224cc5c0a24c22f0e7b71b637 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbc61b648789e6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 1 09:18:41 2013 +0200 Removed old obsolete Makefile --- livestatus/src/Makefile.manual | 79 ---------------------------------------- 1 file changed, 79 deletions(-) diff --git a/livestatus/src/Makefile.manual b/livestatus/src/Makefile.manual deleted file mode 100644 index fb35c57..0000000 --- a/livestatus/src/Makefile.manual +++ /dev/null @@ -1,79 +0,0 @@ -# +------------------------------------------------------------------+ -# | _ _ _ | -# | __| |_ ___ __| |__ _ __ | |__ | -# | / _| ' \/ -_) _| / / | ' \| / / | -# | \__|_||_\___\__|_\_\_|_|_|_|_\_\ | -# | |___| | -# | _ _ __ _ _ _ ____ | -# | / | / | / \| |__ ___| |_ __ _/ |__ | | -# | | |_| || () | '_ \/ -_) _/ _` | | / / | -# | |_(_)_(_)__/|_.__/\___|\__\__,_|_|/_/ | -# | check_mk 1.1.0beta17 | -# | | -# | Copyright Mathias Kettner 2009 mk(a)mathias-kettner.de | -# +------------------------------------------------------------------+ -# -# This file is part of check_mk 1.1.0beta17. -# The official homepage is at http://mathias-kettner.de/check_mk. -# -# check_mk is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation in version 2. check_mk is distributed -# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- -# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU General Public License for more de- -# ails. You should have received a copy of the GNU General Public -# License along with GNU Make; see the file COPYING. If not, write -# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, -# Boston, MA 02110-1301 USA. - -CFLAGS = -O2 -fPIC -I.. - -#ifdef DEBUG - CXXFLAGS += -Wall -pedantic -Werror -#endif -CXXFLAGS = $(CFLAGS) - - -OBJECTS = TableServices.o TableHosts.o Table.o Query.o StringColumn.o \ - OffsetStringColumn.o Store.o store.o logger.o strutil.o \ - Filter.o IntColumn.o OffsetIntColumn.o \ - AndingFilter.o StringColumnFilter.o IntColumnFilter.o \ - Column.o OffsetTimeperiodColumn.o ContactsColumn.o \ - HostContactsColumn.o ListColumnFilter.o ListColumn.o \ - ServiceContactsColumn.o TableContacts.o Downtime.o \ - TableDowntimes.o DowntimesColumn.o CustomVarsColumn.o \ - CustomVarsFilter.o TableHostgroups.o HostlistColumn.o \ - HostlistColumnFilter.o ServicelistColumn.o ServicelistColumnFilter.o \ - TableServicegroups.o OringFilter.o ServicelistStateColumn.o \ - HostlistStateColumn.o global_counters.o GlobalCountersColumn.o \ - TableStatus.o TableColumns.o ColumnsColumn.o TableCommands.o \ - ServicegroupsColumn.o HostgroupsColumn.o EmptyColumn.o \ - OutputBuffer.o DoubleColumn.o DoubleColumnFilter.o \ - OffsetDoubleColumn.o ClientQueue.o InputBuffer.o \ - HostSpecialIntColumn.o - - - -.PHONY: all clean deps tags - -all: livestatus.o unixcat - -livestatus.o: $(OBJECTS) livestatus.c - gcc $(CFLAGS) -shared -o $@ livestatus.c $(OBJECTS) -lpthread -lstdc++ - -unixcat: unixcat.c - $(CC) -lpthread -o $@ $^ - -clean: - rm -f *.o tags .deps *~ unixcat - -tags: - ctags $^ - -deps: - gcc -MM *.cc > .deps - --include .deps - -

11 years, 4 months

Check_MK Git: check_mk: WATO: cleanup texts in activation page

by Mathias Kettner

Module: check_mk Branch: master Commit: 28dfe3d90d48f640c13255014052b2c19b1ad1ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28dfe3d90d48f6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 1 08:57:07 2013 +0200 WATO: cleanup texts in activation page --- web/htdocs/wato.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7305818..2949354 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3492,6 +3492,7 @@ def mode_changelog(phase): sitestatus_do_async_replication = True else: # phase: regular page rendering + changes_activated = False if is_distributed(): # Distributed WATO: Show replication state of each site @@ -3671,6 +3672,7 @@ def mode_changelog(phase): # Single site setup if cmc_rush_ahead_activation(): html.message(_("All changes have been activated.")) + changes_activated = True else: # Is rendered on the page after hitting the "activate" button # Renders the html to show the progress and starts the sync via javascript @@ -3688,7 +3690,8 @@ def mode_changelog(phase): pending = parse_audit_log("pending") if len(pending) == 0: - html.write("<div class=info>" + _("There are no pending changes.") + "</div>") + if not changes_activated: + html.write("<div class=info>" + _("There are no pending changes.") + "</div>") else: html.write('<div id=pending_changes>') render_audit_log(pending, "pending", hilite_others=True)

11 years, 4 months

Check_MK Git: check_mk: Livestatus: code cleanup, prepare for CMC

by Mathias Kettner

Module: check_mk Branch: master Commit: cefd4d2eb6caf765648adc2a865c037a960d9ba9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cefd4d2eb6caf7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 31 18:56:11 2013 +0200 Livestatus: code cleanup, prepare for CMC --- livestatus/src/AttributelistColumn.cc | 2 + livestatus/src/Column.cc | 15 +- livestatus/src/Column.h | 3 + livestatus/src/ContactgroupsColumn.cc | 37 +-- livestatus/src/ContactgroupsColumn.h | 2 - livestatus/src/CustomVarsFilter.cc | 4 +- livestatus/src/DoublePointerColumn.h | 40 +++ livestatus/src/HostlistColumnFilter.cc | 2 +- livestatus/src/InputBuffer.cc | 1 + livestatus/src/LogCache.cc | 348 +++++++++++--------- livestatus/src/LogCache.h | 4 +- livestatus/src/LogEntry.cc | 566 ++++++++++++++++---------------- livestatus/src/LogEntry.h | 31 +- livestatus/src/Logfile.cc | 4 + livestatus/src/Logfile.h | 2 +- livestatus/src/OffsetStringColumn.h | 1 + livestatus/src/OutputBuffer.cc | 3 +- livestatus/src/PerfdataAggregator.cc | 2 + livestatus/src/Query.cc | 5 +- livestatus/src/Store.cc | 26 +- livestatus/src/Store.h | 2 +- livestatus/src/Table.cc | 2 + livestatus/src/TableCommands.h | 2 +- livestatus/src/TableContactgroups.h | 2 +- livestatus/src/TableContacts.h | 2 +- livestatus/src/TableHostgroups.h | 3 +- livestatus/src/TableHosts.cc | 1 + livestatus/src/TableLog.cc | 3 +- livestatus/src/TableServicegroups.h | 1 - livestatus/src/TableServices.h | 2 +- livestatus/src/TableStateHistory.cc | 17 +- livestatus/src/TableStatus.cc | 2 - livestatus/src/global_counters.h | 3 +- livestatus/src/logger.h | 14 + livestatus/src/module.c | 28 +- livestatus/src/nagios.h | 4 + livestatus/src/pnp4nagios.cc | 2 +- livestatus/src/pnp4nagios.h | 2 +- livestatus/src/strutil.c | 3 + livestatus/src/waittriggers.c | 7 + livestatus/src/waittriggers.h | 10 + 41 files changed, 676 insertions(+), 534 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cefd4d2eb6…

11 years, 4 months

Check_MK Git: check_mk: WATO: prepare for CMC

by Mathias Kettner

Module: check_mk Branch: master Commit: f762533507bc26d610dbe6c2b56b90dffa713635 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f762533507bc26… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 31 19:00:36 2013 +0200 WATO: prepare for CMC --- web/htdocs/bi.py | 3 ++ web/htdocs/js/wato.js | 19 ++++++----- web/htdocs/sidebar.py | 2 ++ web/htdocs/valuespec.py | 2 +- web/htdocs/wato.py | 68 ++++++++++++++++++++++++++++++---------- web/plugins/sidebar/shipped.py | 6 ++++ web/plugins/views/painters.py | 15 ++++----- 7 files changed, 81 insertions(+), 34 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f762533507…

11 years, 4 months

Check_MK Git: check_mk: Core: preparation for CMC, make code more generic

by Mathias Kettner

Module: check_mk Branch: master Commit: 26882bbae09ad9c5533b5642737943f88d3da905 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26882bbae09ad9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 31 18:58:56 2013 +0200 Core: preparation for CMC, make code more generic --- modules/.f12 | 3 +- modules/automation.py | 49 +++++++----- modules/check_mk.py | 142 ++++++++++++++++++++++++----------- modules/check_mk_base.py | 158 +++++++++++++++++++++++++++++++++++++-- modules/notify.py | 187 +++++++++++++++++++++++++++------------------- modules/prediction.py | 7 -- 6 files changed, 395 insertions(+), 151 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=26882bbae0…

11 years, 4 months

Check_MK Git: check_mk: Column Perf-O-Meter is now sortable: it sorts after the *first* value

by Mathias Kettner

Module: check_mk Branch: master Commit: 78dae107f01766c3243e3eb482b58b9a92e4f980 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78dae107f01766… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 31 14:42:55 2013 +0200 Column Perf-O-Meter is now sortable: it sorts after the *first* value --- ChangeLog | 3 +++ web/plugins/views/perfometer.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fa16093..c6f7623 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,9 @@ * User accounts can now be locked after a specified amount of auth failures (lock_on_logon_failures can be set to a number of tries) * FIX: better error message in case of exception in SNMP handling + * Column Perf-O-Meter is now sortable: it sorts after the *first* + performance value. This might not always be the one you like, but + its far better than nothing. Checks & Agents: * lnx_if: Fixed crash on missing "Address" field diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index 9744671..4e17c58 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -191,7 +191,8 @@ multisite_painters["perfometer"] = { "short" : _("Perf-O-Meter"), "columns" : [ "service_perf_data", "service_state", "service_check_command", "service_pnpgraph_present", "service_plugin_output" ], - "paint" : paint_perfometer + "paint" : paint_perfometer, + "sorter" : "svc_perf_val01", } load_web_plugins("perfometer", globals())

11 years, 4 months

Check_MK Git: check_mk: View "service globally": make sortable by user

by Mathias Kettner

Module: check_mk Branch: master Commit: d210fb1b338edda2a658a8b0eb53ee598ccb7f42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d210fb1b338edd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 31 14:38:06 2013 +0200 View "service globally": make sortable by user --- web/plugins/views/builtin.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index c9bac8d..f79b098 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1123,10 +1123,10 @@ multisite_builtin_views.update({ 'linktitle': _('Details'), 'title': _('Service')}, 'servicedesc': {'browser_reload': 30, - 'column_headers': 'off', + 'column_headers': 'pergroup', 'datasource': 'services', 'description': 'All Services with\r\na certain description\r\n', - 'group_painters': [('service_description', 'servicedesc')], + 'group_painters': [], 'hard_filters': [], 'hard_filtervars': [('host', ''), ('st0', 'on'), @@ -1151,6 +1151,7 @@ multisite_builtin_views.update({ 'show_filters': ['hostregex', 'svcstate', 'opthostgroup'], 'sorters': [('site', False), ('site_host', False)], + 'user_sortable' : 'on', 'linktitle': _('Service globally'), 'title': _('All Services with this description:')}, 'servicedescpnp': {'browser_reload': 90,

11 years, 4 months

Check_MK Git: check_mk: agent_vsphere: Fix missing sensors section when querying vcenter

by Mathias Kettner

Module: check_mk Branch: master Commit: 3dcc2a8b9e5e1d9b42e30aeaf11fbe987e247cf1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3dcc2a8b9e5e1d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 31 14:16:00 2013 +0200 agent_vsphere: Fix missing sensors section when querying vcenter --- ChangeLog | 2 ++ agents/special/agent_vsphere | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b539b9..fa16093 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ * lnx_if: Fixed crash on missing "Address" field * viprinet_router: Now able to set required target state via rule * windows_agent: Now available as 64 bit version + * agent_vsphere: fix problem where sensors were missing when + you queried multiple host systems via vCenter Notifications: * Flexible Notification can now filter service levels diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 24f4e29..22644d5 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -520,12 +520,12 @@ def output_mors(what, properties, direct=False): obj_type = MORTypes.VirtualMachine count = 0 - sections = [] mors = host._retrieve_properties_traversal(property_names=properties.keys(), obj_type=obj_type) if not mors: return for mor in mors: + sections = [] count += 1 # Parse result into a dictionary. Key is the property name, # value is the value (some custom Python classes) @@ -564,12 +564,12 @@ def output_mors(what, properties, direct=False): obj_name = opt_hostname object_collection.append([what, obj_name, running_on, power_state]) + # pprint.pprint(sections) + for section_name, section_lines in sections: + print '<<<%s>>>' % section_name + for line in section_lines: + print line - # pprint.pprint(sections) - for section_name, section_lines in sections: - print '<<<%s>>>' % section_name - for line in section_lines: - print line def output_datastores(): property_names = [

11 years, 4 months

Check_MK Git: check_mk: Fixed exception when logging in as unknown user

by Mathias Kettner

Module: check_mk Branch: master Commit: 6224e8a5f4d502446163c8ab86ed0854fed696ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6224e8a5f4d502… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 30 09:56:30 2013 +0200 Fixed exception when logging in as unknown user --- ChangeLog | 1 + web/htdocs/userdb.py | 17 +++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a6dc55..147c735 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ * lnx_if: Fixed crash on missing "Address" field * viprinet_router: Now able to set required target state via rule * windows_agent: Now available as 64 bit version + Notifications: * Flexible Notification can now filter service levels diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 2c4f043..5063b53 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -126,16 +126,17 @@ def on_succeeded_login(username): def on_failed_login(username): users = load_users() - if "num_failed" in users[username]: - users[username]["num_failed"] += 1 - else: - users[username]["num_failed"] = 1 + if username in users: + if "num_failed" in users[username]: + users[username]["num_failed"] += 1 + else: + users[username]["num_failed"] = 1 - if config.lock_on_logon_failures: - if users[username]["num_failed"] >= config.lock_on_logon_failures: - users[username]["locked"] = True + if config.lock_on_logon_failures: + if users[username]["num_failed"] >= config.lock_on_logon_failures: + users[username]["locked"] = True - save_users(users) + save_users(users) root_dir = defaults.check_mk_configdir + "/wato/" multisite_dir = defaults.default_config_dir + "/multisite.d/wato/"

11 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits