Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

Check_MK Git: check_mk: agent_vsphere: removed <<<local>>>

by Mathias Kettner

Module: check_mk Branch: master Commit: 56280e80728ed2059c6aafc58f582749214773c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56280e80728ed2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 28 17:50:11 2013 +0100 agent_vsphere: removed <<<local>>> Reason: error messages from the agent cannot be sent via <<<local>>>, since new items here wont be visible. Correct way is to exit with non-zero status. --- agents/special/agent_vsphere | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 5630ed1..0b12890 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -42,9 +42,8 @@ try: from pysphere import VIServer, VIProperty, MORTypes from pysphere.resources import VimService_services as VI except: - print "<<<local>>>" - print "2 Agent_error - pysphere API not found. Please install and make a reinventory" - sys.exit(0) + sys.stderr.write("pysphere API not found. Please install and try again.\n") + sys.exit(1) host = VIServer() @@ -53,9 +52,8 @@ object_collection = {} try: host.connect(params['Hostname'], params['u'], params['s']) except: - print "<<<local>>>" - print "2 Agent_error - Cant connect to vSphere Server. May the wrong credentials. Please correct and make a reinventory" - sys.exit(0) + sys.stderr.write("Cannot connect to vSphere Server. May the wrong credentials. Please correct and make a reinventory.") + sys.exit(1) print "<<<check_mk>>>" print "Version: %s" % host.get_api_version() @@ -142,9 +140,5 @@ if "virtualmachine" in check: }) print "<<<<>>>>" -print "<<<local>>>" -for name, data in object_collection.items(): - print "0 %s-%s - INFO: Collecting data for %s" % (data[0], name, data[1]) - host.disconnect()

11 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: 0c4fddd03b411d88c0623bca95eb4083579d5322 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c4fddd03b411d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 28 17:50:14 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Andreas Boesl

Module: check_mk Branch: master Commit: e62fdc4aa25de2b13700ecf39639aac14a98929a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e62fdc4aa25de2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 28 15:11:09 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 4 months

Check_MK Git: check_mk: checks: if.include now supports assumed input/ output speed

by Andreas Boesl

Module: check_mk Branch: master Commit: 2b114fc36b350698e039929e547ea2c377a53a5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b114fc36b3506… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 28 15:09:07 2013 +0100 checks: if.include now supports assumed input/output speed --- ChangeLog | 1 + checks/if.include | 98 ++++++++++++++++++++---------- web/plugins/wato/check_parameters.py | 109 ++++++++++++++++++++++++++++++++- 3 files changed, 172 insertions(+), 36 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2b114fc36b…

11 years, 4 months

Check_MK Git: check_mk: checks: if.include now supports assumed input/ output speed

by Andreas Boesl

Module: check_mk Branch: master Commit: a5e3aab6d11a83f84e2deebc7ad0209517813021 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5e3aab6d11a83… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 28 15:09:07 2013 +0100 checks: if.include now supports assumed input/output speed --- ChangeLog | 1 + checks/if.include | 98 +++++++++++++++++++++++++++++++++++----------------- 2 files changed, 67 insertions(+), 32 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a5e3aab6d1…

11 years, 4 months

Check_MK Git: check_mk: Remove obsolete -lower option for vsphere agent

by Mathias Kettner

Module: check_mk Branch: master Commit: 7e99e3840027cb5ba0c5fc3bea349582777dda2b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e99e3840027cb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 28 09:13:41 2013 +0100 Remove obsolete -lower option for vsphere agent Is now done by piggyback option. --- agents/special/agent_vsphere | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 5630ed1..5cfff53 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -31,7 +31,6 @@ parser = argparse.ArgumentParser(description='Check_MK vSphere Agent') group = parser.add_argument_group() group.add_argument('-p', type=int, help="Port Number of vSphere Server") group.add_argument('-i', help="Check the hostsystem and or virtualmachine. Comma separated") -group.add_argument('-lower', action="store_true", help="Convert the name attributes of each MOR to lower case") parser.add_argument('-u', help="Username") parser.add_argument('-s', help="Secret") parser.add_argument('Hostname', help="Hostname") @@ -79,8 +78,6 @@ def output_mors(what, properties): # Get the name of this Host/VirtualMachine # May there a comments in the field, so split at whitespace name = data["name"].split()[0] - if params['lower']: - name = name.lower() object_collection[name] = (what, data['name'])

11 years, 4 months

Check_MK Git: check_mk: Fixed .f12 helper for main directory

by Mathias Kettner

