Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

Moved (host & service) groups from shipped.py to dedicated modules

by Kenneth Okoh

Module: check_mk Branch: master Commit: bbbe2205e66962aaa844b3b02b85ee30e081b7c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbbe2205e66962… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Nov 8 13:27:53 2018 +0100 Moved (host & service) groups from shipped.py to dedicated modules Change-Id: Ibe8e3d2a6afdbe02aaaa3b1cf061b82fa688617c --- cmk/gui/plugins/sidebar/groups.py | 53 ++++++++++++++++++++++++++++++++++++++ cmk/gui/plugins/sidebar/shipped.py | 32 ----------------------- 2 files changed, 53 insertions(+), 32 deletions(-) diff --git a/cmk/gui/plugins/sidebar/groups.py b/cmk/gui/plugins/sidebar/groups.py new file mode 100644 index 0000000..190cc54 --- /dev/null +++ b/cmk/gui/plugins/sidebar/groups.py @@ -0,0 +1,53 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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. + +import cmk.gui.sites as sites +from cmk.gui.i18n import _ +from cmk.gui.globals import html + +from cmk.gui.plugins.sidebar import sidebar_snapins, bulletlink + +def render_groups(what): + html.open_ul() + for name, alias in sites.all_groups(what): + url = "view.py?view_name=%sgroup&%sgroup=%s" % (what, what, html.urlencode(name)) + bulletlink(alias or name, url) + html.close_ul() + +sidebar_snapins["hostgroups"] = { + "title" : _("Host Groups"), + "description" : _("Directs links to all host groups"), + "render" : lambda: render_groups("host"), + "restart": True, + "allowed" : [ "user", "admin", "guest" ] +} +sidebar_snapins["servicegroups"] = { + "title" : _("Service Groups"), + "description" : _("Direct links to all service groups"), + "render" : lambda: render_groups("service"), + "restart": True, + "allowed" : [ "user", "admin", "guest" ] +} diff --git a/cmk/gui/plugins/sidebar/shipped.py b/cmk/gui/plugins/sidebar/shipped.py index 54424f7..2e8c04b 100644 --- a/cmk/gui/plugins/sidebar/shipped.py +++ b/cmk/gui/plugins/sidebar/shipped.py @@ -189,38 +189,6 @@ sidebar_snapins["dashboards"] = { } #. -# .--Groups--------------------------------------------------------------. -# | ____ | -# | / ___|_ __ ___ _ _ _ __ ___ | -# | | | _| '__/ _ \| | | | '_ \/ __| | -# | | |_| | | | (_) | |_| | |_) \__ \ | -# | \____|_| \___/ \__,_| .__/|___/ | -# | |_| | -# '----------------------------------------------------------------------' - -def render_groups(what): - html.open_ul() - for name, alias in sites.all_groups(what): - url = "view.py?view_name=%sgroup&%sgroup=%s" % (what, what, html.urlencode(name)) - bulletlink(alias or name, url) - html.close_ul() - -sidebar_snapins["hostgroups"] = { - "title" : _("Host Groups"), - "description" : _("Directs links to all host groups"), - "render" : lambda: render_groups("host"), - "restart": True, - "allowed" : [ "user", "admin", "guest" ] -} -sidebar_snapins["servicegroups"] = { - "title" : _("Service Groups"), - "description" : _("Direct links to all service groups"), - "render" : lambda: render_groups("service"), - "restart": True, - "allowed" : [ "user", "admin", "guest" ] -} - -#. # .--Hosts---------------------------------------------------------------. # | _ _ _ | # | | | | | ___ ___| |_ ___ |

5 years, 7 months

Unbreak navicli build.

by Sven Panne

Module: check_mk Branch: master Commit: 489c5609894adae010b2b6fc15e90a20bdefe487 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=489c5609894ada… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 9 10:03:46 2018 +0100 Unbreak navicli build. Change-Id: Ib3b83993c0b95b9d4644e37f67ebd9407e533dce --- omd/packages/navicli/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/omd/packages/navicli/Makefile b/omd/packages/navicli/Makefile index 1dcbb23..59ad17b 100755 --- a/omd/packages/navicli/Makefile +++ b/omd/packages/navicli/Makefile @@ -2,6 +2,7 @@ include ../../Makefile.omd NAME = navicli VERSION = 0.7.1 +SOURCE_DIR := navisphere-64 .PHONY: build install skel clean

