Checkmk git commits May 2016

checkmk-commits@lists.checkmk.com

6 participants
231 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: c6363052853fd906a28617929f8674b200c2270c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6363052853fd9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 19 09:59:41 2016 +0200 Fixed typo in english text --- 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 13e18be..c8074e6 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -47,7 +47,7 @@ if defaults.omd_root: # | Declarations of the structure of rules and actions | # '----------------------------------------------------------------------' substitute_help = _(""" -The following placeholdes will be substituted by value from the actual event: +The following macros will be substituted by value from the actual event: <table class=help> <tr><td class=tt>$ID$</td><td>Event ID</td></tr> <tr><td class=tt>$COUNT$</td><td>Number of occurrances</td></tr>

8 years, 1 month

Tweak tidy/iwyu/cppcheck to ease CI integration.

by Sven Panne

Module: check_mk Branch: master Commit: d362e4f095ad9c0db788563fb885469ee8e4eafc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d362e4f095ad9c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 18 14:57:02 2016 +0200 Tweak tidy/iwyu/cppcheck to ease CI integration. --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 9d34062..ba27a4c 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ CLANG_TIDY := clang-tidy-$(CLANG_VERSION) SCAN_BUILD := scan-build-$(CLANG_VERSION) CPPCHECK := cppcheck DOXYGEN := doxygen -IWYU := include-what-you-use +IWYU_TOOL := iwyu_tool.py BEAR := bear-fixed # File to pack into livestatus-$(VERSION).tar.gz @@ -280,20 +280,20 @@ compile_commands.json: $(FILES_TO_FORMAT) $(BEAR) $(MAKE) -C livestatus -j8 tidy: compile_commands.json - ./compiled_sources | xargs $(CLANG_TIDY) --extra-arg=-D__clang_analyzer__ + @./compiled_sources | xargs $(CLANG_TIDY) --extra-arg=-D__clang_analyzer__ # Not really perfect rules, but better than nothing -iwyu: - $(MAKE) -C livestatus clean - $(MAKE) -C livestatus CC=$(IWYU) CXX="$(IWYU) -std=c++14" -k +iwyu: compile_commands.json + @$(IWYU_TOOL) -p . # Not really perfect rules, but better than nothing analyze: $(MAKE) -C livestatus clean cd livestatus && $(SCAN_BUILD) -o ../clang-analyzer $(MAKE) CXXFLAGS="-std=c++14" +# TODO: Repeating the include paths here is ugly and fragile. cppcheck: - $(CPPCHECK) --quiet --enable=all -UCMC --max-configs=20 --inline-suppr --template=gcc -I livestatus/src -I livestatus livestatus + @$(CPPCHECK) --quiet -UCMC --enable=all --inline-suppr --template=gcc -I livestatus/src -I livestatus livestatus # TODO: We should probably handle this rule via AM_EXTRA_RECURSIVE_TARGETS in # src/configure.ac, but this needs at least automake-1.13, which in turn is only

8 years, 1 month

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: ed63d20dea5c81442e1a15454784631e732f7e6b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed63d20dea5c81… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 18 14:18:53 2016 +0200 Fetched livestatus from downstream. --- livestatus/src/Query.cc | 24 ++++++++++++++++++++++++ livestatus/src/Query.h | 4 ++++ livestatus/src/StatsColumn.h | 1 + 3 files changed, 29 insertions(+) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 5ef1847..154fc64 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -53,8 +53,25 @@ extern int g_data_encoding; using std::list; using std::string; +using std::unordered_set; using std::vector; +namespace { +void collectFilterColumns(unordered_set<Column *> &filter_columns, + Filter *filter) { + if (filter->isAndingFilter()) { + for (const auto &sub_filter : *static_cast<AndingFilter *>(filter)) { + collectFilterColumns(filter_columns, sub_filter); + } + } else if (filter->isNegatingFilter()) { + collectFilterColumns( + filter_columns, static_cast<NegatingFilter *>(filter)->subfilter()); + } else { + filter_columns.insert(filter->column()); + } +} +} // namespace + Query::Query(const list<string> &lines, OutputBuffer *output, Table *table) : _output(output) , _table(table) @@ -179,6 +196,13 @@ Query::Query(const list<string> &lines, OutputBuffer *output, Table *table) // here, is that really what we want? _show_column_headers = true; } + + _all_columns.insert(_columns.begin(), _columns.end()); + for (const auto &sc : _stats_columns) { + _all_columns.insert(sc->column()); + } + collectFilterColumns(_all_columns, &_filter); + collectFilterColumns(_all_columns, &_wait_condition); } Query::~Query() { diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h index 2fe2074..3f1eda9 100644 --- a/livestatus/src/Query.h +++ b/livestatus/src/Query.h @@ -31,6 +31,7 @@ #include <list> #include <map> #include <string> +#include <unordered_set> #include <vector> #include "AndingFilter.h" #include "global_counters.h" @@ -90,6 +91,8 @@ class Query { typedef std::map<_stats_group_spec_t, Aggregator **> _stats_groups_t; _stats_groups_t _stats_groups; + std::unordered_set<Column *> _all_columns; + public: Query(const std::list<std::string> &lines, OutputBuffer *output, Table *); ~Query(); @@ -129,6 +132,7 @@ public: void optimizeBitmask(const char *columnname, uint32_t *bitmask); int timezoneOffset() { return _timezone_offset; } AndingFilter *filter() { return &_filter; } + std::unordered_set<Column*> *allColumns() { return &_all_columns; } private: bool doStats(); diff --git a/livestatus/src/StatsColumn.h b/livestatus/src/StatsColumn.h index 635f00a..c13d599 100644 --- a/livestatus/src/StatsColumn.h +++ b/livestatus/src/StatsColumn.h @@ -48,6 +48,7 @@ public: StatsColumn(Column *c, Filter *f, int o) : _column(c), _filter(f), _operation(o) {} ~StatsColumn(); + Column *column() const { return _column; } int operation() { return _operation; } Filter *stealFilter() { Filter *f = _filter;

8 years, 1 month

3536 FIX alcatel_timetra_chassis: fixed exception when check is not OK

by Andreas Boesl

Module: check_mk Branch: master Commit: d8d6b8b27837ef85675cfdb3c4e0245bda95da05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8d6b8b27837ef… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 18 13:51:47 2016 +0200 3536 FIX alcatel_timetra_chassis: fixed exception when check is not OK --- .werks/3536 | 9 +++++++++ ChangeLog | 1 + checks/alcatel_timetra_chassis | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/3536 b/.werks/3536 new file mode 100644 index 0000000..c46801c --- /dev/null +++ b/.werks/3536 @@ -0,0 +1,9 @@ +Title: alcatel_timetra_chassis: fixed exception when check is not OK +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1463572278 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 5a7d840..1104eeb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -222,6 +222,7 @@ * 3134 FIX: windows agent: fixed bug where the last message of an eventlog was always re-read * 3603 FIX: wut_webtherm: fixed empty data handling * 3535 FIX: docsis_cm_status: fixed missing performance data + * 3536 FIX: alcatel_timetra_chassis: fixed exception when check is not OK Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/alcatel_timetra_chassis b/checks/alcatel_timetra_chassis index 66373b4..30b7680 100644 --- a/checks/alcatel_timetra_chassis +++ b/checks/alcatel_timetra_chassis @@ -73,7 +73,7 @@ def check_alcatel_timetra_chassis(item, _no_params, info): yield oper_states[operstate][0], "Operational state: %s" % oper_states[operstate][1] if alarm_states[alarmstate][0] != 0: - yield alarm_states[alarmstate], "Alarm state: %s" % alarm_states[alarmstate][1] + yield alarm_states[alarmstate][0], "Alarm state: %s" % alarm_states[alarmstate][1] return

8 years, 1 month

IWYU.

by Sven Panne

Module: check_mk Branch: master Commit: e42e26443de8dbb3e30278f0b24b3b3e406da2dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e42e26443de8db… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 18 11:36:57 2016 +0200 IWYU. --- livestatus/src/Logfile.cc | 6 +++--- livestatus/src/pnp4nagios.cc | 6 ++++++ livestatus/src/pnp4nagios.h | 2 ++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index e80714a..076a2d8 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -23,13 +23,10 @@ // Boston, MA 02110-1301 USA. #include "Logfile.h" -#include <errno.h> #include <fcntl.h> #include <stdlib.h> #include <string.h> -#include <syslog.h> #include <unistd.h> -#include <cinttypes> #include <utility> #include "LogCache.h" #include "LogEntry.h" @@ -37,6 +34,9 @@ #include "logger.h" #ifdef CMC +#include <errno.h> +#include <syslog.h> +#include <cinttypes> #include "cmc.h" #endif diff --git a/livestatus/src/pnp4nagios.cc b/livestatus/src/pnp4nagios.cc index c687b32..bb4987f 100644 --- a/livestatus/src/pnp4nagios.cc +++ b/livestatus/src/pnp4nagios.cc @@ -24,8 +24,12 @@ #include "pnp4nagios.h" #include <stddef.h> +#ifdef CMC #include <sys/stat.h> +#endif +#ifndef CMC #include <unistd.h> +#endif using std::string; @@ -50,6 +54,7 @@ string pnp_cleanup(const string& name) { return replace_all(name, " /\\:", '_'); } +#ifndef CMC int pnpgraph_present(const string& host, const string& service) { string pnp_path(g_pnp_path); if (pnp_path.empty()) { @@ -61,6 +66,7 @@ int pnpgraph_present(const string& host, const string& service) { .append(".xml")); return access(path.c_str(), R_OK) == 0 ? 1 : 0; } +#endif #ifdef CMC string rrd_path(const string& host, const string& service, diff --git a/livestatus/src/pnp4nagios.h b/livestatus/src/pnp4nagios.h index e3b4855..ee0deb6 100644 --- a/livestatus/src/pnp4nagios.h +++ b/livestatus/src/pnp4nagios.h @@ -30,8 +30,10 @@ std::string pnp_cleanup(const std::string& name); +#ifndef CMC int pnpgraph_present(const std::string& host, const std::string& service = "_HOST_"); +#endif #ifdef CMC // Determines if a RRD database exists and returns its path name. Returns an

8 years, 1 month

Make cppcheck happy again.

by Sven Panne

Module: check_mk Branch: master Commit: fd39f66fb7c3605541d4c8244af66cc4db361625 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd39f66fb7c360… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 18 10:28:55 2016 +0200 Make cppcheck happy again. These are the minimal changes to make cppcheck happy again so we can put this into our CI. Note that all those '#ifdef CMC' are an ugly temporary measure only and should vanish when our repos/classes have the right structure. --- Makefile | 2 +- livestatus/src/HostServiceState.cc | 2 ++ livestatus/src/HostServiceState.h | 3 ++- livestatus/src/LogCache.cc | 2 ++ livestatus/src/LogCache.h | 2 ++ livestatus/src/LogEntry.cc | 4 ++-- livestatus/src/Logfile.cc | 2 ++ livestatus/src/Logfile.h | 2 ++ livestatus/src/pnp4nagios.cc | 2 ++ livestatus/src/pnp4nagios.h | 2 ++ 10 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7aca4bd..9d34062 100644 --- a/Makefile +++ b/Makefile @@ -293,7 +293,7 @@ analyze: cd livestatus && $(SCAN_BUILD) -o ../clang-analyzer $(MAKE) CXXFLAGS="-std=c++14" cppcheck: - $(CPPCHECK) --quiet --enable=all --max-configs=20 --inline-suppr --template=gcc -I livestatus/src -I livestatus livestatus + $(CPPCHECK) --quiet --enable=all -UCMC --max-configs=20 --inline-suppr --template=gcc -I livestatus/src -I livestatus livestatus # TODO: We should probably handle this rule via AM_EXTRA_RECURSIVE_TARGETS in # src/configure.ac, but this needs at least automake-1.13, which in turn is only diff --git a/livestatus/src/HostServiceState.cc b/livestatus/src/HostServiceState.cc index 6225fa7..be10da2 100644 --- a/livestatus/src/HostServiceState.cc +++ b/livestatus/src/HostServiceState.cc @@ -31,6 +31,7 @@ HostServiceState::~HostServiceState() { } } +#ifdef CMC void HostServiceState::computePerStateDurations() { _duration_state_UNMONITORED = 0; _duration_part_UNMONITORED = 0; @@ -66,3 +67,4 @@ void HostServiceState::computePerStateDurations() { break; } } +#endif diff --git a/livestatus/src/HostServiceState.h b/livestatus/src/HostServiceState.h index 556496a..9ae14e6 100644 --- a/livestatus/src/HostServiceState.h +++ b/livestatus/src/HostServiceState.h @@ -95,8 +95,9 @@ struct HostServiceState { HostServiceState() { bzero(this, sizeof(HostServiceState)); } ~HostServiceState(); +#ifdef CMC void computePerStateDurations(); - void debug_me(const char *loginfo, ...); +#endif }; #endif // HostServiceState_h diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 4f00e80..8c93a12 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -81,12 +81,14 @@ LogCache::LogCache(const CommandsHolder &commands_holder, updateLogfileIndex(); } +#ifdef CMC void LogCache::setMaxCachedMessages(unsigned long m) { if (m != _max_cached_messages) { logger(LOG_NOTICE, "Logfile cache: Changing max messages to %ld", m); _max_cached_messages = m; } } +#endif LogCache::~LogCache() { forgetLogfiles(); } diff --git a/livestatus/src/LogCache.h b/livestatus/src/LogCache.h index 28c2aa7..778f3fa 100644 --- a/livestatus/src/LogCache.h +++ b/livestatus/src/LogCache.h @@ -51,7 +51,9 @@ public: LogCache(const CommandsHolder &commands_holder, unsigned long max_cached_messages); ~LogCache(); +#ifdef CMC void setMaxCachedMessages(unsigned long m); +#endif time_t _last_index_update; const char *name() { return "log"; } diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 14602d9..6f63f4c 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -28,11 +28,11 @@ #include "strutil.h" LogEntry::LogEntry(const CommandsHolder &commands_holder, unsigned lineno, - char *line) { + char *line) + : _type(NONE) { // TODO(sp) Fix all handleFooEntry() member functions below to always set // all fields and remove this set-me-to-zero-to-be-sure-block. _logclass = LOGCLASS_INFO; - _type = NONE; _host_name = nullptr; _svc_desc = nullptr; _command_name = nullptr; diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 6755f9f..e80714a 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -287,6 +287,7 @@ void Logfile::updateReferences() { #endif } +#ifdef CMC // Read complete file into newly allocated buffer. Returns a pointer // to a malloced buffer, that the caller must free (or 0, in case of // an error). The buffer is 2 bytes larger then the file. One byte @@ -340,3 +341,4 @@ char *Logfile::readIntoBuffer(int *size) { close(fd); return buffer; } +#endif diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h index fc1402a..d450803 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -65,7 +65,9 @@ public: ~Logfile(); char *path() { return _path; } +#ifdef CMC char *readIntoBuffer(int *size); +#endif void load(LogCache *logcache, time_t since, time_t until, unsigned logclasses); void flush(); diff --git a/livestatus/src/pnp4nagios.cc b/livestatus/src/pnp4nagios.cc index c37a8f7..c687b32 100644 --- a/livestatus/src/pnp4nagios.cc +++ b/livestatus/src/pnp4nagios.cc @@ -62,6 +62,7 @@ int pnpgraph_present(const string& host, const string& service) { return access(path.c_str(), R_OK) == 0 ? 1 : 0; } +#ifdef CMC string rrd_path(const string& host, const string& service, const string& varname) { string pnp_path(g_pnp_path); @@ -78,3 +79,4 @@ string rrd_path(const string& host, const string& service, struct stat st; return stat(path.c_str(), &st) == 0 ? path : ""; } +#endif diff --git a/livestatus/src/pnp4nagios.h b/livestatus/src/pnp4nagios.h index 89f6fb3..e3b4855 100644 --- a/livestatus/src/pnp4nagios.h +++ b/livestatus/src/pnp4nagios.h @@ -33,10 +33,12 @@ std::string pnp_cleanup(const std::string& name); int pnpgraph_present(const std::string& host, const std::string& service = "_HOST_"); +#ifdef CMC // Determines if a RRD database exists and returns its path name. Returns an // empty string otherwise. This assumes paths created in the PNP4Nagios style // with storage type MULTIPLE. std::string rrd_path(const std::string& host, const std::string& service, const std::string& varname); +#endif #endif // pnp4nagios_h

8 years, 1 month

Fixed #includes, they confused some tools.

by Sven Panne

Module: check_mk Branch: master Commit: fc1b21051c64f2855050c8eb46640185456cdeb3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc1b21051c64f2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 18 09:25:15 2016 +0200 Fixed #includes, they confused some tools. --- livestatus/src/mk_inventory.cc | 2 +- livestatus/src/mk_logwatch.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/mk_inventory.cc b/livestatus/src/mk_inventory.cc index 8f57b24..824ba5e 100644 --- a/livestatus/src/mk_inventory.cc +++ b/livestatus/src/mk_inventory.cc @@ -27,7 +27,7 @@ #include <sys/stat.h> #ifdef CMC -#include <Config.h> +#include "Config.h" #define MK_INVENTORY_PATH g_config->_mk_inventory_path #else extern char g_mk_inventory_path[]; diff --git a/livestatus/src/mk_logwatch.h b/livestatus/src/mk_logwatch.h index 8bfbf16..780a874 100644 --- a/livestatus/src/mk_logwatch.h +++ b/livestatus/src/mk_logwatch.h @@ -29,7 +29,7 @@ #include <string> #ifdef CMC -#include <Config.h> +#include "Config.h" #define MK_LOGWATCH_PATH g_config->_mk_logwatch_path #else extern char g_mk_logwatch_path[];

8 years, 1 month

3535 FIX docsis_cm_status: fixed missing performance data

by Andreas Boesl

Module: check_mk Branch: master Commit: a808ff0febf43ab29b1c71dbada2c30edc86b843 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a808ff0febf43a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 18 09:19:38 2016 +0200 3535 FIX docsis_cm_status: fixed missing performance data --- .werks/3535 | 9 +++++++++ ChangeLog | 1 + checks/docsis_cm_status | 1 + 3 files changed, 11 insertions(+) diff --git a/.werks/3535 b/.werks/3535 new file mode 100644 index 0000000..84854f6 --- /dev/null +++ b/.werks/3535 @@ -0,0 +1,9 @@ +Title: docsis_cm_status: fixed missing performance data +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1463555965 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 1003524..5a7d840 100644 --- a/ChangeLog +++ b/ChangeLog @@ -221,6 +221,7 @@ * 3530 FIX: agent_vsphere: improved performance, too much perfcounters were queried * 3134 FIX: windows agent: fixed bug where the last message of an eventlog was always re-read * 3603 FIX: wut_webtherm: fixed empty data handling + * 3535 FIX: docsis_cm_status: fixed missing performance data Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/docsis_cm_status b/checks/docsis_cm_status index 959d483..c9ef2e2 100644 --- a/checks/docsis_cm_status +++ b/checks/docsis_cm_status @@ -106,5 +106,6 @@ check_info["docsis_cm_status"] = { ]), "default_levels_variable" : "docsis_cm_status_default_levels", "group" : "docsis_cm_status", + "has_perfdata" : True, "includes" : [ "docsis.include" ], }

8 years, 1 month

improved mkcheck

by Simon Betz

