Checkmk git commits August 2017

checkmk-commits@lists.checkmk.com

10 participants
201 discussions

Services are owned by their corresponding Host.

by Sven Panne

Module: check_mk Branch: master Commit: 84e98aceb04ef5e6fce7e9ffc1019c03f6804402 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84e98aceb04ef5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Aug 4 14:30:53 2017 +0200 Services are owned by their corresponding Host. Change-Id: I6bdbd3d1fdcbf96ff793b98280b2ce8c77511e46 --- livestatus/src/ServiceListColumn.h | 5 ++--- livestatus/src/ServiceListStateColumn.h | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/livestatus/src/ServiceListColumn.h b/livestatus/src/ServiceListColumn.h index f5796f3..8edaad2 100644 --- a/livestatus/src/ServiceListColumn.h +++ b/livestatus/src/ServiceListColumn.h @@ -37,8 +37,7 @@ class Row; class RowRenderer; #ifdef CMC -#include <unordered_set> -class Service; +#include "Host.h" #else #include "nagios.h" #endif @@ -62,7 +61,7 @@ public: std::unique_ptr<Filter> createFilter(RelationalOperator relOp, const std::string &value) override; #ifdef CMC - std::unordered_set<Service *> *getMembers(Row row); + Host::services_t *getMembers(Row row); #else servicesmember *getMembers(Row row); #endif diff --git a/livestatus/src/ServiceListStateColumn.h b/livestatus/src/ServiceListStateColumn.h index 3c52742..d960850 100644 --- a/livestatus/src/ServiceListStateColumn.h +++ b/livestatus/src/ServiceListStateColumn.h @@ -34,9 +34,7 @@ class MonitoringCore; class Row; #ifdef CMC -#include <unordered_set> -class Service; -typedef std::unordered_set<Service *> servicelist_t; +#include "Host.h" #else #include "nagios.h" #endif @@ -71,7 +69,7 @@ public: int32_t getValue(Row row, contact *auth_user) override; #ifdef CMC static int32_t getValue(MonitoringCore *mc, Type logictype, - servicelist_t *mem, contact *auth_user); + Host::services_t *mem, contact *auth_user); #else static int32_t getValue(MonitoringCore *mc, Type logictype, servicesmember *mem, contact *auth_user);

6 years, 11 months

5090 mssql_databases: Database status is now configurable

by Simon Betz

Module: check_mk Branch: master Commit: eb7488a2c74d732964fbe61b3a778650dccd2203 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb7488a2c74d73… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Aug 7 08:13:01 2017 +0200 5090 mssql_databases: Database status is now configurable The following states are configurable: ONLINE, OFFLINE, RESTORING, RECOVERING, RECOVERY PENDING, SUSPECT, EMERGENCY Change-Id: Ice0ffc28d3c458caf34c234056dfe7e7ac339d15 --- .werks/5090 | 12 ++++++++++++ checks/mssql_databases | 13 +++++++++++-- web/plugins/wato/check_parameters.py | 13 +++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/.werks/5090 b/.werks/5090 new file mode 100644 index 0000000..ac2cb15 --- /dev/null +++ b/.werks/5090 @@ -0,0 +1,12 @@ +Title: mssql_databases: Database status is now configurable +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1502085314 +Class: feature + +The following states are configurable: +ONLINE, OFFLINE, RESTORING, RECOVERING, +RECOVERY PENDING, SUSPECT, EMERGENCY diff --git a/checks/mssql_databases b/checks/mssql_databases index 7fdd75d..363fa0d 100644 --- a/checks/mssql_databases +++ b/checks/mssql_databases @@ -36,6 +36,7 @@ # MSSQL_MSSQL46 NOC_CONFIG_T ONLINE FULL 0 0^M # MSSQL_MSSQL46 tempdb ONLINE SIMPLE 0 0^M # MSSQL_MSSQL46 test_autoclose ONLINE FULL 1 0^M +# MSSQL_MSSQL46 test_autoclose RECOVERY PENDING FULL 1 0^M def parse_mssql_databases(info): @@ -44,9 +45,16 @@ def parse_mssql_databases(info): 'Recovery', 'auto_close', 'auto_shrink'] for line in info: + if line == headers: + continue + if len(line) == 6: data = dict(zip(headers, line)) - parsed.setdefault("%s %s" % (data["Instance"], data["DBname"]), data) + elif len(line) == 7: + data = dict(zip(headers, line[:2] + ["%s %s" % (line[2], line[3])] + line[-3:])) + else: + continue + parsed.setdefault("%s %s" % (data["Instance"], data["DBname"]), data) return parsed @@ -61,7 +69,8 @@ def check_mssql_databases(item, params, parsed): if item in parsed: data = parsed[item] - yield 0, 'Status: %s, Recovery: %s' % (data["Status"], data["Recovery"]) + db_state = params.get("map_db_states", {}).get(data["Status"], 0) + yield db_state, 'Status: %s, Recovery: %s' % (data["Status"], data["Recovery"]) for what in ["close", "shrink"]: state, state_readable = map_states[data["auto_%s" % what]] diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index d4ece82..10855f1 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2573,6 +2573,19 @@ register_check_parameters( _("MSSQL Databases properties"), Dictionary( elements = [ + ("map_db_states", Dictionary( + elements = [ + ("ONLINE", MonitoringState(title=_("Database Online"))), + ("OFFLINE", MonitoringState(title=_("Database Offline"))), + ("RESTORING", MonitoringState(title=_("Database Files are restored"))), + ("RECOVERING", MonitoringState(title=_("Database is being recovered"))), + ("RECOVERY PENDING", MonitoringState(title=_("Database must be recovered"))), + ("SUSPECT", MonitoringState(title=_("Database Suspect"))), + ("EMERGENCY", MonitoringState(title=_("Database changed to emergency"))), + ], + title = _('Map Database States'), + optional_keys = [], + )), ("map_auto_close_state", Dictionary( elements = [ ( "on", MonitoringState(title=_("Auto close on"), default_value=1) ),

6 years, 11 months

Fixed include statement

by Simon Betz

Module: check_mk Branch: master Commit: 868a40f220b2578e6fe58f33cc9558540a3f4dd7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=868a40f220b257… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Aug 7 08:14:23 2017 +0200 Fixed include statement Change-Id: I25e4afaddb0931b8ef7283cce412e39701b6a932 --- checks/stormshield_policy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/stormshield_policy b/checks/stormshield_policy index c9263f9..5422e0a 100644 --- a/checks/stormshield_policy +++ b/checks/stormshield_policy @@ -54,5 +54,5 @@ check_info['stormshield_policy'] = { '5', # STORMSHIELD-POLICY-MIB::snsPolicySync ]), 'snmp_scan_function' : stormshield_scan_function, - 'includes' : [ 'stormshield.inlude' ], + 'includes' : [ 'stormshield.include' ], }

6 years, 11 months

5089 FIX: citrix_xenapp.ps1: Refactored; now uses powershell commands for Citrix environment instead of WMI objects which caused runtime errors

by Simon Betz

Module: check_mk Branch: master Commit: 0b0402c7a5cbb8d5586e4ceda1f556cc93fea156 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b0402c7a5cbb8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Aug 7 07:41:38 2017 +0200 5089 FIX: citrix_xenapp.ps1: Refactored; now uses powershell commands for Citrix environment instead of WMI objects which caused runtime errors Change-Id: I518fae36620681fd6607369c85f478fb6ad3c26d --- .werks/5089 | 11 +++++++++++ agents/windows/plugins/citrix_xenapp.ps1 | 17 +++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.werks/5089 b/.werks/5089 new file mode 100644 index 0000000..a272a01 --- /dev/null +++ b/.werks/5089 @@ -0,0 +1,11 @@ +Title: citrix_xenapp.ps1: Refactored; now uses powershell commands for Citrix environment instead of WMI objects which caused runtime errors +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1502083451 + + diff --git a/agents/windows/plugins/citrix_xenapp.ps1 b/agents/windows/plugins/citrix_xenapp.ps1 index 8084244..f77c2bc 100644 --- a/agents/windows/plugins/citrix_xenapp.ps1 +++ b/agents/windows/plugins/citrix_xenapp.ps1 @@ -1,14 +1,15 @@ -$computer = "localhost" +Add-PSSnapin Citrix* ### Citrix XenApp Serverload -$loadObject = Get-WmiObject -Namespace 'Root\Citrix' -class 'MetaFrame_Server_LoadLevel' -ComputerName $computer -ErrorAction Stop +$load = Get-XAServerLoad -ServerName $env:computername | Select-Object -ExpandProperty load "<<<citrix_serverload>>>" -$loadObject.LoadLevel -$computer = "localhost" +$load ### Citrix XenApp Sessions -$serverObject = Get-WmiObject -Namespace root\citrix -Class Metaframe_Server -ComputerName $computer +$disc = (Get-XASession -ServerName $env:computername |Where {$_.State -eq "Disconnected" }).count +$activ = (Get-XASession -ServerName $env:computername |Where {$_.State -eq "Active" }).count +$all = ($disc + $activ) "<<<citrix_sessions>>>" -"sessions {0}" -f $serverObject.NumberOfSessions -"active_sessions {0}" -f $serverObject.NumberOfActiveSessions -"inactive_sessions {0}" -f $serverObject.NumberOfDisconnectedSessions +"sessions {0}" -f $all +"active_sessions {0}" -f $activ +"inactive_sessions {0}" -f $disc \ No newline at end of file

6 years, 11 months

updated date of several werks

by Marcel Arentz

Module: check_mk Branch: master Commit: f96c1364ecb55913bc4ab2501acc05b69cc26b7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f96c1364ecb559… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Aug 4 17:01:30 2017 +0200 updated date of several werks Change-Id: Id5189e9916b2e34f078a87207784a96099fb0624 --- .werks/4548 | 2 +- .werks/4643 | 2 +- .werks/4645 | 2 +- .werks/4738 | 2 +- .werks/4787 | 2 +- .werks/4820 | 2 +- .werks/4910 | 2 +- .werks/4911 | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.werks/4548 b/.werks/4548 index cd8561d..deb066b 100644 --- a/.werks/4548 +++ b/.werks/4548 @@ -4,7 +4,7 @@ Component: checks Compatible: compat Edition: cre Version: 1.5.0i1 -Date: 1490372915 +Date: 1501858734 Class: feature Including Checks for temperatures, fans, humidity, system events, pressure, diff --git a/.werks/4643 b/.werks/4643 index 5e48eaf..4165a2a 100644 --- a/.werks/4643 +++ b/.werks/4643 @@ -4,7 +4,7 @@ Component: checks Compatible: compat Edition: cre Version: 1.5.0i1 -Date: 1494333205 +Date: 1501858734 Class: feature This special agent requires username and password. The matching host will be used as target and the following services will be created: diff --git a/.werks/4645 b/.werks/4645 index 553c239..8fd73fa 100644 --- a/.werks/4645 +++ b/.werks/4645 @@ -4,7 +4,7 @@ Component: checks Compatible: compat Edition: cre Version: 1.5.0i1 -Date: 1494599619 +Date: 1501858734 Class: feature Check_MK is now able to check disks, controller and enclosures. Further checks are possible in the future. diff --git a/.werks/4738 b/.werks/4738 index 3d26774..6d24e36 100644 --- a/.werks/4738 +++ b/.werks/4738 @@ -4,7 +4,7 @@ Component: checks Compatible: compat Edition: cre Version: 1.5.0i1 -Date: 1495545252 +Date: 1501858734 Class: feature diff --git a/.werks/4787 b/.werks/4787 index 843fc90..f300e3f 100644 --- a/.werks/4787 +++ b/.werks/4787 @@ -4,7 +4,7 @@ Component: checks Compatible: compat Edition: cre Version: 1.5.0i1 -Date: 1496743098 +Date: 1501858734 Class: feature diff --git a/.werks/4820 b/.werks/4820 index 664ce54..bdabf4f 100644 --- a/.werks/4820 +++ b/.werks/4820 @@ -4,7 +4,7 @@ Component: checks Compatible: compat Edition: cre Version: 1.5.0i1 -Date: 1497431383 +Date: 1501858734 Class: feature Now checks also stats if the description of this stat is somewhat different diff --git a/.werks/4910 b/.werks/4910 index c294513..46a7fd5 100644 --- a/.werks/4910 +++ b/.werks/4910 @@ -4,7 +4,7 @@ Component: checks Compatible: compat Edition: cre Version: 1.5.0i1 -Date: 1498663765 +Date: 1501858734 Class: feature For more information see the manpages of the particular check. diff --git a/.werks/4911 b/.werks/4911 index 9210673..c6e9292 100644 --- a/.werks/4911 +++ b/.werks/4911 @@ -4,7 +4,7 @@ Component: checks Compatible: compat Edition: cre Version: 1.5.0i1 -Date: 1499100422 +Date: 1501858734 Class: feature

6 years, 11 months

4911 Added new Checks for Dell OpenManage: PSU & Fans

by Marcel Arentz

Module: check_mk Branch: master Commit: 297cf876d6d20fedca39aecdf9494afb7b5eb35f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=297cf876d6d20f… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Jul 3 18:47:40 2017 +0200 4911 Added new Checks for Dell OpenManage: PSU & Fans Change-Id: I8f8c6ebe71cf32ee5dfd8ab62fefd424e82c101c --- .werks/4911 | 10 ++++ checkman/dell_om_fans | 16 ++++++ checkman/dell_om_power | 16 ++++++ checkman/dell_om_power.unit | 16 ++++++ checks/dell_om_fans | 83 +++++++++++++++++++++++++++++ checks/dell_om_power | 125 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 266 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=297cf876d6…

6 years, 11 months

4910 New checks for Stormshield Firewalls

by Marcel Arentz

Module: check_mk Branch: master Commit: 8ff9768b66b66bcf2c1ec67d06a9bdd88a1eade6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ff9768b66b66b… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Jun 29 08:28:07 2017 +0200 4910 New checks for Stormshield Firewalls For more information see the manpages of the particular checkplugin. Change-Id: I52c9ca1f0ddc00bc0558c3ee29eab57634435772 --- .werks/4910 | 10 +++ checkman/stormshield_cluster | 12 ++++ checkman/stormshield_cluster.node | 13 ++++ checkman/stormshield_policy | 14 ++++ checkman/stormshield_route | 16 +++++ checkman/stormshield_system | 15 ++++ checkman/stormshield_system.cpu | 14 ++++ checks/stormshield.include | 32 +++++++++ checks/stormshield_cluster | 133 +++++++++++++++++++++++++++++++++++ checks/stormshield_policy | 58 +++++++++++++++ checks/stormshield_route | 68 ++++++++++++++++++ checks/stormshield_system | 97 +++++++++++++++++++++++++ lib/man_pages.py | 1 + web/plugins/wato/check_parameters.py | 2 +- 14 files changed, 484 insertions(+), 1 deletion(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8ff9768b66…

6 years, 11 months

4738 New Support for Nimble Storage Appliances

by Marcel Arentz

Module: check_mk Branch: master Commit: b57c290c4f4386ce887f22d702daf466837ae8cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b57c290c4f4386… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue May 23 15:14:39 2017 +0200 4738 New Support for Nimble Storage Appliances Change-Id: I117714255a44857304c78a59e5c5fa5e042c8549 --- .werks/4738 | 10 +++ checkman/nimble_capacity | 11 +++ checkman/nimble_latency | 16 ++++ checkman/nimble_latency.write | 16 ++++ checkman/nimble_volumes | 13 ++++ checks/nimble_latency | 162 ++++++++++++++++++++++++++++++++++++++++ checks/nimble_volumes | 63 ++++++++++++++++ lib/man_pages.py | 3 +- web/plugins/metrics/check_mk.py | 1 + 9 files changed, 294 insertions(+), 1 deletion(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b57c290c4f…

6 years, 11 months

4645 Dell Compellent: Added support for Compellent Storage appliances

by Marcel Arentz

Module: check_mk Branch: master Commit: 33a8fa65f7a5c76eb87bd69ddd964a5bb889d18f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33a8fa65f7a5c7… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri May 12 16:35:25 2017 +0200 4645 Dell Compellent: Added support for Compellent Storage appliances Check_MK is now able to check disks, controller and enclosures. Further checks are possible in the future. Change-Id: I23ffd0d5d9e163e41064fe674eec030d2e21c8b9 --- .werks/4645 | 10 +++++ checkman/dell_compellent_controller | 15 +++++++ checkman/dell_compellent_disks | 16 +++++++ checkman/dell_compellent_enclosure | 16 +++++++ checkman/dell_compellent_folder | 14 +++++++ checks/dell_compellent.include | 46 ++++++++++++++++++++ checks/dell_compellent_controller | 61 +++++++++++++++++++++++++++ checks/dell_compellent_disks | 84 +++++++++++++++++++++++++++++++++++++ checks/dell_compellent_enclosure | 61 +++++++++++++++++++++++++++ checks/dell_compellent_folder | 55 ++++++++++++++++++++++++ 10 files changed, 378 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=33a8fa65f7…

6 years, 11 months

4643 Added special agent and checks for HPE StoreOnce

by Marcel Arentz

Module: check_mk Branch: master Commit: ac8c39fdc6c0626d5c35ab3f9a0cf11553abe5bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac8c39fdc6c062… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue May 9 14:41:55 2017 +0200 4643 Added special agent and checks for HPE StoreOnce This special agent requires username and password. The matching host will be used as target and the following services will be created: - HPE StoreOnce xx00 Backup - Appliance Status - Total Capacity - Uptime - ServiceSet x Capacity - ServiceSet x Status - ServiceSet x Store y Further information will be in the manpages. Change-Id: I992b5876ebad61e996debdd31d10791e61bcc170 --- .werks/4643 | 20 + agents/special/agent_storeonce | 4688 +++++++++++++++++++++++++++++++ checkman/storeonce_clusterinfo | 15 + checkman/storeonce_clusterinfo.cluster | 15 + checkman/storeonce_clusterinfo.space | 15 + checkman/storeonce_clusterinfo.uptime | 11 + checkman/storeonce_servicesets | 17 + checkman/storeonce_servicesets.capacity | 15 + checkman/storeonce_stores | 17 + checks/agent_storeonce | 39 + checks/storeonce.include | 53 + checks/storeonce_clusterinfo | 190 ++ checks/storeonce_servicesets | 120 + checks/storeonce_stores | 114 + web/plugins/metrics/check_mk.py | 15 + web/plugins/wato/datasource_programs.py | 22 + 16 files changed, 5366 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ac8c39fdc6…

6 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2017