Checkmk git commits March 2018

checkmk-commits@lists.checkmk.com

10 participants
326 discussions

5839 FIX MSSQL Plugin: fixed mssql_backups for some SQL server versions and situations (alwayson , cluster)

by Marcel Schulte

Module: check_mk Branch: master Commit: 6d29020e46d70a6dad98bb27cb1184ebcc64b77c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d29020e46d70a… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Mon Mar 19 09:18:33 2018 +0100 5839 FIX MSSQL Plugin: fixed mssql_backups for some SQL server versions and situations (alwayson, cluster) Thanks to Kris Radebahs for providing the patch! Change-Id: Iceb61b1e798715b74b046174e770d9723c6412a2 --- .werks/5839 | 10 +++++++++ agents/windows/plugins/mssql.vbs | 46 +++++++++++++++++++--------------------- 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/.werks/5839 b/.werks/5839 new file mode 100644 index 0000000..7c72c5f --- /dev/null +++ b/.werks/5839 @@ -0,0 +1,10 @@ +Title: MSSQL Plugin: fixed mssql_backups for some SQL server versions and situations (alwayson, cluster) +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1521447374 +Class: fix + +Thanks to Kris Radebahs for providing the patch! diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index 29ddb8e..92dfb92 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -366,30 +366,27 @@ For Each instance_id In instances.Keys: Do ' Continue trick addOutput(sections("backup")) For Each dbName in dbNames.Keys RS.Open "USE [master]", CONN - RS.Open "select 1 from sys.sysobjects where name = 'dm_hadr_database_replica_states'", CONN - If RS.EOF Then - RS.Close - RS.Open "SELECT CONVERT(VARCHAR, DATEADD(s, DATEDIFF(s, '19700101', MAX(backup_finish_date)), '19700101'), 120) AS last_backup_date," & _ - "type, machine_name, " & _ - "'True' as is_primary_replica, " &_ - "'1' as is_local, " & _ - "'' as replica_id " & _ - "FROM msdb.dbo.backupset " & _ - "WHERE database_name = '" & dbName & "' " & _ - "GROUP BY type, machine_name ", CONN - Else - RS.Close - RS.Open "SELECT CONVERT(VARCHAR, DATEADD(s, DATEDIFF(s, '19700101', MAX(b.backup_finish_date)), '19700101'), 120) AS last_backup_date, " & _ - "b.type, b.machine_name, " & _ - "isnull(rep.is_primary_replica,0) as is_primary_replica, rep.is_local, isnull(convert(varchar(40), rep.replica_id), '') AS replica_id " & _ - "FROM msdb.dbo.backupset b " & _ - "LEFT OUTER JOIN sys.databases db ON b.database_name = db.name " & _ - "LEFT OUTER JOIN sys.dm_hadr_database_replica_states rep ON db.database_id = rep.database_id " & _ - "WHERE database_name = '" & dbName & "' " & _ - "AND (rep.is_local is null or rep.is_local = 1) " & _ - "AND (rep.is_primary_replica is null or rep.is_primary_replica = 'True') " & _ - "GROUP BY type, rep.replica_id, rep.is_primary_replica, rep.is_local, b.database_name, b.machine_name, rep.synchronization_state, rep.synchronization_health ", CONN - End If + RS.Open "DECLARE @HADRStatus sql_variant; DECLARE @SQLCommand nvarchar(max); " & _ + "SET @HADRStatus = (SELECT SERVERPROPERTY ('IsHadrEnabled')); " & _ + "IF (@HADRStatus IS NULL or @HADRStatus <> 1) " & _ + "BEGIN " & _ + "SET @SQLCommand = 'SELECT CONVERT(VARCHAR, DATEADD(s, DATEDIFF(s, ''19700101'', MAX(backup_finish_date)), ''19700101''), 120) AS last_backup_date, " & _ + "type, machine_name, ''True'' as is_primary_replica, ''1'' as is_local, '''' as replica_id FROM msdb.dbo.backupset " & _ + "WHERE database_name = ''" & dbName & "'' AND machine_name = SERVERPROPERTY(''Machinename'') " & _ + "GROUP BY type, machine_name ' " & _ + "END " & _ + "ELSE " & _ + "BEGIN " & _ + "SET @SQLCommand = 'SELECT CONVERT(VARCHAR, DATEADD(s, DATEDIFF(s, ''19700101'', MAX(b.backup_finish_date)), ''19700101''), 120) AS last_backup_date, " & _ + "b.type, b.machine_name, isnull(rep.is_primary_replica,0) as is_primary_replica, rep.is_local, isnull(convert(varchar(40), rep.replica_id), '''') AS replica_id " & _ + "FROM msdb.dbo.backupset b " & _ + "LEFT OUTER JOIN sys.databases db ON b.database_name = db.name " & _ + "LEFT OUTER JOIN sys.dm_hadr_database_replica_states rep ON db.database_id = rep.database_id " & _ + "WHERE database_name = ''" & dbName & "'' AND (rep.is_local is null or rep.is_local = 1) " & _ + "AND (rep.is_primary_replica is null or rep.is_primary_replica = ''True'') and machine_name = SERVERPROPERTY(''Machinename'') " & _ + "GROUP BY type, rep.replica_id, rep.is_primary_replica, rep.is_local, b.database_name, b.machine_name, rep.synchronization_state, rep.synchronization_health' " & _ + "END " & _ + "EXEC (@SQLCommand)" ,CONN Do While Not RS.Eof lastBackupDate = Trim(RS("last_backup_date")) @@ -515,3 +512,4 @@ Set RS = nothing Set CONN = nothing Set FSO = nothing Set SHO = nothing +

