Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 96c2e18da573407811917aa55cc5ac6c9fa39539 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96c2e18da57340… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 15:19:48 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: FIX: PNP template if if/if64: reset LC_ALL, avoids syntax error

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: df4ae23e54cb86c2a19d49b46a80b8270c4a2c87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df4ae23e54cb86… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 15:18:38 2011 +0100 FIX: PNP template if if/if64: reset LC_ALL, avoids syntax error --- ChangeLog | 1 + pnp-templates/check_mk-if.php | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a66111..c34d862 100644 --- a/ChangeLog +++ b/ChangeLog @@ -119,6 +119,7 @@ * FIX: bluecoat_diskcpu: repair scan function * FIX: mem.vmalloc: fix default levels (32 and 64 was swapped) * FIX: smart: make levels work (thanks to Bernhard Schmidt) + * FIX: PNP template if if/if64: reset LC_ALL, avoids syntax error 1.1.12p4: Multisite: diff --git a/pnp-templates/check_mk-if.php b/pnp-templates/check_mk-if.php index fdab1f9..1012b70 100644 --- a/pnp-templates/check_mk-if.php +++ b/pnp-templates/check_mk-if.php @@ -23,6 +23,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +setlocale(LC_ALL, 'C'); + # Performance data from check: # in=6864.39071505;0.01;0.1;0;125000000.0 # inucast=48.496962273;0.01;0.1;;

12 years, 9 months

