Checkmk git commits July 2015

checkmk-commits@lists.checkmk.com

8 participants
287 discussions

Check_MK Git: check_mk: LDAP: Fixed exception in group membership fetching

by Lars Michelsen

Module: check_mk Branch: master Commit: a15e492ed263345c1947f683935735eeb307b5ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a15e492ed26334… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 29 09:02:13 2015 +0200 LDAP: Fixed exception in group membership fetching --- web/plugins/userdb/ldap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 390951d..b7f2487 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -631,7 +631,7 @@ class LDAPUserConnector(UserConnector): def get_group_memberships(self, filters, filt_attr = 'cn', nested = False): - cache_key = (filters, nested, filt_attr) + cache_key = (tuple(filters), nested, filt_attr) if cache_key in self._group_cache: return self._group_cache[cache_key]

9 years, 2 months

Check_MK Git: check_mk: Fixed identation ; removed debug statements

by Lars Michelsen

Module: check_mk Branch: master Commit: 1ffac1deb7c5316fee8e6ec152005cfa91a8ece7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ffac1deb7c531… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 29 08:54:43 2015 +0200 Fixed identation ; removed debug statements --- agents/windows/plugins/mssql.vbs | 79 ++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 41 deletions(-) diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index 0838f6f..69ff3d3 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -50,26 +50,26 @@ End Sub Function readIniFile(path) Dim parsed : Set parsed = CreateObject("Scripting.Dictionary") If path <> "" Then - Dim FH - Set FH = FSO.OpenTextFile(path) - Dim line, sec, pair - Do Until FH.AtEndOfStream - line = Trim(FH.ReadLine()) - If Left(line, 1) = "[" Then - sec = Mid(line, 2, Len(line) - 2) - Set parsed(sec) = CreateObject("Scripting.Dictionary") - Else - If line <> "" Then - pair = Split(line, "=") - If 1 = UBound(pair) Then - parsed(sec)(Trim(pair(0))) = Trim(pair(1)) - End If - End If - End If - Loop - FH.Close - End If - Set readIniFile = parsed + Dim FH + Set FH = FSO.OpenTextFile(path) + Dim line, sec, pair + Do Until FH.AtEndOfStream + line = Trim(FH.ReadLine()) + If Left(line, 1) = "[" Then + sec = Mid(line, 2, Len(line) - 2) + Set parsed(sec) = CreateObject("Scripting.Dictionary") + Else + If line <> "" Then + pair = Split(line, "=") + If 1 = UBound(pair) Then + parsed(sec)(Trim(pair(0))) = Trim(pair(1)) + End If + End If + End If + Loop + FH.Close + End If + Set readIniFile = parsed End Function ' Dummy empty output. @@ -151,41 +151,38 @@ For Each instId In instIds.Keys cfg_file = "" End If End If - - Set CFG = readIniFile(cfg_file) - If Not CFG.Exists("auth") Then - Set AUTH = CreateObject("Scripting.Dictionary") - Else - Set AUTH = CFG("auth") - End If - + + Set CFG = readIniFile(cfg_file) + If Not CFG.Exists("auth") Then + Set AUTH = CreateObject("Scripting.Dictionary") + Else + Set AUTH = CFG("auth") + End If + ' At this place one could implement to use other authentication mechanism - If Not AUTH.Exists("type") or AUTH("type") = "system" Then - CONN.Properties("Integrated Security").Value = "SSPI" - Else - CONN.Properties("User ID").Value = AUTH("username") - CONN.Properties("Password").Value = AUTH("password") - End If - wscript.echo instId + If Not AUTH.Exists("type") or AUTH("type") = "system" Then + CONN.Properties("Integrated Security").Value = "SSPI" + Else + CONN.Properties("User ID").Value = AUTH("username") + CONN.Properties("Password").Value = AUTH("password") + End If If InStr(instId, "__") <> 0 Then instName = Split(instId, "__")(1) - instId = Replace(instId, "__", "_") - Else + instId = Replace(instId, "__", "_") + Else instName = instId End If - wscript.echo instId ' In case of instance name "MSSQLSERVER" always use (local) as connect string If instName = "MSSQLSERVER" Then CONN.Properties("Data Source").Value = "(local)" Else CONN.Properties("Data Source").Value = hostname & "\" & instName - End If - WScript.echo (CONN) + End If CONN.Open - + ' Get counter data for the whole instance RS.Open "SELECT counter_name, object_name, instance_name, cntr_value " & _ "FROM sys.dm_os_performance_counters " & _

