Checkmk git commits July 2013

checkmk-commits@lists.checkmk.com

4 participants
235 discussions

Check_MK Git: check_mk: fixed titles of manpages for better categorization, categories fsc and fujitsu grouped together under fujitsu

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 611006be173a5e28bc7b24342878b7c949ba165c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=611006be173a5e… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Jul 2 11:44:39 2013 +0200 fixed titles of manpages for better categorization, categories fsc and fujitsu grouped together under fujitsu --- checkman/carel_uniflair_cooling | 2 +- checkman/fsc_fans | 2 +- checkman/fsc_subsystems | 2 +- checkman/fsc_temp | 2 +- checkman/jolokia_metrics.bea_queue | 2 +- checkman/jolokia_metrics.bea_requests | 2 +- checkman/jolokia_metrics.bea_sess | 2 +- checkman/jolokia_metrics.requests | 2 +- checkman/mbg_lantime_refclock | 2 +- checkman/mbg_lantime_state | 2 +- checkman/raritan_emx | 2 +- modules/catalog.py | 1 - 12 files changed, 11 insertions(+), 12 deletions(-) diff --git a/checkman/carel_uniflair_cooling b/checkman/carel_uniflair_cooling index adccb60..709a71c 100644 --- a/checkman/carel_uniflair_cooling +++ b/checkman/carel_uniflair_cooling @@ -1,6 +1,6 @@ title: Carel Uniflair cooling devices agents: snmp -catalog: hw/other +catalog: hw/environment author: Andreas Boesl <ab(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/fsc_fans b/checkman/fsc_fans index ebfdca7..e835671 100644 --- a/checkman/fsc_fans +++ b/checkman/fsc_fans @@ -1,6 +1,6 @@ title: FANs of Fujitsu Siemens (FSC) Servers using ServerView Agent agents: snmp -catalog: hw/server/fsc +catalog: hw/server/fujitsu author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/fsc_subsystems b/checkman/fsc_subsystems index 68f29f0..b8040e0 100644 --- a/checkman/fsc_subsystems +++ b/checkman/fsc_subsystems @@ -1,6 +1,6 @@ title: Physical status of Fujitsu Siemens (FSC) Hardware parts agents: snmp -catalog: hw/server/fsc +catalog: hw/server/fujitsu author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/fsc_temp b/checkman/fsc_temp index 56eec3a..6d3f8de 100644 --- a/checkman/fsc_temp +++ b/checkman/fsc_temp @@ -1,6 +1,6 @@ title: Temperature status of Fujitsu Siemens (FSC) Hardware agents: snmp -catalog: hw/server/fsc +catalog: hw/server/fujitsu author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/jolokia_metrics.bea_queue b/checkman/jolokia_metrics.bea_queue index 9ba13c9..31d3710 100644 --- a/checkman/jolokia_metrics.bea_queue +++ b/checkman/jolokia_metrics.bea_queue @@ -1,4 +1,4 @@ -title: Length of queue in BEA +title: BEA Weblogic: Length of queue agents: linux catalog: app/java author: Mathias Kettner <mk(a)mathias-kettner.de> diff --git a/checkman/jolokia_metrics.bea_requests b/checkman/jolokia_metrics.bea_requests index d19a489..ae69a1e 100644 --- a/checkman/jolokia_metrics.bea_requests +++ b/checkman/jolokia_metrics.bea_requests @@ -1,4 +1,4 @@ -title: Requests to JVM sessions on BEA Weblogic +title: BEA Weblogic: Requests to JVM sessions agents: linux catalog: app/java author: Mathias Kettner <mk(a)mathias-kettner.de> diff --git a/checkman/jolokia_metrics.bea_sess b/checkman/jolokia_metrics.bea_sess index b74ee7d..6209d84 100644 --- a/checkman/jolokia_metrics.bea_sess +++ b/checkman/jolokia_metrics.bea_sess @@ -1,4 +1,4 @@ -title: Number of JVM sessions on BEA Weblogic +title: BEA Weblogic: Number of JVM sessions agents: linux catalog: app/java author: Mathias Kettner <mk(a)mathias-kettner.de> diff --git a/checkman/jolokia_metrics.requests b/checkman/jolokia_metrics.requests index 0d4317a..254a823 100644 --- a/checkman/jolokia_metrics.requests +++ b/checkman/jolokia_metrics.requests @@ -1,4 +1,4 @@ -title: Requests to JVM instances +title: BEA Weblogic: Requests to JVM instances agents: linux catalog: app/java author: Mathias Kettner <mk(a)mathias-kettner.de> diff --git a/checkman/mbg_lantime_refclock b/checkman/mbg_lantime_refclock index 5c81f4e..56b3ff0 100644 --- a/checkman/mbg_lantime_refclock +++ b/checkman/mbg_lantime_refclock @@ -1,4 +1,4 @@ -title: Reflock state of Meinberg LANTIME devices +title: Meinberg LANTIME devices: Reflock state agents: snmp catalog: hw/other author: Lars Michelsen <lm(a)mathias-kettner.de> diff --git a/checkman/mbg_lantime_state b/checkman/mbg_lantime_state index ac5d76e..b0132e4 100644 --- a/checkman/mbg_lantime_state +++ b/checkman/mbg_lantime_state @@ -1,4 +1,4 @@ -title: General state of Meinberg LANTIME devices +title: Meinberg LANTIME devices: General state agents: snmp catalog: hw/other author: Lars Michelsen <lm(a)mathias-kettner.de> diff --git a/checkman/raritan_emx b/checkman/raritan_emx index 9cd77ec..d2035f3 100644 --- a/checkman/raritan_emx +++ b/checkman/raritan_emx @@ -1,4 +1,4 @@ -title: Temperature, FAN and Door States for Raritan EMX devices +title: Raritan EMX devices: Temperature, FAN and Door States agents: snmp catalog: hw/other author: Bastian Kuhn <bk(a)mathias-kettner.de> diff --git a/modules/catalog.py b/modules/catalog.py index 62a0b35..aac4bb8 100644 --- a/modules/catalog.py +++ b/modules/catalog.py @@ -21,7 +21,6 @@ manpage_catalog_titles = { "printer" : "Printers", "server" : "Servers (management boards, blade enclosures)", "ibm" : "IBM", - "fsc" : "Fujitsu", "storagehw" : "Storage (filers, SAN, tape libs)", "brocade" : "Brocade", "fujitsu" : "Fujitsu",

11 years, 2 months

Check_MK Git: check_mk: Fixed output of two ups checks

by Lars Michelsen

Module: check_mk Branch: master Commit: aeda4b147eb356a4d2de6b2d419905ee4b5ebbca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aeda4b147eb356… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 2 11:39:20 2013 +0200 Fixed output of two ups checks --- checks/ups_out_load | 2 +- checks/ups_out_voltage | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/ups_out_load b/checks/ups_out_load index 9f08dcb..f7318e5 100644 --- a/checks/ups_out_load +++ b/checks/ups_out_load @@ -37,7 +37,7 @@ def check_ups_out_load(item, params, info): if line[0] == item: power = int(line[1]) perfdata = [ ( "out_load", power, warn, crit, 100 ) ] - infotext = " - current load: %d (warn/crit at %d/%d) " % \ + infotext = "current load: %d (warn/crit at %d/%d) " % \ (power, warn, crit) if power >= crit: diff --git a/checks/ups_out_voltage b/checks/ups_out_voltage index f8d579c..60694af 100644 --- a/checks/ups_out_voltage +++ b/checks/ups_out_voltage @@ -37,7 +37,7 @@ def check_ups_out_voltage(item, params, info): if line[0] == item: power = int(line[1]) perfdata = [ ( "out_voltage", power, warn, crit, 200, 240 ) ] - infotext = " - current in voltage: %dV (warn/crit at %dV/%dV)" % \ + infotext = "current in voltage: %dV (warn/crit at %dV/%dV)" % \ (power, warn, crit) if power <= crit:

11 years, 2 months

Check_MK Git: check_mk: missing catalog entry: fsc (Fujitsu)

by Andreas Boesl

Module: check_mk Branch: master Commit: 5918a3824db355adbe70e8b4394c1265fa5d5b71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5918a3824db355… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 1 17:32:16 2013 +0200 missing catalog entry: fsc (Fujitsu) --- modules/catalog.py | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/catalog.py b/modules/catalog.py index aac4bb8..62a0b35 100644 --- a/modules/catalog.py +++ b/modules/catalog.py @@ -21,6 +21,7 @@ manpage_catalog_titles = { "printer" : "Printers", "server" : "Servers (management boards, blade enclosures)", "ibm" : "IBM", + "fsc" : "Fujitsu", "storagehw" : "Storage (filers, SAN, tape libs)", "brocade" : "Brocade", "fujitsu" : "Fujitsu",

11 years, 2 months

Check_MK Git: check_mk: new cmk option --list-man: returns check catalogue as python dict

by Andreas Boesl

Module: check_mk Branch: master Commit: 223105cf10e09777d0deb3367fc473a9fdd67cb8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=223105cf10e097… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 1 17:36:33 2013 +0200 new cmk option --list-man: returns check catalogue as python dict --- modules/check_mk.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py old mode 100644 new mode 100755 index 3232fc4..fafb013 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3063,7 +3063,7 @@ no_inventory_possible = None # | | # +----------------------------------------------------------------------+ -opt_nowiki = False +opt_nowiki = False def get_tty_size(): import termios,struct,fcntl @@ -3105,6 +3105,10 @@ def read_manpage_catalog(): global g_manpage_catalog g_manpage_catalog = {} for checkname, path in all_manuals().items(): + # Skip .* file (.f12) + a, filename = os.path.split(path) + if filename.startswith("."): + continue parsed = parse_man_header(checkname, path) cat = parsed["catalog"] if not cat: @@ -5154,10 +5158,10 @@ if __name__ == "__main__": "no-cache", "update", "restart", "reload", "dump", "fake-dns=", "man", "nowiki", "config-check", "backup=", "restore=", "check-inventory=", "paths", "cleanup-autochecks", "checks=", - "cmc-file=", "browse-man" ] + "cmc-file=", "browse-man", "list-man" ] non_config_options = ['-L', '--list-checks', '-P', '--package', '-M', '--notify', - '--man', '-V', '--version' ,'-h', '--help', '--automation', ] + '--man', '-V', '--version' ,'-h', '--help', '--automation'] try: opts, args = getopt.getopt(sys.argv[1:], short_options, long_options) @@ -5289,6 +5293,10 @@ if __name__ == "__main__": else: list_all_manuals() done = True + elif o in [ '--list-man' ]: + read_manpage_catalog() + print pprint.pformat(g_manpage_catalog) + done = True elif o in [ '-m', '--browse-man' ]: manpage_browser() done = True

11 years, 2 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: f9da31fb6eda0bc3605c588a571d234dcd8e1f70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9da31fb6eda0b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 2 11:23:27 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 2 months

Check_MK Git: check_mk: CMC: remove binary 0 from check output

by Mathias Kettner

Module: check_mk Branch: master Commit: 26e647d46087da773a393b54e7ce24223b72ff70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26e647d46087da… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 2 11:22:41 2013 +0200 CMC: remove binary 0 from check output --- modules/check_mk_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 17b860d..465aae6 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1369,7 +1369,7 @@ def submit_check_result(host, servicedesc, result, sa): def submit_to_core(host, service, state, output): # Save data for sending it to the Check_MK Micro Core if monitoring_core == "cmc": - result = "\t%d\t%s\t%s\n" % (state, service, output) + result = "\t%d\t%s\t%s\n" % (state, service, output.replace("\0", "")) # remove binary 0, CMC does not like it if opt_keepalive: global total_check_output total_check_output += result

11 years, 2 months

Check_MK Git: check_mk: Better texts in view editor

by Mathias Kettner

Module: check_mk Branch: master Commit: a53e8cc69e859d778efd9eeb96286a24aa98cf2f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a53e8cc69e859d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 2 11:22:52 2013 +0200 Better texts in view editor --- web/htdocs/views.py | 2 +- web/plugins/icons/builtin.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 2b634c6..18393be 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -578,7 +578,7 @@ def page_edit_view(): html.checkbox("mustsearch", label=_('show data only on search') + "<br>") html.checkbox("hidebutton", label=_('do not show a context button to this view')) - forms.section(_("Browser reload")) + forms.section(_("Automatic page reload")) html.write(_("Reload page every ")) html.number_input("browser_reload", 0) html.write(_(" seconds")) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index d4f20cc..72492a9 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -94,7 +94,7 @@ def paint_reschedule(what, row, tags, custom_vars): servicedesc = '' wait_svc = '' icon = 'icon_reload' - txt = _('Reschedule an immediate check of this %s') % _(what) + txt = _('Reschedule an immediate check') if what == 'service': servicedesc = row['service_description'].replace("\\","\\\\")

11 years, 2 months

Check_MK Git: check_mk: Fixed some help texts

by Mathias Kettner

Module: check_mk Branch: master Commit: c29a70f8b2d4461978a852c4e4931b0bea9b7aa1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c29a70f8b2d446… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 1 18:02:22 2013 +0200 Fixed some help texts --- web/plugins/wato/check_mk_configuration.py | 4 ++-- web/plugins/wato/datasource_programs.py | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 01adfc2..f6b1537 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -235,8 +235,8 @@ register_configvar(group, register_configvar(group, "multisite_draw_ruleicon", - Checkbox(title = _("Draw WATO rule editor icon for services"), - label = _("Draw rule editor icon"), + Checkbox(title = _("Show icon for WATO parameter editor"), + label = _("Show WATO icon"), help = _("When enabled a rule editor icon is displayed for each " "service in the multisite views. It is only displayed if the user " "does have the permission to edit rules"), diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index 7137321..7f7f9db 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -47,7 +47,9 @@ register_rule(group, "special_agents:vsphere", Dictionary( title = _("Check state of VMWare ESX via vSphere"), - help = _("Configure the options whicht needed to connect to the vSphere api"), + help = _("This rule selects the vSphere agent instead of the normal Check_MK Agent " + "and allows monitoring of VMWare ESX via the vSphere API. You can configure " + "your connection settings here."), elements = [ ( "user", TextAscii(

11 years, 2 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: 27a6f5a1cfc64b4d7ac1fe95ec045bf3aaa35c64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27a6f5a1cfc64b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 1 17:01:33 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 2 months

Check_MK Git: check_mk: Updated bug entries #0947

by Mathias Kettner

Module: check_mk Branch: master Commit: dc62c8d0fbae6a97745a1a81ba87cbee8a2bbc54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc62c8d0fbae6a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 1 17:01:31 2013 +0200 Updated bug entries #0947 --- .bugs/947 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/947 b/.bugs/947 new file mode 100644 index 0000000..efd1f9e --- /dev/null +++ b/.bugs/947 @@ -0,0 +1,10 @@ +Title: localization not working share/ +Component: multisite +State: open +Date: 2013-07-01 17:00:52 +Targetversion: 1.2.3 +Class: bug + +In OMD localization seems only to workin local/share, not directlyh +in share. The languages are seen by Multisite, but not used by +gettext.

11 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2013