Check_MK Git: check_mk: Fixed the migration script from 1.1.12 wato to 1.1. 13 wato

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 461df8a12f552bea900487eac210d263287a4cd6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=461df8a12f552b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 16 15:08:15 2011 +0100 Fixed the migration script from 1.1.12 wato to 1.1.13 wato --- doc/helpers/wato-migrate-1.2.0.sh | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/doc/helpers/wato-migrate-1.2.0.sh b/doc/helpers/wato-migrate-1.2.0.sh index 305d5d9..4578a80 100755 --- a/doc/helpers/wato-migrate-1.2.0.sh +++ b/doc/helpers/wato-migrate-1.2.0.sh @@ -46,12 +46,20 @@ then echo "-----------------------------------------" fi +echo find * -name "*.mk.wato" | while read line do - thedir=${line%/*} - thefile=${line##*/} - echo "Moving $thefile in $thedir..." - newdir="wato/${thefile%.mk.wato}" + tmpline=/$line + thedir=${tmpline%/*} + thedir=${thedir:1} + thefile=${tmpline##*/} + if [ -z "$thedir" ]; then + newdir=wato/${thefile//.mk.wato} + else + newdir=wato/$thedir/${thefile//.mk.wato} + fi + + echo "Migrating hostlist $thefile to folder $newdir..." mkdir -vp "$newdir" mv -v "$line" "$newdir/.wato" mv -v "${line%.wato}" "$newdir/hosts.mk" @@ -60,10 +68,11 @@ done # No move also the empty WATO directories find * -name ".wato" | while read line do - if [ ${line:0:7} = ./wato/ ] ; then continue ; fi + # Skip files in wato/ directory (already migrated) + if [ ${line:0:5} = wato/ ] ; then continue ; fi thedir=${line%/*} thefile=${line##*/} - echo "Moving empty directory $thedir..." + echo "Moving empty directory $thedir to wato/$thedir..." mkdir -p "wato/$thedir" mv -v $line "wato/$thedir" rmdir -v "$thedir" 2>/dev/null || true

12 years, 9 months

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7bd40dda75d6e2a74a7a852d6b9e53db95ce2945 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7bd40dda75d6e2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 16 15:11:48 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: WATO: fix editing of icon images (none-case)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 91dedde6faf4d06996a69790755b0109f4de3861 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91dedde6faf4d0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 15:06:07 2011 +0100 WATO: fix editing of icon images (none-case) --- web/plugins/wato/check_mk_configuration.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 076e3d8..f5504eb 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -582,7 +582,7 @@ class MonitoringIcon(ValueSpec): def render_input(self, varprefix, value): num_columns = 12 html.write("<table>") - for nr, filename in enumerate([None] + self.available_icons()): + for nr, filename in enumerate([""] + self.available_icons()): if nr % num_columns == 0: html.write("<tr>") html.write("<td>") @@ -605,13 +605,13 @@ class MonitoringIcon(ValueSpec): def from_html_vars(self, varprefix): nr = int(html.var(varprefix)) if nr == 0: - return None + return "" else: return self.available_icons()[nr-1] def validate_datatype(self, value, varprefix): - if value != None and type(value) != str: - raise MKUserError(varprefix, _("The type is %s, but should be None or str") % + if type(value) != str: + raise MKUserError(varprefix, _("The type is %s, but should be str") % type(value)) def validate_value(self, value, varprefix):

12 years, 9 months

Check_MK Git: check_mk: FIX: add notifications to host/service event view

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7afc637cb8195f7091f6560110a3f965615683fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7afc637cb8195f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 14:56:46 2011 +0100 FIX: add notifications to host/service event view --- ChangeLog | 1 + web/plugins/views/datasources.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c99cd86..0a66111 100644 --- a/ChangeLog +++ b/ChangeLog @@ -108,6 +108,7 @@ * FIX: single dataset layout honors column header settings * FIX: quote '#' in PNP links (when # is contained in services) * FIX: quote '#' in PNP image links also + * FIX: add notifications to host/service event view Checks & Agents: * FIX: lnx_if: assume interfaces as up if ethtool is missing or diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py index 7ff4547..fc6eae2 100644 --- a/web/plugins/views/datasources.py +++ b/web/plugins/views/datasources.py @@ -139,7 +139,7 @@ multisite_datasources["log"] = { multisite_datasources["log_events"] = { "title" : _("Host and Service Events"), "table" : "log", - "add_headers" : "Filter: class = 1\n", + "add_headers" : "Filter: class = 1\nFilter: class = 3\nOr: 2\n", "infos" : [ "log", "host", "service" ], "keys" : [], "idkeys" : [ "log_lineno" ], @@ -148,7 +148,7 @@ multisite_datasources["log_events"] = { multisite_datasources["log_host_events"] = { "title" : _("Host Events"), "table" : "log", - "add_headers" : "Filter: class = 1\nFilter: service_description = \n", + "add_headers" : "Filter: class = 1\nFilter: class = 3\nOr: 2\nFilter: service_description = \n", "infos" : [ "log", "host" ], "keys" : [], "idkeys" : [ "log_lineno" ],

12 years, 9 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4aabb3546f7031efb22c23c35f7e4efee78b53a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4aabb3546f7031… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 14:57:09 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: Add: Wato: Check Definitions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 38677002c7c3652d96d24a4b2ca7762c63d9cf48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38677002c7c365… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Dec 16 14:55:12 2011 +0100 Add: Wato: Check Definitions --- web/plugins/wato/check_parameters.py | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index cfc9ee3..69fe98d 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -110,8 +110,8 @@ checkgroups.append(( Tuple( title = _("Maximum bandwidth in relation to the total traffic"), elements = [ - Float(title = _("Warning at"), unit = _("percent")), - Float(title = _("Critical at"), unit = _("percent")), + Percentage(title = _("Warning at"), unit = _("percent")), + Percentage(title = _("Critical at"), unit = _("percent")), ] ), Tuple( @@ -136,8 +136,8 @@ checkgroups.append(( Tuple ( title = _("CRC errors rate"), elements = [ - Float( title = _("Warning at"), unit = _("percent")), - Float( title = _("Critical at"), unit = _("percent")), + Percentage( title = _("Warning at"), unit = _("percent")), + Percentage( title = _("Critical at"), unit = _("percent")), ] ) ), @@ -145,8 +145,8 @@ checkgroups.append(( Tuple ( title = _("Enc-Out frames rate"), elements = [ - Float( title = _("Warning at"), unit = _("percent")), - Float( title = _("Critical at"), unit = _("percent")), + Percentage( title = _("Warning at"), unit = _("percent")), + Percentage( title = _("Critical at"), unit = _("percent")), ] ) ), @@ -154,8 +154,8 @@ checkgroups.append(( Tuple ( title = _("No-TxCredits errors"), elements = [ - Float( title = _("Warning at"), unit = _("percent")), - Float( title = _("Critical at"), unit = _("percent")), + Percentage( title = _("Warning at"), unit = _("percent")), + Percentage( title = _("Critical at"), unit = _("percent")), ] ) ), @@ -163,8 +163,8 @@ checkgroups.append(( Tuple ( title = _("C3 discards"), elements = [ - Float( title = _("Warning at"), unit = _("percent")), - Float( title = _("Critical at"), unit = _("percent")), + Percentage( title = _("Warning at"), unit = _("percent")), + Percentage( title = _("Critical at"), unit = _("percent")), ] ) ),

12 years, 9 months

Check_MK Git: check_mk: Add: Wato: Check Definitions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 91bc4ef1c0e55653696d241c6d409b3e3d0f3ef5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91bc4ef1c0e556… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Dec 16 14:56:09 2011 +0100 Add: Wato: Check Definitions --- checks/systemtime | 1 + checks/tcp_conn_stats | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/checks/systemtime b/checks/systemtime index 3fb538b..76e0fa8 100644 --- a/checks/systemtime +++ b/checks/systemtime @@ -49,3 +49,4 @@ def check_systemtime(item, params, info): return (0, "OK - " + infotext, perfdata) check_info["systemtime"] = ( check_systemtime, "System Time", 1, inventory_systemtime ) +checkgroup_of['systemtime'] = "systemtime" diff --git a/checks/tcp_conn_stats b/checks/tcp_conn_stats index 64d013e..1d75cb0 100644 --- a/checks/tcp_conn_stats +++ b/checks/tcp_conn_stats @@ -73,3 +73,4 @@ def check_tcp_conn_stats(item, params, info): return (worst_state, "%s - %s" % (nagios_state_names[worst_state], ", ".join(info)), perfdata) check_info['tcp_conn_stats'] = (check_tcp_conn_stats, "TCP Connections", 1, inventory_tcp_conn_stats) +checkgroup_of['tcp_conn_stats'] = "tcp_conn_stats"

12 years, 9 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7d1f6febf8386621b5bb73962f420a8a8e547b6c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d1f6febf83866… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Dec 16 14:56:16 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits