Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

by Simon Betz

Module: check_mk Branch: master Commit: 52d582a4d65ed082f2a1effe97593c69e5965ae4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52d582a4d65ed0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Feb 23 14:50:13 2017 +0100 updated werk 8753 Change-Id: I16b6d537f59189b01e8558e34c60a213ee29eced --- agents/check_mk_agent.solaris | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index ba871b4..0f4f3eb 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -197,20 +197,14 @@ fi # ZFS arc cache # newer Solaris (>=11.3) do not provide hits and misses via mdb -k -function get_zfs_arc_cache_data () { - out=$(echo "::arc" | mdb -k | grep "hits") - if [ ! -z "$out" ] - then - echo "::arc" | mdb -k - else - kstat -p zfs:0:arcstats | sed -e 's/.*arcstats://g' | awk '{printf "%s = %s\n", $1, $2;}' - fi -} +echo '<<<zfs_arc_cache>>>' +if type kstat &>/dev/null +then + kstat -p zfs:0:arcstats | sed -e 's/.*arcstats://g' | awk '{printf "%s = %s\n", $1, $2;}' -if type mdb >/dev/null 2>&1 - then - echo '<<<zfs_arc_cache>>>' - get_zfs_arc_cache_data +elif type mdb &>/dev/null +then + echo '::arc' | mdb -k fi # Processes

7 years, 6 months

htmllib: fixed refactoring bug.

by Roland Halbig

Module: check_mk Branch: master Commit: ab6cc5aebb749923988c8ffb103f0450732b8b68 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab6cc5aebb7499… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Feb 23 14:55:44 2017 +0100 htmllib: fixed refactoring bug. Change-Id: I807b64d03a179241c7a43737efee97dcb366a4d6 --- web/htdocs/htmllib.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 380f61d..a0d5815 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -2759,6 +2759,23 @@ class html(HTMLGenerator, Encoder, RequestHandler): # + # Keyboard control + # TODO: Can we move this specific feature to AQ? + # + + def add_keybinding(self, keylist, jscode): + self.keybindings.append([keylist, jscode]) + + + def add_keybindings(self, bindings): + self.keybindings += bindings + + + def disable_keybindings(self): + self.keybindings_enabled = False + + + # # FIXME: Legacy functions #

7 years, 6 months

4017 New option to hide WATO folders when the user has insufficent permissions

by Andreas Boesl

Module: check_mk Branch: master Commit: 5e1379606520ebc86ac5b52cbd30ee3fdf0bb534 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e1379606520eb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jan 27 15:36:41 2017 +0100 4017 New option to hide WATO folders when the user has insufficent permissions The new global settings option Hide folders without read permissions allows you to hide WATO folders from users. If a user does not have read permission to the subfolder AND any of its subfolders, the folder is simply not shown. Note: This feature only reduces the number of folders in the WATO folder overview. It does not hide these folders in other WATO pages. Change-Id: Ib483c02b4f5818faac3b8d440fa28ebdf95362f4 --- .werks/4017 | 14 +++++++ web/htdocs/wato.py | 21 +++++----- web/htdocs/watolib.py | 66 ++++++++++++++++++++++-------- web/plugins/config/wato.py | 39 +++++++++--------- web/plugins/visuals/wato.py | 2 +- web/plugins/wato/check_mk_configuration.py | 10 +++++ 6 files changed, 106 insertions(+), 46 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5e13796065…

7 years, 6 months

htmllib: added figheaders.

by Roland Halbig

Module: check_mk Branch: master Commit: 9e3712d0b2601f0de8971a33f28b5cc6db96f060 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e3712d0b2601f… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Feb 23 14:27:53 2017 +0100 htmllib: added figheaders. Change-Id: I1d1a793a06ac5d8735ccfc9e5b9439308f1b67b7 --- web/htdocs/htmllib.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 931272f..380f61d 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -163,6 +163,7 @@ class Escaper(object): def permissive_attrencode(self, obj): return self._escape_text(obj) + #. # # HTML encoding @@ -497,6 +498,7 @@ class OutputFunnel(object): while(self.is_plugged()): self.unplug() + #. # .--HTML Generator------------------------------------------------------. # | _ _ _____ __ __ _ | @@ -851,8 +853,19 @@ class HTMLGenerator(Escaper, OutputFunnel): self.write_html(self.render_nbsp()) - #. +# .--RequestHandler----------------------------------------------------------------. +# | ____ _ _ _ _ _ | +# | | _ \ ___ __ _ _ _ ___ ___| |_| | | | __ _ _ __ __| | | ___ _ __ | +# | | |_) / _ \/ _` | | | |/ _ \/ __| __| |_| |/ _` | '_ \ / _` | |/ _ \ '__| | +# | | _ < __/ (_| | |_| | __/\__ \ |_| _ | (_| | | | | (_| | | __/ | | +# | |_| \_\___|\__, |\__,_|\___||___/\__|_| |_|\__,_|_| |_|\__,_|_|\___|_| | +# | |_| | +# +--------------------------------------------------------------------------------+ +# | | +# '--------------------------------------------------------------------------------' + + class RequestHandler(object): def __init__(self): @@ -2815,3 +2828,6 @@ class html(HTMLGenerator, Encoder, RequestHandler): +#. + +

