Checkmk git commits July 2014

checkmk-commits@lists.checkmk.com

7 participants
221 discussions

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: c1936e984dcf98d63639274fdc048c076a6dae85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1936e984dcf98… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 7 11:53:43 2014 +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 e255a85..6d5177e 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1072 +1082

10 years, 4 months

Check_MK Git: check_mk: Werk aktualisiert

by Mathias Kettner

Module: check_mk Branch: master Commit: 597ef2032c1a0427e41c28ad10ba0712039d7675 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=597ef2032c1a04… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 7 09:49:52 2014 +0200 Werk aktualisiert --- .werks/885 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/885 b/.werks/885 index 3cbae30..e0cdbba 100644 --- a/.werks/885 +++ b/.werks/885 @@ -7,7 +7,7 @@ Class: feature The new Event Console global option <i>Syslog-like message logging</i> will enable logging of <b>all</b> incoming events into logfiles that have syslog format. -These files will be stored below <tt>var/check_mk/mkeventd/messages</tt> and will +These files will be stored below <tt>var/mkeventd/messages</tt> and will be named with the same scheme as the history logfiles. They will adopt the same rotation principle as the history files.

10 years, 4 months

Check_MK Git: check_mk: testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 931b0b0248291a64dd9f5c37c58c7de895edffb9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=931b0b0248291a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 7 09:32:04 2014 +0200 testcommit --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index dbc1476..2660aa4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ * 1043 FIX: printer_supply: fix value error in default parameters... * 0626 FIX: veeam_jobs: agent now supports output lines longer than 80 chars + Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... * 1033 New Mutisite filter for the number of services a host has...

10 years, 4 months

Check_MK Git: check_mk: testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 929063d86fc0e57c5d6e54174697199583a6823e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=929063d86fc0e5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 7 09:29:36 2014 +0200 testcommit --- ChangeLog | 1 - 1 file changed, 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2660aa4..dbc1476 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,7 +33,6 @@ * 1043 FIX: printer_supply: fix value error in default parameters... * 0626 FIX: veeam_jobs: agent now supports output lines longer than 80 chars - Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... * 1033 New Mutisite filter for the number of services a host has...

10 years, 4 months

Check_MK Git: check_mk: Removed debug code from check

by Lars Michelsen

Module: check_mk Branch: master Commit: 585a28b72ae0124cd44162a18020899ca5c5cb83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=585a28b72ae012… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 7 08:24:50 2014 +0200 Removed debug code from check --- checks/ibm_imm_health | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/ibm_imm_health b/checks/ibm_imm_health index 1b0cafd..a009608 100644 --- a/checks/ibm_imm_health +++ b/checks/ibm_imm_health @@ -27,7 +27,6 @@ # Author: Michael Nieporte <micha.nieporte(a)gmail.com> - Based on rsa_health by Mathias Kettner def ibm_imm_health_scan(oid): - print "running" if oid('.1.3.6.1.2.1.1.1.0').lower().endswith(" mips") or \ oid('.1.3.6.1.2.1.1.1.0').lower().endswith(" sh4a"): return True

10 years, 4 months

Check_MK Git: check_mk: Fixed events check always being reporting OK state

by Lars Michelsen

Module: check_mk Branch: master Commit: 7e161de099054ec61562b21b2ed7b711efcac3bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e161de099054e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 7 08:24:09 2014 +0200 Fixed events check always being reporting OK state Had been introduced here: commit 6dfcbb60e3be64dcd701aa6abbc1378d4f4a1f3e Date: Wed Jul 2 10:09:02 2014 +0200 --- mkeventd/lib/check_mkevents.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkeventd/lib/check_mkevents.cc b/mkeventd/lib/check_mkevents.cc index f9401c5..37f0a16 100644 --- a/mkeventd/lib/check_mkevents.cc +++ b/mkeventd/lib/check_mkevents.cc @@ -255,5 +255,5 @@ int main(int argc, char** argv) printf(", worst state is %s (Last line: %s)", state_text, worst_row_event_text.c_str()); printf("\n"); } - return 0; + return worst_state; }

10 years, 4 months

Check_MK Git: check_mk: FIX Fixed events check always being reporting OK state

by Lars Michelsen

Module: check_mk Branch: master Commit: 1c0478af9c2466d5c39a4bd0fdea9ebbf616f6af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c0478af9c2466… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 7 08:31:46 2014 +0200 FIX Fixed events check always being reporting OK state The "Events .*" checks were always displayed as OK. Had been introduced here: commit 6dfcbb60e3be64dcd701aa6abbc1378d4f4a1f3e Date: Wed Jul 2 10:09:02 2014 +0200 --- .werks/1053 | 13 +++++++++++++ ChangeLog | 1 + 2 files changed, 14 insertions(+) diff --git a/.werks/1053 b/.werks/1053 new file mode 100644 index 0000000..1eb3ace --- /dev/null +++ b/.werks/1053 @@ -0,0 +1,13 @@ +Title: Fixed events check always being reporting OK state +Level: 2 +Component: core +Version: 1.2.5i5 +Date: 1404714657 +Class: fix + +The "Events .*" checks were always displayed as OK. + +Had been introduced here: + +commit 6dfcbb60e3be64dcd701aa6abbc1378d4f4a1f3e +Date: Wed Jul 2 10:09:02 2014 +0200 diff --git a/ChangeLog b/ChangeLog index d164279..dbc1476 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * 1038 Massive speedup of cmk --snmptranslate * 1035 FIX: Do not fail on errors in *.mk files anymore - except in interactive mode... * 0174 FIX: Fixed appending of --keepalive-fd parameters to checkhelpers... + * 1053 FIX: Fixed events check always being reporting OK state... Checks & Agents: * 0168 f5_bigip_pool: Added Wato configuration...

10 years, 4 months

Check_MK Git: check_mk: lnx_video, win_video: added inventory function and agent for linux video cards, modified windows inventory function

by Goetz Golla

Module: check_mk Branch: master Commit: 28589543751652344d53df9e631c7cd61b44bbfd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28589543751652… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Sun Jul 6 20:17:45 2014 +0200 lnx_video, win_video: added inventory function and agent for linux video cards, modified windows inventory function --- .werks/627 | 8 +++++ ChangeLog | 1 + agents/plugins/mk_inventory.linux | 4 +++ inventory/lnx_video | 62 +++++++++++++++++++++++++++++++++++++ inventory/win_video | 17 +++++----- web/plugins/views/inventory.py | 8 ++++- 6 files changed, 90 insertions(+), 10 deletions(-) diff --git a/.werks/627 b/.werks/627 new file mode 100644 index 0000000..3ab82a1 --- /dev/null +++ b/.werks/627 @@ -0,0 +1,8 @@ +Title: lnx_video, win_video: added inventory function and agent for linux video cards, modified windows inventory function +Level: 1 +Component: inv +Version: 1.2.5i5 +Date: 1404670606 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 590b48f..d164279 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ HW/SW-Inventory: * 0625 hw/sw inventory now reads the kernel version and architecture for linux and windows + * 0627 lnx_video, win_video: added inventory function and agent for linux video cards, modified windows inventory function * 0167 FIX: mk_inventory.linux: Changed field separator from pipe to tab... * 1005 FIX: Fix exception when using pretty-print output format * 0946 FIX: hw/sw inventory: fixed display bug for byte fields with the value 0... diff --git a/agents/plugins/mk_inventory.linux b/agents/plugins/mk_inventory.linux index 75a1e8d..d7d89bd 100755 --- a/agents/plugins/mk_inventory.linux +++ b/agents/plugins/mk_inventory.linux @@ -50,6 +50,10 @@ then uname -m uname -r fi + if type lspci > /dev/null ; then + echo "<<<lnx_vga:sep(58):persist($UNTIL)>>>" + lspci -v -s $(lspci | grep VGA | cut -d" " -f 1) + fi fi diff --git a/inventory/lnx_video b/inventory/lnx_video new file mode 100644 index 0000000..08cd57e --- /dev/null +++ b/inventory/lnx_video @@ -0,0 +1,62 @@ +#!/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. + +# Example output +# <<<lnx_video>>> +# 05:00.0 VGA compatible controller: Advanced Micro Devices [AMD] nee ATI Cape Verde PRO [Radeon HD 7700 Series] (prog-if 00 [VGA controller]) +# Subsystem: Hightech Information System Ltd. Device 200b +# Flags: bus master, fast devsel, latency 0, IRQ 58 +# Memory at d0000000 (64-bit, prefetchable) [size=256M] +# Memory at fe8c0000 (64-bit, non-prefetchable) [size=256K] +# I/O ports at c000 [size=256] +# Expansion ROM at fe8a0000 [disabled] [size=128K] +# Capabilities: [48] Vendor Specific Information: Len=08 <?> +# Capabilities: [50] Power Management version 3 +# Capabilities: [58] Express Legacy Endpoint, MSI 00 +# Capabilities: [a0] MSI: Enable+ Count=1/1 Maskable- 64bit+ +# Capabilities: [100] Vendor Specific Information: ID=0001 Rev=1 Len=010 <?> +# Capabilities: [150] Advanced Error Reporting +# Capabilities: [270] #19 +# Kernel driver in use: fglrx_pci + + +def inv_lnx_video(info): + node = inv_tree("hardware.video:") + array = {} + for line in info: + if len(line) > 1: + if re.search("VGA compatible controller", line[1]): + array["name"] = line[2] + elif line[0] == "Subsystem": + array["subsystem"] = line[1] + elif line[0] == "Kernel driver in use": + array["driver"] = line[1] + node.append(array) + + +inv_info['lnx_video'] = { + "inv_function" : inv_lnx_video, +} diff --git a/inventory/win_video b/inventory/win_video index e50a2e5..4eebf19 100644 --- a/inventory/win_video +++ b/inventory/win_video @@ -37,20 +37,19 @@ def inv_win_video(info): - node = inv_tree("hardware.video.") + node = inv_tree("hardware.video:") + array = {} for varname, value in info: varname = re.sub(" *","", varname) value = re.sub("^ ", "", value) - if varname == "Description": - node["description"] = value - elif varname == "Name": - node["product"] = value - elif varname == "VideoModeDescription": - node["video_mode"] = value + if varname == "Name": + array["name"] = value elif varname == "DriverVersion": - node["driver_version"] = value + array["driver_version"] = value elif varname == "DriverDate": - node["driver_date"] = int(time.mktime(time.strptime(value.split(".")[0], "%Y%m%d%H%M%S"))) + array["driver_date"] = int(time.mktime(time.strptime(value.split(".")[0], "%Y%m%d%H%M%S"))) + node.append(array) + inv_info['win_video'] = { "inv_function" : inv_win_video, diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 95027fa..7ba2214 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -572,7 +572,13 @@ inventory_displayhints.update({ ".hardware.memory.arrays:*.devices:*.speed" : { "title" : _("Speed"), "paint" : "hz", }, ".hardware.system." : { "title" : _("System") }, ".hardware.harddisks." : { "title" : _("Hard Disks") }, - ".hardware.video." : { "title" : _("Video Cards") }, + ".hardware.video:" : { "title" : _("Graphic Cards") }, + ".hardware.video:*." : { "title" : _("Graphic Card %d") }, + ".hardware.video.*.name" : { "title" : _("Graphic Card Name"), "short" : _("Card Name") }, + ".hardware.video.*.subsystem" : { "title" : _("Vendor and Device ID"), "short" : _("Vendor") }, + ".hardware.video.*.driver" : { "title" : _("Driver"), "short" : _("Driver") }, + ".hardware.video.*.driver_date" : { "title" : _("Driver Date"), "short" : _("Driver Date") }, + ".hardware.video.*.driver_version" : { "title" : _("Driver Version"), "short" : _("Driver Version") }, ".software." : { "title" : _("Software"), "icon" : "software" }, ".software.os." : { "title" : _("Operating System") },

10 years, 4 months

