Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64479 discussions

Check_MK Git: check_mk: alcatel_power: Added another Suply type. Thanks to Daniel Hertreiter @einhell.com

by Bastian Kuhn

Module: check_mk Branch: master Commit: 8c97b5811e89ded0eeb8199eddd1a13be5e2f05d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c97b5811e89de… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Oct 21 16:18:25 2013 +0200 alcatel_power: Added another Suply type. Thanks to Daniel Hertreiter @einhell.com --- checks/alcatel_power | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/alcatel_power b/checks/alcatel_power index 7284ca6..ed2e122 100644 --- a/checks/alcatel_power +++ b/checks/alcatel_power @@ -25,12 +25,12 @@ # Boston, MA 02110-1301 USA. def inventory_alcatel_power(info): - return [ (x[0], None) for x in info if x[2] in ['0x35000001', '0x45000004', '0x45000002']] + return [ (x[0], None) for x in info if x[2] in ['0x35000001', '0x45000004', '0x45000002', '0x45000009']] def check_alcatel_power(item, _no_params, info): for line in info: if item == line[0]: - if line[2] not in ['0x35000001', '0x45000004', '0x45000002']: + if line[2] not in ['0x35000001', '0x45000004', '0x45000002', '0x45000009']: return 3, "No Power supply connected to this port" if int(line[1]) != 1: return 2, "Supply in error condition (%s)" % line[1]

10 years, 11 months

Check_MK Git: check_mk: FIX: Hosttag filter now works in service related views

by Lars Michelsen

Module: check_mk Branch: master Commit: 39ce3ff0504d6a1d9ff326ee4c004bc82f431151 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39ce3ff0504d6a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 21 14:43:39 2013 +0200 FIX: Hosttag filter now works in service related views --- ChangeLog | 1 + web/plugins/views/filters.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e4ae473..150b719 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ * FIX: Fixed encoding problem in webservice column output * FIX: Fix output format python for several numeric columns * FIX: Fixed searching hosts by aliases/adresses + * FIX: Hosttag filter now works in service related views Notifications: * Blacklisting for services in the felixble notification system diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 662bc21..24b9fd7 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -771,7 +771,7 @@ class FilterHostTags(Filter): if op and val: operator = op != 'is' and '!~' or '~' - headers.append('Filter: custom_variables %s TAGS %s' % (operator, val)) + headers.append('Filter: host_custom_variables %s TAGS %s' % (operator, val)) if headers: return '\n'.join(headers) + '\n'

10 years, 11 months

Check_MK Git: check_mk: oracle_jobs: fixed issue with incorrect column count

by Andreas Boesl

