Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64625 discussions

Check_MK Git: check_mk: check_mk-df.php: improved legend for days left if not growing

by Andreas Boesl

Module: check_mk Branch: master Commit: b8a543eb382a6fb36ea076c5f9c7ee5523642c88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8a543eb382a6f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 19 16:33:14 2014 +0200 check_mk-df.php: improved legend for days left if not growing --- pnp-templates/check_mk-df.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pnp-templates/check_mk-df.php b/pnp-templates/check_mk-df.php index 957f3d9..c879c9e 100644 --- a/pnp-templates/check_mk-df.php +++ b/pnp-templates/check_mk-df.php @@ -35,6 +35,7 @@ foreach ($NAME as $i => $n) { $CRIT[$n] = $CRIT[$i]; $MIN[$n] = $MIN[$i]; $MAX[$n] = $MAX[$i]; + $ACT[$n] = $ACT[$i]; } # RRDtool Options @@ -145,8 +146,12 @@ if (isset($RRD['trend_hoursleft'])) { $def[4] .= "AREA:hours_left_unmon#AA2200: "; $def[4] .= "AREA:days_left_cap_positive#22AA44:\"Days left\:\" "; - $def[4] .= "GPRINT:days_left:LAST:\"%7.2lf days\" "; - + if ($ACT[4] == -1) + { + $def[4] .= "COMMENT:\"Not growing\" "; + } + else { + $def[4] .= "GPRINT:days_left:LAST:\"%7.2lf days\" "; + } } - ?>

10 years, 4 months

Check_MK Git: check_mk: Renaming hosts: also handle retention.

by Mathias Kettner

dat from Nagios Message-ID: <537a1544.3Fvj43AVy7JwgTUW%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Module: check_mk Branch: master Commit: 0e83f019f9c0aa7debf6d129b5c846e5bcf4d53e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e83f019f9c0aa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 19 16:29:21 2014 +0200 Renaming hosts: also handle retention.dat from Nagios --- doc/drafts/LIESMICH.hosts_umbenennen | 21 +++++++++------------ modules/automation.py | 16 ++++++++++++---- web/htdocs/wato.py | 2 ++ 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/doc/drafts/LIESMICH.hosts_umbenennen b/doc/drafts/LIESMICH.hosts_umbenennen index 4dbe925..a1a0223 100644 --- a/doc/drafts/LIESMICH.hosts_umbenennen +++ b/doc/drafts/LIESMICH.hosts_umbenennen @@ -53,18 +53,6 @@ OMD: ==> Auch das muss mit einer Automation gehen -ES FEHLT: - -* retentions.dat (analog bei CMC) -* Stop/Start vom Core inkl. Config erzeugen zu rechter Zeit -* Nachdenken, ob noch was fehlt. - - -Beim Stoppen/Starten des Cores muss ich sicherstellen: - -1. Das ganze Umbenennen sollte nur dann antriggerbar sein, wenn bei der -entsprechenden Site keine Pending Changes da sind. Ansonsten Hinweis. - 2. Damit ein Fehler beim Konfig erzeugen ausgeschlossen werden kann, muss ich sicherstellen, dass die IP-Adresse des neuen Namens (ebenfalls) auflösbar ist - und zwar von der Monitoring-Site. Man könnte das zur @@ -84,3 +72,12 @@ weiterverwendet und die automation scheitern *am Schluss* mit einem Fehler. - Jetzt die Konfig erzeugen und prüfen. Wenn ein Fehler auftritt, zurückrollen - Und den Core wieder starten (beides mit automation_restart) +------------------------------------------------------------------------------- +ES FEHLT: + +* retentions.dat (analog bei CMC) +* Problem mit Fehler bei der IP-Adresse lösen +* Nachdenken, ob noch was fehlt. +* BI and BI Assumptions?? +* Erlauben nur, wenn die Site sauber ist +* Vor der automation noch einen sync erzwingen diff --git a/modules/automation.py b/modules/automation.py index 87c1b8f..31e21d8 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -978,6 +978,8 @@ def rename_host_file(basedir, oldname, newname): # This functions could be moved out of Check_MK. def omd_rename_host(oldname, newname): + oldregex = oldname.replace(".", "[.]") + newregex = newname.replace(".", "[.]") actions = [] # Temporarily stop processing of performance data @@ -996,13 +998,13 @@ def omd_rename_host(oldname, newname): # entries of rrdcached journal dirpath = omd_root + "/var/rrdcached/" if not os.system("sed -i 's@/perfdata/%s/@/perfdata/%s/@' " - "%s/var/rrdcached/rrd.journal.* 2>/dev/null" % ( oldname, newname, omd_root)): + "%s/var/rrdcached/rrd.journal.* 2>/dev/null" % ( oldregex, newregex, omd_root)): actions.append("rrdcached") # Spoolfiles of NPCD if not os.system("sed -i 's/HOSTNAME::%s /HOSTNAME::%s /' " "%s/var/pnp4nagios/perfdata.dump %s/var/pnp4nagios/spool/perfdata.* 2>/dev/null" % ( - oldname, newname, omd_root, omd_root)): + oldregex, newregex, omd_root, omd_root)): actions.append("pnpspool") if rrdcache_running: @@ -1019,7 +1021,7 @@ s/(INITIAL|CURRENT) (HOST|SERVICE) STATE: %(old)s;/\1 \2 STATE: %(new)s;/ s/(HOST|SERVICE) (DOWNTIME |FLAPPING |)ALERT: %(old)s;/\1 \2ALERT: %(new)s;/ s/PASSIVE (HOST|SERVICE) CHECK: %(old)s;/PASSIVE \1 CHECK: %(new)s;/ s/(HOST|SERVICE) NOTIFICATION: ([^;]+);%(old)s;/\1 NOTIFICATION: \2;%(new)s;/ -''' % { "old" : oldname, "new" : newname } +''' % { "old" : oldregex, "new" : newregex } patterns = [ "var/check_mk/core/history", "var/check_mk/core/archive/*", @@ -1036,10 +1038,16 @@ s/(HOST|SERVICE) NOTIFICATION: ([^;]+);%(old)s;/\1 NOTIFICATION: \2;%(new)s;/ if one_matched: actions.append("history") + # State retention (important for Downtimes, Acknowledgements, etc.) + if monitoring_core == "nagios": + if not os.system("sed -ri 's/^host_name=%s$/host_name=%s/' %s/var/nagios/retention.dat" % ( + oldregex, newregex, omd_root)): + actions.append("retention") + # NagVis maps if not os.system("sed -i 's/^[[:space:]]*host_name=%s[[:space:]]*$/host_name=%s/' " "%s/etc/nagvis/maps/*.cfg 2>/dev/null" % ( - oldname, newname, omd_root)): + oldregex, newregex, omd_root)): actions.append("nagvis") return actions diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8042398..8f23889 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2408,6 +2408,8 @@ def rename_host(host, newname): actions.append(_("NagVis maps")) elif what == "history": actions.append(_("Monitoring history entries (events and availability)")) + elif what == "retention": + actions.append(_("The current monitoring state (including ackowledgements and downtimes)"))