7 years, 6 months

Fixed small html rendering bug.

by Roland Halbig

Module: check_mk Branch: master Commit: ff5a6d49be2f07992ca32ef149fcccf5d458cfc2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff5a6d49be2f07… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Feb 23 14:15:37 2017 +0100 Fixed small html rendering bug. Change-Id: I7c9a863ebb215759c016a3b169f96f191ffd0b40 --- web/htdocs/watolib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 7d38969..499bfd8 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -2905,8 +2905,8 @@ class ContactGroupsAttribute(Attribute): texts.append('<a href="wato.py?mode=edit_contact_group&edit=%s">%s</a>' % (name, display_name)) result = ", ".join(texts) if texts and value["use"]: - result += "*" % \ - _("These contact groups are also used in the monitoring configuration.") + result += html.render_span(html.render_b("*"), + title=_("These contact groups are also used in the monitoring configuration.")) return "", result def render_input(self, varprefix, value):

7 years, 6 months

8753 FIX check_mk_agent.solaris: Fixed zfs_arc_cache section

by Simon Betz

Module: check_mk Branch: master Commit: 6d68cdae6cb8205bb70210fbe021d4b53a4c2741 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d68cdae6cb820… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Feb 23 14:04:43 2017 +0100 8753 FIX check_mk_agent.solaris: Fixed zfs_arc_cache section Change-Id: I0687dda488e9ac9fa81994c9bf15b46fb0c0fe3c --- .werks/8753 | 11 +++++++++++ agents/check_mk_agent.solaris | 3 +-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/8753 b/.werks/8753 new file mode 100644 index 0000000..12dc7ad --- /dev/null +++ b/.werks/8753 @@ -0,0 +1,11 @@ +Title: check_mk_agent.solaris: Fixed zfs_arc_cache section +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.4.0b3 +Date: 1487854878 + + diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 250d40f..ba871b4 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -203,8 +203,7 @@ function get_zfs_arc_cache_data () { then echo "::arc" | mdb -k else - kstat -p zfs:0:arcstats | sed -e 's/.*arcstats://g' | \ - /usr/gnu/bin/sed -e 's/[ \t][ \t]*/ = /g' + kstat -p zfs:0:arcstats | sed -e 's/.*arcstats://g' | awk '{printf "%s = %s\n", $1, $2;}' fi }

7 years, 6 months

refactoring blade_blades

by Marcel Arentz

Module: check_mk Branch: master Commit: ec49b739b8d36a9dce4ae4e503d2f7ac97d17bf9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec49b739b8d36a… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Feb 22 12:04:01 2017 +0100 refactoring blade_blades Change-Id: I874e47be03d5588d9a6e80731be83f768ac7988a --- checks/blade_blades | 91 +++++++++++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 48 deletions(-) diff --git a/checks/blade_blades b/checks/blade_blades index 0624ca1..7eb4965 100644 --- a/checks/blade_blades +++ b/checks/blade_blades @@ -24,60 +24,55 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Author: Lars Michelsen <lm(a)mathias-kettner.de> -# Mappings for translating SNMP states to nagios states -blade_blades_exists_states = (2, 0) -blade_blades_power_states = (1, 0) -blade_blades_health_states = (3, 0, 1, 2) +def parse_blade_blades(info): + map_states = { + 'exist_state' : ((2, "no"), (0, "yes")), + 'power_state' : ((1, "off"), (0, "on")), + 'health_state' : ((3, "unknown"), (0, "good"), (1, "warning"), (2, "bad")), + } -# Name mappings -blade_blades_exists_labels = ('no', 'yes') -blade_blades_power_labels = ('off', 'on') -blade_blades_health_labels = ('unknown', 'good', 'warning', 'bad') - -def inventory_blade_blades(info): - # find only blades that are powered on - return [ (line[0], '', line[1]) for line in info if line[2] == '1' ] - -def check_blade_blades(item, params, info): + parsed = {} for line in info: - if line[0] == item: - exists, power_state, health_state = map(saveint, line[1:4]) - name = line[4] + parsed[line[0]] = [ + map_states['exist_state'][int(line[1])], + map_states['power_state'][int(line[2])], + map_states['health_state'][int(line[3])], + line[4] + ] + + return parsed - state = 0 - output = '%s: ' % (name) +def inventory_blade_blades(parsed): + for key, value in parsed.iteritems(): + if not parsed[key][1][1] == "off": # Only inventory powered on blades + yield (key, None) - for label, part_state, nag_state, state_label in ( - ('Exists', exists, blade_blades_exists_states[exists], blade_blades_exists_labels[exists]), - ('Power', power_state, blade_blades_power_states[power_state], blade_blades_power_labels[power_state]), - ('Health', health_state, blade_blades_health_states[health_state], blade_blades_health_labels[health_state])): - output += '%s: %s' % (label, state_label) - if nag_state == 1: - output += ' (!)' - elif nag_state == 2: - output += ' (!!)' - elif nag_state == 3: - output += ' (UNKNOWN)' - state = max(state, nag_state) - output += ', ' +def check_blade_blades(item, _no_params, parsed): + for key, values in parsed.iteritems(): + if item == key: + # name + yield 0, values[3] + # exist_state + yield values[0][0], "Exists: %s" % values[0][1] + # power_state + yield values[1][0], "Power: %s" % values[1][1] + # health_state + yield values[2][0], "Health: %s" % values[2][1] - return (state, output.rstrip(', ')) - return (3, "no data for '%s' in SNMP info" % item) check_info["blade_blades"] = { - 'check_function': check_blade_blades, - 'inventory_function': inventory_blade_blades, - 'service_description': 'Blade %s', - 'snmp_info': ( - ".1.3.6.1.4.1.2.3.51.2.22.1.5.1.1", [ # BLADE-MIB - 2, # bladeId - 3, # bladeExists - 4, # bladePowerState - 5, # bladeHealthState - 6, # bladeName - ]), - 'snmp_scan_function': \ - lambda oid: re.match('(BladeCenter|BladeCenter Advanced|IBM Flex Chassis) Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, + 'parse_function' : parse_blade_blades, + 'inventory_function' : inventory_blade_blades, + 'check_function' : check_blade_blades, + 'service_description' : "Blade %s", + 'snmp_info' : (".1.3.6.1.4.1.2.3.51.2.22.1.5.1.1", [ # BLADE-MIB + 2, # bladeId + 3, # bladeExists + 4, # bladePowerState + 5, # bladeHealthState + 6, # bladeName + ]), + 'snmp_scan_function' : lambda oid: re.match('(BladeCenter|BladeCenter Advanced|IBM Flex Chassis) Management Module', \ + oid(".1.3.6.1.2.1.1.1.0")) != None, }

7 years, 6 months

4196 FIX blade_blades: fixed out of range state

by Marcel Arentz

Module: check_mk Branch: master Commit: f03c3e9a45e7e60ab7365dbb26e533edbce62072 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f03c3e9a45e7e6… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Feb 22 12:19:37 2017 +0100 4196 FIX blade_blades: fixed out of range state The check will not crash anymore if a state reported by a bladecenter is our of range. Instead the failed part of this service will change to UNKNOWN. Change-Id: I08cc571af1c06f0c4741f0230431e262bd0bd85c --- .werks/4196 | 10 ++++++ checks/blade_blades | 94 ++++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 78 insertions(+), 26 deletions(-) diff --git a/.werks/4196 b/.werks/4196 new file mode 100644 index 0000000..d224b82 --- /dev/null +++ b/.werks/4196 @@ -0,0 +1,10 @@ +Title: blade_blades: fixed out of range state +Level: 1 +Component: checks +Compatible: compat +Version: 1.5.0i1 +Date: 1487762152 +Class: fix + +The check will not crash anymore if a state reported by a bladecenter is +our of range. Instead the failed part of this service will change to UNKNOWN. diff --git a/checks/blade_blades b/checks/blade_blades index 7eb4965..5d8540f 100644 --- a/checks/blade_blades +++ b/checks/blade_blades @@ -24,45 +24,87 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.2.1 1 +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.2.2 2 +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.2.3 3 +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.2.4 4 +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.2.5 5 +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.3.1 1 +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.3.2 1 +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.3.3 1 +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.3.4 1 +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.3.5 1 +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.4.1 1 +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.4.2 3 +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.4.3 255 +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.4.4 0 +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.4.5 1 +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.5.1 1 +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.5.2 12 +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.5.3 9 +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.5.4 1 +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.5.5 1 +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.6.1 ESX1 +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.6.2 ESX109 +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.6.3 ESX110 +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.6.4 ESX137 +#.1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.6.5 ESX138 + -def parse_blade_blades(info): - map_states = { - 'exist_state' : ((2, "no"), (0, "yes")), - 'power_state' : ((1, "off"), (0, "on")), - 'health_state' : ((3, "unknown"), (0, "good"), (1, "warning"), (2, "bad")), - } - parsed = {} +def inventory_blade_blades(info): for line in info: - parsed[line[0]] = [ - map_states['exist_state'][int(line[1])], - map_states['power_state'][int(line[2])], - map_states['health_state'][int(line[3])], - line[4] - ] + if line[2] == '1': + yield (line[0], None) + + +def check_blade_blades(item, _no_params, info): + map_exists = { + '0' : (2, "false"), + '1' : (0, "true") + } - return parsed + map_power = { + '0' : (2, "off"), + '1' : (0, "on"), + '3' : (1, "standby"), + '4' : (1, "hibernate"), + '255' : (3, "unknown"), + } -def inventory_blade_blades(parsed): - for key, value in parsed.iteritems(): - if not parsed[key][1][1] == "off": # Only inventory powered on blades - yield (key, None) + map_health = { + '0' : (3, "unknown"), + '1' : (0, "good"), + '2' : (1, "warning"), + '3' : (2, "critical"), + '4' : (1, "kernel mode"), + '5' : (0, "discovering"), + '6' : (2, "communications error"), + '7' : (2, "no power"), + '8' : (1, "flashing"), + '9' : (2, "initialization Failure"), + '10' : (2, "insuffiecient power"), + '11' : (2, "power denied"), + '12' : (1, "maintenance mode"), + '13' : (1, "firehose dump"), + } -def check_blade_blades(item, _no_params, parsed): - for key, values in parsed.iteritems(): - if item == key: + for line in info: + if line[0] == item: # name - yield 0, values[3] + yield 0, line[4] # exist_state - yield values[0][0], "Exists: %s" % values[0][1] + state, state_readable = map_exists[line[1]] + yield state, "Exists: %s" % state_readable # power_state - yield values[1][0], "Power: %s" % values[1][1] + state, state_readable = map_exists[line[2]] + yield state, "Power: %s" % state_readable # health_state - yield values[2][0], "Health: %s" % values[2][1] + state, state_readable = map_exists[line[3]] + yield state, "Health: %s" % state_readable check_info["blade_blades"] = { - 'parse_function' : parse_blade_blades, 'inventory_function' : inventory_blade_blades, 'check_function' : check_blade_blades, 'service_description' : "Blade %s",

7 years, 6 months

added git bug

by Marcel Arentz

Module: check_mk Branch: master Commit: a79985c398f6f091234bce687820a0acd39333e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a79985c398f6f0… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Feb 23 13:14:08 2017 +0100 added git bug Change-Id: Iecd3274c3ee8ee2816f9dd162d62cc4e0cee28b8 --- .bugs/2510 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2510 b/.bugs/2510 new file mode 100644 index 0000000..5b10165 --- /dev/null +++ b/.bugs/2510 @@ -0,0 +1,8 @@ +Title: local active checks +Component: checks +State: open +Date: 2017-02-23 13:11:32 +Targetversion: 1.4.0 +Class: bug + +The GUI is only using the active checks under ~/lib/nagios/plugins and not local ones (~/local/lib/nagios/plugins).

7 years, 6 months

4394 FIX mssql_backup: Backups of availability group databases are now handled correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: 8e8e877563588a7d7189e6513f6ec8eff6a69906 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e8e877563588a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 23 12:04:38 2017 +0100 4394 FIX mssql_backup: Backups of availability group databases are now handled correctly In previous versions the backups of availability group cluster slave hosts (were no backup is executed) was handled as last backup age. Now we exclude those backups from the monitoring and only handle the backups of the primary replica. Change-Id: I0d0a0e2ddbae5e4f0fa24763d5ed965e7d9e3e4b --- .werks/4394 | 13 ++++++++++++ agents/windows/plugins/mssql.vbs | 44 ++++++++++++++++++++++++++++++++-------- 2 files changed, 49 insertions(+), 8 deletions(-) diff --git a/.werks/4394 b/.werks/4394 new file mode 100644 index 0000000..21ee5c5 --- /dev/null +++ b/.werks/4394 @@ -0,0 +1,13 @@ +Title: mssql_backup: Backups of availability group databases are now handled correctly +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1487847745 +Class: fix + +In previous versions the backups of availability group cluster slave hosts (were no backup is +executed) was handled as last backup age. Now we exclude those backups from the monitoring and +only handle the backups of the primary replica. + diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index cc7fc6a..7e1416f 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -163,7 +163,7 @@ For i = LBound(value_names) To UBound(value_names) Set service = WMI.ExecQuery("SELECT State FROM Win32_Service " & _ "WHERE Name = 'MSSQL$" & instance_id & "' AND State = 'Running'") If Not IsNull(service) Then - instances.add instance_id, "" + instances.add instance_id, cluster_name End If Next @@ -183,6 +183,8 @@ CONN.ConnectionTimeout = 2 ' Loop all found server instances and connect to them ' In my tests only the connect using the "named instance" string worked For Each instance_id In instances.Keys: Do ' Continue trick + ' Is empty on standalone instances, and holds the name of the cluster on nodes + cluster_name = instances(instance_id) ' Use either an instance specific config file named mssql_<instance-id>.ini ' or the default mysql.ini file. @@ -331,14 +333,36 @@ For Each instance_id In instances.Keys: Do ' Continue trick ' Loop all databases to get the date of the last backup. Only show databases ' which have at least one backup - Dim lastBackupDate, backup_type + Dim lastBackupDate, backup_type, is_primary_replica, replica_id, backup_machine_name addOutput(sections("backup")) For Each dbName in dbNames.Keys - RS.open "SELECT CONVERT(VARCHAR, DATEADD(s, DATEDIFF(s, '19700101', MAX(backup_finish_date)), '19700101'), 120) AS last_backup_date," & _ - "type " & _ - "FROM msdb.dbo.backupset " & _ - "WHERE database_name = '" & dbName & "'" & _ - "GROUP BY type", CONN + RS.Open "USE [" & dbName & "]", CONN + RS.open "IF EXISTS (select 1 from sys.sysobjects where name = 'dm_hadr_database_replica_states') " & _ + "BEGIN " & _ + "SELECT CONVERT(VARCHAR, DATEADD(s, DATEDIFF(s, '19700101', MAX(b.backup_finish_date)), '19700101'), 120) AS last_backup_date, " & _ + "b.type, b.machine_name, " & _ + "isnull(rep.is_primary_replica,0) as is_primary_replica, rep.is_local, isnull(convert(varchar(40), rep.replica_id), '') AS replica_id " & _ + "FROM msdb.dbo.backupset b " & _ + "LEFT OUTER JOIN sys.databases db ON b.database_name = db.name " & _ + "LEFT OUTER JOIN sys.dm_hadr_database_replica_states rep ON db.database_id = rep.database_id " & _ + "WHERE database_name = '" & dbName & "' " & _ + "AND b.machine_name = '" & hostname & "' " & _ + "AND (rep.is_local is null or rep.is_local = 1) " & _ + "AND (rep.is_primary_replica is null or rep.is_primary_replica = 1) " & _ + "GROUP BY type, rep.replica_id, rep.is_primary_replica, rep.is_local, b.database_name, b.machine_name, rep.synchronization_state, rep.synchronization_health " & _ + "END " & _ + "ELSE " & _ + "BEGIN " & _ + "SELECT CONVERT(VARCHAR, DATEADD(s, DATEDIFF(s, '19700101', MAX(backup_finish_date)), '19700101'), 120) AS last_backup_date," & _ + "type, machine_name, " & _ + "'1' as is_primary_replica, " &_ + "'1' as is_local, " & _ + "'' as replica_id " & _ + "FROM msdb.dbo.backupset " & _ + "WHERE database_name = '" & dbName & "' " & _ + "GROUP BY type, machine_name " & _ + "END", CONN + Do While Not RS.Eof lastBackupDate = Trim(RS("last_backup_date")) @@ -347,7 +371,11 @@ For Each instance_id In instances.Keys: Do ' Continue trick backup_type = "-" End If - If lastBackupDate <> "" Then + replica_id = Trim(RS("replica_id")) + is_primary_replica = Trim(RS("is_primary_replica")) + backup_machine_name = Trim(RS("machine_name")) + + If lastBackupDate <> "" and (replica_id = "" or is_primary_replica = "1") AND hostname = backup_machine_name Then addOutput("MSSQL_" & instance_id & " " & Replace(dbName, " ", "_") & _ " " & lastBackupDate & " " & backup_type) End If

7 years, 6 months

← Newer
1
2
3
4
5
6
7
8
9
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017