Module: check_mk Branch: master Commit: 34fe71e04b3e37765db70a3ffafd5daec6c0d51e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34fe71e04b3e37… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Oct 21 14:37:40 2013 +0200 oracle_jobs: fixed issue with incorrect column count --- ChangeLog | 1 + checks/oracle_jobs | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 939a72a..39aa259 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ * FIX: apache_status: If ReqPerSec and BytesPerSec are not reported by the agent, no PNP graphs for them are drawn. (This is the case if ExtendedStatus set to Off in Apache config) + * FIX: oracle_jobs: fixed issues with incorrect column count in check output WATO: diff --git a/checks/oracle_jobs b/checks/oracle_jobs index 394e247..af88bc4 100644 --- a/checks/oracle_jobs +++ b/checks/oracle_jobs @@ -25,16 +25,16 @@ # Boston, MA 02110-1301 USA. # <<<oracle_jobs>>> -# IODBSZ1 SYS SM$CLEAN_AUTO_SPLIT_MERGE SCHEDULED 0 763 TRUE 24.04.13 00:00:00,600000 EUROPE/VIENNA - SUCCEEDED 0 -# IODBSZ1 SYS RSE$CLEAN_RECOVERABLE_SCRIPT SCHEDULED 0 763 TRUE 24.04.13 00:00:00,100000 EUROPE/VIENNA - SUCCEEDED 0 -# IODBSZ1 SYS BSLN_MAINTAIN_STATS_JOB SCHEDULED 0 110 TRUE 29.04.13 00:00:00,300000 +01:00 BSLN_MAINTAIN_STATS_SCHED SUCCEEDED 0 -# IODBSZ1 SYS DRA_REEVALUATE_OPEN_FAILURES SCHEDULED 0 97 TRUE 01.01.70 00:00:00,000000 +02:00 MAINTENANCE_WINDOW_GROUP SUCCEEDED 0 -# IODBSZ1 SYS ORA$AUTOTASK_CLEAN SCHEDULED 0 763 TRUE 24.04.13 03:00:00,900000 EUROPE/VIENNA DAILY_PURGE_SCHEDULE SUCCEEDED 0 -# IODBSZ1 SYS PURGE_LOG SCHEDULED 0 763 TRUE 24.04.13 03:00:00,800000 EUROPE/VIENNA DAILY_PURGE_SCHEDULE SUCCEEDED 0 -# IODBSZ1 ORACLE_OCM MGMT_CONFIG_JOB SCHEDULED 0 97 TRUE 01.01.70 00:00:00,000000 +02:00 MAINTENANCE_WINDOW_GROUP SUCCEEDED 1 -# IODBSZ1 ORACLE_OCM MGMT_STATS_CONFIG_JOB SCHEDULED 0 3 TRUE 01.05.13 01:01:01,000000 +01:00 - SUCCEEDED 1 -# IODBSZ1 EXFSYS RLM$SCHDNEGACTION SCHEDULED 0 18954 TRUE 23.04.13 14:51:57,000000 +02:00 - SUCCEEDED 0 -# IODBSZ1 EXFSYS RLM$EVTCLEANUP SCHEDULED 0 18202 TRUE 23.04.13 13:41:48,200000 +01:00 - SUCCEEDED 0 +# IODBSZ1 SYS SM$CLEAN_AUTO_SPLIT_MERGE SCHEDULED 0 763 TRUE 24.04.13 00:00:00,600000 EUROPE/VIENNA - SUCCEEDED +# IODBSZ1 SYS RSE$CLEAN_RECOVERABLE_SCRIPT SCHEDULED 0 763 TRUE 24.04.13 00:00:00,100000 EUROPE/VIENNA - SUCCEEDED +# IODBSZ1 SYS BSLN_MAINTAIN_STATS_JOB SCHEDULED 0 110 TRUE 29.04.13 00:00:00,300000 +01:00 BSLN_MAINTAIN_STATS_SCHED SUCCEEDED +# IODBSZ1 SYS DRA_REEVALUATE_OPEN_FAILURES SCHEDULED 0 97 TRUE 01.01.70 00:00:00,000000 +02:00 MAINTENANCE_WINDOW_GROUP SUCCEEDED +# IODBSZ1 SYS ORA$AUTOTASK_CLEAN SCHEDULED 0 763 TRUE 24.04.13 03:00:00,900000 EUROPE/VIENNA DAILY_PURGE_SCHEDULE SUCCEEDED +# IODBSZ1 SYS PURGE_LOG SCHEDULED 0 763 TRUE 24.04.13 03:00:00,800000 EUROPE/VIENNA DAILY_PURGE_SCHEDULE SUCCEEDED +# IODBSZ1 ORACLE_OCM MGMT_CONFIG_JOB SCHEDULED 0 97 TRUE 01.01.70 00:00:00,000000 +02:00 MAINTENANCE_WINDOW_GROUP SUCCEEDED +# IODBSZ1 ORACLE_OCM MGMT_STATS_CONFIG_JOB SCHEDULED 0 3 TRUE 01.05.13 01:01:01,000000 +01:00 - SUCCEEDED +# IODBSZ1 EXFSYS RLM$SCHDNEGACTION SCHEDULED 0 18954 TRUE 23.04.13 14:51:57,000000 +02:00 - SUCCEEDED +# IODBSZ1 EXFSYS RLM$EVTCLEANUP SCHEDULED 0 18202 TRUE 23.04.13 13:41:48,200000 +01:00 - SUCCEEDED def inventory_oracle_jobs(info): inventory = [] @@ -80,17 +80,17 @@ def check_oracle_jobs(item, params, info): perfdata.append(("duration", last_duration)) # 01.05.13 01:01:01,000000 +01:00 - next_run = " ".join(line[7:9]) + next_run = " ".join(line[7:-3]) if next_run.startswith("01.01.70 00:00:00"): - if line[-1] == "-": + if line[-2] == "-": next_run = "not scheduled (!)" state = max(state, 1) else: - next_run = line[10] + next_run = line[-2] output.append("Next Run: %s" % next_run) - txt = "Last Run Status: %s" % (line[11]) - if line[11] != "SUCCEEDED": + txt = "Last Run Status: %s" % (line[-1]) + if line[-1] != "SUCCEEDED": txt += " (!!)" state = max(state, 2) output.append(txt)

