Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 1cfbd9f1efbd06c4d1ad48a67eea06556bdae6da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cfbd9f1efbd06… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 12 10:23:24 2015 +0100 Use C++-style casts. --- livestatus/src/HostFileColumn.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/livestatus/src/HostFileColumn.cc b/livestatus/src/HostFileColumn.cc index fedbff9..6a08c1e 100644 --- a/livestatus/src/HostFileColumn.cc +++ b/livestatus/src/HostFileColumn.cc @@ -57,11 +57,9 @@ char *HostFileColumn::getBlob(void *data, int *size) if (!data) return 0; #ifdef CMC - Host *hst = (Host *)data; - const char *host_name = hst->_name; + const char *host_name = static_cast<Host *>(data)->_name; #else - host *hst = (host *)data; - const char *host_name = hst->name; + const char *host_name = static_cast<host *>(data)->name; #endif char path[4096];

8 years, 10 months

#2775 FIX omd_status: handle case where status information is incomplete due to missing cmk version

by Mathias Kettner

Module: check_mk Branch: master Commit: 6baf2cbabda4c046d459bb8f4fffc20389ecb623 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6baf2cbabda4c0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 12 10:18:19 2015 +0100 #2775 FIX omd_status: handle case where status information is incomplete due to missing cmk version --- .werks/2775 | 9 +++++++++ ChangeLog | 1 + checks/omd_status | 8 ++++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/2775 b/.werks/2775 new file mode 100644 index 0000000..b56d5ca --- /dev/null +++ b/.werks/2775 @@ -0,0 +1,9 @@ +Title: omd_status: handle case where status information is incomplete due to missing cmk version +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1447319883 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 9f2be85..1634c35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ * 2761 FIX: check_http: Fixed handling of multiple strings given as "Strings to expect in server response" * 2786 FIX: agent_netapp: now able to monitor more than 20 instances of a given type, e.g. volumes or interfaces... * 2765 FIX: heartbeat_crm: Fixed issue detecting outdated data with daylight saving time + * 2775 FIX: omd_status: handle case where status information is incomplete due to missing cmk version Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/omd_status b/checks/omd_status index 4e47cf9..f2764ec 100644 --- a/checks/omd_status +++ b/checks/omd_status @@ -80,9 +80,10 @@ def check_omd_status(item, _no_params, info): stopped_nodes = 0 for node, services in parsed_site.iteritems(): - if services["overall"] == "stopped": + if "overall" in services and services["overall"] == "stopped": stopped_nodes += 1 + # stopped sites are only CRIT when all are stopped if stopped_nodes == number_nodes: state = 2 @@ -94,7 +95,10 @@ def check_omd_status(item, _no_params, info): node_text = " on %s" % node else: node_text = "" - if services["overall"] == "running": + if "overall" not in services: + infotext = "defective installation%s" % node_text + yield 2, infotext + elif services["overall"] == "running": infotext = "running%s" % node_text # running sites are always OK yield 0, infotext

8 years, 10 months

New option --delete-rrds for RRD module of CMC

by Mathias Kettner

Module: check_mk Branch: master Commit: 746f0e21c9b90981ec89ab0ebac6bc119ef053f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=746f0e21c9b909… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 11 15:36:34 2015 +0100 New option --delete-rrds for RRD module of CMC --- checks/cpu_load.include | 2 ++ modules/check_mk.py | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/checks/cpu_load.include b/checks/cpu_load.include index b4698e6..4b6db43 100644 --- a/checks/cpu_load.include +++ b/checks/cpu_load.include @@ -41,6 +41,8 @@ def check_cpu_load_generic(params, load, num_cpus=1): perfdata = [ ('load' + str(z), l, warn, crit, 0, num_cpus ) for (z,l) in [ (1,load[0]), (5,load[1]), (15, load[2]) ] ] + perfdata.append( ('sepp', 17) ) + state, text, perf = check_levels(load[2], 'load15', params, factor = num_cpus) perfdata += perf infotext = "15 min load %.2f" % load[2] diff --git a/modules/check_mk.py b/modules/check_mk.py index 6ed4325..fbc7274 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4880,6 +4880,7 @@ load_checks() opt_nowiki = False opt_split_rrds = False +opt_delete_rrds = False # Do option parsing and execute main function - short_options = 'ASHVLCURODMmd:Ic:nhvpXPNBilf' @@ -4889,7 +4890,7 @@ long_options = [ "help", "version", "verbose", "compile", "debug", "interactive" "snmptranslate", "bake-agents", "force", "show-snmp-stats", "usewalk", "scan-parents", "procs=", "automation=", "handle-alerts", "notify", "snmpget=", "profile", "keepalive", "keepalive-fd=", "create-rrd", - "convert-rrds", "compress-history", "split-rrds", + "convert-rrds", "compress-history", "split-rrds", "delete-rrds", "no-cache", "update", "restart", "reload", "dump", "fake-dns=", "man", "nowiki", "config-check", "backup=", "restore=", "check-inventory=", "check-discovery=", "discover-marked-hosts", "paths", @@ -4970,6 +4971,8 @@ for o,a in opts: opt_cmc_relfilename = a elif o == "--split-rrds": opt_split_rrds = True + elif o == "--delete-rrds": + opt_delete_rrds = True elif o == "--hw-changes": opt_inv_hw_changes = int(a) elif o == "--sw-changes":