Module: check_mk Branch: master Commit: 3c25f0b62f42f9576f2306b8611704bf511e42f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c25f0b62f42f9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 27 15:52:14 2013 +0100 Fixed .f12 helper for main directory This now calls all .f12 files from all subdirectories --- .f12 | 23 +++++++++-------------- 1 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.f12 b/.f12 index bd23f86..3871f7d 100644 --- a/.f12 +++ b/.f12 @@ -1,14 +1,9 @@ -#!/bin/bash -SITE=${SITE:-$(omd sites --bare | head -n 1)} -set -xe - -sed -e "s#@BINDIR@#/omd/sites/$SITE/bin#g" \ - -e "s#@VARDIR@#/omd/sites/$SITE/var/check_mk#g" \ - -e "s#@CHECK_ICMP@#/omd/sites/$SITE/lib/nagios/plugins/check_icmp#g" \ - -e "s#@PNPURL@#/$SITE/pnp4nagios/#g" \ - -e "s#@CGIURL@#/$SITE/nagios/cgi-bin#g" \ - < check_mk_templates.cfg > /tmp/check_mk_templates.cfg - -sudo mv /tmp/check_mk_templates.cfg /omd/sites/$SITE/etc/nagios/conf.d -sudo omd restart $SITE nagios -echo 'location.reload();' | nc -w 0 localhost 32000 +(cd web ; bash .f12) +(cd modules ; bash .f12) +(cd checks ; bash .f12) +(cd checkman ; bash .f12) +(cd mkeventd ; bash .f12) +(cd notifications ; bash .f12) +(cd agents ; bash .f12) +(cd livestatus ; bash .f12) +(cd pnp-templates ; bash .f12)

11 years, 4 months

Check_MK Git: check_mk: Back to view optionally with checkboxes cleared

by Mathias Kettner

Module: check_mk Branch: master Commit: 25dabeb656fee544579862b17ae56bc9f929dd11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25dabeb656fee5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 27 14:48:04 2013 +0100 Back to view optionally with checkboxes cleared --- ChangeLog | 4 +++- web/htdocs/views.py | 5 +++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea8d1d3..79beb2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,9 +6,11 @@ Multisite: * New availability view for arbitrary host/service collections * New option auth_by_http_header to use the value of a HTTP header - variable for authentication (Useful in reverse proxy environments) + variable for authentication (Useful in reverse proxy environments) * New permission that is needed for seeing views that other users have defined (per default this is contained in all roles) + * New path back to the view after command exection with all + checkboxes cleared Event Console: * New rule feature: automatically delete event after actions diff --git a/web/htdocs/views.py b/web/htdocs/views.py index db2602f..025eff0 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2199,6 +2199,11 @@ def do_actions(view, what, action_rows, backurl): if message: if html.output_format == "html": # sorry for this hack message += '<br><a href="%s">%s</a>' % (backurl, _('Back to view')) + if html.var("show_checkboxes") == "1": + html.del_var("selection") + weblib.selection_id() + backurl += "&selection=" + html.var("selection") + message += '<br><a href="%s">%s</a>' % (backurl, _('Back to view with checkboxes reset')) html.message(message) return True

11 years, 4 months

Check_MK Git: check_mk: resolve merge conflict

by Andreas Boesl

Module: check_mk Branch: master Commit: 00bb7f94561a2ca47fe947208babd765c58ca1a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00bb7f94561a2c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 27 14:28:48 2013 +0100 resolve merge conflict --- ChangeLog | 1 + livestatus/src/TableStateHistory.cc | 11 ++--------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d1eedb..ea8d1d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,7 @@ * FIX: check_mk_base: fixed rounding error in get_bytes_human_readable * FIX: check_mk: improved support of utf-8 characters in extra_service_conf * New configuration variable contactgroup_members + * FIX: livestatus: table statehist now able to check AuthUser permissions Checks & Agents: * FIX: smart - not trying to parse unhandled lines to prevent errors diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index c3c578f..8068286 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -615,21 +615,14 @@ void TableStateHistory::process(Query *query, HostServiceState *hs_state) bool TableStateHistory::isAuthorized(contact *ctc, void *data) { - LogEntry *entry = (LogEntry *)data; + HostServiceState *entry = (HostServiceState *)data; service *svc = entry->_service; host *hst = entry->_host; if (hst || svc) return is_authorized_for(ctc, hst, svc); - // suppress entries for messages that belong to - // hosts that do not exist anymore. - else if (entry->_logclass == LOGCLASS_ALERT - || entry->_logclass == LOGCLASS_NOTIFICATION - || entry->_logclass == LOGCLASS_PASSIVECHECK - || entry->_logclass == LOGCLASS_STATE) - return false; else - return true; + return false; } Column *TableStateHistory::column(const char *colname)

11 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Andreas Boesl

Module: check_mk Branch: master Commit: 44d8e21a62d4b402bac8c2eace7e0935a4133115 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44d8e21a62d4b4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 27 14:33:09 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

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 February 2013