10 years, 4 months

Check_MK Git: check_mk: Renaming of hosts: stop and start core

by Mathias Kettner

Module: check_mk Branch: master Commit: 6f7c31bbb100cc43de57cdafd687e930cbcf7c43 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f7c31bbb100cc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 19 16:17:57 2014 +0200 Renaming of hosts: stop and start core --- doc/drafts/LIESMICH.hosts_umbenennen | 26 ++++++++++++++ modules/automation.py | 64 ++++++++++++++++++++++------------ modules/check_mk.py | 32 +++++++++++------ web/htdocs/wato.py | 18 +++++----- 4 files changed, 97 insertions(+), 43 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6f7c31bbb1…

10 years, 4 months

Check_MK Git: check_mk: brocade_vdx_status: set check permissions to 664

by Andreas Boesl

Module: check_mk Branch: master Commit: 2bad923a640e111c93eb14a4479af8e09661ce37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2bad923a640e11… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 19 14:50:09 2014 +0200 brocade_vdx_status: set check permissions to 664 --- 0 files changed diff --git a/checks/brocade_vdx_status b/checks/brocade_vdx_status old mode 100755 new mode 100644

10 years, 4 months

Check_MK Git: check_mk: optimized perfometer for days left in df check

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 8347a6f303eedfe0a8892e6a5bd583452b6b00e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8347a6f303eedf… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon May 19 14:27:39 2014 +0200 optimized perfometer for days left in df check --- web/plugins/perfometer/check_mk.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 67af132..d2023a4 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -89,7 +89,11 @@ def perfometer_check_mk_df(row, check_command, perf_data): h += perfometer_td(100 - pos, color) h += perfometer_td(pos, "white") h += '</tr></table></div>' - return "%0.1f%%/%0.1f days left" % (perc_used, days_left), h + if days_left > 365: + days_left = " >365" + else: + days_left = "%0.1f" % days_left + return "%0.1f%%/%s days left" % (perc_used, days_left), h else: h = '<table><tr>' h += perfometer_td(perc_used, "#00ffc6")