8 years, 10 months

#2787 netapp_api_snapvaults: Clustermode supported, netapp_api_disks: fixed invalid total disk space

by Andreas Boesl

Module: check_mk Branch: master Commit: 4cd460b9b59ea9e223d18638f545718a273cf449 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4cd460b9b59ea9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 11 17:20:26 2015 +0100 #2787 netapp_api_snapvaults: Clustermode supported, netapp_api_disks: fixed invalid total disk space netapp_api_snapvaults: You can now monitor the Snapmirror Lag Time with NetApp Clustermode. netapp_api_disks: Total disk space was incorrectly reported by the agent. --- .werks/2787 | 12 +++++++++++ ChangeLog | 1 + agents/special/agent_netapp | 21 +++++++++++++++++-- checkman/netapp_api_snapvault | 2 +- checks/netapp_api_disk | 2 +- checks/netapp_api_snapvault | 37 +++++++++++++++++++++++----------- web/plugins/wato/check_parameters.py | 26 +++++++++++++++++++++--- 7 files changed, 82 insertions(+), 19 deletions(-) diff --git a/.werks/2787 b/.werks/2787 new file mode 100644 index 0000000..49e3a83 --- /dev/null +++ b/.werks/2787 @@ -0,0 +1,12 @@ +Title: netapp_api_snapvaults: Clustermode supported, netapp_api_disks: fixed invalid total disk space +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1447258603 +Class: feature + +netapp_api_snapvaults: You can now monitor the Snapmirror Lag Time with NetApp Clustermode. + +netapp_api_disks: Total disk space was incorrectly reported by the agent. + diff --git a/ChangeLog b/ChangeLog index 513fd37..9f2be85 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ * 2708 sap, sap_state: new sap_state service reports connection problems to sap hosts... * 2740 local: better warning output in case of invalid agent output * 2763 apache_status: Can now be configured to use the protocols default port... + * 2787 netapp_api_snapvaults: Clustermode supported, netapp_api_disks: fixed invalid total disk space... * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 65b3ba1..7753ef7 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -482,8 +482,8 @@ if netapp_mode == "clustermode": "disk-raid-info.position", "disk-raid-info.used-blocks", "disk-raid-info.physical-blocks" ], - config_scale = { "disk-raid-info.physical-blocks": 512, - "disk-raid-info.used-blocks": 512 }, + config_scale = { "disk-raid-info.physical-blocks": 4096, + "disk-raid-info.used-blocks": 4096 }, config_rename = { "disk-inventory-info.shelf-bay": "bay", "disk-inventory-info.serial-number": "serial-number", "disk-inventory-info.vendor": "vendor-id", @@ -549,6 +549,23 @@ if netapp_mode == "clustermode": for key, values in child_dict.items(): print format_dict(values, prefix = "node %s" % key, as_line = True) + # Snapmirror / Snapvault lag-time + snapmirror_info = query("snapmirror-get-iter") + if snapmirror_info: + print "<<<netapp_api_snapvault:sep(9)>>>" + print format_config(snapmirror_info, "snapvault", "destination-volume", + config_report = [ "destination-volume-node", + "policy", + "mirror-state", + "source-vserver", + "lag-time", + "relationship-status" ], + config_rename = { "destination-volume-node": "destination-system", + "mirror-state": "state", + "source-vserver": "source-system", + "relationship-status": "status" } + ) + # Environmental sensors environment_info = query_nodes("storage-shelf-environment-list-info", only_first = True) if environment_info: diff --git a/checkman/netapp_api_snapvault b/checkman/netapp_api_snapvault index ba7fc9b..60ebb7c 100644 --- a/checkman/netapp_api_snapvault +++ b/checkman/netapp_api_snapvault @@ -1,4 +1,4 @@ -title: NetApp Filer 7Mode: Snapvault lag-time +title: NetApp Filer: Snapvault/Snapmirror lag-time agents: netapp catalog: hw/storagehw/netapp license: GPL diff --git a/checks/netapp_api_disk b/checks/netapp_api_disk index ff047ae..e2e148b 100644 --- a/checks/netapp_api_disk +++ b/checks/netapp_api_disk @@ -73,7 +73,7 @@ def check_netapp_api_disk_summary(_no_item, params, info): disk['state'] = "spare" else: disk['state'] = 'ok' - disk['capacity'] = int(disk['used-space']) + disk['capacity'] = int(disk['physical-space']) disks_converted.append(disk) diff --git a/checks/netapp_api_snapvault b/checks/netapp_api_snapvault index cd60ef7..556ed9c 100644 --- a/checks/netapp_api_snapvault +++ b/checks/netapp_api_snapvault @@ -31,26 +31,39 @@ # snapvault /vol/ipb_vol0/ status idle state snapvaulted lag-time 97011 source-system 172.31.12.15 def inventory_netapp_api_snapvault(parsed): - for volume in parsed: - yield volume, {} + for snapvault in parsed: + yield snapvault, {} def check_netapp_api_snapvault(item, params, parsed): - volume = parsed.get(item) - if not volume: + snapvault = parsed.get(item) + if not snapvault: return info = [] - for what in [ "source-system", "status", "state", "destination-system" ]: - yield 0, "%s: %s" % (what.title(), volume[what]) + for what in [ "source-system", "destination-system", "policy", "status", "state" ]: + if what in snapvault: + yield 0, "%s: %s" % (what.title(), snapvault[what]) - lag_time = int(volume["lag-time"]) + lag_time = int(snapvault["lag-time"]) state = 0 if params: - warn, crit = params["lag_time"] - if lag_time >= crit: - state = 2 - elif lag_time >= warn: - state = 1 + levels = None + snapvault_policy = snapvault.get("policy") + + for name, policy_levels in params.get("policy_lag_time", []): + if name == snapvault_policy: + levels = policy_levels + break + + if not levels and params.get("lag_time"): + levels = params["lag_time"] + + if levels: + warn, crit = levels + if lag_time >= crit: + state = 2 + elif lag_time >= warn: + state = 1 yield state, "Lag-Time: %s" % get_age_human_readable(lag_time) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 6e938b5..1a31f67 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6589,20 +6589,40 @@ register_check_parameters( register_check_parameters( subgroup_storage, "snapvault", - _("NetApp Snapvaults"), + _("NetApp Snapvaults / Snapmirror Lag Time"), Dictionary( elements = [ ("lag_time", Tuple( - title = _("Maximum age of lag-time"), + title = _("Default levels"), elements = [ Age(title = _("Warning at")), Age(title = _("Critical at")), ], ), ), + ("policy_lag_time", + ListOf( + Tuple( + orientation = "horizontal", + elements = [ + TextAscii(title = _("Policy name")), + Tuple( + title = _("Maximum age"), + elements = [ + Age(title = _("Warning at")), + Age(title = _("Critical at")), + ], + ), + ] + ), + title = _('Policy specific levels (Clustermode only)'), + help = _("Here you can specify levels for different policies which overrule the levels " + "from the Default levels parameter. This setting only works in NetApp Clustermode setups."), + allow_empty = False, + ) + ) ], - optional_keys = False ), TextAscii( title = _("Source Path"),