10 years, 11 months

Check_MK Git: check_mk: apache_status: If ReqPerSec and BytesPerSec are not reported by the agent, no PNP graphs for them are drawn. ( This is the case if ExtendedStatus set to Off in Apache config)

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 55fd5f484e26d7f82c780f34d3cd9f85248ed6a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55fd5f484e26d7… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Oct 21 13:42:52 2013 +0200 apache_status: If ReqPerSec and BytesPerSec are not reported by the agent, no PNP graphs for them are drawn. (This is the case if ExtendedStatus set to Off in Apache config) --- ChangeLog | 4 ++++ pnp-templates/check_mk-apache_status.php | 34 +++++++++++++++++------------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index aff52a1..939a72a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,10 @@ in order to make it consistent with the other temperature checks * FIX: hp_blade_blades: Fixed crash on inventory when receiving unexpected snmp data + * FIX: apache_status: If ReqPerSec and BytesPerSec are not reported by + the agent, no PNP graphs for them are drawn. + (This is the case if ExtendedStatus set to Off in Apache config) + WATO: * You can now have site-specific global settings when using diff --git a/pnp-templates/check_mk-apache_status.php b/pnp-templates/check_mk-apache_status.php index 47b81db..74ef885 100644 --- a/pnp-templates/check_mk-apache_status.php +++ b/pnp-templates/check_mk-apache_status.php @@ -76,27 +76,31 @@ foreach ($this->DS as $KEY=>$VAL) { # Requests per Second # $i++; -$def[$i] = ""; -$opt[$i] = " --title '$hostname: $servicedesc Requests/sec' "; -$color = '#000000'; -foreach ($this->DS as $KEY=>$VAL) { - if($VAL['NAME'] == 'ReqPerSec') { - $def[$i] .= rrd::def ("var".$KEY, $VAL['RRDFILE'], $VAL['DS'], "AVERAGE"); - $def[$i] .= rrd::line1 ("var".$KEY, $color, rrd::cut($VAL['NAME'],16), 'STACK' ); - $def[$i] .= rrd::gprint ("var".$KEY, array("LAST","MAX","AVERAGE"), "%6.1lf/s"); +if (isset($RRD["ReqPerSec"])) { + $def[$i] = ""; + $opt[$i] = " --title '$hostname: $servicedesc Requests/sec' "; + $color = '#000000'; + foreach ($this->DS as $KEY=>$VAL) { + if($VAL['NAME'] == 'ReqPerSec') { + $def[$i] .= rrd::def ("var".$KEY, $VAL['RRDFILE'], $VAL['DS'], "AVERAGE"); + $def[$i] .= rrd::line1 ("var".$KEY, $color, rrd::cut($VAL['NAME'],16), 'STACK' ); + $def[$i] .= rrd::gprint ("var".$KEY, array("LAST","MAX","AVERAGE"), "%6.1lf/s"); + } } } # # Bytes per Second # $i++; -$def[$i] = ""; -$opt[$i] = " --title '$hostname: $servicedesc Bytes per Second'"; -foreach ($this->DS as $KEY=>$VAL) { - if($VAL['NAME'] == 'BytesPerSec') { - $def[$i] .= rrd::def ("var".$KEY, $VAL['RRDFILE'], $VAL['DS'], "AVERAGE"); - $def[$i] .= rrd::line1 ("var".$KEY, rrd::color($KEY),rrd::cut($VAL['NAME'],16), 'STACK' ); - $def[$i] .= rrd::gprint ("var".$KEY, array("LAST","MAX","AVERAGE"), "%6.1lf %sb/s"); +if (isset($RRD["ReqPerSec"])) { + $def[$i] = ""; + $opt[$i] = " --title '$hostname: $servicedesc Bytes per Second'"; + foreach ($this->DS as $KEY=>$VAL) { + if($VAL['NAME'] == 'BytesPerSec') { + $def[$i] .= rrd::def ("var".$KEY, $VAL['RRDFILE'], $VAL['DS'], "AVERAGE"); + $def[$i] .= rrd::line1 ("var".$KEY, rrd::color($KEY),rrd::cut($VAL['NAME'],16), 'STACK' ); + $def[$i] .= rrd::gprint ("var".$KEY, array("LAST","MAX","AVERAGE"), "%6.1lf %sb/s"); + } } } ?>

10 years, 11 months

Check_MK Git: check_mk: checkmans for etherbox now include MessPC in title

by Andreas Boesl

Module: check_mk Branch: master Commit: 394b2f80fc489d1fb1d854d99758d06f16e362db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=394b2f80fc489d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Oct 21 13:09:42 2013 +0200 checkmans for etherbox now include MessPC in title --- checkman/etherbox.humidity | 2 +- checkman/etherbox.smoke | 2 +- checkman/etherbox.switch | 2 +- checkman/etherbox.temp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/checkman/etherbox.humidity b/checkman/etherbox.humidity index a394a7e..5a42f19 100644 --- a/checkman/etherbox.humidity +++ b/checkman/etherbox.humidity @@ -1,4 +1,4 @@ -title: Etherbox: Sensor Humidity +title: Etherbox / MessPC: Sensor Humidity catalog: hw/environment agents: snmp license: GPL diff --git a/checkman/etherbox.smoke b/checkman/etherbox.smoke index 9b8036b..9ba619b 100644 --- a/checkman/etherbox.smoke +++ b/checkman/etherbox.smoke @@ -1,4 +1,4 @@ -title: Etherbox: Sensor Smoke +title: Etherbox / MessPC: Sensor Smoke catalog: hw/environment agents: snmp license: GPL diff --git a/checkman/etherbox.switch b/checkman/etherbox.switch index 00d228f..ba1b811 100644 --- a/checkman/etherbox.switch +++ b/checkman/etherbox.switch @@ -1,4 +1,4 @@ -title: Etherbox: Sensor Switch Contact +title: Etherbox / MessPC: Sensor Switch Contact catalog: hw/environment agents: snmp license: GPL diff --git a/checkman/etherbox.temp b/checkman/etherbox.temp index 8504078..e3309b4 100644 --- a/checkman/etherbox.temp +++ b/checkman/etherbox.temp @@ -1,4 +1,4 @@ -title: Etherbox: Sensor Temperature +title: Etherbox / MessPC: Sensor Temperature catalog: hw/environment agents: snmp license: GPL

10 years, 11 months

Check_MK Git: check_mk: Wiki Sitebar Snapin: showing navigation and quicksearch. OMD only.

by Bastian Kuhn

Module: check_mk Branch: master Commit: da571fbb8ceaedadaf3a90b38174cd91ee5b55a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da571fbb8ceaed… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Oct 21 12:21:07 2013 +0200 Wiki Sitebar Snapin: showing navigation and quicksearch. OMD only. --- ChangeLog | 1 + doc/treasures/wiki_snapin.py | 170 ---------------------------- web/htdocs/images/button_wikisearch_hi.png | Bin 0 -> 1553 bytes web/htdocs/images/button_wikisearch_lo.png | Bin 0 -> 1473 bytes web/htdocs/images/wikisearch_field_bg.png | Bin 0 -> 444 bytes web/plugins/sidebar/shipped.py | 136 ++++++++++++++++++++++ 6 files changed, 137 insertions(+), 170 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=da571fbb8c…

10 years, 11 months

Check_MK Git: check_mk: small typo in WATO

by Götz Golla

Module: check_mk Branch: master Commit: 09592ac8cce582ccbaa40b42f373109cadef61a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09592ac8cce582… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Oct 21 10:43:24 2013 +0200 small typo in WATO --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index eef918f..0310cba 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11236,7 +11236,7 @@ def mode_edit_rule(phase, new = False): ( "comment", TextUnicode( title = _("Comment"), - help = _("An optional comment that helps you documenting the purpose of " + help = _("An optional comment that helps you document the purpose of " "this rule"), size = 80, attrencode = True,

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0960

by Mathias Kettner

Module: check_mk Branch: master Commit: 35b1a38bf3a78947bb37aec7d38f1c24d396c948 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35b1a38bf3a789… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 20 12:57:41 2013 -0400 Updated bug entries #0960 --- .bugs/960 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/960 b/.bugs/960 index ba6d14d..5e3e9bb 100644 --- a/.bugs/960 +++ b/.bugs/960 @@ -1,9 +1,9 @@ Title: Security issue if agent_vsphere exits with RC != 0 Component: checks -State: open +Class: bug +State: done Date: 2013-08-08 11:37:26 Targetversion: 1.2.3i5 -Class: bug mit dem vSphere Agent ist mir noch ein kleines Security Problem aufgefallen. Ab und zu läuft der Agent bei uns in einen Fehler, der zu einem Critical @@ -17,3 +17,7 @@ Lösung: evtl. kann der Prozess agent_vsphere das Argument im Speicher selbst durch **** ersetzen. Alternativ: Die Fehlermeldung Program... zeigt nur alles bis zum ersten Space. + +2013-10-20 12:57:40: changed state open -> done +Wurde schon dadurch gelöst, dass das Kommando nicht mehr ausgegeben +wird.

10 years, 11 months

Check_MK Git: check_mk: Fix button layout on Chrome

by Mathias Kettner

Module: check_mk Branch: master Commit: 2df135faf4a7f43db7ac7399a95bd16435cbeb22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2df135faf4a7f4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 20 17:39:03 2013 -0400 Fix button layout on Chrome --- web/htdocs/check_mk.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index a71ace0..3a760ad 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -158,7 +158,7 @@ label.image_button { top: 0px; background: transparent url('images/image_button_l.png') no-repeat; background-position: 0px -35px; - padding: 0 0 0 8px; + padding: 0 0 0 7.5px; height: 22px; margin-right: 5px; vertical-align: middle;

10 years, 11 months

Check_MK Git: check_mk: FIX: Avoid timed browser reload after execution of exections

by Mathias Kettner

Module: check_mk Branch: master Commit: 748548df5f6d7cebcb17619fde5d8192a860176c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=748548df5f6d7c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 20 12:54:36 2013 -0400 FIX: Avoid timed browser reload after execution of exections Still the wohl workflow is stull much too complicated in the implementation. There are still some subtle work flows where things do not work out correctly. --- .bugs/977 | 8 ++++++-- ChangeLog | 1 + web/htdocs/views.py | 6 ++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.bugs/977 b/.bugs/977 index 913fa05..1a1a0ff 100644 --- a/.bugs/977 +++ b/.bugs/977 @@ -1,9 +1,9 @@ Title: Invalid reload after command execution Component: multisite -State: open +Class: bug +State: done Date: 2013-06-23 11:21:05 Targetversion: 1.2.3i5 -Class: bug When you issue a command on hosts/services and confirm then you see a blue message with a link back to the view. In that situation there must be no @@ -14,3 +14,7 @@ An even better resolution would be to drop that intermediate page at all and instead print the result of the command in a kind of overlay window that goes away after a view seconds or when you hover over it. That saves one mouse click. + +2013-10-20 12:53:59: changed state open -> done +Disabled reload after execution of actions and also +during confirmation. diff --git a/ChangeLog b/ChangeLog index 2dc4a71..6093cb2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ * FIX: Fix output format python for several numeric columns * FIX: Fixed searching hosts by aliases/adresses * FIX: Remove duplicate entries from Quicksearch + * FIX: Avoid timed browser reload after execution of exections BI: * FIX: Fix exception when showing BI tree in reporting time warp diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 6420737..5958fc0 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1429,6 +1429,8 @@ def render_view(view, rows, datasource, group_painters, painters, show_checkboxes, layout, num_columns, show_filters, show_footer, hide_filters, browser_reload): + if html.transaction_valid() and html.do_actions(): + html.set_browser_reload(0) # Show heading (change between "preview" mode and full page mode) if show_heading: @@ -1528,8 +1530,8 @@ def render_view(view, rows, datasource, group_painters, painters, if show_buttons: update_context_links( # don't take display_options into account here ('c' is set during reload) - row_count > 0 and should_show_command_form('C', datasource) \ - and not html.do_actions(), + row_count > 0 and should_show_command_form('C', datasource), + # and not html.do_actions(), can_display_checkboxes )

10 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits