Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

by Simon Betz

Module: check_mk Branch: master Commit: 57f6a293bad053118ee6a6866e23d22e0f751590 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57f6a293bad053… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 13 11:02:44 2016 +0200 added header --- checks/hp_proliant.include | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/checks/hp_proliant.include b/checks/hp_proliant.include index 0fabebf..3204ddf 100644 --- a/checks/hp_proliant.include +++ b/checks/hp_proliant.include @@ -1,3 +1,30 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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. + + hp_proliant_status_map = { 1: 'unknown', 2: 'ok', @@ -30,5 +57,3 @@ hp_proliant_locale = { 12: "chassis", 13: "bridgeCard", } - -

8 years, 5 months

3024 FIX Fixed WATO GIT version control for older (<2.0) GIT versions

by Andreas Boesl

Module: check_mk Branch: master Commit: d674de171b27738340097599c0405184a5b66620 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d674de171b2773… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 13 10:44:03 2016 +0200 3024 FIX Fixed WATO GIT version control for older (<2.0) GIT versions --- .werks/3024 | 9 +++++++++ ChangeLog | 1 + web/htdocs/watolib.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/3024 b/.werks/3024 new file mode 100644 index 0000000..7bba04e --- /dev/null +++ b/.werks/3024 @@ -0,0 +1,9 @@ +Title: Fixed WATO GIT version control for older (<2.0) GIT versions +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.9i1 +Date: 1460537019 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 451fa1f..d7c0289 100644 --- a/ChangeLog +++ b/ChangeLog @@ -252,6 +252,7 @@ * 3371 FIX: Be compatible to old site=None setting read from hosts.mk... * 3329 FIX: Function discover_services now allows the URL parameter mode... * 3330 FIX: WATO Web-API now allows to specify root folder with / instead of empty string again + * 3024 FIX: Fixed WATO GIT version control for older (<2.0) GIT versions Notifications: diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index efc8946..af88693 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4507,7 +4507,7 @@ def do_git_commit(): def git_add_files(): - git_command(["add", ".gitignore", "*.d/wato"]) + git_command(["add", "--all", ".gitignore", "*.d/wato"]) def git_has_pending_changes():

8 years, 5 months

Refactored display option handling to use own data structures instead of the super global html object

by Lars Michelsen

Module: check_mk Branch: master Commit: ca4e7bd116c587f39c6e4aee0f08f337eabdd792 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca4e7bd116c587… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 13 10:31:25 2016 +0200 Refactored display option handling to use own data structures instead of the super global html object --- web/htdocs/bi.py | 5 - web/htdocs/mobile.py | 2 +- web/htdocs/views.py | 287 +++++++++++++++++++++---------------- web/plugins/icons/builtin.py | 6 +- web/plugins/icons/wato.py | 2 +- web/plugins/views/availability.py | 14 +- web/plugins/views/inventory.py | 2 +- web/plugins/views/mkeventd.py | 2 +- web/plugins/views/painters.py | 2 +- web/plugins/views/perfometer.py | 4 +- 10 files changed, 181 insertions(+), 145 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ca4e7bd116…

8 years, 5 months

3404 fireeye_sys_status: new inventory plugin which gives information about serial number and model of Fireeye Appliances which support the FE-FIREEYE-MIB

by Simon Betz

Module: check_mk Branch: master Commit: 1ee287bc0f5a949585e40118b61818a1788a0e4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ee287bc0f5a94… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 13 10:24:46 2016 +0200 3404 fireeye_sys_status: new inventory plugin which gives information about serial number and model of Fireeye Appliances which support the FE-FIREEYE-MIB --- .werks/3404 | 9 ++++++++ ChangeLog | 1 + inventory/fireeye_sys_status | 50 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+) diff --git a/.werks/3404 b/.werks/3404 new file mode 100644 index 0000000..fa3a180 --- /dev/null +++ b/.werks/3404 @@ -0,0 +1,9 @@ +Title: fireeye_sys_status: new inventory plugin which gives information about serial number and model of Fireeye Appliances which support the FE-FIREEYE-MIB +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1460535811 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 6430bdf..451fa1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,7 @@ * 3120 mssql_datafiles, mssql_transactionlogs: new chech to also monitor the datafiles and added option to summarize datafiles and transactionlogs * 3121 mssql_counters.page_activity, mssql_counters.locks_per_batch: additional checks for mssql performance counters * 3403 fireeye_content, fireeye_fans, fireeye_powersupplies, fireeye_raid, fireeye_raid.disks, fireeye_sys_image, fireeye_sys_status, fireeye_temp: new checks for Fireeye Appliances which support the FE-FIREEYE-MIB + * 3404 fireeye_sys_status: new inventory plugin which gives information about serial number and model of Fireeye Appliances which support the FE-FIREEYE-MIB * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/inventory/fireeye_sys_status b/inventory/fireeye_sys_status new file mode 100644 index 0000000..e18c9e8 --- /dev/null +++ b/inventory/fireeye_sys_status @@ -0,0 +1,50 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2016 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. + + +# .1.3.6.1.4.1.25597.11.1.1.1.0 Good --> FE-FIREEYE-MIB::feSystemStatus.0 +# .1.3.6.1.4.1.25597.11.1.1.2.0 FireEye3400 --> FE-FIREEYE-MIB::feHardwareModel.0 +# .1.3.6.1.4.1.25597.11.1.1.3.0 FZ1548EA19G --> FE-FIREEYE-MIB::feSerialNumber.0 + + +def inv_fireeye_sys_status(info): + status, model, serial = info[0] + node = inv_tree("hardware.system.") + node["serial"] = serial + node["model"] = model + + +inv_info["fireeye_sys_status"] = { + "inv_function" : inv_fireeye_sys_status, + # If you make changes here in snmp_info, don't forget to make + # these changes in the related check plugin, too. + "snmp_info" : (".1.3.6.1.4.1.25597.11.1.1", [ + "1", # FE-FIREEYE-MIB::feSystemStatus + "2", # FE-FIREEYE-MIB::feHardwareModel + "3", # FE-FIREEYE-MIB::feSerialNumber + ]), + "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0').startswith('.1.3.6.1.4.1.25597.1'), +}

8 years, 5 months

add missing manpage

by Simon Betz

Module: check_mk Branch: master Commit: 1a9541d8b55d416b27510ccc6c19eb9eec9066e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a9541d8b55d41… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 13 10:21:44 2016 +0200 add missing manpage --- checkman/{fireeye_sys_info => fireeye_sys_status} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/checkman/fireeye_sys_info b/checkman/fireeye_sys_status similarity index 100% rename from checkman/fireeye_sys_info rename to checkman/fireeye_sys_status

8 years, 5 months

3403 fireeye_content, fireeye_fans, fireeye_powersupplies, fireeye_raid, fireeye_raid.disks, fireeye_sys_image, fireeye_sys_status, fireeye_temp: new checks for Fireeye Appliances which support the FE-FIREEYE-MIB

by Simon Betz

Module: check_mk Branch: master Commit: f008f83f0f3e49fbb1b138968b51242a47edff6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f008f83f0f3e49… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 13 10:20:11 2016 +0200 3403 fireeye_content, fireeye_fans, fireeye_powersupplies, fireeye_raid, fireeye_raid.disks, fireeye_sys_image, fireeye_sys_status, fireeye_temp: new checks for Fireeye Appliances which support the FE-FIREEYE-MIB --- .werks/3403 | 9 ++++ ChangeLog | 1 + checkman/fireeye_content | 15 ++++++ checkman/fireeye_fans | 17 ++++++ checkman/fireeye_powersupplies | 18 +++++++ checkman/fireeye_raid | 17 ++++++ checkman/fireeye_raid.disks | 17 ++++++ checkman/fireeye_sys_image | 17 ++++++ checkman/fireeye_sys_info | 17 ++++++ checkman/fireeye_temp | 19 +++++++ checks/fireeye.include | 61 +++++++++++++++++++++ checks/fireeye_content | 61 +++++++++++++++++++++ checks/fireeye_fans | 84 +++++++++++++++++++++++++++++ checks/fireeye_powersupplies | 49 +++++++++++++++++ checks/fireeye_raid | 114 ++++++++++++++++++++++++++++++++++++++++ checks/fireeye_sys_image | 59 +++++++++++++++++++++ checks/fireeye_sys_status | 49 +++++++++++++++++ checks/fireeye_temp | 66 +++++++++++++++++++++++ 18 files changed, 690 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f008f83f0f…

8 years, 5 months

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 02baabadeb8012311a2f62981d35bc7cadf84827 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02baabadeb8012… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Apr 13 10:07:42 2016 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 8903fed..81b84ec 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3403 +3413

8 years, 5 months

Updated manpage of cisco_asa_svcsessions

by Sven Rueß

Module: check_mk Branch: master Commit: 61d7662bbf6cab951f5bb2be8826b1aad8711897 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61d7662bbf6cab… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Wed Apr 13 09:36:13 2016 +0200 Updated manpage of cisco_asa_svcsessions --- checkman/cisco_asa_svcsessions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checkman/cisco_asa_svcsessions b/checkman/cisco_asa_svcsessions index 4cae9c4..dffe42a 100644 --- a/checkman/cisco_asa_svcsessions +++ b/checkman/cisco_asa_svcsessions @@ -1,10 +1,10 @@ -title: Citrix ASA SVC Sessions (SSL VPN Client) +title: Cisco ASA SVC Sessions (SSL VPN Client) agents: snmp catalog: hw/network/cisco distribution: check_mk license: GPLv3 description: - This check monitors the number of active Sessions VPN Sessions (e.g. Anyconnect) on a citrix server. + This check monitors the number of active VPN Sessions (e.g. Anyconnect) on a cisco server. inventory: One service will be created.

8 years, 5 months

windows agent: slight cleanup, no functional change

by Sebastian Herbord

Module: check_mk Branch: master Commit: 70f66656b49c0fe7d6a70f249808a9f09a86d46d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70f66656b49c0f… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Apr 13 08:54:13 2016 +0200 windows agent: slight cleanup, no functional change --- agents/windows/check_mk_agent.cc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 3c465d3..bc289e1 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -994,13 +994,21 @@ void section_ps(OutputProxy &out) { pe32.dwSize = sizeof(PROCESSENTRY32); if (Process32First(hProcessSnap, &pe32)) { + // GetProcessHandleCount is only available winxp upwards + typedef BOOL WINAPI (*GetProcessHandleCount_type)(HANDLE, PDWORD); + GetProcessHandleCount_type GetProcessHandleCount_dyn = + DYNAMIC_FUNC(GetProcessHandleCount, L"kernel32.dll"); + do { string user = "unknown"; DWORD dwAccess = PROCESS_QUERY_INFORMATION | PROCESS_VM_READ; WinHandle hProcess( OpenProcess(dwAccess, FALSE, pe32.th32ProcessID)); - if (NULL == hProcess) continue; + // the following isn't really necessary. We only need the + // process handle to determine process owner and handle count, + // the process list could still be useful without that. + if (nullptr == hProcess) continue; // Process times FILETIME createTime, exitTime, kernelTime, userTime; @@ -1015,12 +1023,7 @@ void section_ps(OutputProxy &out) { DWORD processHandleCount = 0; - // GetProcessHandleCount is only available winxp upwards - typedef BOOL WINAPI (*GetProcessHandleCount_type)(HANDLE, - PDWORD); - GetProcessHandleCount_type GetProcessHandleCount_dyn = - DYNAMIC_FUNC(GetProcessHandleCount, L"kernel32.dll"); - if (GetProcessHandleCount_dyn != NULL) { + if (GetProcessHandleCount_dyn != nullptr) { GetProcessHandleCount_dyn(hProcess, &processHandleCount); }

8 years, 5 months

fixed exception from command_downtime

by Sebastian Herbord

Module: check_mk Branch: master Commit: 29ba28ea46943c67cd196f50bbcac409b98e6201 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29ba28ea46943c… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Apr 12 18:11:58 2016 +0200 fixed exception from command_downtime --- web/plugins/views/commands.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 8fd2726..8ffdf97 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -528,29 +528,26 @@ def command_downtime(cmdtag, spec, row): def resolve_end(name): now = time.localtime(down_from) if name == "next_day": - return time.mktime((br.tm_year, br.tm_mon, br.tm_mday, 23, 59, 59, 0, 0, br.tm_isdst)) + 1, \ + return time.mktime((now.tm_year, now.tm_mon, now.tm_mday, 23, 59, 59, 0, 0, now.tm_isdst)) + 1, \ _("%s until 24:00:00 on") % title_start elif name == "next_week": - br = time.localtime(down_from) - wday = br.tm_wday + wday = now.tm_wday days_plus = 6 - wday - res = time.mktime((br.tm_year, br.tm_mon, br.tm_mday, 23, 59, 59, 0, 0, br.tm_isdst)) + 1 + res = time.mktime((now.tm_year, now.tm_mon, now.tm_mday, 23, 59, 59, 0, 0, now.tm_isdst)) + 1 res += days_plus * 24 * 3600 return res, _("%s until sunday night on") % title_start elif name == "next_month": - br = time.localtime(down_from) - new_month = br.tm_mon + 1 + new_month = now.tm_mon + 1 if new_month == 13: - new_year = br.tm_year + 1 + new_year = now.tm_year + 1 new_month = 1 else: - new_year = br.tm_year - return time.mktime((new_year, new_month, 1, 0, 0, 0, 0, 0, br.tm_isdst)), \ + new_year = now.tm_year + return time.mktime((new_year, new_month, 1, 0, 0, 0, 0, 0, now.tm_isdst)), \ _("%s until end of month on") % title_start elif name == "next_year": - br = time.localtime(down_from) - return time.mktime((br.tm_year, 12, 31, 23, 59, 59, 0, 0, br.tm_isdst)) + 1, \ - _("%s until end of %d on") % (title_start, br.tm_year) + return time.mktime((now.tm_year, 12, 31, 23, 59, 59, 0, 0, now.tm_isdst)) + 1, \ + _("%s until end of %d on") % (title_start, now.tm_year) else: duration = int(name) return down_from + duration, \

8 years, 5 months

← Newer
1
...
20
21
22
23
24
25
26
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016