10 years, 4 months

Check_MK Git: check_mk: brocade_vdx: Added missing manpage

by Bastian Kuhn

Module: check_mk Branch: master Commit: bf7c8d50c00f54d50cf3a605b211a30c31108c03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf7c8d50c00f54… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon May 19 13:49:06 2014 +0200 brocade_vdx: Added missing manpage --- checkman/if_brocade | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/checkman/if_brocade b/checkman/if_brocade new file mode 100644 index 0000000..4cd20cf --- /dev/null +++ b/checkman/if_brocade @@ -0,0 +1,13 @@ +title: Brocade VDX devices: Network interfaces via standard MIB using 64 Bit counters +agents: snmp +catalog: hw/network/brocade +license: GPL +distribution: check_mk +description: + This check does exactly the same as {if64} but retrieves {ifName} instead + of {ifDescr}, because {ifDescr} is not useful in Brocade VDX devices. + + Please refer to the if64 manpage for documentation. + + +

10 years, 4 months

Check_MK Git: check_mk: if_brocade: New if64 Check version for Brocade VDX Switches

by Bastian Kuhn

Module: check_mk Branch: master Commit: 3bcdb63798f73387c8142392cafdcc3e1be18ab8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bcdb63798f733… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon May 19 13:42:36 2014 +0200 if_brocade: New if64 Check version for Brocade VDX Switches This check does the same like the normal if64 check. The only difference is that ifName is used instead of ifDescription. You may want to do a reinventory on broace switches, because otherwise the "Check_MK Inventory" check (if used) will trigger warning state cause of unchecked services. --- .werks/162 | 10 ++++++ ChangeLog | 2 ++ checks/if64 | 1 + checks/if_brocade | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 115 insertions(+) diff --git a/.werks/162 b/.werks/162 new file mode 100644 index 0000000..8ad143f --- /dev/null +++ b/.werks/162 @@ -0,0 +1,10 @@ +Title: if_brocade: New if64 Check version for Brocade VDX Switches +Level: 2 +Component: checks +Version: 1.2.5i3 +Date: 1400499450 +Class: incomp + +This check does the same like the normal if64 check. The only difference is that ifName is used instead of ifDescription. +You may want to do a reinventory on broace switches, because otherwise the "Check_MK Inventory" check (if used) will trigger warning state +cause of unchecked services. diff --git a/ChangeLog b/ChangeLog index 66073a9..029b577 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,8 @@ * 0917 df checks: now able to show time left until disk full as perfometer and pnpgraph... * 0954 juniper_bgp_state: New Check for BGP status at Juniper Routers * 0955 zfs_arc_cache, zfs_arc_cache.l2: New Checks for Hit Ratios and Sizes of ZFS arc Cache + * 0162 if_brocade: New if64 Check version for Brocade VDX Switches... + NOTE: Please refer to the migration notes! * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/checks/if64 b/checks/if64 index f842658..e41600f 100644 --- a/checks/if64 +++ b/checks/if64 @@ -44,6 +44,7 @@ def check_if64(item, params, info): def if64_scan_function(oid): ignored_strings = [ "LANCOM", + "Brocade VDX Switch", ] for string in ignored_strings: if string in oid(".1.3.6.1.2.1.1.1.0"): diff --git a/checks/if_brocade b/checks/if_brocade new file mode 100644 index 0000000..829b53f --- /dev/null +++ b/checks/if_brocade @@ -0,0 +1,102 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +def fix_if_64_highspeed(info): + for line in info: + if type(line[3]) == str: # not yet converted + line[3] = saveint(line[3]) * 1000000 + +def if_brocade_convert(info): + iftab, ssidtab = info + ssid_dict = dict(ssidtab) + new_info = [] + for line in iftab: + if line[20].startswith("Point-2-Point"): + continue + else: + ifName = line[1] + + new_line = line[:-1] + if line[20].startswith("Logical Network"): + new_line[1] += " Logical" + ssid = ssid_dict.get(ifName, "") + if ssid: + new_line[1] += " " + ssid + new_line[1] = new_line[1].strip() + new_info.append(new_line) + return new_info + +def inventory_if_brocade(info): + info = if_brocade_convert(info) + fix_if_64_highspeed(info) + return inventory_if_common(info) + +def check_if_brocade(item, params, info): + info = if_brocade_convert(info) + fix_if_64_highspeed(info) + return check_if_common(item, params, info) + +check_includes['if_brocade'] = [ "if.include" ] +check_info["if_brocade"] = { + 'check_function': check_if_brocade, + 'inventory_function': inventory_if_brocade, + 'service_description': 'Interface %s', + 'has_perfdata': True, + 'snmp_info': [ + ( ".1.3.6.1.2.1", [ + "2.2.1.1", # ifIndex 0 + "31.1.1.1.1", # ifName (brocade has no useful information if Descr) + "2.2.1.3", # ifType 2 + "31.1.1.1.15", # ifHighSpeed .. 1000 means 1GBit + "2.2.1.8", # ifOperStatus 4 + "31.1.1.1.6", # ifHCInOctets 5 + "31.1.1.1.7", # ifHCInUcastPkts 6 + "31.1.1.1.8", # ifHCInMulticastPkts 7 + "31.1.1.1.9", # ifHCInBroadcastPkts 8 + "2.2.1.13", # ifInDiscards 9 + "2.2.1.14", # ifInErrors 10 + "31.1.1.1.10", # ifHCOutOctets 11 + "31.1.1.1.11", # ifHCOutUcastPkts 12 + "31.1.1.1.12", # ifHCOutMulticastPkts 13 + "31.1.1.1.13", # ifHCOutBroadcastPkts 14 + "2.2.1.19", # ifOutDiscards 15 + "2.2.1.20", # ifOutErrors 16 + "2.2.1.21", # ifOutQLen 17 + "31.1.1.1.18", # ifAlias 18 + "2.2.1.6", # ifPhysAddress 19 + # Used in order to ignore some logical NICs + "2.2.1.2", # ifDescr 20 + ]), + ( ".1.3.6.1.4.1.2356.11.1.3.56.1", [1, 3] ) # brocade: SSID 21 + ], + # check if number of network interfaces (IF-MIB::ifNumber.0) is at least 2 + 'snmp_scan_function': \ + lambda oid: "Brocade VDX Switch" in oid(".1.3.6.1.2.1.1.1.0") and \ + (not if64_disabled(g_hostname)) and \ + oid(".1.3.6.1.2.1.31.1.1.1.6.*") != None, + 'group': 'if', + 'default_levels_variable': 'if_default_levels', +}

