Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

Small reformating of changelog component headers

by Lars Michelsen

Module: check_mk Branch: master Commit: 2df29f172d362acf297d32f5f0e4ae274f388815 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2df29f172d362a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 11 15:09:34 2016 +0200 Small reformating of changelog component headers --- ChangeLog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 54fd501..9e6cce9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.2.9i1: Core & Setup: + * 3342 MKP: local/lib and local/bin of sites can now be packed... * 3114 linux and windows agent can now be configured to directly encrypt their output. For real-time updates encryption is now optional (but active per default)... * 3193 FIX: Fixed fake check results for hosts... @@ -15,6 +16,7 @@ * 3349 FIX: Added rule to disable Inline-SNMP per host... Checks & Agents: + * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller * 3184 varnish, varnish.backend, varnish.backend_success_ratio, varnish.cache, varnish.cache_hit_ratio, varnish.client, varnish.esi, varnish.fetch, varnish.objects, varnish.worker, varnish.worker_thread_ratio: new checks which monitor HTTP Accelerator Statistics via varnishstat on Linux * 2994 brocade.temp: increased temperature default levels from 35/40 to 55/60 @@ -138,6 +140,7 @@ * 3117 FIX: windows agent: fixed installer may fail to re-start service on update... Multisite: + * 3187 notification view: new filter for log command via regex * 3228 The BI Treestate painter now exports the aggregation tree as real json structure * 3288 Implemented grouping of services in table views... @@ -186,6 +189,7 @@ * 3118 FIX: Availability view now takes daylight saving time into account WATO: + * 3244 WATO BI Module: swap order of aggregation function and child node selection... * 3002 Treasure script wato_import.py: now able to set wato host tag groups * 3003 New treasure script: migrate_oldcmk2wato.py... @@ -245,11 +249,13 @@ * 3330 FIX: WATO Web-API now allows to specify root folder with / instead of empty string again Notifications: + * 3263 Notifications: allow users to restrict by their contact groups... * 3253 FIX: sms: notification script sms now handles single quotes in the message in the right way * 3346 FIX: Re-added envelope sender to asciimail/mail notification plugins BI: + * 3271 New option in aggregation for tuning aggregation of downtimes... * 3247 FIX: Do not allow multiple BI aggregates with the same title... * 3232 FIX: BI: Only querying site of host for specific host status info... @@ -257,6 +263,7 @@ * 3358 FIX: Fixed BI Boxes views when "Enable BI compilation diagnostics" enabled Reporting & Availability: + * 3267 New availability option for reclassifying host state "unreachable"... * 3102 added option to availability to include host alias in reports... * 3394 Availability: Annotations can now be used to reclassify the scheduled downtime status... @@ -268,6 +275,7 @@ * 3393 FIX: Availability annotations: also show annotations for hosts when showing services Event Console: + * 2999 The contact name is now included in Event Console notifications... * 3262 Event Console: bulk delete button for custom MIBs now available * 3058 FIX: Event Console is now allowing non loadable MIB modules on startup... @@ -278,10 +286,12 @@ * 3240 FIX: Fixed various quotation issues in GUI parts related to the EC Livestatus: + * 3233 FIX: Fixed shutdown of Nagios core with Livestatus module... * 3235 FIX: Unbreak COMMAND handling... HW/SW-Inventory: + * 3192 snmp_extended_info: now inventorizes all physical components of devices which support the ENTITY-MIB * 3319 HW/SW-Inventory service can now be OK in case of unreachable host... * 3322 esx_vsphere_hostsystem: inventory now adds information about memory, uuid and service tag...

8 years, 5 months

Changelog: Adding one empty line after component headers

by Lars Michelsen

Module: check_mk Branch: master Commit: 8394a6cbafd355750c0fcb2619a87aafb1316ce0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8394a6cbafd355… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 11 15:09:57 2016 +0200 Changelog: Adding one empty line after component headers --- werk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/werk b/werk index db40952..4ccb5ed 100755 --- a/werk +++ b/werk @@ -149,7 +149,8 @@ def rewrite_changelog(*args): else: chn.write("\n") compname = dict(components).get(compid, compid) - chn.write(" %s:\n" % compname) + chn.write(" %s:\n" + "\n" % compname) for werk in werks: write_changelog_line(chn, werk)

8 years, 5 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: ec997e979fc8850633e478f14562a8e538db02f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec997e979fc885… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 11 11:38:37 2016 +0200 Fetched livestatus from downstream. --- livestatus/src/TableLog.cc | 2 -- livestatus/src/TableLog.h | 3 --- livestatus/src/TableStateHistory.h | 10 +++------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index 9d5be95..556bace 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -142,8 +142,6 @@ TableLog::TableLog() { reinterpret_cast<char *>(ref)); } -TableLog::~TableLog() = default; - void TableLog::answerQuery(Query *query) { lock_guard<mutex> lg(g_store->logCache()->_lock); g_store->logCache()->logCachePreChecks(); diff --git a/livestatus/src/TableLog.h b/livestatus/src/TableLog.h index 8a2c00b..7f3a9de 100644 --- a/livestatus/src/TableLog.h +++ b/livestatus/src/TableLog.h @@ -36,12 +36,9 @@ class Query; class TableLog : public Table { public: TableLog(); - ~TableLog(); const char *name() override { return "log"; } const char *prefixname() override { return "logs"; } bool isAuthorized(contact *ctc, void *data) override; - void handleNewMessage(Logfile *logfile, time_t since, time_t until, - unsigned logclasses); void answerQuery(Query *query) override; Column *column(const char *colname) override; diff --git a/livestatus/src/TableStateHistory.h b/livestatus/src/TableStateHistory.h index 323c089..934af6a 100644 --- a/livestatus/src/TableStateHistory.h +++ b/livestatus/src/TableStateHistory.h @@ -26,7 +26,6 @@ #define TableStateHistory_h #include "config.h" // IWYU pragma: keep -#include <time.h> #include <map> #include <string> #include "LogCache.h" @@ -54,7 +53,6 @@ class TableStateHistory : public Table { _logfiles_t::iterator _it_logs; logfile_entries_t *_entries; logfile_entries_t::iterator _it_entries; - LogEntry *_current_entry; protected: bool _abort_query; @@ -64,18 +62,16 @@ public: const char *name() override { return "statehist"; } const char *prefixname() override { return "statehist_"; } bool isAuthorized(contact *ctc, void *data) override; - void handleNewMessage(Logfile *logfile, time_t since, time_t until, - unsigned logclasses); void answerQuery(Query *query) override; Column *column(const char *colname) override; - int updateHostServiceState(Query *query, const LogEntry *entry, - HostServiceState *hs_state, - const bool only_update); private: LogEntry *getPreviousLogentry(); LogEntry *getNextLogentry(); void process(Query *query, HostServiceState *hs_state); + int updateHostServiceState(Query *query, const LogEntry *entry, + HostServiceState *hs_state, + const bool only_update); }; #endif // TableStateHistory_h

8 years, 5 months

Fetched livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: 49062f44ef7bd7b00884818258d500ab9e8ba496 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49062f44ef7bd7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 11 11:20:07 2016 +0200 Fetched livestatus from upstream. --- livestatus/src/TableContactgroups.cc | 25 +++--- livestatus/src/TableContactgroups.h | 3 - livestatus/src/TableLog.cc | 140 ++++++++++++++-------------------- livestatus/src/TableLog.h | 3 - livestatus/src/TableStateHistory.cc | 99 ++++++++++++------------ livestatus/src/TableStateHistory.h | 1 - livestatus/src/TableTimeperiods.cc | 24 ++---- livestatus/src/TableTimeperiods.h | 3 - 8 files changed, 124 insertions(+), 174 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=49062f44ef…

8 years, 5 months

Set new future version 1.4.0i1

by Lars Michelsen

Module: check_mk Branch: master Commit: 439ebbcf8883e7ca10d34803f90dc27abd983485 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=439ebbcf8883e7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 11 08:33:44 2016 +0200 Set new future version 1.4.0i1 --- Makefile | 2 +- agents/Makefile | 2 +- agents/check-mk-agent-1.2.9i1-1.noarch.rpm | Bin 28336 -> 0 bytes agents/check-mk-agent-1.4.0i1-1.noarch.rpm | Bin 0 -> 28690 bytes agents/check-mk-agent_1.2.9i1-1_all.deb | Bin 20214 -> 0 bytes agents/check-mk-agent_1.4.0i1-1_all.deb | Bin 0 -> 20512 bytes agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.hpux | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.macosx | 2 +- agents/check_mk_agent.netbsd | 2 +- agents/check_mk_agent.openbsd | 2 +- agents/check_mk_agent.openvms | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/Makefile | 2 +- agents/windows/check_mk_agent-64.exe | Bin 940544 -> 940544 bytes agents/windows/check_mk_agent.exe | Bin 868352 -> 868352 bytes agents/windows/check_mk_agent.msi | Bin 2070528 -> 2070528 bytes agents/windows/install_agent-64.exe | Bin 431814 -> 431814 bytes agents/windows/install_agent.exe | Bin 422666 -> 422666 bytes agents/windows/installer-64.nsi | 2 +- agents/windows/installer.nsi | 2 +- bin/mkeventd | 2 +- debian/files | 2 +- livestatus/configure.ac | 2 +- scripts/setup.sh | 2 +- 27 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 4956bb5..d43c30c 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL := /bin/bash -VERSION := 1.2.9i1 +VERSION := 1.4.0i1 NAME := check_mk PREFIX := /usr BINDIR := $(PREFIX)/bin diff --git a/agents/Makefile b/agents/Makefile index 9d38264..1e8c007 100644 --- a/agents/Makefile +++ b/agents/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.2.9i1 +VERSION = 1.4.0i1 RPM_VERSION = $(subst -,_,$(VERSION)) NAME = check-mk-agent DISTNAME = $(NAME)-$(VERSION) diff --git a/agents/check-mk-agent-1.2.9i1-1.noarch.rpm b/agents/check-mk-agent-1.2.9i1-1.noarch.rpm deleted file mode 100644 index 19fc1b8..0000000 Binary files a/agents/check-mk-agent-1.2.9i1-1.noarch.rpm and /dev/null differ diff --git a/agents/check-mk-agent-1.4.0i1-1.noarch.rpm b/agents/check-mk-agent-1.4.0i1-1.noarch.rpm new file mode 100644 index 0000000..6b872ad Binary files /dev/null and b/agents/check-mk-agent-1.4.0i1-1.noarch.rpm differ diff --git a/agents/check-mk-agent_1.2.9i1-1_all.deb b/agents/check-mk-agent_1.2.9i1-1_all.deb deleted file mode 100644 index 4e39ed8..0000000 Binary files a/agents/check-mk-agent_1.2.9i1-1_all.deb and /dev/null differ diff --git a/agents/check-mk-agent_1.4.0i1-1_all.deb b/agents/check-mk-agent_1.4.0i1-1_all.deb new file mode 100644 index 0000000..9eeda0f Binary files /dev/null and b/agents/check-mk-agent_1.4.0i1-1_all.deb differ diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 15da341..db5e022 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -119,7 +119,7 @@ function run_cached { } echo '<<<check_mk>>>' -echo Version: 1.2.9i1 +echo Version: 1.4.0i1 echo AgentOS: aix echo Hostname: $(hostname) diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 4b5ded9..a1b1100 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -105,7 +105,7 @@ function run_cached() { } echo '<<<check_mk>>>' -echo Version: 1.2.9i1 +echo Version: 1.4.0i1 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 98f95da..18a2b1a 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -49,7 +49,7 @@ fi echo '<<<check_mk>>>' -echo Version: 1.2.9i1 +echo Version: 1.4.0i1 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index ba4d933..cfd6f80 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -226,7 +226,7 @@ function run_real_time_checks() } echo '<<<check_mk>>>' -echo Version: 1.2.9i1 +echo Version: 1.4.0i1 echo AgentOS: linux echo Hostname: $HOSTNAME echo AgentDirectory: $MK_CONFDIR diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index a3a7530..42b2f33 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -44,7 +44,7 @@ fi echo '<<<check_mk>>>' -echo Version: 1.2.9i1 +echo Version: 1.4.0i1 echo AgentOS: macosx osver="$(uname -r)" diff --git a/agents/check_mk_agent.netbsd b/agents/check_mk_agent.netbsd index 8f18d74..3b13967 100755 --- a/agents/check_mk_agent.netbsd +++ b/agents/check_mk_agent.netbsd @@ -60,7 +60,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.9i1 +echo Version: 1.4.0i1 echo AgentOS: netbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd index 287c195..0bcfbd0 100755 --- a/agents/check_mk_agent.openbsd +++ b/agents/check_mk_agent.openbsd @@ -60,7 +60,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.9i1 +echo Version: 1.4.0i1 echo AgentOS: openbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openvms b/agents/check_mk_agent.openvms index 1de6a42..c302707 100755 --- a/agents/check_mk_agent.openvms +++ b/agents/check_mk_agent.openvms @@ -163,7 +163,7 @@ $set noVerify $define sys$output "''cacheFile'_new" $on error then goto WCFdone $say "<<<check_mk>>>" -$say "Version: 1.2.9i1" +$say "Version: 1.4.0i1" $say "AgentOS: openvms" $say "Nodename: ",f$getsyi("nodename") $say "Architecture: ''HWinfo'" diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 038ab04..da5b85c 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -114,7 +114,7 @@ function run_cached () { echo '<<<check_mk>>>' -echo Version: 1.2.9i1 +echo Version: 1.4.0i1 echo AgentOS: solaris diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 7f72771..f6fa516 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -24,7 +24,7 @@ SHELL = /bin/bash -VERSION = 1.2.9i1 +VERSION = 1.4.0i1 VERSION_DUMMY = @@@@@CHECK_MK_VERSION@@@@@ WINDRES = i686-w64-mingw32-windres COPTIONS = -s -O2 -Wall -Wformat=2 -Werror -static -static-libgcc -static-libstdc++ -fno-rtti -std=c++11 -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' -D__USE_MINGW_ANSI_STDIO diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 85ed24c..d72398a 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index c728f22..af2a2e4 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 938691b..38001c9 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 52132fe..51cc6bb 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index ec1bae5..0698ef7 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/installer-64.nsi b/agents/windows/installer-64.nsi index 8e56529..02640ac 100644 --- a/agents/windows/installer-64.nsi +++ b/agents/windows/installer-64.nsi @@ -4,7 +4,7 @@ ; Useful sources: ; http://nsis.sourceforge.net/Reusable_installer_script -!define CHECK_MK_VERSION "1.2.9i1" +!define CHECK_MK_VERSION "1.4.0i1" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi index 1eb58c9..82fe295 100644 --- a/agents/windows/installer.nsi +++ b/agents/windows/installer.nsi @@ -4,7 +4,7 @@ ; Useful sources: ; http://nsis.sourceforge.net/Reusable_installer_script -!define CHECK_MK_VERSION "1.2.9i1" +!define CHECK_MK_VERSION "1.4.0i1" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/bin/mkeventd b/bin/mkeventd index dbe74b7..7d2a696 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -6,7 +6,7 @@ import socket, os, time, sys, getopt, signal, thread, pprint, re, \ from pwd import getpwnam from grp import getgrnam -VERSION="1.2.9i1" +VERSION="1.4.0i1" # .--Declarations--------------------------------------------------------. # | ____ _ _ _ | diff --git a/debian/files b/debian/files index 2aa41ea..ac3492a 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.2.9i1-1_all.deb net optional +check-mk_1.4.0i1-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 01a8d5e..b5f6064 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.2.9i1], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.4.0i1], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/scripts/setup.sh b/scripts/setup.sh index c243567..a6ed4ac 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.2.9i1 +VERSION=1.4.0i1 NAME=check_mk LANG= LC_ALL=

8 years, 5 months

Some additional subclassing cleanups in pagetypes

by Lars Michelsen

Module: check_mk Branch: master Commit: 876d8ab9fd747726a1765ff843004794329067d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=876d8ab9fd7477… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 11 08:23:20 2016 +0200 Some additional subclassing cleanups in pagetypes --- web/htdocs/pagetypes.py | 92 ++++++++++++++++++++++++++++++---------- web/plugins/sidebar/shipped.py | 2 - 2 files changed, 70 insertions(+), 24 deletions(-) diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index 34d0977..0f9d9a8 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -24,6 +24,10 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# TODO: Cleanup "self" in classmethods to use "cls" which is +# a) easier to see that this is a classmethod +# b) more "standard" naming + import os, inspect import config, table, forms, userdb from lib import * @@ -168,6 +172,11 @@ class Base(object): def description(self): return self._.get("description", "") + + def render_title(self): + return _u(self.title()) + + def is_empty(self): return False @@ -259,6 +268,20 @@ class Base(object): raise NotImplementedError() + # Lädt alle Dinge vom aktuellen User-Homeverzeichnis und + # mergt diese mit den übergebenen eingebauten + @classmethod + def load(self): + raise NotImplementedError() + + + # Custom method to load e.g. old configs after performing the + # loading of the regular files. + @classmethod + def _load(self): + pass + + #. # .--PageRenderer--------------------------------------------------------. # | ____ ____ _ | @@ -290,15 +313,6 @@ class PageRenderer(Base): def ident_attr(self): return "name" - def topic(self): - return self._.get("topic", _("Other")) - - # Helper functions for page handlers and render function - def page_header(self): - return self.phrase("title") + " - " + self.title() - - def page_url(self): - return html.makeuri_contextless([(self.ident_attr(), self.name())], filename = "%s.py" % self.type_name()) # Parameters special for page renderers. These can be added to the sidebar, # so we need a topic and a checkbox for the visibility @@ -344,6 +358,28 @@ class PageRenderer(Base): yield page.topic(), page.title(), page.page_url() + def topic(self): + return self._.get("topic", _("Other")) + + + # Helper functions for page handlers and render function + def page_header(self): + return self.phrase("title") + " - " + self.title() + + + def page_url(self): + return html.makeuri_contextless([(self.ident_attr(), self.name())], + filename = "%s.py" % self.type_name()) + + + def render_title(self): + if not self.is_hidden(): + return HTML("<a href=\"%s\">%s</a>" % + (self.page_url(), html.attrencode(self.title()))) + else: + return "" + + #. # .--Overridable---------------------------------------------------------. @@ -462,28 +498,34 @@ class Overridable(Base): owner = not self.is_mine() and ("&owner=%s" % self.owner()) or "" return "edit_%s.py?load_name=%s%s" % (self.type_name(), self.name(), owner) + def clone_url(self): backurl = html.urlencode(html.makeuri([])) return "edit_%s.py?load_user=%s&load_name=%s&mode=clone&back=%s" \ % (self.type_name(), self.owner(), self.name(), backurl) + def delete_url(self): add_vars = [('_delete', self.name())] if not self.is_mine(): add_vars.append(('_owner', self.owner())) return html.makeactionuri(add_vars) + @classmethod def create_url(self): return "edit_%s.py?mode=create" % self.type_name() + @classmethod def list_url(self): return "%ss.py" % self.type_name() + def after_create_url(self): return None # where redirect after a create should go + @classmethod def context_button_list(self): html.context_button(self.phrase("title_plural"), self.list_url(), self.type_name()) @@ -529,6 +571,7 @@ class Overridable(Base): def has_overriding_permission(self, how): return config.may("general.%s_%s" % (how, self.type_name())) + @classmethod def need_overriding_permission(self, how): if not self.has_overriding_permission(how): @@ -605,12 +648,14 @@ class Overridable(Base): else: return None + @classmethod def find_my_page(self, name): for page in self.instances(): if page.is_mine() and page.name() == name: return page + @classmethod def find_foreign_page(self, owner, name): try: @@ -618,6 +663,7 @@ class Overridable(Base): except KeyError: return None + @classmethod def builtin_pages(self): return {} @@ -658,10 +704,7 @@ class Overridable(Base): raise MKGeneralException(_("Cannot load %s from %s: %s") % (self.type_name(), path, e)) - # FIXME: Better switch to "new style classes" and use super() and then override load() - # in the subclass. Brings more flexibility. - if hasattr(self, "_load"): - self._load() + self._load() # Declare permissions - one for each of the pages, if it is public config.declare_permission_section(self.type_name(), self.phrase("title_plural"), @@ -671,6 +714,7 @@ class Overridable(Base): if instance.is_public(): self.declare_permission(instance) + @classmethod def save_user_instances(self, owner=None): if not owner: @@ -683,10 +727,12 @@ class Overridable(Base): config.save_user_file('user_%ss' % self.type_name(), save_dict, user=owner) + @classmethod def add_page(self, new_page): self.add_instance((new_page.owner(), new_page.name()), new_page) + def clone(self): page_dict = {} page_dict.update(self._) @@ -695,6 +741,7 @@ class Overridable(Base): self.add_page(new_page) return new_page + @classmethod def declare_permission(self, page): permname = "%s.%s" % (self.type_name(), page.name()) @@ -702,10 +749,12 @@ class Overridable(Base): config.declare_permission(permname, page.title(), page.description(), ['admin','user','guest']) + @classmethod def custom_list_buttons(self, instance): pass + @classmethod def page_list(self): self.load() @@ -813,12 +862,7 @@ class Overridable(Base): # Title table.cell(_('Title')) - title = _u(instance.title()) - if isinstance(instance, PageRenderer) and not instance.is_hidden(): - html.write("<a href=\"%s.py?%s=%s\">%s</a>" % - (self.type_name(), self.ident_attr(), instance.name(), html.attrencode(instance.title()))) - else: - html.write(html.attrencode(instance.title())) + html.write(html.attrencode(instance.render_title())) html.help(html.attrencode(_u(instance.description()))) # Custom columns specific to that page type @@ -994,6 +1038,8 @@ class Container(Base): def is_empty(self): return not self.elements() + +class OverridableContainer(Overridable, Container): # The popup for "Add to ...", e.g. for adding a graph to a report # or dashboard. This is needed for page types with the aspect "ElementContainer". @classmethod @@ -1017,7 +1063,8 @@ class Container(Base): @classmethod def render_addto_popup_entry(self, type_name, name, title): html.write('<li><a href="javascript:void(0)" ' - 'onclick="pagetype_add_to_container(\'%s\', \'%s\'); reload_sidebar();"><img src="images/icon_%s.png"> %s</a></li>' % + 'onclick="pagetype_add_to_container(\'%s\', \'%s\'); reload_sidebar();">' + '<img src="images/icon_%s.png"> %s</a></li>' % (type_name, name, type_name, title)) @@ -1034,7 +1081,8 @@ class Container(Base): create_info = json.loads(html.var("create_info")) page_type = page_types[page_type_name] - target_page, need_sidebar_reload = page_type.add_element_via_popup(page_name, element_type, create_info) + target_page, need_sidebar_reload = page_type.add_element_via_popup(page_name, + element_type, create_info) # Redirect user to tha page this displays the thing we just added to if target_page: if type(target_page) != str: @@ -1106,7 +1154,7 @@ def page_handlers(): # Ajax handler for adding elements to a container # TODO: Shouldn't we move that declaration into the class? - page_handlers["ajax_pagetype_add_element"] = lambda: Container.ajax_add_element() + page_handlers["ajax_pagetype_add_element"] = lambda: OverridableContainer.ajax_add_element() return page_handlers diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 9adaf88..941c599 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1155,8 +1155,6 @@ class BookmarkList(pagetypes.Overridable): ])] - # FIXME: Better switch to "new style classes" and use super() and then override load() - # in the subclass. Brings more flexibility. @classmethod def _load(self): self.load_legacy_bookmarks()

8 years, 5 months

updated werk and added plugged-in state

by Simon Betz

Module: check_mk Branch: master Commit: aa9bffa1c87114f94328a09699eeec11471878c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa9bffa1c87114… Author: Simon Betz <si(a)mathias-kettner.de> Date: Sat Apr 9 13:55:13 2016 +0200 updated werk and added plugged-in state --- .werks/3311 | 2 +- ChangeLog | 2 +- checks/apc_netbotz_sensors | 101 ++++++++++++++++++++++++++++++++------------ 3 files changed, 77 insertions(+), 28 deletions(-) diff --git a/.werks/3311 b/.werks/3311 index 2cf7701..0ffc051 100644 --- a/.werks/3311 +++ b/.werks/3311 @@ -1,4 +1,4 @@ -Title: apc_netbotz_sensors, apc_netbotz_sensors.dewpoint, apc_netbotz_sensors.humidity: new checks for APC Netbotz devices which support the NETBOTZV2 MIB +Title: apc_netbotz_sensors, apc_netbotz_sensors.dewpoint, apc_netbotz_sensors.humidity, apc_netbotz_other_sensors: new checks for APC Netbotz devices which support the NETBOTZV2 MIB Level: 1 Component: checks Compatible: compat diff --git a/ChangeLog b/ChangeLog index d323a18..54fd501 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,7 +45,7 @@ * 3108 network interface and switch port discovery rules can now be combined to dicover multiple sets of interfaces... NOTE: Please refer to the migration notes! * 3109 dotnet_clrmemory: levels are now configurable - * 3311 apc_netbotz_sensors, apc_netbotz_sensors.dewpoint, apc_netbotz_sensors.humidity: new checks for APC Netbotz devices which support the NETBOTZV2 MIB + * 3311 apc_netbotz_sensors, apc_netbotz_sensors.dewpoint, apc_netbotz_sensors.humidity, apc_netbotz_other_sensors: new checks for APC Netbotz devices which support the NETBOTZV2 MIB * 3115 logwatch: made check cluster-able... * 3312 check_ssh: service description can be set * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... diff --git a/checks/apc_netbotz_sensors b/checks/apc_netbotz_sensors index 228889a..8f9cbbf 100644 --- a/checks/apc_netbotz_sensors +++ b/checks/apc_netbotz_sensors @@ -26,33 +26,79 @@ # .1.3.6.1.4.1.5528.100.4.1.1.1.1.636159851 nbAlinkEnc_0_4_TEMP +# .1.3.6.1.4.1.5528.100.4.1.1.1.1.882181375 nbAlinkEnc_2_1_TEMP # .1.3.6.1.4.1.5528.100.4.1.1.1.1.1619732064 nbAlinkEnc_0_2_TEMP +# .1.3.6.1.4.1.5528.100.4.1.1.1.1.1665932156 nbAlinkEnc_1_4_TEMP +# .1.3.6.1.4.1.5528.100.4.1.1.1.1.1751899818 nbAlinkEnc_2_2_TEMP +# .1.3.6.1.4.1.5528.100.4.1.1.1.1.1857547767 nbAlinkEnc_1_5_TEMP +# .1.3.6.1.4.1.5528.100.4.1.1.1.1.2370211927 nbAlinkEnc_1_6_TEMP +# .1.3.6.1.4.1.5528.100.4.1.1.1.1.2618588815 nbAlinkEnc_2_3_TEMP # .1.3.6.1.4.1.5528.100.4.1.1.1.1.2628357572 nbAlinkEnc_0_1_TEMP # .1.3.6.1.4.1.5528.100.4.1.1.1.1.3031356659 nbAlinkEnc_0_5_TEMP # .1.3.6.1.4.1.5528.100.4.1.1.1.1.3056253200 nbAlinkEnc_0_6_TEMP +# .1.3.6.1.4.1.5528.100.4.1.1.1.1.3103062985 nbAlinkEnc_2_4_TEMP +# .1.3.6.1.4.1.5528.100.4.1.1.1.1.3328914949 nbAlinkEnc_1_3_TEMP # .1.3.6.1.4.1.5528.100.4.1.1.1.1.3406802758 nbAlinkEnc_0_3_TEMP -# .1.3.6.1.4.1.5528.100.4.1.1.1.2.636159851 238 -# .1.3.6.1.4.1.5528.100.4.1.1.1.2.1619732064 202 -# .1.3.6.1.4.1.5528.100.4.1.1.1.2.2628357572 225 -# .1.3.6.1.4.1.5528.100.4.1.1.1.2.3031356659 204 -# .1.3.6.1.4.1.5528.100.4.1.1.1.2.3056253200 239 -# .1.3.6.1.4.1.5528.100.4.1.1.1.2.3406802758 214 -# .1.3.6.1.4.1.5528.100.4.1.2.1.1.1744856019 nbAlinkEnc_0_4_HUMI -# .1.3.6.1.4.1.5528.100.4.1.2.1.1.1974269701 nbAlinkEnc_0_2_HUMI -# .1.3.6.1.4.1.5528.100.4.1.2.1.1.2804425567 nbAlinkEnc_0_1_HUMI +# .1.3.6.1.4.1.5528.100.4.1.1.1.2.636159851 252 +# .1.3.6.1.4.1.5528.100.4.1.1.1.2.882181375 222 +# .1.3.6.1.4.1.5528.100.4.1.1.1.2.1619732064 222 +# .1.3.6.1.4.1.5528.100.4.1.1.1.2.1665932156 216 +# .1.3.6.1.4.1.5528.100.4.1.1.1.2.1751899818 245 +# .1.3.6.1.4.1.5528.100.4.1.1.1.2.1857547767 234 +# .1.3.6.1.4.1.5528.100.4.1.1.1.2.2370211927 240 +# .1.3.6.1.4.1.5528.100.4.1.1.1.2.2618588815 220 +# .1.3.6.1.4.1.5528.100.4.1.1.1.2.2628357572 229 +# .1.3.6.1.4.1.5528.100.4.1.1.1.2.3031356659 0 +# .1.3.6.1.4.1.5528.100.4.1.1.1.2.3056253200 0 +# .1.3.6.1.4.1.5528.100.4.1.1.1.2.3103062985 215 +# .1.3.6.1.4.1.5528.100.4.1.1.1.2.3328914949 234 +# .1.3.6.1.4.1.5528.100.4.1.1.1.2.3406802758 238 +# .1.3.6.1.4.1.5528.100.4.1.1.1.7.636159851 25.200000 +# .1.3.6.1.4.1.5528.100.4.1.1.1.7.882181375 22.200000 +# .1.3.6.1.4.1.5528.100.4.1.1.1.7.1619732064 22.200000 +# .1.3.6.1.4.1.5528.100.4.1.1.1.7.1665932156 21.600000 +# .1.3.6.1.4.1.5528.100.4.1.1.1.7.1751899818 24.500000 +# .1.3.6.1.4.1.5528.100.4.1.1.1.7.1857547767 23.400000 +# .1.3.6.1.4.1.5528.100.4.1.1.1.7.2370211927 24.000000 +# .1.3.6.1.4.1.5528.100.4.1.1.1.7.2618588815 22.000000 +# .1.3.6.1.4.1.5528.100.4.1.1.1.7.2628357572 22.900000 +# .1.3.6.1.4.1.5528.100.4.1.1.1.7.3031356659 +# .1.3.6.1.4.1.5528.100.4.1.1.1.7.3056253200 +# .1.3.6.1.4.1.5528.100.4.1.1.1.7.3103062985 21.500000 +# .1.3.6.1.4.1.5528.100.4.1.1.1.7.3328914949 23.400000 +# .1.3.6.1.4.1.5528.100.4.1.1.1.7.3406802758 23.800000 + +# .1.3.6.1.4.1.5528.100.4.1.2.1.1.421607638 nbAlinkEnc_1_5_HUMI +# .1.3.6.1.4.1.5528.100.4.1.2.1.1.581338442 nbAlinkEnc_1_3_HUMI +# .1.3.6.1.4.1.5528.100.4.1.2.1.1.1121716336 nbAlinkEnc_0_6_HUMI +# .1.3.6.1.4.1.5528.100.4.1.2.1.1.3273299739 nbAlinkEnc_0_3_HUMI # .1.3.6.1.4.1.5528.100.4.1.2.1.1.4181308384 nbAlinkEnc_0_5_HUMI -# .1.3.6.1.4.1.5528.100.4.1.2.1.2.1744856019 200 -# .1.3.6.1.4.1.5528.100.4.1.2.1.2.1974269701 360 -# .1.3.6.1.4.1.5528.100.4.1.2.1.2.2804425567 200 -# .1.3.6.1.4.1.5528.100.4.1.2.1.2.4181308384 370 +# .1.3.6.1.4.1.5528.100.4.1.2.1.2.421607638 370 +# .1.3.6.1.4.1.5528.100.4.1.2.1.2.581338442 320 +# .1.3.6.1.4.1.5528.100.4.1.2.1.2.1121716336 0 +# .1.3.6.1.4.1.5528.100.4.1.2.1.2.3273299739 320 +# .1.3.6.1.4.1.5528.100.4.1.2.1.2.4181308384 0 +# .1.3.6.1.4.1.5528.100.4.1.2.1.7.421607638 37.000000 +# .1.3.6.1.4.1.5528.100.4.1.2.1.7.581338442 32.000000 +# .1.3.6.1.4.1.5528.100.4.1.2.1.7.1121716336 +# .1.3.6.1.4.1.5528.100.4.1.2.1.7.3273299739 32.000000 +# .1.3.6.1.4.1.5528.100.4.1.2.1.7.4181308384 + # .1.3.6.1.4.1.5528.100.4.1.3.1.1.1000015730 nbAlinkEnc_0_5_DWPT -# .1.3.6.1.4.1.5528.100.4.1.3.1.1.1807639405 nbAlinkEnc_0_1_DWPT -# .1.3.6.1.4.1.5528.100.4.1.3.1.1.2231143474 nbAlinkEnc_0_2_DWPT -# .1.3.6.1.4.1.5528.100.4.1.3.1.1.4125059843 nbAlinkEnc_0_4_DWPT -# .1.3.6.1.4.1.5528.100.4.1.3.1.2.1000015730 52 -# .1.3.6.1.4.1.5528.100.4.1.3.1.2.1807639405 -15 -# .1.3.6.1.4.1.5528.100.4.1.3.1.2.2231143474 46 -# .1.3.6.1.4.1.5528.100.4.1.3.1.2.4125059843 -5 +# .1.3.6.1.4.1.5528.100.4.1.3.1.1.1490079962 nbAlinkEnc_0_3_DWPT +# .1.3.6.1.4.1.5528.100.4.1.3.1.1.2228353183 nbAlinkEnc_0_6_DWPT +# .1.3.6.1.4.1.5528.100.4.1.3.1.1.2428087247 nbAlinkEnc_1_3_DWPT +# .1.3.6.1.4.1.5528.100.4.1.3.1.1.3329736831 nbAlinkEnc_1_5_DWPT +# .1.3.6.1.4.1.5528.100.4.1.3.1.2.1000015730 0 +# .1.3.6.1.4.1.5528.100.4.1.3.1.2.1490079962 61 +# .1.3.6.1.4.1.5528.100.4.1.3.1.2.2228353183 0 +# .1.3.6.1.4.1.5528.100.4.1.3.1.2.2428087247 57 +# .1.3.6.1.4.1.5528.100.4.1.3.1.2.3329736831 78 +# .1.3.6.1.4.1.5528.100.4.1.3.1.7.1000015730 +# .1.3.6.1.4.1.5528.100.4.1.3.1.7.1490079962 6.100000 +# .1.3.6.1.4.1.5528.100.4.1.3.1.7.2228353183 +# .1.3.6.1.4.1.5528.100.4.1.3.1.7.2428087247 5.700000 +# .1.3.6.1.4.1.5528.100.4.1.3.1.7.3329736831 7.800000 # .--temperature---------------------------------------------------------. @@ -81,12 +127,13 @@ def parse_apc_netbotz_sensors(info): "3" : "dewpoint", } parsed = {} - for oid_item, reading_str in info: - item_info = oid_item.split(".") - item_type = map_sensors[item_info[0]] - item_name = " ".join(item_info[2:]) - parsed.setdefault(item_type, {}) - parsed[item_type][item_name] = float(reading_str)/10 + for oid_item, reading_str, plugged_in_state in info: + if plugged_in_state: + item_info = oid_item.split(".") + item_type = map_sensors[item_info[0]] + item_name = " ".join(item_info[2:]) + parsed.setdefault(item_type, {}) + parsed[item_type][item_name] = (float(reading_str)/10 ) return parsed @@ -115,6 +162,8 @@ check_info['apc_netbotz_sensors'] = { ], [ "1", # NETBOTZV2-MIB::*SensorId "2", # NETBOTZV2-MIB::*SensorValue + "7", # NETBOTZV2-MIB::*ValueStr + # empty if sensor is not plugged in ]), 'snmp_scan_function' : lambda oid: \ oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5528.100.20.10.2014"),

8 years, 5 months

minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 3fbf05bbbd6f79c39355bc978d3c3f8811d9e646 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fbf05bbbd6f79… Author: Simon Betz <si(a)mathias-kettner.de> Date: Sat Apr 9 13:56:46 2016 +0200 minor cleanup --- checks/apc_netbotz_sensors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/apc_netbotz_sensors b/checks/apc_netbotz_sensors index 8f9cbbf..2f65b36 100644 --- a/checks/apc_netbotz_sensors +++ b/checks/apc_netbotz_sensors @@ -133,7 +133,7 @@ def parse_apc_netbotz_sensors(info): item_type = map_sensors[item_info[0]] item_name = " ".join(item_info[2:]) parsed.setdefault(item_type, {}) - parsed[item_type][item_name] = (float(reading_str)/10 ) + parsed[item_type][item_name] = float(reading_str)/10 return parsed

8 years, 5 months

3118 FIX Availability view now takes daylight saving time into account

by Sebastian Herbord

Module: check_mk Branch: master Commit: e862d00634a8d4a1004d7804c085cf444531dc56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e862d00634a8d4… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Apr 8 17:59:43 2016 +0200 3118 FIX Availability view now takes daylight saving time into account --- .werks/3118 | 9 ++++ ChangeLog | 1 + web/htdocs/valuespec.py | 127 +++++++++++++++++++++++++++++------------------ 3 files changed, 88 insertions(+), 49 deletions(-) diff --git a/.werks/3118 b/.werks/3118 new file mode 100644 index 0000000..077321a --- /dev/null +++ b/.werks/3118 @@ -0,0 +1,9 @@ +Title: Availability view now takes daylight saving time into account +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.9i1 +Date: 1460130852 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 118acca..d323a18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -183,6 +183,7 @@ * 3373 FIX: Fixed exception when handling syntax errors while loading pagetype files * 3374 FIX: Fixed broken Logwatch page when a host has no log directory (yet) * 3375 FIX: Fixed exception when adding a bookmark while having a list not named my_bookmarks + * 3118 FIX: Availability view now takes daylight saving time into account WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 1d40491..cc27f80 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2238,6 +2238,58 @@ month_names = [ _("September"), _("October"), _("November"), _("December") ] + +class TimeHelper: + @staticmethod + def round(timestamp, unit): + time_s = list(time.localtime(timestamp)) + time_s[3] = time_s[4] = time_s[5] = 0 + time_s[8] = -1 + if unit == 'd': + return time.mktime(time_s) + elif unit == 'w': + days = time_s[6] # 0 based + elif unit == 'm': + days = time_s[2] - 1 # 1 based + elif unit == 'y': + days = time_s[7] - 1 # 1 based + else: + raise MKGeneralException("invalid time unit %s" % unit) + + return TimeHelper.round(time.mktime(time_s) - days * 86400 + 3600, 'd') + + @staticmethod + def add(timestamp, count, unit): + if unit == 'h': + return timestamp + 3600 * count + elif unit == 'd': + return timestamp + 86400 * count + elif unit == 'w': + return timestamp + (7 * 86400) * count + elif unit == 'm': + time_s = list(time.localtime(timestamp)) + years, months = divmod(abs(count), 12) + + if count < 0: + years *= -1 + months *= -1 + + time_s[0] += years + time_s[1] += months + if time_s[1] <= 0: + time_s[0] -= 1 + time_s[1] = 12 - time_s[1] + time_s[8] = -1 + return time.mktime(time_s) + elif unit == 'y': + time_s = list(time.localtime(timestamp)) + time_s[0] += count + return time.mktime(time_s) + else: + MKGeneralException("invalid time unit %s" % unit) + + + class Timerange(CascadingDropdown): def __init__(self, **kwargs): self._title = _('Time range') @@ -2319,6 +2371,7 @@ class Timerange(CascadingDropdown): }.get(rangespec[1], "4h") now = time.time() + if rangespec[0] == 'age': from_time = now - rangespec[1] until_time = now @@ -2330,69 +2383,45 @@ class Timerange(CascadingDropdown): if from_time > until_time: raise MKUserError("avo_rangespec_9_0_year", _("The end date must be after the start date")) if rangespec[0] == 'date': - until_time += 86400 # Consider *end* of this day + # add 25 hours, then round to 00:00 of that day. This accounts for + # daylight-saving time + until_time = TimeHelper.round(TimeHelper.add(until_time, 25, 'h'), 'd') title = AbsoluteDate().value_to_text(from_time) + " ... " + \ AbsoluteDate().value_to_text(until_time) return (from_time, until_time), title else: - # year, month, day_of_month, hour, minute, second, day_of_week, day_of_year, is_daylightsavingtime - broken = list(time.localtime(now)) - broken[3:6] = 0, 0, 0 # set time to 00:00:00 - midnight = time.mktime(broken) - until_time = now if rangespec[0].isdigit(): # 4h, 365d count = int(rangespec[:-1]) - s = rangespec[-1] - if s == 'd': - seconds = count * 86400 - title = _("Last %d days") % count - else: - seconds = count * 3600 - title = _("Last %d hours") % count - from_time = now - seconds + from_time = TimeHelper.add(now, count * -1, rangespec[-1]) + unit_name = { + 'd': "days", + 'h': "hours" + }[rangespec[-1]] + title = _("Last %d %s") % (count, unit_name) return (from_time, now), title - if rangespec[0] == 'd': # this/last Day - from_time = time.mktime(broken) - titles = _("Today"), _("Yesterday") - - elif rangespec[0] == 'w': # week - from_time = midnight - (broken[6]) * 86400 - titles = _("This week"), _("Last week") - - elif rangespec[0] == 'm': # month - broken[2] = 1 - from_time = time.mktime(broken) - last_year = broken[0] - ((broken[1] == 1) and 1 or 0) - titles = month_names[broken[1] - 1] + " " + str(broken[0]), \ - month_names[(broken[1] + 10) % 12] + " " + str(last_year) - - elif rangespec[0] == 'y': # year - broken[1:3] = [1, 1] - from_time = time.mktime(broken) - titles = str(broken[0]), str(broken[0]-1) + year, month = time.localtime(now)[:2] + # base time is current time rounded down to the nearest unit (day, week, ...) + from_time = TimeHelper.round(now, rangespec[0]) + # derive titles from unit () + titles = { + 'd': (_("Today"), _("Yesterday")), + 'w': (_("This week"), _("Last week")), + 'y': (str(year), str(year - 1)), + 'm': ("%s %d" % (month_names[month - 1], year), + "%s %d" % (month_names[(month + 10) % 12], year - int(month == 1))), + }[rangespec[0]] if rangespec[1] == '0': return (from_time, now), titles[0] - else: # last (previous) - if rangespec[0] == 'd': - return (from_time - 86400, from_time), titles[1] - elif rangespec[0] == 'w': - return (from_time - 7 * 86400, from_time), titles[1] - - until_time = from_time - from_broken = list(time.localtime(from_time)) - if rangespec[0] == 'y': - from_broken[0] -= 1 - else: # m - from_broken[1] -= 1 - if from_broken[1] == 0: - from_broken[1] = 12 - from_broken[0] -= 1 - return (time.mktime(from_broken), until_time), titles[1] + prev_time = TimeHelper.add(from_time, -1, rangespec[0]) + # add one hour to the calculated time so that if dst started in that period, + # we don't round down a whole day + prev_time = TimeHelper.round(prev_time + 3600, 'd') + return (prev_time, from_time), titles[1] # A selection of various date formats

8 years, 5 months

Added TODO hint to htmllib.py

by Mathias Kettner

Module: check_mk Branch: master Commit: ba6f94f9a3ea833b8e17384f59b556076b3dd7bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba6f94f9a3ea83… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 8 17:20:43 2016 +0200 Added TODO hint to htmllib.py --- web/htdocs/htmllib.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 81f6cb7..7857f87 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -56,6 +56,7 @@ except ImportError: from lib import * # Only parse variable adhering to the following regular expressions +# TODO: Fix this regex. +-\ selects all from + to \, not +, - and \! varname_regex = re.compile('^[\w\d_.%+-\\\*]+$') # Information about uri

8 years, 5 months

← Newer
1
...
22
23
24
25
26
27
28
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016