6 years, 3 months

5838 FIX Citrix Netscaler Certificates: check is cluster aware now

by Marcel Schulte

Module: check_mk Branch: master Commit: e61e756678a5eaa72542a17fddb8e3a99e810cf4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e61e756678a5ea… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Mon Mar 19 08:35:59 2018 +0100 5838 FIX Citrix Netscaler Certificates: check is cluster aware now Change-Id: Id870396837f5604dee87093578bc6317cd20adef --- .werks/5838 | 10 ++++++++++ checks/netscaler_sslcertificates | 12 ++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.werks/5838 b/.werks/5838 new file mode 100644 index 0000000..748d39a --- /dev/null +++ b/.werks/5838 @@ -0,0 +1,10 @@ +Title: Citrix Netscaler Certificates: check is cluster aware now +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1521444854 +Class: fix + + diff --git a/checks/netscaler_sslcertificates b/checks/netscaler_sslcertificates index afe0196..6d236e2 100644 --- a/checks/netscaler_sslcertificates +++ b/checks/netscaler_sslcertificates @@ -41,13 +41,13 @@ factory_settings["netscaler_sslcerts_default_levels"] = { def inventory_netscaler_sslcerts(info): - for line in info: - if line[0]: - yield line[0], {} + for node, certname, daysleft in info: + if certname: + yield certname, {} def check_netscaler_sslcerts(item, params, info): - for certname, daysleft in info: + for node, certname, daysleft in info: if certname == item: state, daysleft = 0, int(daysleft) warn, crit = params["age_levels"] @@ -59,6 +59,9 @@ def check_netscaler_sslcerts(item, params, info): infotext = "Certificate valid for %d days" % daysleft + if node: + infotext = ": ".join([node, infotext]) + if state > 0: infotext += " (warn/crit below %s/%s)" % (warn, crit) @@ -69,6 +72,7 @@ check_info["netscaler_sslcertificates"] = { "check_function" : check_netscaler_sslcerts, "inventory_function" : inventory_netscaler_sslcerts, "service_description" : "SSL Certificate %s", + "node_info" : True, "snmp_info" : (".1.3.6.1.4.1.5951.4.1.1.56.1.1", [ 1, # sslCertKeyName 5, # sslDaysToExpire

6 years, 3 months

Stylistic change only, unifying things a bit.

by Sven Panne

Module: check_mk Branch: master Commit: d5b67acb1c4ada2bcaee4ae62236f6a3c7ead2d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5b67acb1c4ada… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Mar 16 17:27:31 2018 +0100 Stylistic change only, unifying things a bit. Change-Id: I03851a35a9a91824c355d8e462a6906b9ee0cf22 --- livestatus/src/ListFilter.cc | 9 ++++----- livestatus/src/StringFilter.cc | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/livestatus/src/ListFilter.cc b/livestatus/src/ListFilter.cc index ae1e664..36c6dcd 100644 --- a/livestatus/src/ListFilter.cc +++ b/livestatus/src/ListFilter.cc @@ -113,13 +113,12 @@ bool ListFilter::accepts(Row row, const contact *auth_user, std::optional<std::string> ListFilter::stringValueRestrictionFor( const std::string &column_name) const { + if (column_name != columnName()) { + return {}; // wrong column + } switch (oper()) { case RelationalOperator::greater_or_equal: - if (column_name == columnName()) { - return {value()}; - } else { - return {}; - } + return {value()}; case RelationalOperator::equal: case RelationalOperator::not_equal: case RelationalOperator::matches: diff --git a/livestatus/src/StringFilter.cc b/livestatus/src/StringFilter.cc index 6c7415a..40a36fa 100644 --- a/livestatus/src/StringFilter.cc +++ b/livestatus/src/StringFilter.cc @@ -65,13 +65,12 @@ bool StringFilter::accepts(Row row, const contact * /* auth_user */, std::optional<std::string> StringFilter::stringValueRestrictionFor( const std::string &column_name) const { + if (column_name != columnName()) { + return {}; // wrong column + } switch (oper()) { case RelationalOperator::equal: - if (column_name == columnName()) { - return {value()}; - } else { - return {}; - } + return {value()}; case RelationalOperator::not_equal: case RelationalOperator::matches: case RelationalOperator::doesnt_match:

6 years, 3 months

Compute GLB/LUB instead of range, simplifying and unifying things quite a bit.

by Sven Panne

Module: check_mk Branch: master Commit: 1db324482b8b7c8a1ad9f2c64485a5520dd10045 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1db324482b8b7c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Mar 16 15:00:50 2018 +0100 Compute GLB/LUB instead of range, simplifying and unifying things quite a bit. Change-Id: I89f373eb0c06ff45b5dc24518867dcb3be1652f6 --- livestatus/src/AndingFilter.cc | 26 +++++++++-- livestatus/src/AndingFilter.h | 8 +++- livestatus/src/Filter.cc | 14 ++++-- livestatus/src/Filter.h | 9 ++-- livestatus/src/IntFilter.cc | 87 +++++++++++++++++------------------- livestatus/src/IntFilter.h | 10 ++++- livestatus/src/OringFilter.cc | 36 ++++++++------- livestatus/src/OringFilter.h | 8 +++- livestatus/src/Query.cc | 42 +++++++++++++----- livestatus/src/Query.h | 6 ++- livestatus/src/TableEventConsole.cc | 14 +++--- livestatus/src/TableLog.cc | 15 +++---- livestatus/src/TableStateHistory.cc | 21 ++++----- livestatus/src/TimeFilter.cc | 88 +++++++++++++++++-------------------- livestatus/src/TimeFilter.h | 10 ++++- 15 files changed, 226 insertions(+), 168 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1db324482b…

6 years, 3 months

Win-agent: remove dead code in SectionPerfcounter

by Jukka Aro

Module: check_mk Branch: master Commit: 5e4254176958af6d81e9c7bb0c66374f2c8ecb61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e4254176958af… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Mar 16 16:05:00 2018 +0100 Win-agent: remove dead code in SectionPerfcounter The option _toggle_if_missing was never used in this section. --- agents/windows/build_version | 2 +- agents/windows/sections/SectionPerfcounter.cc | 5 ----- agents/windows/sections/SectionPerfcounter.h | 4 ---- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 90a4e98..55b22ed 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3184 +3186 diff --git a/agents/windows/sections/SectionPerfcounter.cc b/agents/windows/sections/SectionPerfcounter.cc index 9b57cad..6de4240 100644 --- a/agents/windows/sections/SectionPerfcounter.cc +++ b/agents/windows/sections/SectionPerfcounter.cc @@ -57,11 +57,6 @@ SectionPerfcounter::SectionPerfcounter(const std::string &outputName, : Section(outputName, configName, env, logger, winapi) , _nameNumberMap(nameNumberMap) {} -SectionPerfcounter *SectionPerfcounter::withToggleIfMissing() { - _toggle_if_missing = true; - return this; -} - bool SectionPerfcounter::produceOutputInner( std::ostream &out, const std::optional<std::string> &) { Debug(_logger) << "SectionPerfcounter::produceOutputInner"; diff --git a/agents/windows/sections/SectionPerfcounter.h b/agents/windows/sections/SectionPerfcounter.h index 50568f9..931d815 100644 --- a/agents/windows/sections/SectionPerfcounter.h +++ b/agents/windows/sections/SectionPerfcounter.h @@ -55,16 +55,12 @@ public: NameBaseNumberMap &nameNumberMap, Logger *logger, const WinApiAdaptor &winapi); - SectionPerfcounter *withToggleIfMissing(); - protected: virtual bool produceOutputInner( std::ostream &out, const std::optional<std::string> &) override; private: unsigned char separator() const override { return ','; } - - bool _toggle_if_missing{false}; time_t _disabled_until{0}; NameBaseNumberMap &_nameNumberMap; };

6 years, 3 months

Win-agent: reduce no of constructor params 3

by Jukka Aro

Module: check_mk Branch: master Commit: 7250fafbf2b67d074a771fe4cb60bc9717b7414c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7250fafbf2b67d… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Mar 16 15:31:25 2018 +0100 Win-agent: reduce no of constructor params 3 SectionGroup always has ',' as its separator, so there is no need to parameterize this. --- agents/windows/SectionManager.cc | 4 ++-- agents/windows/build_version | 2 +- agents/windows/sections/SectionGroup.cc | 3 +-- agents/windows/sections/SectionGroup.h | 6 ++---- agents/windows/sections/SectionSkype.cc | 2 +- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/agents/windows/SectionManager.cc b/agents/windows/SectionManager.cc index 739f74a..dc90e01 100644 --- a/agents/windows/SectionManager.cc +++ b/agents/windows/SectionManager.cc @@ -154,7 +154,7 @@ void SectionManager::loadStaticSections(Configuration &config, ->withToggleIfMissing()); addSection((new SectionGroup("wmi_cpuload", "wmi_cpuload", _env, _logger, - _winapi, true, true, ',')) + _winapi, true, true)) ->withToggleIfMissing() ->withSubSection( (new SectionWMI("system_perf", "system_perf", _env, @@ -167,7 +167,7 @@ void SectionManager::loadStaticSections(Configuration &config, addSection( (new SectionGroup("msexch", "msexch", _env, _logger, _winapi, false, - false, ',')) + false)) ->withToggleIfMissing() ->withSubSection( (new SectionWMI("msexch_activesync", "msexch_activesync", _env, diff --git a/agents/windows/build_version b/agents/windows/build_version index b589279..90a4e98 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3182 +3184 diff --git a/agents/windows/sections/SectionGroup.cc b/agents/windows/sections/SectionGroup.cc index 37177d2..81b6383 100644 --- a/agents/windows/sections/SectionGroup.cc +++ b/agents/windows/sections/SectionGroup.cc @@ -29,10 +29,9 @@ SectionGroup::SectionGroup(const std::string &outputName, const std::string &configName, const Environment &env, Logger *logger, const WinApiAdaptor &winapi, bool nested, - bool show_header, char separator) + bool show_header) : Section(outputName, configName, env, logger, winapi) , _nested(nested) - , _separator(separator) , _show_header(show_header) {} SectionGroup *SectionGroup::withSubSection(Section *section) { diff --git a/agents/windows/sections/SectionGroup.h b/agents/windows/sections/SectionGroup.h index 156364a..f401bc7 100644 --- a/agents/windows/sections/SectionGroup.h +++ b/agents/windows/sections/SectionGroup.h @@ -43,8 +43,7 @@ class SectionGroup : public Section { public: SectionGroup(const std::string &outputName, const std::string &configName, const Environment &env, Logger *logger, - const WinApiAdaptor &winapi, bool nested, bool show_header, - char separator); + const WinApiAdaptor &winapi, bool nested, bool show_header); /** * add a section that will be printed as part of this group @@ -65,7 +64,7 @@ protected: std::ostream &out, const std::optional<std::string> &remoteIP) override; private: - unsigned char separator() const override { return _separator; } + unsigned char separator() const override { return ','; } bool showHeader() const override { return _show_header; } std::vector<std::unique_ptr<Section>> _subsections; @@ -74,7 +73,6 @@ private: bool _fail_if_missing{false}; const bool _nested; time_t _disabled_until{0}; - const unsigned char _separator; const bool _show_header; }; diff --git a/agents/windows/sections/SectionSkype.cc b/agents/windows/sections/SectionSkype.cc index d7005ba..98aa6cc 100644 --- a/agents/windows/sections/SectionSkype.cc +++ b/agents/windows/sections/SectionSkype.cc @@ -30,7 +30,7 @@ SectionSkype::SectionSkype(const Environment &env, Logger *logger, const WinApiAdaptor &winapi) - : SectionGroup("skype", "skype", env, logger, winapi, true, true, ',') + : SectionGroup("skype", "skype", env, logger, winapi, true, true) , _nameNumberMap(_logger, _winapi) { withToggleIfMissing();

6 years, 3 months

update for #WK5794

by Andreas Boesl

Module: check_mk Branch: master Commit: 5e2cbe3be60fa5cb1c49c2263c84972a2fc5f536 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e2cbe3be60fa5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 16 14:56:35 2018 +0100 update for #WK5794 Change-Id: I98ff3bb1941ba72489bcd7f95cb6b973a75a2279 --- omd/packages/maintenance/diskspace | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/omd/packages/maintenance/diskspace b/omd/packages/maintenance/diskspace index 9dd41cf..a57ddbf 100755 --- a/omd/packages/maintenance/diskspace +++ b/omd/packages/maintenance/diskspace @@ -152,10 +152,10 @@ def delete_file(path, reason): # Also delete any .info files which are connected to the rrd file if path.endswith(".rrd"): - info_path = "%sinfo" % path[:-3] - if os.path.exists(info_path): - log('Deleting file (%s): %s' % (reason, info_path)) - os.unlink(info_path) + path = "%sinfo" % path[:-3] + if os.path.exists(path): + log('Deleting file (%s): %s' % (reason, path)) + os.unlink(path) return True except Exception, e:

6 years, 3 months

5794 FIX diskspace cleanup: now also deletes any connected .info file when removing a rrd file

by Andreas Boesl

Module: check_mk Branch: master Commit: c313b3c3eb24cba7db742335c6d1a9cc11d1fa50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c313b3c3eb24cb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 16 14:37:25 2018 +0100 5794 FIX diskspace cleanup: now also deletes any connected .info file when removing a rrd file Change-Id: I8a13f0c5b165b96c6722ec07393d2415774d6774 --- .werks/5794 | 10 ++++++++++ omd/packages/maintenance/diskspace | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/.werks/5794 b/.werks/5794 new file mode 100644 index 0000000..d809341 --- /dev/null +++ b/.werks/5794 @@ -0,0 +1,10 @@ +Title: diskspace cleanup: now also deletes any connected .info file when removing a rrd file +Level: 1 +Component: packages +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1521207422 +Class: fix + + diff --git a/omd/packages/maintenance/diskspace b/omd/packages/maintenance/diskspace index a8c5459..9dd41cf 100755 --- a/omd/packages/maintenance/diskspace +++ b/omd/packages/maintenance/diskspace @@ -149,6 +149,14 @@ def delete_file(path, reason): try: log('Deleting file (%s): %s' % (reason, path)) os.unlink(path) + + # Also delete any .info files which are connected to the rrd file + if path.endswith(".rrd"): + info_path = "%sinfo" % path[:-3] + if os.path.exists(info_path): + log('Deleting file (%s): %s' % (reason, info_path)) + os.unlink(info_path) + return True except Exception, e: error('Error while deleting %s: %s' % (path, e))

6 years, 3 months

5793 FIX Agent Encryption: No longer trying to decrypt all incoming tcp data when a "Encryption" rule with an arbitrary value was set

by Andreas Boesl

Module: check_mk Branch: master Commit: 95ce2db4b3da82bddeca9de71f8d5db73b5d9ba3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95ce2db4b3da82… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 16 14:17:18 2018 +0100 5793 FIX Agent Encryption: No longer trying to decrypt all incoming tcp data when a "Encryption" rule with an arbitrary value was set The agent output decryption function was incorrectly called for hosts with a specifically "Encryption" rule set. In most scenarios the decryption failed, because the plain text was obviously not decrypted correctly. The fallback of the decryption error was to use the plain text instead for further processing - this was conincidentally the right bevhaviour. However, sometimes the decryption succeeded, which lead to garbled agent output and missing agent sections. Change-Id: Iac0f7df0f5e01f0485b8916e828aac3232b29df8 --- .werks/5793 | 18 ++++++++++++++++++ cmk_base/config.py | 2 +- cmk_base/data_sources/tcp.py | 13 ++++++++----- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.werks/5793 b/.werks/5793 new file mode 100644 index 0000000..80da5ef --- /dev/null +++ b/.werks/5793 @@ -0,0 +1,18 @@ +Title: Agent Encryption: No longer trying to decrypt all incoming tcp data when a "Encryption" rule with an arbitrary value was set +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1521206167 +Class: fix + +The agent output decryption function was incorrectly called for hosts with a specifically "Encryption" rule set. +In most scenarios the decryption failed, because the plain text was obviously not decrypted correctly. +The fallback of the decryption error was to use the plain text instead for further processing - this was conincidentally the right bevhaviour. + + +However, sometimes the decryption succeeded, which lead to garbled agent output and missing agent sections. + + + diff --git a/cmk_base/config.py b/cmk_base/config.py index 45b7754..85c8d24 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -745,7 +745,7 @@ def agent_encryption_of(hostname): if settings: return settings[0] else: - return {'use_regular': 'disabled', + return {'use_regular': 'disable', 'use_realtime': 'enforce'} diff --git a/cmk_base/data_sources/tcp.py b/cmk_base/data_sources/tcp.py index 085fcc2..6b2070e 100644 --- a/cmk_base/data_sources/tcp.py +++ b/cmk_base/data_sources/tcp.py @@ -135,16 +135,19 @@ class TCPDataSource(CheckMKAgentDataSource): elif len(output) < 16: raise MKAgentError("Too short output from agent: %r" % output) - if encryption_settings["use_regular"] == "enforce" and \ - output.startswith("<<<check_mk>>>"): + + output_is_plaintext = output.startswith("<<<") + if encryption_settings["use_regular"] == "enforce" and output_is_plaintext: raise MKAgentError("Agent output is plaintext but encryption is enforced by configuration") - if encryption_settings["use_regular"] != "disabled": + if not output_is_plaintext and encryption_settings["use_regular"] in ["enforce", "allow"]: try: - # currently ignoring version and timestamp - #protocol_version = int(output[0:2]) + # simply check if the protocol is an actual number + protocol_version = int(output[0:2]) output = self._decrypt_package(output[2:], encryption_settings["passphrase"]) + except ValueError: + raise MKAgentError("Unsupported protocol version: %s" % output[:2]) except Exception, e: if encryption_settings["use_regular"] == "enforce": raise MKAgentError("Failed to decrypt agent output: %s" % e)

6 years, 3 months

Fix typo in GUI

by Konstantin Büttner

Module: check_mk Branch: master Commit: 364a0f6b730e3ad3ba242620b71c1c79dcaf485b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=364a0f6b730e3a… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Mar 16 13:35:27 2018 +0100 Fix typo in GUI Change-Id: I4dde5753743414f08c5c6adc3b0c926b3476b6ed --- web/plugins/wato/mkeventd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index f9bb948..6ed1def 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -1243,7 +1243,7 @@ def mode_mkeventd_rule_packs(phase): if type_ == ec.RulePackType.internal: export_url = make_action_link([("mode", "mkeventd_rule_packs"), ("_export", nr)]) - html.icon_button(export_url, _("Make this rule pack available in the Exension Packages module"), "cached") + html.icon_button(export_url, _("Make this rule pack available in the Extension Packages module"), "cached") # Icons for mkp export and disabling table.cell("", css="buttons")

6 years, 3 months

← Newer
1
...
9
10
11
12
13
14
15
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2018