10 years, 4 months

Check_MK Git: check_mk: Renaming of hosts: also handle history files

by Mathias Kettner

Module: check_mk Branch: master Commit: 3947a25d5d59257d38780791bd4bb54aed84417a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3947a25d5d5925… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 16 17:32:25 2014 +0200 Renaming of hosts: also handle history files --- doc/drafts/LIESMICH.hosts_umbenennen | 1 - modules/automation.py | 21 ++++++++++ web/htdocs/wato.py | 74 +++++++++++++++++----------------- 3 files changed, 59 insertions(+), 37 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3947a25d5d…

10 years, 4 months

Check_MK Git: check_mk: Virtual Host Trees: show problem icon also on non-leaf nodes

by Mathias Kettner

Module: check_mk Branch: master Commit: b32bb8224a9e5a8c9763653be490b5f7e2d9135e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b32bb8224a9e5a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 16 15:20:12 2014 +0200 Virtual Host Trees: show problem icon also on non-leaf nodes --- web/plugins/sidebar/shipped.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index b18e419..39756de 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1283,6 +1283,15 @@ def tag_tree_worst_state(tree): return 2 return max(states) +def tag_tree_has_svc_problems(tree): + if "_svc_problems" in tree: + return tree["_svc_problems"] + else: + for x in tree.values(): + if tag_tree_has_svc_problems(x): + return True + return False + def tag_tree_url(taggroups, taglist, viewname): urlvars = [("view_name", viewname), ("filled_in", "filter")] if viewname == "svcproblems": @@ -1299,6 +1308,14 @@ def tag_tree_bullet(state, leaf): def render_tag_tree_level(taggroups, path, title, tree): bullet = tag_tree_bullet(tag_tree_worst_state(tree), False) + if tag_tree_has_svc_problems(tree): + html.plug() + url = tag_tree_url(taggroups, path, "svcproblems") + html.icon_button(url, _("Show the service problems contained in this branch"), + "svc_problems", target="main") + bullet += html.drain() + html.unplug() + if path: html.begin_foldable_container("tag-tree", ".".join(map(str, path)), False, bullet + title) items = tree.items()