8 years, 10 months

Fixed bug in last change

by Lars Michelsen

Module: check_mk Branch: master Commit: 2d4e4c9313644d6f770c28d509c8ccca3b912b5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d4e4c9313644d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 11 15:10:09 2015 +0100 Fixed bug in last change --- checks/apache_status | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/apache_status b/checks/apache_status index 28b37bd..196ecd2 100644 --- a/checks/apache_status +++ b/checks/apache_status @@ -78,7 +78,7 @@ def apache_status_parse(info): continue # Skip unexpected lines label = (' '.join(line[2:-1])).rstrip(':') value = _apache_status_fields[label][1](line[-1]) - if port == None: + if port == "None": item = address else: item = '%s:%s' % (address, port)

8 years, 10 months

#2765 FIX heartbeat_crm: Fixed issue detecting outdated data with daylight saving time

by Lars Michelsen

Module: check_mk Branch: master Commit: c9a7fc045bc59ea294f522d44ce585ade35e4344 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9a7fc045bc59e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 11 14:40:28 2015 +0100 #2765 FIX heartbeat_crm: Fixed issue detecting outdated data with daylight saving time --- .werks/2765 | 10 ++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2765 b/.werks/2765 new file mode 100644 index 0000000..a559d94 --- /dev/null +++ b/.werks/2765 @@ -0,0 +1,10 @@ +Title: heartbeat_crm: Fixed issue detecting outdated data with daylight saving time +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1447249165 + + diff --git a/ChangeLog b/ChangeLog index 7c44447..513fd37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ * 2702 FIX: oracle_diva_csm: fixed handling of empty sublists * 2761 FIX: check_http: Fixed handling of multiple strings given as "Strings to expect in server response" * 2786 FIX: agent_netapp: now able to monitor more than 20 instances of a given type, e.g. volumes or interfaces... + * 2765 FIX: heartbeat_crm: Fixed issue detecting outdated data with daylight saving time Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 05d2cb3..d32045d 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -487,7 +487,7 @@ fi # for the resource state if [ -S /var/run/heartbeat/crm/cib_ro -o -S /var/run/crm/cib_ro ] || pgrep crmd > /dev/null 2>&1; then echo '<<<heartbeat_crm>>>' - crm_mon -1 -r | grep -v ^$ | sed 's/^ //; /^\sResource Group:/,$ s/^\s//; s/^\s/_/g' + TZ=UTC crm_mon -1 -r | grep -v ^$ | sed 's/^ //; /^\sResource Group:/,$ s/^\s//; s/^\s/_/g' fi if type cl_status > /dev/null 2>&1; then echo '<<<heartbeat_rscstatus>>>'

