Checkmk git commits March 2015

checkmk-commits@lists.checkmk.com

7 participants
320 discussions

Check_MK Git: check_mk: postgres checks: fixed naming of default_levels variables

by Andreas Boesl

Module: check_mk Branch: master Commit: 6793649c325d820237913e37d5a79e516c4cf832 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6793649c325d82… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 12 15:52:14 2015 +0100 postgres checks: fixed naming of default_levels variables --- checks/postgres_bloat | 4 ++-- checks/postgres_connections | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/postgres_bloat b/checks/postgres_bloat index a529adb..e8a50c0 100644 --- a/checks/postgres_bloat +++ b/checks/postgres_bloat @@ -35,7 +35,7 @@ # postgres;pg_catalog;pg_amproc;291;3;2;1.5;1;8192;8192;pg_amproc_fam_proc_index;291;4;2;2.0;2;16384;16384;24576 # postgres;pg_catalog;pg_amop;403;4;3;1.3;1;8192;8192;pg_amop_opr_fam_index;403;4;2;2.0;2;16384;16384;24576 -factory_settings["postgres_bloat"] = { +factory_settings["postgres_bloat_default_levels"] = { 'table_bloat_perc': (180.0, 200.0), # WARN at 180%, CRIT at 200% 'index_bloat_perc': (180.0, 200.0) } @@ -129,7 +129,7 @@ check_info['postgres_bloat'] = { "inventory_function" : inventory_postgres_bloat, "service_description" : "PostgreSQL Bloat %s", "group" : "db_bloat", - "default_levels_variable" : "postgres_bloat", + "default_levels_variable" : "postgres_bloat_default_levels", "has_perfdata" : True, "includes" : [ "postgres.include" ] } diff --git a/checks/postgres_connections b/checks/postgres_connections index 1488f1a..bc2e6c5 100644 --- a/checks/postgres_connections +++ b/checks/postgres_connections @@ -35,7 +35,7 @@ # template0;0;100 # template1;0;100 -factory_settings["postgres_connections"] = { +factory_settings["postgres_connections_default_levels"] = { 'levels_perc': (80.0, 90.0), # Levels at 80%/90% of maximum } @@ -87,7 +87,7 @@ check_info['postgres_connections'] = { "service_description" : "PostgreSQL Connections %s", "group" : "db_connections", "has_perfdata" : True, - "default_levels_variable" : "postgres_connections", + "default_levels_variable" : "postgres_connections_default_levels", "includes" : [ "postgres.include" ] }

9 years, 6 months

Check_MK Git: check_mk: Improved BI help text

by Lars Michelsen

Module: check_mk Branch: master Commit: 537909fdfd133a54c9c05a4bd9bc1547afd55d15 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=537909fdfd133a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 12 11:17:47 2015 +0100 Improved BI help text --- web/htdocs/wato.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 30aa8e5..c6365df 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16924,15 +16924,15 @@ def declare_bi_valuespecs(aggregation_rules): ), ( 'parent', _("The found hosts' parents") ), ], - help = _('When refering to the found hosts childs, this means you ' - 'configure the conditions (tags and host name) below to match ' - 'a host, but you will get one node created for each child host. The' + help = _('When selecting The found hosts\' childs, the conditions ' + '(tags and host name) are used to match a host, but you will get one ' + 'node created for each child of the matched host. The ' 'place holder <tt>$1$</tt> contains the name of the found child. ' - 'When refering to the found hosts parents, you use the conditions ' - 'to match a host, but you will get one node created for each of the ' - 'parent hosts of this found host. The conditions are used to match ' - 'the child hosts. The place holder <tt>$1$</tt> contains the name ' - 'of the child host and <tt>$2$</tt> the name of the parent host.'), + 'When selecting The found hosts\' parents, the conditions ' + '(tags and host name) are used to match a host, but you will get one ' + 'node created for each of the parent hosts of the matched host. ' + 'The place holder <tt>$1$</tt> contains the name of the child host ' + 'and <tt>$2$</tt> the name of the parent host.'), ), HostTagCondition( title = _("Host Tags:")

9 years, 6 months

Check_MK Git: check_mk: fixed werk description

by Andreas Boesl

Module: check_mk Branch: master Commit: 3c1198fcdc32d9ae46c7260bdfddddeffefdf9b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c1198fcdc32d9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 12 11:01:02 2015 +0100 fixed werk description --- .werks/2057 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.werks/2057 b/.werks/2057 index 37eb278..5e4c9c4 100644 --- a/.werks/2057 +++ b/.werks/2057 @@ -10,14 +10,14 @@ With this update the agent plugin mk_postgres now reports additional information, which will be processed by these new checks: <table> -<tr><th>Check</th><th>Description</th><th>Limit configurable</th></tr> -<tr><td>postgres_bloat</td><td>Shows size of table and index bloat</td><td>X</td></tr> -<tr><td>postgres_conn_time</td><td>Time to connect to database</td><td></td></tr> +<tr><th>Check</th><th>Description</th><th>Limits configurable</th></tr> +<tr><td>postgres_bloat</td><td>Size of wasted table- and indexspace</td><td>X</td></tr> <tr><td>postgres_connections</td><td>Number of connections to database</td><td>X</td></tr> -<tr><td>postgres_locks</td><td>Number of ShareAccess and ExclusiveLocks</td><td>X</td></tr> -<tr><td>postgres_query_duration</td><td>Displays longest running query</td><td></td></tr> +<tr><td>postgres_locks</td><td>Number of SharedAccess and ExclusiveLocks</td><td>X</td></tr> <tr><td>postgres_stats</td><td>Time of last VACUUM and ANALYZE</td><td>X</td></tr> +<tr><td>postgres_query_duration</td><td>Displays longest running query</td><td></td></tr> <tr><td>postgres_version</td><td>Displays PostgreSQL version</td><td></td></tr> +<tr><td>postgres_conn_time</td><td>Time to connect to database</td><td></td></tr> </table> Note: You have to update the agent plugin mk_postgres on the target host.

9 years, 6 months

Check_MK Git: check_mk: #2057 New checks for postgreSQL monitoring

by Andreas Boesl

Module: check_mk Branch: master Commit: d4a065c5e3de5e69df8de5198187c199d2e49512 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4a065c5e3de5e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 12 10:57:18 2015 +0100 #2057 New checks for postgreSQL monitoring --- .werks/2057 | 23 +++ ChangeLog | 1 + agents/plugins/mk_postgres | 257 ++++++++++++++++++++++++++++++++++ checkman/postgres_bloat | 34 +++++ checkman/postgres_conn_time | 17 +++ checkman/postgres_connections | 23 +++ checkman/postgres_locks | 24 ++++ checkman/postgres_query_duration | 14 ++ checkman/postgres_stats | 21 +++ checks/postgres.include | 48 +++++++ checks/postgres_bloat | 136 ++++++++++++++++++ checks/postgres_conn_time | 41 ++++++ checks/postgres_connections | 93 ++++++++++++ checks/postgres_locks | 83 +++++++++++ checks/postgres_query_duration | 72 ++++++++++ checks/postgres_stats | 106 ++++++++++++++ checks/postgres_version | 40 ++++++ web/plugins/metrics/check_mk.py | 119 ++++++++++++++++ web/plugins/wato/check_parameters.py | 136 +++++++++++++++++- 19 files changed, 1287 insertions(+), 1 deletion(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d4a065c5e3…

9 years, 6 months

Check_MK Git: check_mk: Removed wrong and ineffective checkgroup cpu_utilization from juniper_cpu check

by Lars Michelsen

Module: check_mk Branch: master Commit: 72d39992b3c661e9bb094f782669a55ba0b670f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72d39992b3c661… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 12 10:34:10 2015 +0100 Removed wrong and ineffective checkgroup cpu_utilization from juniper_cpu check --- checks/juniper_cpu | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/juniper_cpu b/checks/juniper_cpu index 2665e6a..23649bb 100644 --- a/checks/juniper_cpu +++ b/checks/juniper_cpu @@ -68,7 +68,6 @@ def check_juniper_cpu(item, params, info): check_info["juniper_cpu"] = { "check_function" : check_juniper_cpu, "inventory_function" : inventory_juniper_cpu, - "group" : "cpu_utilization", "service_description" : "CPU utilization %s", "has_perfdata" : True, "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1.2"),

9 years, 6 months

Check_MK Git: check_mk: metrics: fixed legend text alignment

by Andreas Boesl

Module: check_mk Branch: master Commit: 8a6cf0381178b3d2f8b81f7b87d98a8cbd0307b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a6cf0381178b3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 12 10:34:08 2015 +0100 metrics: fixed legend text alignment --- web/htdocs/metrics.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 233acc3..b3e9b71 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -786,6 +786,7 @@ def render_pnp_graph(graph, translated_metrics): for what, what_title in [ ("AVERAGE", _("average")), ("MAX", _("max")), ("LAST", _("last")) ]: rrdgraph_commands += "GPRINT:%%s_LEGSCALED:%%s:\"%%%%8.%dlf%%s %%s\" " % legend_precision % \ (metric_name, what, legend_symbol, what_title) + rrdgraph_commands += "COMMENT:\"\\n\" " # Now compute the arguments for the command line of rrdgraph

9 years, 6 months

Check_MK Git: check_mk: prevent mixup between host/ service rulesets when check uses wrong ruleset

by Lars Michelsen

Module: check_mk Branch: master Commit: dc19eaf70e7464520863c539c03680f95e8efc03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc19eaf70e7464… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 12 10:33:14 2015 +0100 prevent mixup between host/service rulesets when check uses wrong ruleset --- modules/check_mk.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 9a6b0b9..37b434c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1567,6 +1567,7 @@ def service_deps(hostname, servicedesc): return deps +g_converted_host_rulesets_cache = {} def convert_host_ruleset(ruleset): new_rules = [] if len(ruleset) == 1 and ruleset[0] == "": @@ -1591,13 +1592,13 @@ def convert_host_ruleset(ruleset): # will avoid recomputation later new_rules.append((item, all_matching_hosts(tags, hostlist))) - g_converted_rulesets_cache[id(ruleset)] = new_rules + g_converted_host_rulesets_cache[id(ruleset)] = new_rules return new_rules def host_extra_conf(hostname, ruleset): try: - ruleset = g_converted_rulesets_cache[id(ruleset)] + ruleset = g_converted_host_rulesets_cache[id(ruleset)] except KeyError: ruleset = convert_host_ruleset(ruleset) @@ -1740,8 +1741,8 @@ def all_matching_hosts(tags, hostlist): g_hostlist_match_cache[cache_id] = matching return matching -g_converted_rulesets_cache = {} +g_converted_service_rulesets_cache = {} def convert_service_ruleset(ruleset): new_rules = [] for rule in ruleset: @@ -1766,7 +1767,7 @@ def convert_service_ruleset(ruleset): # And now preprocess the configured patterns in the servlist new_rules.append((item, hosts, convert_pattern_list(servlist))) - g_converted_rulesets_cache[id(ruleset)] = new_rules + g_converted_service_rulesets_cache[id(ruleset)] = new_rules return new_rules @@ -1774,7 +1775,7 @@ def convert_service_ruleset(ruleset): g_extraconf_servicelist_cache = {} def service_extra_conf(hostname, service, ruleset): try: - ruleset = g_converted_rulesets_cache[id(ruleset)] + ruleset = g_converted_service_rulesets_cache[id(ruleset)] except KeyError: ruleset = convert_service_ruleset(ruleset) @@ -1820,14 +1821,14 @@ def convert_boolean_service_ruleset(ruleset): hosts = all_matching_hosts(tags, hostlist) new_rules.append((negate, hosts, convert_pattern_list(servlist))) - g_converted_rulesets_cache[id(ruleset)] = new_rules + g_converted_service_rulesets_cache[id(ruleset)] = new_rules return new_rules # Compute outcome of a service rule set that just say yes/no def in_boolean_serviceconf_list(hostname, service_description, ruleset): try: - ruleset = g_converted_rulesets_cache[id(ruleset)] + ruleset = g_converted_service_rulesets_cache[id(ruleset)] except KeyError: ruleset = convert_boolean_service_ruleset(ruleset) @@ -5077,7 +5078,8 @@ def copy_globals(): "g_check_table_cache", "g_singlehost_checks", "g_nodesof_cache", "g_compiled_regexes", "vars_before_config", "g_initial_times", "g_keepalive_initial_memusage", - "g_dns_cache", "g_ip_lookup_cache", "g_converted_rulesets_cache", + "g_dns_cache", "g_ip_lookup_cache", + "g_converted_host_rulesets_cache", "g_converted_service_rulesets_cache", "g_extraconf_servicelist_cache", "g_hostlist_match_cache", "g_hosttag_taglist_cache" ] \ and type(value).__name__ not in [ "function", "module", "SRE_Pattern" ]:

9 years, 6 months

Check_MK Git: check_mk: metrics: introduced new legend scale m (Milli)

by Andreas Boesl

Module: check_mk Branch: master Commit: 480eb3958ba884bc3f5b209f2eca750b57745e72 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=480eb3958ba884… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 12 10:02:13 2015 +0100 metrics: introduced new legend scale m (Milli) --- web/htdocs/metrics.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index fd38d055..233acc3 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -63,6 +63,7 @@ GB = MB * 1024 TB = GB * 1024 PB = TB * 1024 +m = 0.001 K = 1000 M = K * 1000 G = M * 1000 @@ -70,6 +71,7 @@ T = G * 1000 P = T * 1000 scale_symbols = { + m : "m", 1 : "", KB : "k", MB : "M",

9 years, 6 months

Check_MK Git: check_mk: mk_jolokia: Added more debug output

by Bastian Kuhn

Module: check_mk Branch: master Commit: 3fa6025b88bc608335be3e85d105328753c69de9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fa6025b88bc60… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Mar 12 08:45:26 2015 +0100 mk_jolokia: Added more debug output --- agents/plugins/mk_jolokia | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index 40553ad..05d2e47 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -30,10 +30,14 @@ opt_debug = '--debug' in sys.argv def fetch_var(server, port, path, suburi, itemspec): url = "http://%s:%d/%s/%s" % (server, port, suburi, path) + if opt_debug: + sys.stderr.write("DEBUG: Fetching: %s\n" % url) try: json = urllib2.urlopen(url).read() + if opt_debug: + sys.stderr.write("DEBUG: Result: %s\n\n" % json) except Exception, e: - sys.stderr.write("ERROR: %s" % e) + sys.stderr.write("ERROR: %s\n" % e) return []

9 years, 6 months

Check_MK Git: check_mk: Fixed typo in specfile

by Bastian Kuhn

Module: check_mk Branch: master Commit: 9e3215d62a19cb016289478bef90404fc0d41e2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e3215d62a19cb… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Mar 12 08:32:33 2015 +0100 Fixed typo in specfile --- agents/check-mk-agent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/check-mk-agent.spec b/agents/check-mk-agent.spec index 1f0a810..7b950b3 100644 --- a/agents/check-mk-agent.spec +++ b/agents/check-mk-agent.spec @@ -83,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT %define reload_xinetd_systemd if [ ! -x /etc/init.d/xinetd ] && [ -x /usr/sbin/xinetd ]; then if pgrep -x xinetd >/dev/null ; then echo "Reloading xinetd..." ; service xinetd reload ; else echo "Starting xinetd..." ; service init.d/xinetd start ; fi ; fi -%define activate_xinetd if [ -x /usr/bin/xinted ] && [ which chkconfig >/dev/null 2>&1 ] ; then echo "Activating startscript of xinetd" ; chkconfig xinetd on ; fi +%define activate_xinetd if [ -x /usr/bin/xinetd ] && [ which chkconfig >/dev/null 2>&1 ] ; then echo "Activating startscript of xinetd" ; chkconfig xinetd on ; fi %define cleanup_rpmnew if [ -f /etc/xinetd.d/check_mk.rpmnew ] ; then rm /etc/xinetd.d/check_mk.rpmnew ; fi %define systemd_enable if [ -x /usr/bin/systemctl ] && [ ! -x /usr/sbin/xinetd ] ; then echo "Enable Check_MK_Agent in systemd..." ; systemctl enable check_mk.socket ; systemctl restart sockets.target ; fi

9 years, 6 months

← Newer
1
...
18
19
20
21
22
23
24
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2015