5 years, 7 months

6852 FIX Fixed broken validation of host diagnose user input

by Lars Michelsen

Module: check_mk Branch: master Commit: 766e75be588057e2e8fde1ccec8c8ce0ce7d2034 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=766e75be588057… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 9 09:26:10 2018 +0100 6852 FIX Fixed broken validation of host diagnose user input Change-Id: Ie6767c1c88e84aa49f1c2a35f0f4c12a999431e7 --- .werks/6852 | 11 +++++ cmk/gui/wato/pages/host_diagnose.py | 89 ++++++++++++++++++++++++------------- 2 files changed, 68 insertions(+), 32 deletions(-) diff --git a/.werks/6852 b/.werks/6852 new file mode 100644 index 0000000..747cfdf --- /dev/null +++ b/.werks/6852 @@ -0,0 +1,11 @@ +Title: Fixed broken validation of host diagnose user input +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1541687135 + + diff --git a/cmk/gui/wato/pages/host_diagnose.py b/cmk/gui/wato/pages/host_diagnose.py index a89a41e..287bbed 100644 --- a/cmk/gui/wato/pages/host_diagnose.py +++ b/cmk/gui/wato/pages/host_diagnose.py @@ -31,7 +31,7 @@ import cmk.gui.pages import cmk.gui.config as config import cmk.gui.watolib as watolib import cmk.gui.forms as forms -from cmk.gui.exceptions import MKAuthException, MKGeneralException +from cmk.gui.exceptions import MKAuthException, MKGeneralException, MKUserError from cmk.gui.plugins.wato.utils.base_modes import WatoWebApiMode from cmk.gui.i18n import _ from cmk.gui.globals import html @@ -103,6 +103,13 @@ class ModeDiagHost(WatoMode): if not html.check_transaction(): return + if html.var('_try'): + try: + self._validate_diag_html_vars() + except MKUserError, e: + html.add_user_error(e.varname, e) + return + if html.var('_save'): # Save the ipaddress and/or community vs_host = self._vs_host() @@ -129,6 +136,15 @@ class ModeDiagHost(WatoMode): html.set_var("folder", watolib.Folder.current().path()) return "edit_host", return_message + def _validate_diag_html_vars(self): + vs_host = self._vs_host() + host_vars = vs_host.from_html_vars("vs_host") + vs_host.validate_value(host_vars, "vs_host") + + vs_rules = self._vs_rules() + rule_vars = vs_rules.from_html_vars("vs_rules") + vs_rules.validate_value(rule_vars, "vs_rules") + def page(self): html.open_div(class_="diag_host") html.open_table() @@ -179,44 +195,49 @@ class ModeDiagHost(WatoMode): html.close_td() html.open_td(style="padding-left:10px;") + self._show_diagnose_output() + + def _show_diagnose_output(self): if not html.var('_try'): html.message(_('You can diagnose the connection to a specific host using this dialog. ' 'You can either test whether your current configuration is still working ' 'or investigate in which ways a host can be reached. Simply configure the ' 'connection options you like to try on the right side of the screen and ' 'press the "Test" button. The results will be displayed here.')) - else: - # TODO: Insert any vs_host valuespec validation - # These tests can be called with invalid valuespec settings... - # TODO: Replace hard coded icon paths with dynamic ones to old or new theme - for ident, title in ModeDiagHost.diag_host_tests(): - html.h3(title) - html.open_table(class_=["data", "test"]) - html.open_tr(class_=["data", "odd0"]) - - html.open_td(class_="icons") - html.open_div() - html.img("images/icon_reload.png", class_="icon", id_="%s_img" % ident) - html.open_a(href="") - html.img("images/icon_reload.png", class_=["icon", "retry"], id_="%s_retry" % ident, title=_('Retry this test')) - html.close_a() - html.close_div() - html.close_td() - - html.open_td() - html.div('', class_="log", id="%s_log" % ident) - html.close_td() - - html.close_tr() - html.close_table() - html.javascript('start_host_diag_test(%s, %s, %s)' % - (json.dumps(ident), json.dumps(self._hostname), - json.dumps(html.transaction_manager.fresh_transid()))) + return + + if html.has_user_errors(): + html.show_user_errors() + return + + + # TODO: Insert any vs_host valuespec validation + # These tests can be called with invalid valuespec settings... + # TODO: Replace hard coded icon paths with dynamic ones to old or new theme + for ident, title in ModeDiagHost.diag_host_tests(): + html.h3(title) + html.open_table(class_=["data", "test"]) + html.open_tr(class_=["data", "odd0"]) + + html.open_td(class_="icons") + html.open_div() + html.img("images/icon_reload.png", class_="icon", id_="%s_img" % ident) + html.open_a(href="") + html.img("images/icon_reload.png", class_=["icon", "retry"], id_="%s_retry" % ident, title=_('Retry this test')) + html.close_a() + html.close_div() + html.close_td() + + html.open_td() + html.div('', class_="log", id="%s_log" % ident) + html.close_td() + + html.close_tr() + html.close_table() + html.javascript('start_host_diag_test(%s, %s, %s)' % + (json.dumps(ident), json.dumps(self._hostname), + json.dumps(html.transaction_manager.fresh_transid()))) - html.close_td() - html.close_tr() - html.close_table() - html.close_div() def _vs_host(self): return Dictionary( @@ -261,6 +282,7 @@ class ModeDiagHost(WatoMode): optional_keys = False, elements = [ ('agent_port', Integer( + allow_empty = False, minvalue = 1, maxvalue = 65535, default_value = 6556, @@ -270,6 +292,7 @@ class ModeDiagHost(WatoMode): "be used to connect to the agent on a per-host-basis.") )), ('tcp_connect_timeout', Float( + allow_empty = False, minvalue = 1.0, default_value = 5.0, unit = _("sec"), @@ -282,6 +305,7 @@ class ModeDiagHost(WatoMode): "If the agent does not respond within this time, it is considered to be unreachable.") )), ('snmp_timeout', Integer( + allow_empty = False, title = _("SNMP-Timeout (<a href=\"%s\">Rules</a>)") % \ watolib.folder_preserving_link([('mode', 'edit_ruleset'), ('varname', 'snmp_timing')]), help = _("After a request is sent to the remote SNMP agent we will wait up to this " @@ -292,6 +316,7 @@ class ModeDiagHost(WatoMode): unit = _("sec"), )), ('snmp_retries', Integer( + allow_empty = False, title = _("SNMP-Retries (<a href=\"%s\">Rules</a>)") % \ watolib.folder_preserving_link([('mode', 'edit_ruleset'), ('varname', 'snmp_timing')]), default_value = 5,

5 years, 7 months

6853 FIX Fixed host diagnose not using SNMP retry of 0

by Lars Michelsen

Module: check_mk Branch: master Commit: 1a934e20a71e6b5155e3bf5672b9d97824eadfb8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a934e20a71e6b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 8 15:43:04 2018 +0100 6853 FIX Fixed host diagnose not using SNMP retry of 0 Change-Id: I9b77dc60d580ebf61dea289b370ab8a133f3e2bf --- .werks/6853 | 11 +++++++++++ cmk_base/automations/check_mk.py | 14 ++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.werks/6853 b/.werks/6853 new file mode 100644 index 0000000..895b61b --- /dev/null +++ b/.werks/6853 @@ -0,0 +1,11 @@ +Title: Fixed host diagnose not using SNMP retry of 0 +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1541688153 + + diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index a7fadfb..11bcbaa 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -1171,14 +1171,12 @@ class AutomationDiagHost(Automation): config.explicit_snmp_communities[hostname] = entry break - # Override timing settings if provided - if snmp_timeout or snmp_retries: - timing = {} - if snmp_timeout: - timing['timeout'] = snmp_timeout - if snmp_retries: - timing['retries'] = snmp_retries - config.snmp_timing.insert(0, (timing, [], [hostname])) + # Enforce automation call timing settings + timing = { + 'timeout': snmp_timeout, + 'retries': snmp_retries, + } + config.snmp_timing.insert(0, (timing, [], [hostname])) # SNMP versions if test in ['snmpv2', 'snmpv3']:

5 years, 7 months

6854 FIX Host diagnose was not using SNMPv3 credentials correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: 249407118f7ba4ddaf116a80c690a08ee56bd074 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=249407118f7ba4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 8 15:49:17 2018 +0100 6854 FIX Host diagnose was not using SNMPv3 credentials correctly The host diagnose page was not respecting the SNMPv3 credentials provided by the user on the host diagnose page. It was doing a SNMPv1/v2 test instead of SNMPv3 instead of using v3. Change-Id: I2223339e25d910051f0f29a589558020cbe56021 --- .werks/6854 | 13 +++++++++++++ cmk_base/automations/check_mk.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/6854 b/.werks/6854 new file mode 100644 index 0000000..bd8a9c4 --- /dev/null +++ b/.werks/6854 @@ -0,0 +1,13 @@ +Title: Host diagnose was not using SNMPv3 credentials correctly +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1541688459 + +The host diagnose page was not respecting the SNMPv3 credentials provided by +the user on the host diagnose page. It was doing a SNMPv1/v2 test instead +of SNMPv3 instead of using v3. diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index 11bcbaa..c1840e0 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -1195,7 +1195,7 @@ class AutomationDiagHost(Automation): access_data = { "hostname": hostname, "ipaddress": ipaddress, - "credentials": snmp_community, + "credentials": config.snmp_credentials_of(hostname), } data = snmp.get_snmp_table( access_data,

5 years, 7 months

6575 azure_virtualmachines: Monitor Azure VMs

by Moritz Kiemer

Module: check_mk Branch: master Commit: c01a2eb7281135a33d6292078b0e6c2b44fffbf3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c01a2eb7281135… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Sep 24 13:29:54 2018 +0200 6575 azure_virtualmachines: Monitor Azure VMs This werk adds a check reporting on the state of the VMs running in an Azure Cloud environment. CMK-1028 Change-Id: I18449c261fcb45b9ed389831799d2ef4bf8e8132 --- .werks/6575 | 11 ++ checkman/azure_virtualmachines | 18 ++ checkman/azure_virtualmachines.summary | 17 ++ checks/azure.include | 27 +-- checks/azure_databases | 1 - checks/azure_virtualmachines | 187 +++++++++++++++++++++ cmk/gui/plugins/wato/check_parameters.py | 100 +++++++++++ .../generictests/datasets/azure_databases.py | 2 +- .../datasets/azure_virtualmachines_1.py | 107 ++++++++++++ .../azure_virtualmachines_1_on_grouphost.py | 103 ++++++++++++ .../datasets/azure_virtualmachines_1_on_vm.py | 39 +++++ 11 files changed, 599 insertions(+), 13 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c01a2eb728…

5 years, 7 months

Make pylint happy again

by Konstantin Büttner

Module: check_mk Branch: master Commit: 9be7a1e02630eb59f44000f81403006dcadaa8e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9be7a1e02630eb… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Nov 9 08:28:37 2018 +0100 Make pylint happy again Change-Id: I90c18062b56d26550ee7d4dd92c929540e921418 --- checks/ibm_svc_license | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/ibm_svc_license b/checks/ibm_svc_license index 64f52ef..92ebe18 100644 --- a/checks/ibm_svc_license +++ b/checks/ibm_svc_license @@ -59,10 +59,10 @@ def parse_ibm_svc_license(info): return licenses def inventory_ibm_svc_license(parsed): - for license, data in parsed.items(): + for item, data in parsed.items(): if data != [0.0, 0.0]: # Omit unused svc features - yield license, None + yield item, None def check_ibm_svc_license(item, params, parsed): licensed, used = parsed[item]

5 years, 7 months

6633 FIX ibm_svc_license: Do not discover unused features

by Konstantin Büttner

Module: check_mk Branch: master Commit: 9b1df3a3d522eba84b6d610e4d3dae28b5977b56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b1df3a3d522eb… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Nov 9 08:18:26 2018 +0100 6633 FIX ibm_svc_license: Do not discover unused features Change-Id: I69bb00e6907ca947f0359b5e2e91832943000684 --- .werks/6633 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/6633 b/.werks/6633 new file mode 100644 index 0000000..2147024 --- /dev/null +++ b/.werks/6633 @@ -0,0 +1,10 @@ +Title: ibm_svc_license: Do not discover unused features +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1541747840 +Class: fix + +

5 years, 7 months

Patch 0102-fix-pdf-export-php7.diff is obsolete, since the changes are in version 0.6.26

by Alex Zurhake

Module: check_mk Branch: master Commit: 45bfd2098c47bcc3dae5d34b3a8fa98accc8bc90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45bfd2098c47bc… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Thu Nov 8 15:18:12 2018 +0100 Patch 0102-fix-pdf-export-php7.diff is obsolete, since the changes are in version 0.6.26 Change-Id: I1ab27005d6046761863682f8e5083e5fd984e95f --- .../patches/0102-fix-pdf-export-php7.diff | 80 ---------------------- 1 file changed, 80 deletions(-) diff --git a/omd/packages/pnp4nagios/patches/0102-fix-pdf-export-php7.diff b/omd/packages/pnp4nagios/patches/0102-fix-pdf-export-php7.diff deleted file mode 100644 index cce9eb3..0000000 --- a/omd/packages/pnp4nagios/patches/0102-fix-pdf-export-php7.diff +++ /dev/null @@ -1,80 +0,0 @@ -diff -Nur pnp4nagios-0.6.25.orig/share/pnp/application/vendor/fpdf/fpdf.php pnp4nagios-0.6.25/share/pnp/application/vendor/fpdf/fpdf.php ---- pnp4nagios-0.6.25.orig/share/pnp/application/vendor/fpdf/fpdf.php 2015-01-03 14:09:06.000000000 +0100 -+++ pnp4nagios-0.6.25/share/pnp/application/vendor/fpdf/fpdf.php 2017-05-11 12:07:24.039514703 +0200 -@@ -73,7 +73,7 @@ - * Public methods * - * * - *******************************************************************************/ --function FPDF($orientation='P', $unit='mm', $size='A4') -+function __construct($orientation='P', $unit='mm', $size='A4') - { - // Some checks - $this->_dochecks(); -@@ -879,7 +879,7 @@ - $this->y += $h; - } - --function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='') -+function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='', $align='', $resize=false, $dpi=300, $palign='', $ismask=false, $imgmask=false, $border=0) - { - // Put an image on the page - if(!isset($this->images[$file])) -diff -Nur pnp4nagios-0.6.25.orig/share/pnp/application/vendor/fpdf/fpdf_tpl.php pnp4nagios-0.6.25/share/pnp/application/vendor/fpdf/fpdf_tpl.php ---- pnp4nagios-0.6.25.orig/share/pnp/application/vendor/fpdf/fpdf_tpl.php 2015-01-03 14:09:06.000000000 +0100 -+++ pnp4nagios-0.6.25/share/pnp/application/vendor/fpdf/fpdf_tpl.php 2017-05-11 12:08:02.846515215 +0200 -@@ -266,7 +266,7 @@ - /** - * See FPDF/TCPDF-Documentation ;-) - */ -- function Image($file, $x, $y, $w=0, $h=0, $type='', $link='', $align='', $resize=false, $dpi=300, $palign='', $ismask=false, $imgmask=false, $border=0) { -+ function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='', $align='', $resize=false, $dpi=300, $palign='', $ismask=false, $imgmask=false, $border=0) { - if (!is_subclass_of($this, 'TCPDF') && func_num_args() > 7) { - $this->Error('More than 7 arguments for the Image method are only available in TCPDF.'); - } -diff -Nur pnp4nagios-0.6.25.orig/share/pnp/application/vendor/fpdf/fpdi_pdf_parser.php pnp4nagios-0.6.25/share/pnp/application/vendor/fpdf/fpdi_pdf_parser.php ---- pnp4nagios-0.6.25.orig/share/pnp/application/vendor/fpdf/fpdi_pdf_parser.php 2015-01-03 14:09:06.000000000 +0100 -+++ pnp4nagios-0.6.25/share/pnp/application/vendor/fpdf/fpdi_pdf_parser.php 2017-05-11 12:09:41.947959592 +0200 -@@ -66,10 +66,10 @@ - * @param string $filename Source-Filename - * @param object $fpdi Object of type fpdi - */ -- function fpdi_pdf_parser($filename, &$fpdi) { -+ function __construct($filename, &$fpdi) { - $this->fpdi =& $fpdi; - -- parent::pdf_parser($filename); -+ parent::__construct($filename); - - // resolve Pages-Dictonary - $pages = $this->pdf_resolve_object($this->c, $this->root[1][1]['/Pages']); -diff -Nur pnp4nagios-0.6.25.orig/share/pnp/application/vendor/fpdf/pdf_context.php pnp4nagios-0.6.25/share/pnp/application/vendor/fpdf/pdf_context.php ---- pnp4nagios-0.6.25.orig/share/pnp/application/vendor/fpdf/pdf_context.php 2015-01-03 14:09:06.000000000 +0100 -+++ pnp4nagios-0.6.25/share/pnp/application/vendor/fpdf/pdf_context.php 2017-05-11 12:09:16.752609736 +0200 -@@ -35,7 +35,7 @@ - - // Constructor - -- function pdf_context(&$f) { -+ function __construct(&$f) { - $this->file =& $f; - if (is_string($this->file)) - $this->_mode = 1; -@@ -94,4 +94,4 @@ - return false; - } - } --} -\ No newline at end of file -+} -diff -Nur pnp4nagios-0.6.25.orig/share/pnp/application/vendor/fpdf/pdf_parser.php pnp4nagios-0.6.25/share/pnp/application/vendor/fpdf/pdf_parser.php ---- pnp4nagios-0.6.25.orig/share/pnp/application/vendor/fpdf/pdf_parser.php 2015-01-03 14:09:06.000000000 +0100 -+++ pnp4nagios-0.6.25/share/pnp/application/vendor/fpdf/pdf_parser.php 2017-05-11 12:09:01.932992019 +0200 -@@ -91,7 +91,7 @@ - * - * @param string $filename Source-Filename - */ -- function pdf_parser($filename) { -+ function __construct($filename) { - $this->filename = $filename; - - $this->f = @fopen($this->filename, 'rb');

5 years, 7 months

Fixed broken server time snapin description since recent refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 6dbd50e06a9e6b039752c59989d2c181f989c27a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6dbd50e06a9e6b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 8 19:59:07 2018 +0100 Fixed broken server time snapin description since recent refactoring Change-Id: I8ae47b62d1640b351f6c6689b4dc11b09a489798 --- cmk/gui/plugins/sidebar/server_time.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cmk/gui/plugins/sidebar/server_time.py b/cmk/gui/plugins/sidebar/server_time.py index 602c251..3e1686c 100644 --- a/cmk/gui/plugins/sidebar/server_time.py +++ b/cmk/gui/plugins/sidebar/server_time.py @@ -44,15 +44,11 @@ class CurrentTime(SidebarSnapin): @classmethod def description(cls): return _("A large clock showing the current time of " - "the web server"), + "the web server") def show(self): html.div(time.strftime("%H:%M"), class_="time") - @classmethod - def allowed_roles(cls): - return [ "admin", "user", "guest" ] - def styles(self): return """ div.time {

5 years, 7 months

← Newer
1
...
36
37
38
39
40
41
42
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018