8 years, 10 months

The SNMP check interval caused the agent data of single nodes to be skipped for clusters

by Lars Michelsen

Module: check_mk Branch: master Commit: 8ab5416f7ccad822c42456b14af754f292b53e3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ab5416f7ccad8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 11 14:20:55 2015 +0100 The SNMP check interval caused the agent data of single nodes to be skipped for clusters which could lead to CRITICAL clustered services which are based on SNMP checks. Conflicts: ChangeLog modules/check_mk_base.py --- .werks/2764 | 11 +++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 8 +++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.werks/2764 b/.werks/2764 new file mode 100644 index 0000000..f8f56d0 --- /dev/null +++ b/.werks/2764 @@ -0,0 +1,11 @@ +Title: Fixed broken SNMP checks in case SNMP check interval is configured for clusters +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1447247901 + +The SNMP check interval caused the agent data of single nodes to be skipped for clusters +which could lead to CRITICAL clustered services which are based on SNMP checks. diff --git a/ChangeLog b/ChangeLog index dea1279..7c44447 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * 2724 FIX: Discovery check: Fixed exception in simulation mode when no cache file present * 2756 FIX: SNMP: Generalized error handling of emtpy info for SNMP checks... * 2759 FIX: Allowing Emails to contain special characters like umlauts... + * 2764 FIX: Fixed broken SNMP checks in case SNMP check interval is configured for clusters... Checks & Agents: * 2434 NetApp monitoring: Cluster-Mode is now supported, changes in existing 7Mode checks... diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index f13dee0..3951089 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -348,10 +348,13 @@ def get_host_info(hostname, ipaddress, checkname, max_cachefile_age=None, ignore # If an error with the agent occurs, we still can (and must) # try the other nodes. try: + # We must ignore the SNMP check interval when dealing with SNMP + # checks on cluster nodes because the cluster is always reading + # the cache files of the nodes. ipaddress = lookup_ip_address(node) new_info = get_realhost_info(node, ipaddress, checkname, max_cachefile_age == None and cluster_max_cachefile_age or max_cache_age, - ignore_check_interval) + ignore_check_interval=True) if new_info != None: if add_nodeinfo: new_info = [ [node] + line for line in new_info ] @@ -425,6 +428,9 @@ def get_realhost_info(hostname, ipaddress, check_type, max_cache_age, if oid_info: cache_path = tcp_cache_dir + "/" + cache_relpath + + # Handle SNMP check interval. The idea: An SNMP check should only be + # executed every X seconds. Skip when called too often. check_interval = check_interval_of(hostname, check_type) if not ignore_check_interval \ and not opt_dont_submit \

8 years, 10 months

#2786 FIX agent_netapp: now able to monitor more than 20 instances of a given type, e.g. volumes or interfaces

by Andreas Boesl

Module: check_mk Branch: master Commit: eeed19111fb284c97be546d9c5d36951a6a09d9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eeed19111fb284… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 11 14:10:53 2015 +0100 #2786 FIX agent_netapp: now able to monitor more than 20 instances of a given type, e.g. volumes or interfaces The netapp agent was unable to output more than 20 instances. This value was used as default when elements got queried with the help of an iterator. --- .werks/2786 | 10 ++++++++++ ChangeLog | 1 + agents/special/agent_netapp | 8 +++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/2786 b/.werks/2786 new file mode 100644 index 0000000..231c97a --- /dev/null +++ b/.werks/2786 @@ -0,0 +1,10 @@ +Title: agent_netapp: now able to monitor more than 20 instances of a given type, e.g. volumes or interfaces +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1447247271 +Class: fix + +The netapp agent was unable to output more than 20 instances. +This value was used as default when elements got queried with the help of an iterator. diff --git a/ChangeLog b/ChangeLog index e7c9e05..dea1279 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,7 @@ * 2701 FIX: zfsget: fixed handling in case of zero total size based on buggy 'df -h' command on some solaris systems... * 2702 FIX: oracle_diva_csm: fixed handling of empty sublists * 2761 FIX: check_http: Fixed handling of multiple strings given as "Strings to expect in server response" + * 2786 FIX: agent_netapp: now able to monitor more than 20 instances of a given type, e.g. volumes or interfaces... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index a5c6ca2..65b3ba1 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -264,7 +264,13 @@ def query_nodes(what, only_first = False, node_attribute = "node-name"): section_errors = [] def query(what, return_toplevel_node = False): - response = server.invoke(what) + # HACK: if "what" endswith get-iter, add max_records = 5000 + # This approach is way easier than reading the tag, invoke another + # command and merge all answers together + if what.endswith("get-iter"): + response = server.invoke(what, "max-records", 5000) + else: + response = server.invoke(what) if response.results_status() == "failed": section_errors.append("In class %s: %s" % (what, response.results_reason()))

8 years, 10 months

#2763 apache_status: Can now be configured to use the protocols default port

by Lars Michelsen

Module: check_mk Branch: master Commit: eec68385c04b9301c2346a5ca850f2d66cedbb10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eec68385c04b93… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 11 13:03:06 2015 +0100 #2763 apache_status: Can now be configured to use the protocols default port When specifiying None as port number, no port number is used to contact the web server. The resulting service will also only contain the host name without the tailing :[port]. --- .werks/2763 | 11 +++++++++++ ChangeLog | 1 + agents/plugins/apache_status | 10 ++++++---- checks/apache_status | 5 ++++- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.werks/2763 b/.werks/2763 new file mode 100644 index 0000000..86600b4 --- /dev/null +++ b/.werks/2763 @@ -0,0 +1,11 @@ +Title: apache_status: Can now be configured to use the protocols default port +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1447243247 +Class: feature + +When specifiying None as port number, no port number is used to contact +the web server. The resulting service will also only contain the host name +without the tailing :[port]. diff --git a/ChangeLog b/ChangeLog index b6417a3..e7c9e05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ * 2707 winperf_processor: can now be configured to warn if a single cpu core exceeds a utilization threshold for a while... * 2708 sap, sap_state: new sap_state service reports connection problems to sap hosts... * 2740 local: better warning output in case of invalid agent output + * 2763 apache_status: Can now be configured to use the protocols default port... * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/agents/plugins/apache_status b/agents/plugins/apache_status index f06b05d..43978b6 100755 --- a/agents/plugins/apache_status +++ b/agents/plugins/apache_status @@ -128,8 +128,10 @@ for server in servers: port = server['port'] page = server.get('page', 'server-status') + portspec = port and ":%d" % port or "" + try: - url = '%s://%s:%s/%s?auto' % (proto, address, port, page) + url = '%s://%s%s/%s?auto' % (proto, address, portspec, page) # Try to fetch the status page for each server try: request = urllib2.Request(url, headers={"Accept" : "text/plain"}) @@ -138,7 +140,7 @@ for server in servers: if 'SSL23_GET_SERVER_HELLO:unknown protocol' in str(e): # HACK: workaround misconfigurations where port 443 is used for # serving non ssl secured http - url = 'http://%s:%s/server-status?auto' % (address, port) + url = 'http://%s%s/server-status?auto' % (address, portspec) fd = urllib2.urlopen(url) else: raise @@ -151,7 +153,7 @@ for server in servers: break print address, port, line except urllib2.HTTPError, e: - sys.stderr.write('HTTP-Error (%s:%d): %s %s\n' % (address, port, e.code, e)) + sys.stderr.write('HTTP-Error (%s%s): %s %s\n' % (address, portspec, e.code, e)) except Exception, e: - sys.stderr.write('Exception (%s:%d): %s\n' % (address, port, e)) + sys.stderr.write('Exception (%s%s): %s\n' % (address, portspec, e)) diff --git a/checks/apache_status b/checks/apache_status index 14c2109..28b37bd 100644 --- a/checks/apache_status +++ b/checks/apache_status @@ -78,7 +78,10 @@ def apache_status_parse(info): continue # Skip unexpected lines label = (' '.join(line[2:-1])).rstrip(':') value = _apache_status_fields[label][1](line[-1]) - item = '%s:%s' % (address, port) + if port == None: + item = address + else: + item = '%s:%s' % (address, port) if item not in data: data[item] = {}

8 years, 10 months

Export pnp_cleanup.

by Sven Panne

Module: check_mk Branch: master Commit: 602a54dc1173f1cacdeae733f5bec6b45bca16dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=602a54dc1173f1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Nov 11 11:57:11 2015 +0100 Export pnp_cleanup. --- livestatus/src/pnp4nagios.cc | 19 +++++++++++-------- livestatus/src/pnp4nagios.h | 2 ++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/livestatus/src/pnp4nagios.cc b/livestatus/src/pnp4nagios.cc index 5c1ed8a..c70d97f 100644 --- a/livestatus/src/pnp4nagios.cc +++ b/livestatus/src/pnp4nagios.cc @@ -36,6 +36,7 @@ extern char* g_pnp_path; namespace { +// TODO: Move this to some kind of C++ string utility file. string replace_all(const string& str, const string& chars, char replacement) { string result(str); size_t i = 0; @@ -44,19 +45,21 @@ string replace_all(const string& str, const string& chars, char replacement) { } return result; } +} // namespace -string cleanup(const string& name) { return replace_all(name, " /\\:", '_'); } - -} // namespace +string pnp_cleanup(const string& name) +{ + return replace_all(name, " /\\:", '_'); +} int pnpgraph_present(const string& host, const string& service) { string pnp_path(g_pnp_path); if (pnp_path.empty()) return -1; - string path(pnp_path.append(cleanup(host)) + string path(pnp_path.append(pnp_cleanup(host)) .append("/") - .append(cleanup(service)) + .append(pnp_cleanup(service)) .append(".xml")); return access(path.c_str(), R_OK) == 0 ? 1 : 0; } @@ -67,11 +70,11 @@ string rrd_path(const string& host, const string& service, string pnp_path(g_pnp_path); if (pnp_path.empty()) return ""; string path(pnp_path.append("/") - .append(cleanup(host)) + .append(pnp_cleanup(host)) .append("/") - .append(cleanup(service)) + .append(pnp_cleanup(service)) .append("_") - .append(cleanup(varname)) + .append(pnp_cleanup(varname)) .append(".rrd")); struct stat st; return stat(path.c_str(), &st) == 0 ? path : ""; diff --git a/livestatus/src/pnp4nagios.h b/livestatus/src/pnp4nagios.h index 3e80144..8fcb61c 100644 --- a/livestatus/src/pnp4nagios.h +++ b/livestatus/src/pnp4nagios.h @@ -29,6 +29,8 @@ #include <string> +std::string pnp_cleanup(const std::string& name); + int pnpgraph_present(const std::string& host, const std::string& service = "_HOST_");

8 years, 10 months

← Newer
1
...
14
15
16
17
18
19
20
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2015