10 years, 4 months

Check_MK Git: check_mk: Virtual host tree now shows icon with link to service problems

by Mathias Kettner

Module: check_mk Branch: master Commit: d3278f344b9fe9441c2b7b9108aff7c8250bace1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3278f344b9fe9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 16 15:05:37 2014 +0200 Virtual host tree now shows icon with link to service problems --- web/plugins/sidebar/shipped.py | 33 +++++++++++++++++++++++---------- web/plugins/views/builtin.py | 1 + 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 82031b9..b18e419 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1236,16 +1236,20 @@ def compute_tag_tree(taglist): tree = {} for site, host_name, state, num_ok, num_warn, num_crit, num_unknown, custom_variables in hosts: # make state reflect the state of the services + host + have_svc_problems = False if state: state += 1 # shift 1->2 (DOWN->CRIT) and 2->3 (UNREACH->UNKNOWN) if num_crit: state = 2 + have_svc_problems = True elif num_unknown: if state != 2: state = 3 + have_svc_problems = True elif num_warn: if not state: state = 1 + have_svc_problems = True tags = custom_variables.get("TAGS", []).split() tree_entry = tree @@ -1258,9 +1262,10 @@ def compute_tag_tree(taglist): if not tree_entry: tree_entry.update({ "_num_hosts" : 0, - "_state" : 0, + "_state" : 0, }) tree_entry["_num_hosts"] += 1 + tree_entry["_svc_problems"] = tree_entry.get("_svc_problems", False) or have_svc_problems if state == 2 or tree_entry["_state"] == 2: tree_entry["_state"] = 2 else: @@ -1278,8 +1283,10 @@ def tag_tree_worst_state(tree): return 2 return max(states) -def tag_tree_url(taggroups, taglist): - urlvars = [("view_name", "allhosts"), ("filled_in", "filter")] +def tag_tree_url(taggroups, taglist, viewname): + urlvars = [("view_name", viewname), ("filled_in", "filter")] + if viewname == "svcproblems": + urlvars += [ ("st1", "on"), ("st2", "on"), ("st3", "on") ] for nr, (group, tag) in enumerate(zip(taggroups, taglist)): urlvars.append(("host_tag_%d_grp" % nr, group)) urlvars.append(("host_tag_%d_op" % nr, "is")) @@ -1299,12 +1306,17 @@ def render_tag_tree_level(taggroups, path, title, tree): for nr, ((title, tag), subtree) in enumerate(items): subpath = path + [tag] - url = tag_tree_url(taggroups, subpath) + url = tag_tree_url(taggroups, subpath, "allhosts") if "_num_hosts" in subtree: title += " (%d)" % subtree["_num_hosts"] href = '<a target=main href="%s">%s</a>' % (url, html.attrencode(title)) if "_num_hosts" in subtree: + html.write(tag_tree_bullet(subtree["_state"], True)) + if subtree.get("_svc_problems"): + url = tag_tree_url(taggroups, subpath, "svcproblems") + html.icon_button(url, _("Show the service problems contained in this branch"), + "svc_problems", target="main") html.write(href) html.write("<br>") else: @@ -1324,12 +1336,6 @@ function virtual_host_tree_changed(field) """ def render_tag_tree(): - virtual_host_trees = [ - (u"Nach Typ des Hosts", [ "hosttyp", "avail", "agent"], ), - (u"Nach Agent", [ "agent", "hosttyp", "avail"], ), - (u"Nach Verfügbarkeit", [ "avail", "HTTP", "SMTP" ], ), - ] - if not config.virtual_host_trees: url = 'wato.py?varname=virtual_host_trees&mode=edit_configvar' html.write(_('You have not defined any virtual host trees. You can ' @@ -1358,6 +1364,13 @@ sidebar_snapins["tag_tree"] = { "allowed" : [ "admin", "user", "guest" ], "styles" : """ +#snapin_tag_tree img.iconbutton { + width: 12px; + height: 12px; + position: relative; + top: -2px; +} + #snapin_tag_tree select { background-color: #6DA1B8; border-color: #123A4A; diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 99f8c80..a13f422 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1566,6 +1566,7 @@ multisite_builtin_views.update({ 'svcstate', 'svchardstate', 'serviceregex', + 'host_tags', 'hoststate'], 'sorters': [('svcstate', True), ('stateage', False),

10 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits