Checkmk git commits June 2016

checkmk-commits@lists.checkmk.com

8 participants
185 discussions

by Sven Panne

Module: check_mk Branch: master Commit: bf20a1f05bb4a79adca15d8d90966fa21100abd2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf20a1f05bb4a7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jun 9 16:47:53 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/Query.cc | 3 +-- livestatus/src/opids.cc | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 7314763..402ff48 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -488,8 +488,7 @@ void Query::parseFilterLine(char *line, AndingFilter &filter) { return; } RelationalOperator relOp; - ; - if (relationalOperatorForName(operator_name, relOp)) { + if (!relationalOperatorForName(operator_name, relOp)) { setError(OutputBuffer::ResponseCode::invalid_header, "invalid filter operator '" + string(operator_name) + "'"); return; diff --git a/livestatus/src/opids.cc b/livestatus/src/opids.cc index 2002c42..ad43801 100644 --- a/livestatus/src/opids.cc +++ b/livestatus/src/opids.cc @@ -32,7 +32,7 @@ using std::unordered_map; namespace { unordered_map<string, RelationalOperator> fromString = { - {"==", RelationalOperator::equal}, + {"=", RelationalOperator::equal}, {"!=", RelationalOperator::not_equal}, {"~", RelationalOperator::matches}, {"!~", RelationalOperator::doesnt_match},

8 years

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 0f5a6094792dac19c4aad12485972b121d5648bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f5a6094792dac… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jun 9 16:29:19 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/AttributelistColumn.cc | 14 ++- livestatus/src/AttributelistColumn.h | 4 +- livestatus/src/AttributelistFilter.cc | 56 ++++++----- livestatus/src/AttributelistFilter.h | 17 ++-- livestatus/src/Column.cc | 3 +- livestatus/src/Column.h | 9 +- livestatus/src/CustomVarsColumn.cc | 7 +- livestatus/src/CustomVarsColumn.h | 4 +- livestatus/src/CustomVarsFilter.cc | 156 ++++++++++++++++------------- livestatus/src/CustomVarsFilter.h | 16 +-- livestatus/src/DoubleColumn.cc | 6 +- livestatus/src/DoubleColumn.h | 4 +- livestatus/src/DoubleColumnFilter.cc | 51 +++++----- livestatus/src/DoubleColumnFilter.h | 15 +-- livestatus/src/GlobalCountersColumn.h | 2 - livestatus/src/HostlistColumn.cc | 8 +- livestatus/src/HostlistColumn.h | 4 +- livestatus/src/HostlistColumnFilter.cc | 52 +++++++--- livestatus/src/HostlistColumnFilter.h | 14 +-- livestatus/src/IntColumn.cc | 5 +- livestatus/src/IntColumn.h | 4 +- livestatus/src/IntColumnFilter.cc | 139 ++++++++++++++----------- livestatus/src/IntColumnFilter.h | 14 +-- livestatus/src/ListColumn.cc | 8 +- livestatus/src/ListColumn.h | 4 +- livestatus/src/ListColumnFilter.cc | 73 +++++++++----- livestatus/src/ListColumnFilter.h | 16 +-- livestatus/src/MetricsColumn.h | 1 - livestatus/src/OffsetStringMacroColumn.cc | 4 +- livestatus/src/OffsetStringMacroColumn.h | 4 +- livestatus/src/OffsetTimeColumn.cc | 12 ++- livestatus/src/OffsetTimeColumn.h | 4 +- livestatus/src/Query.cc | 18 ++-- livestatus/src/Query.h | 4 +- livestatus/src/ServicelistColumn.cc | 8 +- livestatus/src/ServicelistColumn.h | 4 +- livestatus/src/ServicelistColumnFilter.cc | 55 ++++++---- livestatus/src/ServicelistColumnFilter.h | 14 +-- livestatus/src/StringColumn.cc | 8 +- livestatus/src/StringColumn.h | 4 +- livestatus/src/StringColumnFilter.cc | 139 ++++++++++++++----------- livestatus/src/StringColumnFilter.h | 16 +-- livestatus/src/TimeColumnFilter.h | 7 +- livestatus/src/TimePointerColumn.cc | 12 ++- livestatus/src/TimePointerColumn.h | 4 +- livestatus/src/opids.cc | 67 ++++++------- livestatus/src/opids.h | 31 +++--- 47 files changed, 672 insertions(+), 449 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0f5a609479…

8 years

3592 Views: Added sorter for host names (without site)

by Lars Michelsen

Module: check_mk Branch: master Commit: 4505df14e638fb567421ef711d3a76f001df6674 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4505df14e638fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 9 13:51:44 2016 +0200 3592 Views: Added sorter for host names (without site) --- .werks/3592 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/sorters.py | 11 ++++++++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/3592 b/.werks/3592 new file mode 100644 index 0000000..5aefcd0 --- /dev/null +++ b/.werks/3592 @@ -0,0 +1,10 @@ +Title: Views: Added sorter for host names (without site) +Level: 1 +Component: multisite +Class: feature +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1465473081 + + diff --git a/ChangeLog b/ChangeLog index 6e81dc8..447eae5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -281,6 +281,7 @@ * 3129 new view and datasource containing the results of the last periodic discovery check... * 3572 Added user login session idle timeout... * 3575 User logins can now be limited to single session at a time... + * 3592 Views: Added sorter for host names (without site) * 3059 FIX: Fixed highlighting of availability timeline time slices * 3175 FIX: Fix timeranges of graphs that are embedded in a dashboard... * 3076 FIX: fixed broken views in check_mk raw edition diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py index e6daa25..6565e54 100644 --- a/web/plugins/views/sorters.py +++ b/web/plugins/views/sorters.py @@ -100,11 +100,20 @@ def cmp_site_host(r1, r2): cmp_num_split("host_name", r1, r2) multisite_sorters["site_host"] = { - "title" : _("Host"), + "title" : _("Host site and name"), "columns" : ["site", "host_name" ], "cmp" : cmp_site_host } +def cmp_host_name(r1, r2): + return cmp_num_split("host_name", r1, r2) + +multisite_sorters["host_name"] = { + "title" : _("Host name"), + "columns" : ["host_name" ], + "cmp" : cmp_host_name, +} + def cmp_site_alias(r1, r2): return cmp(config.site(r1["site"])["alias"], config.site(r2["site"])["alias"])

8 years

mail notification: fixed access to invalid parameter in smtp-path

by Sebastian Herbord

Module: check_mk Branch: master Commit: e8da4c423712e3dd295ba5cb0d6f09a925450aa9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8da4c423712e3… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Jun 9 11:57:23 2016 +0200 mail notification: fixed access to invalid parameter in smtp-path --- notifications/mail | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/notifications/mail b/notifications/mail index 6ef6644..6030e77 100755 --- a/notifications/mail +++ b/notifications/mail @@ -489,14 +489,13 @@ def send_mail_smtp_impl(message, target, host, from_address, context): return self.last_code, self.last_repl port = int(context['PARAMETER_SMTP_PORT']) - timeout = int(context['PARAMETER_SMTP_TIMEOUT']) encryption = context.get('PARAMETER_SMTP_ENCRYPTION', "NONE") if encryption == "SSL_TLS": - conn = smtplib.SMTP_SSL(host, port, from_address, timeout=timeout) + conn = smtplib.SMTP_SSL(host, port, from_address) else: - conn = smtplib.SMTP(host, port, from_address, timeout=timeout) + conn = smtplib.SMTP(host, port, from_address) # evil hack: the smtplib doesn't allow access to the reply code/message # in case of success. But we want it!

8 years

3591 mssql_clusters: Added information about nodes to MSSQL instance inventory

by Lars Michelsen

Module: check_mk Branch: master Commit: 13efe633afa23d17096056b1b394d396f58e2886 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13efe633afa23d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 9 08:52:25 2016 +0200 3591 mssql_clusters: Added information about nodes to MSSQL instance inventory --- .werks/3591 | 9 ++++++ ChangeLog | 1 + agents/windows/plugins/mssql.vbs | 36 +++++++++++++++++++++++- inventory/mssql_clusters | 56 ++++++++++++++++++++++++++++++++++++++ inventory/mssql_versions | 14 ++++++++-- web/plugins/views/inventory.py | 6 +++- 6 files changed, 117 insertions(+), 5 deletions(-) diff --git a/.werks/3591 b/.werks/3591 new file mode 100644 index 0000000..d5d39c8 --- /dev/null +++ b/.werks/3591 @@ -0,0 +1,9 @@ +Title: mssql_clusters: Added information about nodes to MSSQL instance inventory +Level: 1 +Component: inv +Compatible: compat +Version: 1.4.0i1 +Date: 1465455101 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 33abde6..6e81dc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -493,6 +493,7 @@ * 3447 mssql_versions: Added inventory plugin for MSSQL instances * 3581 mssql_versions: Added product name to inventory information * 3585 Implemented API for exporting the full host inventory... + * 3591 mssql_clusters: Added information about nodes to MSSQL instance inventory * 3219 FIX: lnx_distro: Now detecting Oracle VM Server correctly * 3229 FIX: lnx_distro: SLES based systems have now an OS name inventorized\ * 3265 FIX: mk_inventory.solaris: fix problem on Solaris 10, do prtdiag and prtpicl only in global zone diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index 75052df..4a529af 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -317,7 +317,6 @@ For Each instance_id In instances.Keys 'Loop all databases to get the size of the transaction log addOutput( "<<<mssql_datafiles>>>" ) - For Each dbName in dbNames.Keys RS.Open "USE [" & dbName & "];", CONN RS.Open "SELECT name, physical_name," &_ @@ -335,6 +334,41 @@ For Each instance_id In instances.Keys Loop RS.Close Next + + addOutput("<<<mssql_clusters>>>") + Dim active_node, nodes + For Each dbName in dbNames.Keys + RS.Open "USE [" & dbName & "];", CONN + + ' Skip non cluster instances + RS.Open "SELECT SERVERPROPERTY('IsClustered') AS is_clustered", CONN + If RS("is_clustered") = 0 Then + RS.Close + Continue + End If + RS.Close + + nodes = "" + RS.Open "SELECT nodename FROM sys.dm_os_cluster_nodes", CONN + Do While Not RS.Eof + If nodes <> "" Then + nodes = nodes & "," + End If + nodes = nodes & RS("nodename") + RS.MoveNext + Loop + RS.Close + + active_node = "-" + RS.Open "SELECT SERVERPROPERTY('ComputerNamePhysicalNetBIOS') AS active_node", CONN + Do While Not RS.Eof + active_node = RS("active_node") + RS.MoveNext + Loop + RS.Close + + addOutput(instance_id & " " & Replace(dbName, " ", "_") & " " & active_node & " " & nodes) + Next CONN.Close Next diff --git a/inventory/mssql_clusters b/inventory/mssql_clusters new file mode 100644 index 0000000..e38a5e7 --- /dev/null +++ b/inventory/mssql_clusters @@ -0,0 +1,56 @@ +#!/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- +# tails. 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. + +# <<<mssql_clusters>>> +# MSSQL_VIM_SQLEXP node1 node1,node2 + +def inv_mssql_clusters(info): + node = inv_tree_list("software.applications.mssql.instances:") + + def get_list_item(key, val): + for item in node: + if item[key] == val: + return item + + node.append({}) + return node[-1] + + for line in info: + instance_id = line[0] + database = line[1] + active_node = line[2] + nodes = line[3].split(",") + + instance = get_list_item("name", instance_id) + instance.update({ + "name" : instance_id, + "active_node" : active_node, + "node_names" : nodes, + }) + +inv_info["mssql_clusters"] = { + "inv_function" : inv_mssql_clusters, +} diff --git a/inventory/mssql_versions b/inventory/mssql_versions index 2d9c8bd..646aafa 100644 --- a/inventory/mssql_versions +++ b/inventory/mssql_versions @@ -55,6 +55,14 @@ def inv_mssql_versions(info): else: return "Unknown Product" + def get_list_item(key, val): + for item in node: + if item[key] == val: + return item + + node.append({}) + return node[-1] + for line in info: if len(line) not in [2, 4]: continue @@ -65,15 +73,15 @@ def inv_mssql_versions(info): clustered = len(line) == 4 and line[3] != "" cluster_name = len(line) == 4 and line[3] or "" - instance = { + instance = get_list_item("name", instance_id) + instance.update({ "name" : instance_id, "version" : version, "product" : product(version), "edition" : edition, "clustered" : clustered, "cluster_name" : cluster_name, - } - node.append(instance) + }) inv_info["mssql_versions"] = { "inv_function" : inv_mssql_versions, diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 012ee83..0cfcfc8 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -479,6 +479,9 @@ def inv_paint_mssql_is_clustered(clustered): return "mssql_" + (clustered and "is_clustered" or "is_not_clustered"), \ (clustered and _("is clustered") or _("is not clustered")) +def inv_paint_mssql_node_names(node_names): + return "", ", ".join(node_names) + def inv_paint_ipv4_network(nw): if nw == "0.0.0.0/0": return "", _("Default") @@ -695,7 +698,8 @@ inventory_displayhints.update({ ".software.applications.mssql." : { "title" : _("MSSQL") }, ".software.applications.mssql.instances:" : { "title" : _("Instances"), "render" : render_inv_dicttable, - "keyorder" : [ "name", "product", "edition", "version", "clustered", "cluster_name" ], + "keyorder" : [ "name", "product", "edition", "version", "clustered", + "cluster_name", "active_node", "node_names" ], }, ".software.applications.mssql.instances:*.clustered" : { "title" : _("Clustered"), "paint" : "mssql_is_clustered"},

8 years

mailman_lists: Fixed spelling error in check output

by Mathias Kettner

Module: check_mk Branch: master Commit: 1dbede90c4f15fc11f5572e7f4a1ee2893f43009 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1dbede90c4f15f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 8 19:10:03 2016 +0200 mailman_lists: Fixed spelling error in check output --- checks/mailman_lists | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/mailman_lists b/checks/mailman_lists index f969930..9f33e05 100644 --- a/checks/mailman_lists +++ b/checks/mailman_lists @@ -31,7 +31,7 @@ def check_mailman_lists(item, params, info): for line in info: name, num_members = line[0], saveint(line[1]) if name == item: - return (0, '%d members subcribed' % (num_members), [('count', num_members)]) + return (0, '%d members subscribed' % (num_members), [('count', num_members)]) return (3, 'List could not be found in agent output') check_info["mailman_lists"] = {

8 years

Some assorted fixes/cleanups/leftovers/...

by Sven Panne

Module: check_mk Branch: master Commit: affac47ee3765524c1b153c731686ddab28ed534 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=affac47ee37655… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jun 8 16:00:24 2016 +0200 Some assorted fixes/cleanups/leftovers/... --- agents/windows/stringutil.cc | 2 -- livestatus/src/AttributelistFilter.cc | 1 + livestatus/src/DoubleColumnFilter.cc | 1 + livestatus/src/HostlistColumnFilter.cc | 9 +++++---- livestatus/src/IntColumnFilter.cc | 1 + livestatus/src/ListColumnFilter.cc | 1 + livestatus/src/ServicelistColumnFilter.cc | 17 ++++++++--------- livestatus/src/StringColumnFilter.cc | 3 ++- 8 files changed, 19 insertions(+), 16 deletions(-) diff --git a/agents/windows/stringutil.cc b/agents/windows/stringutil.cc index f87ee09..06cb203 100644 --- a/agents/windows/stringutil.cc +++ b/agents/windows/stringutil.cc @@ -252,7 +252,6 @@ bool globmatch(const wchar_t *pattern, const wchar_t *astring) { return *p == 0; } - std::string replaceAll(const std::string &str, const std::string &from, const std::string &to) { if (from.empty()) { @@ -269,7 +268,6 @@ std::string replaceAll(const std::string &str, const std::string &from, return result; } - #ifdef _WIN32 std::string get_win_error_as_string(DWORD error_id) { // Get the error message, if any. diff --git a/livestatus/src/AttributelistFilter.cc b/livestatus/src/AttributelistFilter.cc index 67dcd0b..bd5d93b 100644 --- a/livestatus/src/AttributelistFilter.cc +++ b/livestatus/src/AttributelistFilter.cc @@ -23,6 +23,7 @@ // Boston, MA 02110-1301 USA. #include "AttributelistFilter.h" +#include <ostream> #include <string> #include "AttributelistColumn.h" #include "Logger.h" diff --git a/livestatus/src/DoubleColumnFilter.cc b/livestatus/src/DoubleColumnFilter.cc index 1b9b275..48aef66 100644 --- a/livestatus/src/DoubleColumnFilter.cc +++ b/livestatus/src/DoubleColumnFilter.cc @@ -24,6 +24,7 @@ #include "DoubleColumnFilter.h" #include <stdlib.h> +#include <ostream> #include <string> #include "DoubleColumn.h" #include "Logger.h" diff --git a/livestatus/src/HostlistColumnFilter.cc b/livestatus/src/HostlistColumnFilter.cc index f72d89b..211ac64 100644 --- a/livestatus/src/HostlistColumnFilter.cc +++ b/livestatus/src/HostlistColumnFilter.cc @@ -24,8 +24,9 @@ #include "HostlistColumnFilter.h" #include <stdlib.h> +#include <ostream> #include "HostlistColumn.h" -#include "logger.h" +#include "Logger.h" #include "nagios.h" #include "opids.h" @@ -58,9 +59,9 @@ bool HostlistColumnFilter::accepts(void *data) { case OP_LESS: return !is_member; default: - logger(LG_INFO, - "Sorry, Operator %s for host lists lists not implemented.", - op_names_plus_8[_opid]); + Informational() << "Sorry, Operator " + << nameOfRelationalOperator(_opid) + << " for host lists not implemented."; return true; } } diff --git a/livestatus/src/IntColumnFilter.cc b/livestatus/src/IntColumnFilter.cc index eb2774e..0b10d29 100644 --- a/livestatus/src/IntColumnFilter.cc +++ b/livestatus/src/IntColumnFilter.cc @@ -25,6 +25,7 @@ #include "IntColumnFilter.h" #include <stdlib.h> #include <string.h> +#include <ostream> #include "IntColumn.h" #include "Logger.h" #include "opids.h" diff --git a/livestatus/src/ListColumnFilter.cc b/livestatus/src/ListColumnFilter.cc index 34bb40a..c7eaec1 100644 --- a/livestatus/src/ListColumnFilter.cc +++ b/livestatus/src/ListColumnFilter.cc @@ -24,6 +24,7 @@ #include "ListColumnFilter.h" #include <string.h> +#include <ostream> #include <string> #include "ListColumn.h" #include "Logger.h" diff --git a/livestatus/src/ServicelistColumnFilter.cc b/livestatus/src/ServicelistColumnFilter.cc index cb00a02..9371e79 100644 --- a/livestatus/src/ServicelistColumnFilter.cc +++ b/livestatus/src/ServicelistColumnFilter.cc @@ -25,8 +25,9 @@ #include "ServicelistColumnFilter.h" #include <stdlib.h> #include <string.h> +#include <ostream> +#include "Logger.h" #include "ServicelistColumn.h" -#include "logger.h" #include "nagios.h" #include "opids.h" @@ -45,10 +46,9 @@ ServicelistColumnFilter::ServicelistColumnFilter(ServicelistColumn *column, // service_description char *sep = index(refvalue, HOSTSERVICE_SEPARATOR); if (sep == nullptr) { - logger(LG_INFO, - "Invalid reference value for service list membership. Must be " - "'hostname%cservicename'", - HOSTSERVICE_SEPARATOR); + Informational() << "Invalid reference value for service list " + "membership. Must be 'hostname" + << string(1, HOSTSERVICE_SEPARATOR) << "servicename'"; _ref_host = ""; _ref_service = ""; } else { @@ -82,10 +82,9 @@ bool ServicelistColumnFilter::accepts(void *data) { case OP_LESS: return !is_member; default: - logger( - LG_INFO, - "Sorry, Operator %s for service lists lists not implemented.", - op_names_plus_8[_opid]); + Informational() << "Sorry, Operator " + << nameOfRelationalOperator(_opid) + << " for service lists lists not implemented."; return true; } } diff --git a/livestatus/src/StringColumnFilter.cc b/livestatus/src/StringColumnFilter.cc index ca327ce..f40a53e 100644 --- a/livestatus/src/StringColumnFilter.cc +++ b/livestatus/src/StringColumnFilter.cc @@ -90,7 +90,8 @@ bool StringColumnFilter::accepts(void *data) { break; default: // this should never be reached, all operators are handled - Informational() << "Sorry. Operator " << nameOfRelationalOperator(_opid) + Informational() << "Sorry. Operator " + << nameOfRelationalOperator(_opid) << " for strings not implemented."; break; }

8 years

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: c6ec6c906c9745e4a4877a012df10c96327a08d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6ec6c906c9745… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jun 8 15:37:56 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/AttributelistFilter.cc | 9 ++++---- livestatus/src/CustomVarsFilter.cc | 3 ++- livestatus/src/DoubleColumnFilter.cc | 9 ++++---- livestatus/src/IntColumnFilter.cc | 7 +++--- livestatus/src/ListColumnFilter.cc | 12 +++++----- livestatus/src/Query.cc | 36 ++---------------------------- livestatus/src/Query.h | 1 - livestatus/src/StringColumnFilter.cc | 2 +- livestatus/src/opids.cc | 39 +++++++++++++++++++++++++++++++++ livestatus/src/opids.h | 4 +++- 10 files changed, 68 insertions(+), 54 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c6ec6c906c…

8 years

mssql_versions: Fixed wrong reported server 2005/2008 versions

by Lars Michelsen

Module: check_mk Branch: master Commit: f34021ee46e5b3b64b1a4c6c69e8ab983c018082 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f34021ee46e5b3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 8 15:00:42 2016 +0200 mssql_versions: Fixed wrong reported server 2005/2008 versions --- inventory/mssql_versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inventory/mssql_versions b/inventory/mssql_versions index 7d5421a..2d9c8bd 100644 --- a/inventory/mssql_versions +++ b/inventory/mssql_versions @@ -43,9 +43,9 @@ def inv_mssql_versions(info): return "SQL Server 2012" elif parts[0] == 10: if parts[1] == 50: - return "SQL Server 2005 R2" + return "SQL Server 2008 R2" else: - return "SQL Server 2005" + return "SQL Server 2008" elif parts[0] == 9: return "SQL Server 2005" elif parts[0] == 8:

8 years

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 0a06b494d3eb1b2b404310f9b86bd64e864ed18f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a06b494d3eb1b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jun 8 14:26:08 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/Aggregator.h | 6 +- livestatus/src/AndingFilter.cc | 7 +- livestatus/src/AndingFilter.h | 4 +- livestatus/src/CountAggregator.h | 3 +- livestatus/src/DoubleAggregator.cc | 33 +-- livestatus/src/DoubleAggregator.h | 2 +- livestatus/src/IntAggregator.cc | 33 +-- livestatus/src/IntAggregator.h | 2 +- livestatus/src/OutputBuffer.cc | 5 +- livestatus/src/OutputBuffer.h | 8 +- livestatus/src/PerfdataAggregator.cc | 31 +-- livestatus/src/PerfdataAggregator.h | 3 +- livestatus/src/Query.cc | 455 +++++++++++++++++----------------- livestatus/src/Query.h | 30 +-- livestatus/src/StatsColumn.cc | 2 +- livestatus/src/StatsColumn.h | 17 +- 16 files changed, 315 insertions(+), 326 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0a06b494d3…

8 years

← Newer
1
...
8
9
10
11
12
13
14
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2016