Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

Remove more pnp templates and fix some issues

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 24a682d490934dfef572c3a02be0a5b45a123f3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24a682d490934d… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Feb 27 10:03:30 2019 +0100 Remove more pnp templates and fix some issues Issues: * optional_metrics was removed in the graph_info of util_average_1 * add missing metric translation for hitachi_hnas_cifs * add missing metric translation for hitachi_hnas_fans * remove pointless number_of_processes entry in graph_info CMK-1739 Change-Id: Id3159c11eed6e4f8938d7146e892d28a389e1eed --- cmk/gui/plugins/metrics/check_mk.py | 18 +++-- pnp-templates/check_mk-emc_datadomain_temps.php | 1 - pnp-templates/check_mk-emc_isilon_iops.php | 48 ------------- pnp-templates/check_mk-emcvnx_disks.php | 1 - pnp-templates/check_mk-emcvnx_hba.php | 60 ---------------- pnp-templates/check_mk-emerson_temp.php | 1 - pnp-templates/check_mk-enterasys_cpu_util.php | 1 - pnp-templates/check_mk-enterasys_temp.php | 1 - .../check_mk-esx_vsphere_hostsystem.cpu_usage.php | 80 ---------------------- pnp-templates/check_mk-etherbox.humidity.php | 48 ------------- pnp-templates/check_mk-f5_bigip_chassis_temp.php | 1 - pnp-templates/check_mk-f5_bigip_cpu_temp.php | 1 - pnp-templates/check_mk-f5_bigip_interfaces.php | 42 ------------ pnp-templates/check_mk-f5_bigip_vserver.php | 41 ----------- pnp-templates/check_mk-fsc_temp.php | 1 - pnp-templates/check_mk-h3c_lanswitch_cpu.php | 44 ------------ pnp-templates/check_mk-hitachi_hnas_cifs.php | 34 --------- pnp-templates/check_mk-hitachi_hnas_fan.php | 34 --------- pnp-templates/check_mk-hitachi_hnas_fpga.php | 39 ----------- pnp-templates/check_mk-hitachi_hnas_temp.php | 38 ---------- pnp-templates/check_mk-hp_blade_psu.php | 66 ------------------ pnp-templates/check_mk-hp_procurve_cpu.php | 1 - pnp-templates/check_mk-hpux_cpu.php | 1 - pnp-templates/check_mk-hpux_snmp_cs.cpu.php | 48 ------------- .../check_mk-hpux_tunables.maxfiles_lim.php | 1 - pnp-templates/check_mk-hpux_tunables.nkthread.php | 1 - pnp-templates/check_mk-hpux_tunables.nproc.php | 1 - pnp-templates/check_mk-hpux_tunables.php | 49 ------------- pnp-templates/check_mk-hpux_tunables.semmni.php | 1 - pnp-templates/check_mk-hpux_tunables.semmns.php | 1 - pnp-templates/check_mk-hpux_tunables.shmseg.php | 1 - pnp-templates/check_mk-innovaphone_cpu.php | 1 - pnp-templates/check_mk-innovaphone_temp.php | 1 - .../check_mk-netapp_api_cpu.utilization.php | 1 - .../check_mk-netapp_api_vf_stats.cpu_util.php | 1 - pnp-templates/check_mk-netapp_cpu.php | 1 - pnp-templates/check_mk-qlogic_sanbox.temp.php | 1 - 37 files changed, 13 insertions(+), 698 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=24a682d490…

5 years, 7 months

7153 FIX Solaris Agent: fixed wrong ps command in CPU section

by Ronny Bruska

Module: check_mk Branch: master Commit: 2c7044961f0cb4cf60ae90220f1b1ff650a7cbdb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c7044961f0cb4… Author: Ronny Bruska <rb(a)mathias-kettner.de> Date: Thu Feb 28 07:54:11 2019 +0100 7153 FIX Solaris Agent: fixed wrong ps command in CPU section On Solaris the option "--no-headers" is missing and caused a crash in the check cpu.threads. Change-Id: Ie76beb9676f53503b4933fb40c5ca99ad0a020e9 --- .werks/7153 | 13 +++++++++++++ agents/check_mk_agent.solaris | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/7153 b/.werks/7153 new file mode 100644 index 0000000..b928220 --- /dev/null +++ b/.werks/7153 @@ -0,0 +1,13 @@ +Title: Solaris Agent: fixed wrong ps command in CPU section +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1551336188 +Class: fix + +On Solaris the option "--no-headers" is missing and caused a crash in the check +cpu.threads. + + diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 0a2c320..002afda 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -289,7 +289,7 @@ fi # Simulated Output of Linux /proc/cpu echo '<<<cpu>>>' load=$(uptime|sed -e 's;.*average: $[0-9]\{1,\}\.[0-9]\{1,\}$, $[0-9]\{1,\}\.[0-9]\{1,\}$, $[0-9]\{1,\}\.[0-9]\{1,\}$.*;\1 \2 \3;') -nthreads=$(ps -AL --no-headers | wc -l) +nthreads=$(ps -AL | wc -l) procs=$(($(psrinfo | wc -l))) echo $load 1/$nthreads $$ $procs

5 years, 7 months

mssql.vbs: improve formatting

by Moritz Kiemer

Module: check_mk Branch: master Commit: 89f4159402320a31e12d6899ba792099d3b88ccf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89f4159402320a… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Feb 25 11:53:55 2019 +0100 mssql.vbs: improve formatting Change-Id: Id01218c3e6b8e936dbf85d3554e756bb25f619ff --- agents/windows/plugins/mssql.vbs | 45 ++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index af305e9..72b74ab 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -206,6 +206,7 @@ Dim CONN, RS, CFG, AUTH ' Initialize database connection objects Set CONN = CreateObject("ADODB.Connection") Set RS = CreateObject("ADODB.Recordset") + CONN.Provider = "sqloledb" ' It's a local connection. 2 seconds should be enough! CONN.ConnectionTimeout = 2 @@ -378,17 +379,17 @@ For Each instance_id In instances.Keys: Do ' Continue trick For Each dbName in dbNames.Keys RS.Open "USE [master]", CONN RS.Open "DECLARE @HADRStatus sql_variant; DECLARE @SQLCommand nvarchar(max); " & _ - "SET @HADRStatus = (SELECT SERVERPROPERTY ('IsHadrEnabled')); " & _ - "IF (@HADRStatus IS NULL or @HADRStatus <> 1) " & _ - "BEGIN " & _ - "SET @SQLCommand = 'SELECT CONVERT(VARCHAR, DATEADD(s, DATEDIFF(s, ''19700101'', MAX(backup_finish_date)), ''19700101''), 120) AS last_backup_date, " & _ - "type, machine_name, ''True'' as is_primary_replica, ''1'' as is_local, '''' as replica_id FROM msdb.dbo.backupset " & _ - "WHERE database_name = ''" & dbName & "'' AND machine_name = SERVERPROPERTY(''Machinename'') " & _ - "GROUP BY type, machine_name ' " & _ - "END " & _ - "ELSE " & _ - "BEGIN " & _ - "SET @SQLCommand = 'SELECT CONVERT(VARCHAR, DATEADD(s, DATEDIFF(s, ''19700101'', MAX(b.backup_finish_date)), ''19700101''), 120) AS last_backup_date, " & _ + "SET @HADRStatus = (SELECT SERVERPROPERTY ('IsHadrEnabled')); " & _ + "IF (@HADRStatus IS NULL or @HADRStatus <> 1) " & _ + "BEGIN " & _ + "SET @SQLCommand = 'SELECT CONVERT(VARCHAR, DATEADD(s, DATEDIFF(s, ''19700101'', MAX(backup_finish_date)), ''19700101''), 120) AS last_backup_date, " & _ + "type, machine_name, ''True'' as is_primary_replica, ''1'' as is_local, '''' as replica_id FROM msdb.dbo.backupset " & _ + "WHERE database_name = ''" & dbName & "'' AND machine_name = SERVERPROPERTY(''Machinename'') " & _ + "GROUP BY type, machine_name ' " & _ + "END " & _ + "ELSE " & _ + "BEGIN " & _ + "SET @SQLCommand = '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 " & _ @@ -396,12 +397,12 @@ For Each instance_id In instances.Keys: Do ' Continue trick "WHERE database_name = ''" & dbName & "'' AND (rep.is_local is null or rep.is_local = 1) " & _ "AND (rep.is_primary_replica is null or rep.is_primary_replica = ''True'') and machine_name = SERVERPROPERTY(''Machinename'') " & _ "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 " & _ - "EXEC (@SQLCommand)" ,CONN + "END " & _ + "EXEC (@SQLCommand)" ,CONN If RS.Eof Then addOutput("MSSQL_" & instance_id & "|" & Replace(dbName, " ", "_") & _ - "|-|-|-|no backup found") + "|-|-|-|no backup found") End If Do While Not RS.Eof @@ -429,15 +430,15 @@ For Each instance_id In instances.Keys: Do ' Continue trick ' Loop all databases to get the size of the transaction log addOutput(sections("transactionlogs")) For Each dbName in dbNames.Keys - RS.Open "USE [" & dbName & "];", CONN - RS.Open "SELECT name, physical_name," &_ - " cast(max_size/128 as bigint) as MaxSize," &_ - " cast(size/128 as bigint) as AllocatedSize," &_ - " cast(FILEPROPERTY (name, 'spaceused')/128 as bigint) as UsedSize," &_ - " case when max_size = '-1' then '1' else '0' end as Unlimited" &_ - " FROM sys.database_files WHERE type_desc = 'LOG'", CONN + RS.Open "USE [" & dbName & "];", CONN + RS.Open "SELECT name, physical_name," &_ + " cast(max_size/128 as bigint) as MaxSize," &_ + " cast(size/128 as bigint) as AllocatedSize," &_ + " cast(FILEPROPERTY (name, 'spaceused')/128 as bigint) as UsedSize," &_ + " case when max_size = '-1' then '1' else '0' end as Unlimited" & + " FROM sys.database_files WHERE type_desc = 'LOG'", CONN Do While Not RS.Eof - addOutput( instance_id & "|" & Replace(dbName, " ", "_") & "|" & Replace(RS("name"), " ", "_") & _ + addOutput(instance_id & "|" & Replace(dbName, " ", "_") & "|" & Replace(RS("name"), " ", "_") & _ "|" & Replace(RS("physical_name"), " ", "_") & "|" & _ RS("MaxSize") & "|" & RS("AllocatedSize") & "|" & RS("UsedSize")) & _ "|" & RS("Unlimited")

5 years, 7 months

mssql_datafiles, mssql_transactionlogs: skip error messages

by Moritz Kiemer

Module: check_mk Branch: master Commit: 2da9930a0c97efac966d841606d53345ff445395 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2da9930a0c97ef… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Feb 22 15:58:42 2019 +0100 mssql_datafiles, mssql_transactionlogs: skip error messages CMK-1570 Change-Id: Id92de3c412db3d2dcb10700abfe11efecf5c34d3 --- checks/mssql.include | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks/mssql.include b/checks/mssql.include index f5094eb..4002c97 100644 --- a/checks/mssql.include +++ b/checks/mssql.include @@ -112,6 +112,8 @@ mssql_transactionlogs_discovery = [] def parse_mssql_datafiles(info): parsed = {} for line in info: + if line[-1].startswith("ERROR: "): + continue if len(line) == 8: inst, database, file_name, _physical_name, max_size, allocated_size, used_size, unlimited = line unlimited = unlimited == '1'

5 years, 7 months

mssql_blocked_sessions: prepare parse function to ignore err msg

by Moritz Kiemer

Module: check_mk Branch: master Commit: 82a0551479e095949bf80f512e409603e788e2ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82a0551479e095… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Feb 22 11:03:56 2019 +0100 mssql_blocked_sessions: prepare parse function to ignore err msg Also make pylint happy and use new CheckAPI CMK-1570 Change-Id: Ief0fbd6f4ff1866fd8be45fdc90c02aacde42dc2 --- checks/mssql_blocked_sessions | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/checks/mssql_blocked_sessions b/checks/mssql_blocked_sessions index 5263d05..077ef55 100644 --- a/checks/mssql_blocked_sessions +++ b/checks/mssql_blocked_sessions @@ -44,13 +44,10 @@ def parse_mssql_blocked_sessions(info): "DBInstance", ["session_id", "wait_type", "blocking_session_id", "wait_duration"]) parsed = {} for line in info: - if len(line) == 5: - inst, session_id, wait_duration_ms, wait_type, blocking_session_id = line - elif len(line) == 4: - session_id, wait_duration_ms, wait_type, blocking_session_id = line - inst = "" - else: + if len(line) not in (4, 5) or line[-1].startswith("ERROR: "): continue + inst = line[0] if len(line) == 5 else "" + session_id, wait_duration_ms, wait_type, blocking_session_id = line[-4:] parsed.setdefault(inst, []).append( db_instance( @@ -59,12 +56,8 @@ def parse_mssql_blocked_sessions(info): blocking_session_id, float(wait_duration_ms) / 1000, )) - return parsed - -def inventory_mssql_blocked_sessions(parsed): - for instance in parsed: - yield instance, {} + return parsed def check_mssql_blocked_sessions(item, params, parsed): @@ -82,26 +75,26 @@ def check_mssql_blocked_sessions(item, params, parsed): ignored_waittypes = set() waittypes_to_be_ignored = params.get("ignore_waittypes", []) - for e in parsed[item]: - if e.wait_type in waittypes_to_be_ignored: - ignored_waittypes.add(e.wait_type) + for db_inst in parsed[item]: + if db_inst.wait_type in waittypes_to_be_ignored: + ignored_waittypes.add(db_inst.wait_type) continue level_info = "" state = 0 - if crit is not None and e.wait_duration >= crit: + if crit is not None and db_inst.wait_duration >= crit: state = 2 - elif warn is not None and e.wait_duration >= warn: + elif warn is not None and db_inst.wait_duration >= warn: state = 1 if state: level_info = " (warn/crit at %s/%s)" % (get_age_human_readable(warn), get_age_human_readable(crit)) - summary.setdefault(e.session_id, 0) - summary[e.session_id] += 1 + summary.setdefault(db_inst.session_id, 0) + summary[db_inst.session_id] += 1 details.append((state, "Session %s blocked by %s (Type: %s, Wait: %s)%s" % \ - (e.session_id, e.blocking_session_id, e.wait_type, - get_age_human_readable(e.wait_duration), level_info))) + (db_inst.session_id, db_inst.blocking_session_id, db_inst.wait_type, + get_age_human_readable(db_inst.wait_duration), level_info))) if summary: yield params['state'], "Summary: %s" % (", ".join( @@ -118,7 +111,7 @@ def check_mssql_blocked_sessions(item, params, parsed): check_info['mssql_blocked_sessions'] = { 'parse_function': parse_mssql_blocked_sessions, - 'inventory_function': inventory_mssql_blocked_sessions, + 'inventory_function': discover(), 'check_function': check_mssql_blocked_sessions, 'service_description': 'MSSQL %s Blocked Sessions', 'group': 'mssql_instance_blocked_sessions',

5 years, 7 months

mssql_backup: cleanup

by Moritz Kiemer

Module: check_mk Branch: master Commit: 2e0f4b49651548f8d9b9fbd1a3280b0955e4360f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e0f4b49651548… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Feb 22 09:14:00 2019 +0100 mssql_backup: cleanup Change-Id: If3591a7c50a3674485ee30d1330bc170b516cdb2 --- checks/mssql_backup | 68 +++++++++++++++++++---------------------------------- 1 file changed, 24 insertions(+), 44 deletions(-) diff --git a/checks/mssql_backup b/checks/mssql_backup index a9e7dc2..cf09005 100644 --- a/checks/mssql_backup +++ b/checks/mssql_backup @@ -66,13 +66,13 @@ factory_settings["mssql_backup_default_levels"] = { def parse_mssql_backup(info): - def _parse_date_and_time(backup_date, backup_time): + def _parse_date_and_time(b_date, b_time): try: - timestamp = time.mktime( - time.strptime("%s %s" % (backup_date, backup_time), '%Y-%m-%d %H:%M:%S')) + if b_time is None: + return int(b_date) + return time.mktime(time.strptime("%s %s" % (b_date, b_time), '%Y-%m-%d %H:%M:%S')) except ValueError: - timestamp = None - return timestamp + return None map_backup_types = { "D": "database", @@ -88,37 +88,21 @@ def parse_mssql_backup(info): parsed = {} Backup = collections.namedtuple("Backup", ["timestamp", "type", "state"]) for line in info: - backup_state = None - backup_type = None - if len(line) == 6: - inst, tablespace, backup_date, backup_time, backup_type, backup_state = line - timestamp = _parse_date_and_time(backup_date, backup_time) - - elif len(line) == 5: - inst, tablespace, backup_date, backup_time, backup_type = line - timestamp = _parse_date_and_time(backup_date, backup_time) - - elif len(line) == 4: - inst, tablespace = line[:2] - try: - backup_date, backup_time = line[2].split(" ") - backup_type = line[3] - except ValueError: - backup_date, backup_time = line[2:4] - timestamp = _parse_date_and_time(backup_date, backup_time) - - elif len(line) == 3: - inst, tablespace, backup_timestamp = line - try: - timestamp = int(backup_timestamp) - except ValueError: - timestamp = None - - else: + if len(line) <= 2: continue + # handle one special case where spaces are in date/time: + if len(line) == 4 and " " in line[2]: + line = line[:2] + line[2].split(" ") + line[3:] + + # fill up with Nones: + line += [None] * (6 - len(line)) + + inst, tablespace, b_date, b_time, b_type, b_state = line + timestamp = _parse_date_and_time(b_date, b_time) - parsed.setdefault("%s %s" % (inst, tablespace), []).append( - Backup(timestamp, map_backup_types.get(backup_type), backup_state)) + item = "%s %s" % (inst, tablespace) + backup = Backup(timestamp, map_backup_types.get(b_type), b_state) + parsed.setdefault(item, []).append(backup) return parsed @@ -127,7 +111,7 @@ def inventory_mssql_backup(parsed): discovery_mode = _mssql_backup_discovery_mode() if discovery_mode != "summary": return - for db_name in parsed.iterkeys(): + for db_name in parsed: yield db_name, {} @@ -151,7 +135,7 @@ def check_mssql_backup(item, params, parsed): for backup in data: if backup.state == "no backup found": - yield params.get("not_found", 1), "State: %s" % backup.state + yield params.get("not_found", 1), "No backup found" continue if backup.type is None: backup_type_var = "database" @@ -222,17 +206,13 @@ def inventory_mssql_backup_per_type(parsed): def check_mssql_backup_per_type(item, params, parsed): - data = None for db_name, attrs in parsed.iteritems(): for backup in attrs: if item == _mssql_backup_per_type_item(db_name, backup): - data = backup - break - if data is None: - # Assume general connection problem to the database, which is reported - # by the "X Instance" service and skip this check. - raise MKCounterWrapped("Failed to connect to database") - return _check_mssql_backup(data, params.get("levels", (None, None)), "backup_age") + return _check_mssql_backup(backup, params.get("levels", (None, None)), "backup_age") + # Assume general connection problem to the database, which is reported + # by the "X Instance" service and skip this check. + raise MKCounterWrapped("Failed to connect to database") check_info['mssql_backup.per_type'] = {

5 years, 7 months

tmssql_tablespaces: prepare to handle error message

by Moritz Kiemer

Module: check_mk Branch: master Commit: 178a5b16d9253f808d4cfae2467e2fbf91b88630 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=178a5b16d9253f… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Feb 22 12:06:03 2019 +0100 tmssql_tablespaces: prepare to handle error message The plugin does not produce such an error message yet, but we will be ready. No animals were harmed during testing. Change-Id: I3e92356617fd7b06fb041990830570bb94a04729 --- checks/mssql_tablespaces | 25 ++++++++++++++-------- .../datasets/mssql_tablespaces_regression.py | 5 +++++ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/checks/mssql_tablespaces b/checks/mssql_tablespaces index d42c173..c638094 100644 --- a/checks/mssql_tablespaces +++ b/checks/mssql_tablespaces @@ -69,6 +69,9 @@ def parse_mssql_tablespaces(info): values = (to_bytes(*p) for p in pairs[1:]) data = dict(zip(keys, values)) + if len(line) > 14 and line[14].startswith("ERROR: "): + data["error"] = line[14][7:] + parsed.setdefault(item, data) return parsed @@ -82,17 +85,20 @@ def check_mssql_tablespaces(item, params, parsed): raise MKCounterWrapped("Tablespace not found") size = tablespace["size"] + if "error" in tablespace: + yield 2, tablespace["error"] + if size is not None: levels = params.get("size", (None, None)) yield check_levels( size, 'size', levels, human_readable_func=get_bytes_human_readable, infoname="Size") - for key, title, levels_info, upper_bounds in [ - ('unallocated', 'Unallocated space', 'below', False), - ('reserved', 'Reserved space', 'at', True), - ('data', 'Data', 'at', True), - ('indexes', 'Indexes', 'at', True), - ('unused', 'Unused', 'at', True), + for key, title, is_upper in [ + ('unallocated', 'Unallocated space', False), + ('reserved', 'Reserved space', True), + ('data', 'Data', True), + ('indexes', 'Indexes', True), + ('unused', 'Unused', True), ]: value_bytes = tablespace[key] if value_bytes is None: @@ -117,12 +123,13 @@ def check_mssql_tablespaces(item, params, parsed): continue state = 0 - if upper_bounds and value >= crit or not upper_bounds and value <= crit: + if is_upper and value >= crit or not is_upper and value <= crit: state = 2 - elif upper_bounds and value >= warn or not upper_bounds and value <= warn: + elif is_upper and value >= warn or not is_upper and value <= warn: state = 1 if state: - infotext += " (warn/crit %s %s/%s)" % (levels_info, readable_f(warn), readable_f(crit)) + infotext += " (warn/crit %s %s/%s)" % ( + ('below', 'at')[is_upper], readable_f(warn), readable_f(crit)) yield state, infotext diff --git a/tests/unit/checks/generictests/datasets/mssql_tablespaces_regression.py b/tests/unit/checks/generictests/datasets/mssql_tablespaces_regression.py index e7f43ad..b6ce600 100644 --- a/tests/unit/checks/generictests/datasets/mssql_tablespaces_regression.py +++ b/tests/unit/checks/generictests/datasets/mssql_tablespaces_regression.py @@ -6,12 +6,14 @@ checkname = 'mssql_tablespaces' info = [ ['MSSQL_SQLEXPRESS', 'master', '5.25', 'MB', '1.59', 'MB', '2464', 'KB', '1096', 'KB', '1024', 'KB', '344', 'KB'], + ['MSSQL_Katze', 'Kitty'] + ['-'] * 12 + ['ERROR: Kitty ist auf die Nase gefallen!'], ] discovery = { '': [ ('MSSQL_SQLEXPRESS master', {}), + ('MSSQL_Katze Kitty', {}), ], } @@ -34,5 +36,8 @@ checks = { (0, 'Indexes: 1.00 MB, 19.0%', []), (0, 'Unused: 344.00 kB, 6.4%', []), ]), + ('MSSQL_Katze Kitty', {}, [ + (2, 'Kitty ist auf die Nase gefallen!'), + ]), ], }

5 years, 7 months

mssql_tablespaces: cleanup + extend test

by Moritz Kiemer

Module: check_mk Branch: master Commit: f8da44b26733615c3a9951e712be88c8608734db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8da44b2673361… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Feb 22 11:56:41 2019 +0100 mssql_tablespaces: cleanup + extend test Change-Id: Id71d1e8a580036499264acbf7447b4d6e006d3ce --- checks/mssql_tablespaces | 64 +++++++--------------- .../datasets/mssql_tablespaces_regression.py | 8 +++ 2 files changed, 27 insertions(+), 45 deletions(-) diff --git a/checks/mssql_tablespaces b/checks/mssql_tablespaces index f320a47..d42c173 100644 --- a/checks/mssql_tablespaces +++ b/checks/mssql_tablespaces @@ -33,7 +33,8 @@ # 0: process instance # 1: tablespace name -# 2: db size (Size of the current database in megabytes. database_size includes both data and log files.)) +# 2: db size (Size of the current database in megabytes. +# database_size includes both data and log files.) # 3: uom # 4: unallocated space (Space in the database that has not been reserved for database objects.) # 5: uom @@ -51,67 +52,40 @@ factory_settings["mssql_tablespace_default_levels"] = {} def parse_mssql_tablespaces(info): def to_bytes(value, uom): + exponent = {'KB': 1, 'MB': 2, 'GB': 3, 'TB': 4}.get(uom, 0) try: - value = float(value) + return float(value) * (1024**exponent) except ValueError: return None - if uom == 'KB': - val_bytes = value * 1024 - elif uom == 'MB': - val_bytes = value * 1024 * 1024 - elif uom == 'GB': - val_bytes = value * 1024 * 1024 * 1024 - elif uom == 'TB': - val_bytes = value * 1024 * 1024 * 1024 * 1024 - else: - val_bytes = value - return val_bytes parsed = {} for line in info: if len(line) < 14: continue - parsed.setdefault( - "%s %s" % (line[0], line[1]), { - 'size': to_bytes(line[2], line[3]), - 'unallocated': to_bytes(line[4], line[5]), - 'reserved': to_bytes(line[6], line[7]), - 'data': to_bytes(line[8], line[9]), - 'indexes': to_bytes(line[10], line[11]), - 'unused': to_bytes(line[12], line[13]), - }) - - return parsed + pairs = zip(line[:14:2], line[1:14:2]) + item = "%s %s" % pairs[0] + keys = ('size', 'unallocated', 'reserved', 'data', 'indexes', 'unused') + values = (to_bytes(*p) for p in pairs[1:]) + data = dict(zip(keys, values)) + parsed.setdefault(item, data) -def inventory_mssql_tablespaces(parsed): - for tablespace_name in parsed: - yield tablespace_name, {} + return parsed def check_mssql_tablespaces(item, params, parsed): - tablespace_data = parsed.get(item) - if tablespace_data is None: + tablespace = parsed.get(item) + if tablespace is None: # Assume general connection problem to the database, which is reported # by the "X Instance" service and skip this check. raise MKCounterWrapped("Tablespace not found") - size = tablespace_data["size"] + size = tablespace["size"] if size is not None: - infotext = 'Size: %s' % get_bytes_human_readable(size) - warn, crit = params.get("size", (None, None)) - - if crit is not None and size >= crit: - state = 2 - elif warn is not None and size >= warn: - state = 1 - else: - state = 0 - if state: - infotext += " (warn/crit at %s/%s)" % (get_bytes_human_readable(warn), - get_bytes_human_readable(crit)) - yield state, infotext, [("size", size, warn, crit)] + levels = params.get("size", (None, None)) + yield check_levels( + size, 'size', levels, human_readable_func=get_bytes_human_readable, infoname="Size") for key, title, levels_info, upper_bounds in [ ('unallocated', 'Unallocated space', 'below', False), @@ -120,7 +94,7 @@ def check_mssql_tablespaces(item, params, parsed): ('indexes', 'Indexes', 'at', True), ('unused', 'Unused', 'at', True), ]: - value_bytes = tablespace_data[key] + value_bytes = tablespace[key] if value_bytes is None: continue @@ -154,7 +128,7 @@ def check_mssql_tablespaces(item, params, parsed): check_info['mssql_tablespaces'] = { 'parse_function': parse_mssql_tablespaces, - 'inventory_function': inventory_mssql_tablespaces, + 'inventory_function': discover(), 'check_function': check_mssql_tablespaces, 'service_description': 'MSSQL %s Sizes', 'group': 'mssql_tablespaces', diff --git a/tests/unit/checks/generictests/datasets/mssql_tablespaces_regression.py b/tests/unit/checks/generictests/datasets/mssql_tablespaces_regression.py index 0595dbd..e7f43ad 100644 --- a/tests/unit/checks/generictests/datasets/mssql_tablespaces_regression.py +++ b/tests/unit/checks/generictests/datasets/mssql_tablespaces_regression.py @@ -26,5 +26,13 @@ checks = { (0, 'Indexes: 1.00 MB, 19.0%', []), (0, 'Unused: 344.00 kB, 6.4%', []), ]), + ('MSSQL_SQLEXPRESS master', {"size": (3*1024**2, 6*1024**2)}, [ + (1, 'Size: 5.25 MB (warn/crit at 3.00 MB/6.00 MB)', [('size', 5505024.0, 3*1024**2, 6*1024**2, None, None)]), + (0, 'Unallocated space: 1.59 MB, 30.3%', []), + (0, 'Reserved space: 2.41 MB, 45.8%', []), + (0, 'Data: 1.07 MB, 20.4%', []), + (0, 'Indexes: 1.00 MB, 19.0%', []), + (0, 'Unused: 344.00 kB, 6.4%', []), + ]), ], }

5 years, 7 months

Moved topic VS to helper function

by Lars Michelsen

Module: check_mk Branch: master Commit: 224581bcc17653f21acebdc1bd0c94abb9f0a8e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=224581bcc17653… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 27 14:04:14 2019 +0100 Moved topic VS to helper function CMK-1754 Change-Id: I32c36e843654611e4e03e3a8fbd6a1c669e597aa --- cmk/gui/plugins/sidebar/bookmarks.py | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/cmk/gui/plugins/sidebar/bookmarks.py b/cmk/gui/plugins/sidebar/bookmarks.py index e79000e..454fa5e 100644 --- a/cmk/gui/plugins/sidebar/bookmarks.py +++ b/cmk/gui/plugins/sidebar/bookmarks.py @@ -121,22 +121,7 @@ class BookmarkList(pagetypes.Overridable): validate=cls.validate_url, )), (IconSelector(title=_("Icon"),)), - (Alternative( - elements=[ - FixedValue( - None, - title=_("Use default topic"), - totext=_("(default topic)"), - ), - TextUnicode( - title=_("Individual topic"), - size=30, - allow_empty=False, - ), - ], - title=_("Topic") + "<sup>*</sup>", - style="dropdown", - )), + (cls._vs_topic()), ], orientation="horizontal", title=_("Bookmarks"), @@ -149,6 +134,25 @@ class BookmarkList(pagetypes.Overridable): return parameters @classmethod + def _vs_topic(cls): + return Alternative( + elements=[ + FixedValue( + None, + title=_("Use default topic"), + totext=_("(default topic)"), + ), + TextUnicode( + title=_("Individual topic"), + size=30, + allow_empty=False, + ), + ], + title=_("Topic") + "<sup>*</sup>", + style="dropdown", + ) + + @classmethod def validate_url(cls, value, varprefix): parsed = urlparse.urlparse(value)

5 years, 7 months

7190 More GUI elements can be shared with specific contact groups

by Lars Michelsen

Module: check_mk Branch: master Commit: c55baef658306643b38288823ae81903c39c5374 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c55baef6583066… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 27 15:44:19 2019 +0100 7190 More GUI elements can be shared with specific contact groups Views, reports and dashboard could already be shared with the users of specific contact groups. For a consistent user experience other customizable elements can now also be shared with a specific group of users instead of all users. This change affects the following elemets: The bookmark lists and snapins for all Check_MK Editions and the Graph Collections, Custom Graphs, Graph Tunings and SLAs for the Enterprise and Managed Services Edition CMK-1754 Change-Id: I32a0ebdd958e99d4b8628cf6ab24518bdc693f7b --- .werks/7190 | 18 ++++++ cmk/gui/pagetypes.py | 106 ++++++++++++++++++++++++++++------ cmk/gui/plugins/sidebar/bookmarks.py | 4 +- cmk/gui/visuals.py | 36 +----------- tests/unit/cmk/gui/test_gui_config.py | 6 ++ 5 files changed, 115 insertions(+), 55 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c55baef658…

5 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2019