Check_MK Git: check_mk: ibm_imm_health: Trying to recognice newer versions of IBM IMM now too

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 537364b53443244f6cf557c4dc9a626b356c0c50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=537364b5344324… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Jul 4 16:01:29 2014 +0200 ibm_imm_health: Trying to recognice newer versions of IBM IMM now too --- .werks/998 | 8 ++++++++ ChangeLog | 1 + checks/ibm_imm_health | 11 +++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.werks/998 b/.werks/998 new file mode 100644 index 0000000..5949e7c --- /dev/null +++ b/.werks/998 @@ -0,0 +1,8 @@ +Title: ibm_imm_health: Trying to recognice newer versions of IBM IMM now too +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1404482411 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 9228911..6b6bb5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * 0997 New checks and a special agent for ALLNET IP Sensoric devices... * 0175 logwatch.groups: New logwatch subcheck who can be used to group logfiles together.... * 1041 aix_memory: new check for RAM and SWAP on AIX + * 0998 ibm_imm_health: Trying to recognice newer versions of IBM IMM now too * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... diff --git a/checks/ibm_imm_health b/checks/ibm_imm_health index 28d822d..1b0cafd 100644 --- a/checks/ibm_imm_health +++ b/checks/ibm_imm_health @@ -26,6 +26,14 @@ # Author: Michael Nieporte <micha.nieporte(a)gmail.com> - Based on rsa_health by Mathias Kettner +def ibm_imm_health_scan(oid): + print "running" + if oid('.1.3.6.1.2.1.1.1.0').lower().endswith(" mips") or \ + oid('.1.3.6.1.2.1.1.1.0').lower().endswith(" sh4a"): + return True + else: + return False + def inventory_ibm_imm_health(info): if len(info) > 0: return [(None, None)] @@ -57,6 +65,5 @@ check_info["ibm_imm_health"] = { 'inventory_function': inventory_ibm_imm_health, 'service_description': 'System health', 'snmp_info': ('.1.3.6.1.4.1.2.3.51.3.1', ['4']), - 'snmp_scan_function': lambda oid: \ - oid('.1.3.6.1.2.1.1.1.0').lower().endswith(" mips"), + 'snmp_scan_function': ibm_imm_health_scan, }

10 years, 4 months

Check_MK Git: check_mk: SEC index start URL can not be used to redirect to absolute URLs anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 31611e42584dd0836ddab2ed80e72bb9aa561443 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=31611e42584dd0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 4 15:27:14 2014 +0200 SEC index start URL can not be used to redirect to absolute URLs anymore An attacker could make a user open up an URL to a compromised website which the does not want to open index.py?start_url=http://(url to compromised URL). --- .werks/1052 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/main.py | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/.werks/1052 b/.werks/1052 new file mode 100644 index 0000000..448b622 --- /dev/null +++ b/.werks/1052 @@ -0,0 +1,10 @@ +Title: index start URL can not be used to redirect to absolute URLs anymore +Level: 1 +Component: multisite +Class: security +State: unknown +Version: 1.2.5i5 +Date: 1404480323 + +An attacker could make a user open up an URL to a compromised website which the +does not want to open index.py?start_url=http://(url to compromised URL). diff --git a/ChangeLog b/ChangeLog index 48cb0d8..f10cf0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... * 1033 New Mutisite filter for the number of services a host has... * 0949 quicksearch: now able to search for multiple hosts at once... + * 1052 SEC: index start URL can not be used to redirect to absolute URLs anymore... * 0945 FIX: Sidebar snapin "Problem hosts": Now excludes hosts and services in downtime * 1036 FIX: doc/treasures/downtime: fix --url option, better error output diff --git a/web/htdocs/main.py b/web/htdocs/main.py index c0e4815..338ad16 100644 --- a/web/htdocs/main.py +++ b/web/htdocs/main.py @@ -28,6 +28,11 @@ import defaults, config def page_index(): start_url = html.var("start_url", config.start_url) + # Prevent redirecting to absolute URL which could be used to redirect + # users to compromised pages + if '://' in start_url: + start_url = config.start_url + # Do not cache the index page -> caching problems when page is accessed # while not logged in #html.req.headers_out.add("Cache-Control", "max-age=7200, public");

10 years, 4 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2014