Module: check_mk Branch: master Commit: 559f4fafc9771ca8eecee1f5c800d15ea19b6123 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=559f4fafc9771c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue May 17 18:12:42 2016 +0200 improved mkcheck --- doc/helpers/mkcheck | 227 +++++++++++++++++++++++++++++++++++++-------------- doc/helpers/mkman | 45 ---------- 2 files changed, 165 insertions(+), 107 deletions(-) diff --git a/doc/helpers/mkcheck b/doc/helpers/mkcheck index e19c307..2eaee33 100755 --- a/doc/helpers/mkcheck +++ b/doc/helpers/mkcheck @@ -1,17 +1,50 @@ -#!/bin/bash -# usage: -# 'mkcheck NAME' for a standard check -# 'mkcheck NAME snmp' for a snmp check -content_std="#!/usr/bin/python +#!/usr/bin/python + + +import os, sys, getopt, time + + +def usage(): + sys.stdout.write(""" +DESCRIPTION: + This script creates a basic check file or if '-m' + specified a manual page. + You have to specify at least one name. + + The created check or manual page are saved to + the current directory. + + It is recommended to run this script in the checks folder + if you want to create a check or in the manual page folder + if you want to create a man page. + +USAGE: mkcheck [OPTS] ARGS + +OPTIONS: + -h, --help Show this help + -s Adds SNMP info and scan function + -p Adds parse function + -m Creates the manual page instead of + the check + +""") + + +def stderr(msg): + sys.stderr.write("ERROR: %s\n" % msg) + + +def header(): + return """#!/usr/bin/python # -*- encoding: utf-8; py-indent-offset: 4 -*- # +------------------------------------------------------------------+ # | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \\/ | |/ / | -# | | | | '_ \\ / _ \\/ __| |/ / | |\\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \\ | -# | \\____|_| |_|\\___|\\___|_|\\_\\___|_| |_|_|\\_\\ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | # | | -# | Copyright Mathias Kettner YEAR mk(a)mathias-kettner.de | +# | Copyright Mathias Kettner %s mk(a)mathias-kettner.de | # +------------------------------------------------------------------+ # # This file is part of Check_MK. @@ -29,57 +62,127 @@ content_std="#!/usr/bin/python # Boston, MA 02110-1301 USA. -# example output: -# +# example output + + +""" % time.gmtime(time.time())[0] + + +def get_check_content(check_name, has_parse=False, is_snmp=False): + if has_parse: + info_str = "parsed" + pprint_info = "" + check_info_parse = \ + " 'parse_function' : parse_%s,\n" % check_name + + parse_func_info = ("def parse_%s(info):\n" + \ + " pprint.pprint(info)\n" + \ + " parsed = {}\n" + \ + " return parsed\n\n\n") % check_name + else: + info_str = "info" + parse_func_info = "" + check_info_parse = "" + pprint_info = " pprint.pprint(info)\n" + + inventory_func_info = ("def inventory_%s(%s):\n%s" + \ + " return []\n\n\n") % (check_name, info_str, pprint_info) + + check_func_info = ("def check_%s(item, params, %s):\n" + \ + " return 3, 'not yet implemented'\n\n\n") % (check_name, info_str) + + if is_snmp: + snmp_content = \ + " 'snmp_info' : ('', []),\n" + \ + " 'snmp_scan_function' : lambda oid: False,\n" + else: + snmp_content = "" + + check_info_title = "check_info['%s'] = {\n" % check_name + check_info_keys = ("{1}" + \ + " 'inventory_function' : inventory_{0},\n" + \ + " 'check_function' : check_{0},\n" + \ + " 'service_description' : 'DESCR',\n{2}").format( + check_name, check_info_parse, snmp_content) + + return header() + parse_func_info + inventory_func_info + \ + check_func_info + check_info_title + check_info_keys + '}' + + +def get_man_content(check_name, is_snmp=False): + snmp_info = "" + if is_snmp: + snmp_info = " snmp" + return """title: +agents:%s +catalog: +license: GPL +distribution: check_mk +description: + +item: + +inventory:""" % snmp_info + + +def main(cmdl_args): + opts_short = "hspm" + opts_long = [ "help" ] + + try: + opts, args = getopt.getopt(cmdl_args, opts_short, opts_long) + except Exception, err: + stderr(err) + sys.exit(1) + + is_snmp = False + has_parse = False + create_man = False + create_check = True + for o, a in opts: + if o in [ "-h", "--help" ]: + usage() + sys.exit(0) + elif o == "-s": + is_snmp = True + elif o == "-p": + has_parse = True + elif o == "-m": + create_man = True + create_check = False + + if len(args) > 0: + check_names = args + else: + usage() + stderr("specifiy exactly one check name") + sys.exit(1) + + whereiam = os.getcwd() + for check_name in check_names: + filename = "%s/%s" % (whereiam, check_name) + if create_check: + if os.path.isfile(filename): + stderr("check already exists") + else: + check_content = get_check_content(check_name, has_parse=has_parse, is_snmp=is_snmp) + try: + check_f = file(filename, 'w') + check_f.write(check_content) + except Exception, err: + stderr(err) + + if create_man: + if os.path.isfile(filename): + stderr("man page already exists") + else: + man_content = get_man_content(check_name, is_snmp=is_snmp) + try: + man_f = file(filename, 'w') + man_f.write(man_content) + except Exception, err: + stderr(err) -factory_settings['CHECKNAME_default_levels'] = { -} - - -def inventory_CHECKNAME(info): - print info - return [] - - -def check_CHECKNAME(item, params, info): - return (3, 'Not yet implemented') - - -check_info['CHECKNAME'] = { - 'inventory_function' : inventory_CHECKNAME, - 'check_function' : check_CHECKNAME, - 'service_description' : 'DESCRIPTION %s', - 'has_perfdata' : True, - 'default_levels_variable' : 'CHECKNAME_default_levels', - 'includes' : []," -content_snmp=" - 'snmp_info' : INFO, - 'snmp_scan_function' : lambda oid: FUNCTION, -}" -path=`pwd` -filename=$1 -snmp=$2 -path2file=$path"/"$filename -no_name=$path"/no_name" -year=`date +"%Y"` -if [ -z "$filename" ]; then - echo "No name or argument given. Please determine one." -else - content_std=${content_std//CHECKNAME/$filename} - content_std=${content_std//YEAR/$year} - if [ ! -f "$path2file" ]; then - if [ -z $snmp ]; then - content_std=$content_std"\n#\n}" - elif [ $snmp = "snmp" ]; then - content_std=$content_std$content_snmp - else - echo "Wrong arguments." - exit 0 - fi - echo "New check '$filename' is created and stored in '$path2file'." - echo -e "${content_std}" > $path2file - else - echo "File already exists." - fi -fi +if __name__ == "__main__": + main(sys.argv[1:]) diff --git a/doc/helpers/mkman b/doc/helpers/mkman deleted file mode 100755 index acfaa66..0000000 --- a/doc/helpers/mkman +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -# useage: -# 'mkcheck' for a standard check -# 'mkchecksnmp' for a snmp check -content_std="title: -agents: TYPE -catalog: -license: GPL -distribution: check_mk -description: - -item: - -examples: - -perfdata: - -inventory: - -[parameters] - -[configuration]" -path=`pwd` -filename=$1 -snmp=$2 -path2file=$path"/"$filename -if [ -z "$filename" ]; then - echo "No name given. Please determine one." - exit 0 -else - if [ ! -f "$path2file" ]; then - if [ -z $snmp ]; then - content_std=${content_std//" TYPE"/} - elif [ $snmp = "snmp" ]; then - content_std=${content_std//" TYPE"/" snmp"} - else - echo "Wrong arguments." - exit 0 - fi - echo "New check '$filename' created and stored in '$path2file'." - echo -e "${content_std}" > $path2file - else - echo "File already exists." - fi -fi

8 years, 1 month

Renamed initial contact group from Everybody to Everything

by Mathias Kettner

Module: check_mk Branch: master Commit: 4f0bb90397aafc69969221f814d4d52a1f8efa32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f0bb90397aafc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 17 16:53:51 2016 +0200 Renamed initial contact group from Everybody to Everything Reason: Everybody is not correct --- web/htdocs/wato.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 45af65a..9bb12bc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14125,9 +14125,9 @@ def create_sample_config(): ) - # A contact group where everyone is member of + # A contact group for all hosts and services groups = { - "contact" : { 'all' : {'alias': u'Everybody'} }, + "contact" : { 'all' : {'alias': u'Everything'} }, } save_group_information(groups)

8 years, 1 month

← Newer
1
...
7
8
9
10
11
12
13
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2016