9 years, 2 months

Check_MK Git: check_mk: BI rules: Added some small help for rule config

by Lars Michelsen

Module: check_mk Branch: master Commit: 5ea5e5ed936f2821d915729d5472ab4ec437fdbf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ea5e5ed936f28… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 29 08:48:53 2015 +0200 BI rules: Added some small help for rule config --- web/htdocs/wato.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 05a918e..5c32900 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -17545,6 +17545,8 @@ def declare_bi_valuespecs(aggregation_rules): explicit = TextAscii(size = 60), otherlabel = _("Regex for host name"), default_value = None, + help = _("If you choose \"Regex for host name\", you need to provide a regex " + "which results in exactly one match group."), ), CascadingDropdown( title = _("Nodes to create:"),

9 years, 2 months

Check_MK Git: check_mk: #2500 FIX qlogic_fcport: Can now deal with missing port status information

by Lars Michelsen

Module: check_mk Branch: master Commit: 823d29b35e9373a25ef20404d1b33c5665db91f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=823d29b35e9373… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 29 08:29:47 2015 +0200 #2500 FIX qlogic_fcport: Can now deal with missing port status information Some devices, like for example QLogic 8 Gb and 4/8 Gb Intelligent Pass-thru Modules for IBM BladeCenter do not report admin/oper-status information for their interfaces. These interfaces are allways discovered. --- .werks/2500 | 11 +++++++++++ ChangeLog | 1 + checks/qlogic_fcport | 27 +++++++++++++++++++++------ 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/.werks/2500 b/.werks/2500 new file mode 100644 index 0000000..c2522e3 --- /dev/null +++ b/.werks/2500 @@ -0,0 +1,11 @@ +Title: qlogic_fcport: Can now deal with missing port status information +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1438151316 +Class: fix + +Some devices, like for example QLogic 8 Gb and 4/8 Gb Intelligent Pass-thru +Modules for IBM BladeCenter do not report admin/oper-status information +for their interfaces. These interfaces are allways discovered. diff --git a/ChangeLog b/ChangeLog index b3cf5cf..543fc4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -86,6 +86,7 @@ * 2498 FIX: livestatus_status: Records the number of hosts/services now * 2489 FIX: cmciii_lcp_water: New check replacing cmciii_lcp_waterin/out, support for newer devices... NOTE: Please refer to the migration notes! + * 2500 FIX: qlogic_fcport: Can now deal with missing port status information... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/qlogic_fcport b/checks/qlogic_fcport index 4c5f279..c2b4cad 100644 --- a/checks/qlogic_fcport +++ b/checks/qlogic_fcport @@ -47,8 +47,11 @@ def inventory_qlogic_fcport(info): c2_discards, c2_fbsy_frames, c2_frjt_frames, c3_in_frames, \ c3_out_frames, c3_in_octets, c3_out_octets, c3_discards in info: - if admin_status in qlogic_fcport_inventory_admstates and \ - oper_status in qlogic_fcport_inventory_opstates: + # There are devices out there which are totally missing the status related + # SNMP tables. In this case we add all interfaces. + if (admin_status == '' and oper_status == '') \ + or (admin_status in qlogic_fcport_inventory_admstates and \ + oper_status in qlogic_fcport_inventory_opstates): inventory.append( (qlogic_fcport_generate_port_id(port_id), None) ) return inventory @@ -73,13 +76,18 @@ def check_qlogic_fcport(item, params, info): message += " AdminStatus: online" status = 0 elif admin_status == "2": - message += "AdminStatus: offline (!!)" + message += " AdminStatus: offline (!!)" status = 2 elif admin_status == "3": - message += "AdminStatus: testing (!)" + message += " AdminStatus: testing (!)" status = 1 + elif admin_status == "": + # Is not a possible valid value in the MIB, but some devices don't + # provide status information at all (SNMP table missing). + message += " AdminStatus: not reported" + status = 0 else: - message += "unknown AdminStatus %s (!)" % admin_status + message += " unknown AdminStatus %s (!)" % admin_status status = 1 # fcFxPortPhysOperStatus @@ -95,6 +103,11 @@ def check_qlogic_fcport(item, params, info): elif oper_status == "4": message += ", OperStatus: linkFailure (!!)" status = max(status, 2) + elif admin_status == "": + # Is not a possible valid value in the MIB, but some devices don't + # provide status information at all (SNMP table missing). + message += ", OperStatus: not reported" + status = 0 else: message += ", unknown OperStatus %s (!)" % oper_status status = max(status, 1) @@ -202,9 +215,11 @@ check_info["qlogic_fcport"] = { ]), # .1.3.6.1.4.1.3873.1.14 Qlogic-Switch # .1.3.6.1.4.1.3873.1.8 Qlogic-4Gb SAN Switch Module for IBM BladeCenter + # .1.3.6.1.4.1.3873.1.12 QLogic 8 Gb and 4/8 Gb Intelligent Pass-thru Module 'snmp_scan_function' : lambda oid: \ oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.14") \ - or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.8"), + or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.8") \ + or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.3873.1.12"), 'group': 'qlogic_fcport', 'default_levels_variable': 'qlogic_fcport_default_levels', }

9 years, 2 months

Check_MK Git: check_mk: #2291 check juniper_trpz_aps: now monitor the number of access points of all juniper trapeze devices which support the TRAPEZE-NETWORKS-REGISTRATION-MIB

by Simon Betz

Module: check_mk Branch: master Commit: f4a648129f87d7e3cd65211062a374312e7f7e74 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4a648129f87d7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 28 16:33:55 2015 +0200 #2291 check juniper_trpz_aps: now monitor the number of access points of all juniper trapeze devices which support the TRAPEZE-NETWORKS-REGISTRATION-MIB --- .werks/2291 | 9 +++++++++ ChangeLog | 1 + checks/juniper_trpz_aps | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/2291 b/.werks/2291 new file mode 100644 index 0000000..b78b9df --- /dev/null +++ b/.werks/2291 @@ -0,0 +1,9 @@ +Title: check juniper_trpz_aps: now monitor the number of access points of all juniper trapeze devices which support the TRAPEZE-NETWORKS-REGISTRATION-MIB +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1438093799 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 31f2687..557e7d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ * 2289 New checks: aix_hacmp_resources, aix_hacmp_services, aix_hacmp_nodes... * 2410 ESX / agent_vsphere: Now able to re-use session cookies... * 2290 New check hp_procurve_temp: monitors the system temperature of HP Switches which support the HP-ICF-CHASSIS-Mib + * 2291 check juniper_trpz_aps: now monitor the number of access points of all juniper trapeze devices which support the TRAPEZE-NETWORKS-REGISTRATION-MIB * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... diff --git a/checks/juniper_trpz_aps b/checks/juniper_trpz_aps index dbe5b9d..acdd421 100644 --- a/checks/juniper_trpz_aps +++ b/checks/juniper_trpz_aps @@ -36,7 +36,7 @@ check_info["juniper_trpz_aps"] = { "check_function" : check_juniper_trpz_aps, "inventory_function" : inventory_juniper_trpz_aps, "service_description" : "Access Points", - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.14525.3.1.6"), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.14525.3.1"), "snmp_info" : (".1.3.6.1.4.1.14525.4.5.1.1",[ 1, #number of Access Points ])

9 years, 2 months

Check_MK Git: check_mk: Fixed wording

by Konstantin Büttner

Module: check_mk Branch: master Commit: 216a9c38396d51df161dfa94eb45f0fa552295b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=216a9c38396d51… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Jul 28 14:46:27 2015 +0200 Fixed wording Conflicts: web/plugins/wato/check_parameters.py --- web/plugins/wato/check_parameters.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 594c03a..b5f7b1e 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6590,16 +6590,16 @@ register_check_parameters( Tuple( title = _("Upper Temperature Levels"), elements = [ - Integer(title = _("warning at"), unit = u"°C", default_value = 26), - Integer(title = _("critical at"), unit = u"°C", default_value = 30), + Integer(title = _("Warning at"), unit = u"°C", default_value = 26), + Integer(title = _("Critical at"), unit = u"°C", default_value = 30), ] )), ( "levels_lower", Tuple( title = _("Lower Temperature Levels"), elements = [ - Integer(title = _("warning below"), unit = u"°C", default_value = 0), - Integer(title = _("critical below"), unit = u"°C", default_value = -10), + Integer(title = _("Warning below"), unit = u"°C", default_value = 0), + Integer(title = _("Critical below"), unit = u"°C", default_value = -10), ] )), ( "output_unit",

9 years, 2 months

Check_MK Git: check_mk: new metric definitions, graphs and perfometers

by Simon Betz

Module: check_mk Branch: master Commit: 4705c1e61a9b4f73f69d6450205b8321f517d4a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4705c1e61a9b4f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jul 28 13:45:32 2015 +0200 new metric definitions, graphs and perfometers --- web/plugins/metrics/check_mk.py | 87 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index d936c76..246115b 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1112,6 +1112,12 @@ metric_info["signal_noise"] = { "color" : "#aadd66", } +metric_info["noise_floor"] = { + "title" : _("Noise floor"), + "unit" : "dbm", + "color" : "11/a", +} + metric_info["codewords_corrected"] = { "title" : _("Corrected codewords"), "unit" : "ratio", @@ -1392,6 +1398,12 @@ metric_info["if_in_octets"] = { "color" : "#00e060", } +metric_info["if_in_pkts"] = { + "title" : _("Input Packets"), + "unit" : "1/s", + "color" : "#00e060", +} + metric_info["if_out_octets"] = { "title" : _("Output Octets"), "unit" : "bytes/s", @@ -1411,7 +1423,7 @@ metric_info["if_in_errors"] = { } metric_info["if_out_discards"] = { - "title" : _("Output Dicards"), + "title" : _("Output Discards"), "unit" : "1/s", "color" : "#ff8080", } @@ -1440,12 +1452,42 @@ metric_info["if_out_unicast"] = { "color" : "#00c0ff", } +metric_info["if_out_unicast_octets"] = { + "title" : _("Output unicast oackets"), + "unit" : "bytes/s", + "color" : "#00c0ff", +} + metric_info["if_out_non_unicast"] = { "title" : _("Output non-unicast packets"), "unit" : "1/s", "color" : "#0080c0", } +metric_info["if_out_non_unicast_octets"] = { + "title" : _("Output non-unicast octets"), + "unit" : "bytes/s", + "color" : "#0080c0", +} + +metric_info["wlan_physical_errors"] = { + "title" : "WLAN physical errors", + "unit" : "1/s", + "color" : "14/a", +} + +metric_info["wlan_resets"] = { + "title" : "WLAN Reset operations", + "unit" : "1/s", + "color" : "21/a", +} + +metric_info["wlan_retries"] = { + "title" : "WLAN transmission retries", + "unit" : "1/s", + "color" : "24/a", +} + metric_info["read_blocks"] = { "title" : _("Read blocks per second"), "unit" : "1/s", @@ -3664,6 +3706,21 @@ perfometer_info.append(("dual", [ perfometer_info.append(("dual", [ { "type" : "logarithmic", + "metric" : "if_out_unicast_octets,if_out_non_unicast_octets,+", + "half_value" : 5000000, + "exponent" : 5, + }, + { + "type" : "logarithmic", + "metric" : "if_in_octets", + "half_value" : 5000000, + "exponent" : 5, + } +])) + +perfometer_info.append(("dual", [ + { + "type" : "logarithmic", "metric" : "read_blocks", "half_value" : 50000000, "exponent" : 2, @@ -4720,6 +4777,34 @@ graph_info.append({ ], }) +graph_info.append({ + "title" : _("Packets"), + "metrics" : [ + ( "if_in_pkts", "area" ), + ( "if_out_non_unicast", "-area" ), + ( "if_out_unicast", "-stack" ), + ], +}) + +graph_info.append({ + "title" : _("Traffic"), + "metrics" : [ + ( "if_in_octets", "area" ), + ( "if_out_non_unicast_octets", "-area" ), + ( "if_out_unicast_octets", "-stack" ), + ], +}) + +graph_info.append({ + "title" : _("WLAN errors, reset operations and transmission retries"), + "metrics" : [ + ( "wlan_physical_errors", "area" ), + ( "wlan_resets", "stack" ), + ( "wlan_retries", "stack" ), + ], +}) + + # TODO: show this graph instead of Bandwidth if this is configured # in the check's parameters. But is this really a good solution? # We could use a condition on if_in_octets:min. But if this value

9 years, 2 months

Check_MK Git: check_mk: #1275 FIX Fileinfo: Fixed handling of output from AIX Agent

by Bastian Kuhn

Module: check_mk Branch: master Commit: 12049a940ed766aed49246f70c1b72f9953b8888 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12049a940ed766… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Jul 28 13:09:31 2015 +0200 #1275 FIX Fileinfo: Fixed handling of output from AIX Agent --- .werks/1275 | 10 ++++++++++ ChangeLog | 1 + checks/fileinfo | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1275 b/.werks/1275 new file mode 100644 index 0000000..c561158 --- /dev/null +++ b/.werks/1275 @@ -0,0 +1,10 @@ +Title: Fileinfo: Fixed handling of output from AIX Agent +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1438081722 + + diff --git a/ChangeLog b/ChangeLog index b3cf5cf..31f2687 100644 --- a/ChangeLog +++ b/ChangeLog @@ -86,6 +86,7 @@ * 2498 FIX: livestatus_status: Records the number of hosts/services now * 2489 FIX: cmciii_lcp_water: New check replacing cmciii_lcp_waterin/out, support for newer devices... NOTE: Please refer to the migration notes! + * 1275 FIX: Fileinfo: Fixed handling of output from AIX Agent Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/fileinfo b/checks/fileinfo index e8cf6e2..ba91896 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -172,7 +172,7 @@ def check_fileinfo_groups(item, params, info): # endswith("No such file...") is needed to # support the solaris perl based version of fileinfo if not line[0].endswith("No such file or directory") \ - and fnmatch.fnmatch(line[0], inclusion) and str(line[1]) != 'missing' \ + and fnmatch.fnmatch(line[0], inclusion) and str(line[1]) not in ['missing',''] \ and not fnmatch.fnmatch(line[0], exclusion): size = int(line[1]) size_all += size

9 years, 2 months

Check_MK Git: check_mk: Fixed typo

by Konstantin Büttner

Module: check_mk Branch: master Commit: 09f47fac156b8a0b156dc3ce8ce3f42b0df753a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09f47fac156b8a… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Jul 28 12:30:32 2015 +0200 Fixed typo --- web/plugins/wato/check_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 79a9132..594c03a 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6102,7 +6102,7 @@ register_rule( "description. The UUID will be displayed in the pluging output.")) ), ], - help = _("This rule controls wether the UUID or the alias is used in the service description during " + help = _("This rule controls whether the UUID or the alias is used in the service description during " "discovery of Multipath devices on Linux."), ), match = 'dict',

9 years, 2 months

Check_MK Git: check_mk: #2499 FIX Git: Fixed message " Please tell me who you are. Run git config ..." on making changes

by Lars Michelsen

Module: check_mk Branch: master Commit: 46628eb7d14b5ebedf1906bd7e3278e066afd128 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46628eb7d14b5e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 28 12:28:49 2015 +0200 #2499 FIX Git: Fixed message "Please tell me who you are. Run git config ..." on making changes At least on Ubuntu 15.04 a user/mail had to be configured in the git repository. Even when the single changes of the users do set an own author. --- .werks/2499 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/.werks/2499 b/.werks/2499 new file mode 100644 index 0000000..ce5ca55 --- /dev/null +++ b/.werks/2499 @@ -0,0 +1,11 @@ +Title: Git: Fixed message "Please tell me who you are. Run git config ..." on making changes +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1438079275 + +At least on Ubuntu 15.04 a user/mail had to be configured in the git repository. Even +when the single changes of the users do set an own author. diff --git a/ChangeLog b/ChangeLog index 79bca0d..b3cf5cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -132,6 +132,7 @@ * 2467 FIX: Fixed encoding exception occuring in localized GUI when a WATO action triggers an error message... * 2407 FIX: WATO master/slave replication: fixed problem where the configuration from the master site was not activate on slave site... * 2474 FIX: Fixed possible corruption of user datasets (contact, mail, rbn config)... + * 2499 FIX: Git: Fixed message "Please tell me who you are. Run git config ..." on making changes... Notifications: * 2478 Integrated notification plugin for mobile phone push messages via Pushover... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4ca4127..05a918e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -392,6 +392,12 @@ def do_git_commit(): if not os.path.exists(git_dir): git_command(["init"]) + # Set git repo global user/mail. seems to be needed to prevent warning message + # on at least ubuntu 15.04: "Please tell me who you are. Run git config ..." + # The individual commits by users override the author on their own + git_command(["config", "user.email", "check_mk"]) + git_command(["config", "user.name", "check_mk"]) + # Make sure that .gitignore-files are present and uptodate file(defaults.default_config_dir + "/.gitignore", "w").write("*\n!*.d\n!.gitignore\n*swp\n") for subdir in os.listdir(defaults.default_config_dir):

9 years, 2 months

← Newer
1
2
3
4
5
6
7
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2015