Checkmk git commits November 2010

checkmk-commits@lists.checkmk.com

2 participants
180 discussions

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: be64332280a1742ab9ffcbb197441cc511dfe8c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be64332280a174… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 5 17:50:41 2010 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: ChangeLog ---

13 years, 8 months

Check_MK Git: check_mk: Added compile helper file

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d256ef42541fe122e02ea7139567eb53051d6864 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d256ef42541fe1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 5 17:50:00 2010 +0100 Added compile helper file --- agents/windows/.f12 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/agents/windows/.f12 b/agents/windows/.f12 new file mode 100644 index 0000000..8f58e6d --- /dev/null +++ b/agents/windows/.f12 @@ -0,0 +1 @@ +make

13 years, 8 months

Check_MK Git: check_mk: Windows agent: allow restriction to ip addresses with only_hosts (like xinetd)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5aed940f45f9f1d83adbe24467ad568327dce7b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5aed940f45f9f1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 5 17:47:05 2010 +0100 Windows agent: allow restriction to ip addresses with only_hosts (like xinetd) --- ChangeLog | 1 + agents/windows/check_mk_agent.cc | 222 +++++++++++++++++++++++++++++++++++-- agents/windows/check_mk_agent.exe | Bin 93184 -> 94720 bytes 3 files changed, 212 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index d87eb62..2462a12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ * blade_blades: Added new check for checking the health-, present- and power-state of IBM Bladecenter blades * win_dhcp_pools: Several cleanups in check + * Windows agent: allow restriction to ip addresses with only_hosts (like xinetd) Multisite: * The custom open/close states of custom links are now stored for each diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 778d009..a4f6ff3 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -52,10 +52,12 @@ #include <stdarg.h> #include <time.h> #include <string.h> +#include <strings.h> #include <locale.h> #include <unistd.h> #include <sys/types.h> #include <dirent.h> +#include <ctype.h> // isspace() #define CHECK_MK_VERSION "1.1.9i1" @@ -87,6 +89,16 @@ char g_agent_directory[256]; char g_current_directory[256]; char g_plugins_dir[256]; char g_local_dir[256]; +char g_config_file[256]; + +struct ipspec { + uint32_t address; + uint32_t netmask; +}; + +#define MAX_ONLY_FROM 32 +struct ipspec g_only_from[MAX_ONLY_FROM]; +unsigned int g_num_only_from = 0; #ifdef DEBUG @@ -1016,24 +1028,36 @@ void get_agent_dir(char *buffer, int size) *end = 0; // replace \ with string end => get directory of executable } size = dsize; + RegCloseKey(key); } - RegCloseKey(key); + else { + // If the agent is not installed as service, simply + // assume the current directory to be the agent + // directory (for test and adhoc mode) + strcpy(g_agent_directory, g_current_directory); + } + } -void output_data(SOCKET &out) +void section_check_mk(SOCKET &out) { - // make sure, output of numbers is not localized - setlocale(LC_ALL, "C"); - output(out, "<<<check_mk>>>\n"); output(out, "Version: %s\n", CHECK_MK_VERSION); output(out, "AgentOS: windows\n"); output(out, "WorkingDirectory: %s\n", g_current_directory); + output(out, "ConfigFile: %s\n", g_config_file); output(out, "AgentDirectory: %s\n", g_agent_directory); output(out, "PluginsDirectory: %s\n", g_plugins_dir); output(out, "LocalDirectory: %s\n", g_local_dir); +} +void output_data(SOCKET &out) +{ + // make sure, output of numbers is not localized + setlocale(LC_ALL, "C"); + + section_check_mk(out); section_df(out); section_ps(out); section_mem(out); @@ -1045,6 +1069,32 @@ void output_data(SOCKET &out) } +char *ipv4_to_text(uint32_t ip) +{ + static char text[32]; + snprintf(text, 32, "%u.%u.%u.%u", + ip & 255, + ip >> 8 & 255, + ip >> 16 & 255, + ip >> 24); + return text; +} + +bool check_only_from(uint32_t ip) +{ + if (g_num_only_from == 0) + return true; // no restriction set + + for (unsigned i=0; i<g_num_only_from; i++) + { + uint32_t signibits = ip & g_only_from[i].netmask; + if (signibits == g_only_from[i].address) + return true; + } + return false; +} + + void listen_tcp_loop() { WSADATA wsa; @@ -1091,15 +1141,19 @@ void listen_tcp_loop() struct timeval timeout; timeout.tv_sec = 0; timeout.tv_usec = 500000; + + SOCKADDR_IN remote_addr; + int addr_len = sizeof(SOCKADDR_IN); + if (1 == select(1, &fds, NULL, NULL, &timeout)) { - connection = accept(s, NULL, NULL); - debug("Habe accepted."); + connection = accept(s, (SOCKADDR *)&remote_addr, &addr_len); if (connection != INVALID_SOCKET) { - - debug("socket ist auch da."); - output_data(connection); - + uint32_t ip = 0; + if (remote_addr.sin_family == AF_INET) + ip = remote_addr.sin_addr.s_addr; + if (check_only_from(ip)) + output_data(connection); closesocket(connection); } } @@ -1347,16 +1401,162 @@ void determine_directories() snprintf(g_local_dir, sizeof(g_local_dir), "%s\\local", g_agent_directory); } +char *lstrip(char *s) +{ + while (isspace(*s)) + s++; + return s; +} + + +void rstrip(char *s) +{ + char *end = s + strlen(s); // point one beyond last character + while (end > s && isspace(*(end - 1))) { + end--; + } + *end = 0; +} + +char *strip(char *s) +{ + rstrip(s); + return lstrip(s); +} + +void add_only_from(char *value) +{ + if (g_num_only_from >= MAX_ONLY_FROM) { + fprintf(stderr, "Cannot handle more the %d entries for only_from\r\n", MAX_ONLY_FROM); + exit(1); + } + + unsigned a, b, c, d; + int bits = 32; + + if (strchr(value, '/')) { + if (5 != sscanf(value, "%u.%u.%u.%u/%u", &a, &b, &c, &d, &bits)) { + fprintf(stderr, "Invalid value %s for only_hosts\n", value); + exit(1); + } + } + else { + if (4 != sscanf(value, "%u.%u.%u.%u", &a, &b, &c, &d)) { + fprintf(stderr, "Invalid value %s for only_hosts\n", value); + exit(1); + } + } + + uint32_t ip = a + b * 0x100 + c * 0x10000 + d * 0x1000000; + uint32_t mask_swapped = 0; + for (int bit = 0; bit < bits; bit ++) + mask_swapped |= 0x80000000 >> bit; + uint32_t mask; + unsigned char *s = (unsigned char *)&mask_swapped; + unsigned char *t = (unsigned char *)&mask; + t[3] = s[0]; + t[2] = s[1]; + t[1] = s[2]; + t[0] = s[3]; + g_only_from[g_num_only_from].address = ip; + g_only_from[g_num_only_from].netmask = mask; + + if ((ip & mask) != ip) { + fprintf(stderr, "Invalid only_hosts entry: host part not 0: %s/%u", + ipv4_to_text(ip), bits); + exit(1); + } + g_num_only_from ++; +} + +void parse_only_from(char *value) +{ + char *end = value + strlen(value); + while (value < end) { + value = lstrip(value); + char *s = value; + while (*s && !isspace(*s)) + s++; + *s = 0; + add_only_from(value); + value = s + 1; + } +} + +void handle_config_variable(char *var, char *value) +{ + if (!strcmp(var, "only_from")) { + parse_only_from(value); + } + else { + fprintf(stderr, "Invalid configuration variable %s.\r\n", var); + exit(1); + } +} + + +void read_config_file() +{ + snprintf(g_config_file, sizeof(g_config_file), "%s\\check_mk.ini", g_agent_directory); + FILE *file = fopen(g_config_file, "r"); + if (!file) { + g_config_file[0] = 0; + return; + } + + char line[512]; + int lineno = 0; + while (!feof(file)) { + if (!fgets(line, sizeof(line), file)) + return; + lineno ++; + char *l = strip(line); + if (l[0] == 0 || l[0] == '#' || l[0] == ';') + continue; // skip empty lines and comments + int len = strlen(l); + if (l[0] == '[' && l[len-1] == ']') { + // found section header + l[len-1] = 0; + char *section = l + 1; + if (strcmp(section, "global")) { + fprintf(stderr, "Invalid section %s in %s.\r\n", + section, g_config_file); + exit(1); + } + } + else { + // split up line at = sign + char *s = l; + while (*s && *s != '=') + s++; + if (*s != '=') { + fprintf(stderr, "Invalid line %d in %s.\r\n", + lineno, g_config_file); + exit(1); + } + *s = 0; + char *value = s + 1; + char *variable = l; + rstrip(variable); + value = strip(value); + handle_config_variable(variable, value); // add section later + } + } + +} int main(int argc, char **argv) { determine_directories(); + read_config_file(); + if (argc > 2) usage(); else if (argc <= 1) RunService(); else if (!strcmp(argv[1], "test")) do_test(); + else if (!strcmp(argv[1], "adhoc")) do_adhoc(); else if (!strcmp(argv[1], "install")) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index e906449..4f02124 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ

13 years, 8 months

Check_MK Git: check_mk: win_dhcp_pools.bat: Filtering additional error message

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c611b7ec36faffcd2ca576ee0e5ea6523447baaa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c611b7ec36faff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 5 16:40:33 2010 +0100 win_dhcp_pools.bat: Filtering additional error message Conflicts: ChangeLog --- ChangeLog | 3 +++ agents/windows/plugins/win_dhcp_pools.bat | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 776fbd4..316071a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,9 @@ * tcp_conn_stats: Fixed inventory function when no conn stats can be inventoried * heartbeat_nodes: fix Linux agent for hostname with upper case letters (thanks to Thorsten Robers) + * heartbeat_rscstatus: Catching empty output from agent correctly + * win_dhcp_pools agent plugin: Filtering additional error message on + systems without dhcp server Multisite: * The custom open/close states of custom links are now stored for each diff --git a/agents/windows/plugins/win_dhcp_pools.bat b/agents/windows/plugins/win_dhcp_pools.bat index 497ea10..f90093a 100644 --- a/agents/windows/plugins/win_dhcp_pools.bat +++ b/agents/windows/plugins/win_dhcp_pools.bat @@ -1,3 +1,3 @@ @echo off echo ^<^<^<win_dhcp_pools^>^>^> -netsh dhcp server show mibinfo | find /V ": dhcp." | find /V "DHCP-Serverversion wurde" | find /V "nicht richtig funktionieren." +netsh dhcp server show mibinfo | find /V ": dhcp." | find /V "DHCP-Serverversion wurde" | find /V "nicht richtig funktionieren." | find /V ": dhcp server show mibinfo."

13 years, 8 months

Check_MK Git: check_mk: Merge branch 'master' of git@mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 830fc690e9a3599999a0d812bcdfea43dd380d2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=830fc690e9a359… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 4 17:52:06 2010 +0100 Merge branch 'master' of git@mathias-kettner.de:check_mk Conflicts: ChangeLog ---

13 years, 8 months

Check_MK Git: check_mk: tcp_conn_stats: Fixed inventory function when no conn stats can be inventoried,

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ccf1301bb0a25d7eec1d5704bcda7988429d8ad5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ccf1301bb0a25d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 4 12:05:00 2010 +0100 tcp_conn_stats: Fixed inventory function when no conn stats can be inventoried, Inventory: Better error handling on invalid inventory result of checks --- ChangeLog | 2 ++ checks/tcp_conn_stats | 1 + modules/check_mk.py | 5 +++++ 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 107cbcb..7192f3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * Packages (MKP): Allow to create and install packages within OMD! Files are installed below ~/local/share/check_mk. No root permissions are neccessary + * Inventory: Better error handling on invalid inventory result of checks Checks & Agents: * megaraid_pdisks: Using the real enclosure number as check item now @@ -26,6 +27,7 @@ power-state of IBM Bladecenter blades * win_dhcp_pools: Several cleanups in check * heartbeat_rscstatus: Catching empty output from agent correctly + * tcp_conn_stats: Fixed inventory function when no conn stats can be inventoried Multisite: * The custom open/close states of custom links are now stored for each diff --git a/checks/tcp_conn_stats b/checks/tcp_conn_stats index e745879..223f872 100644 --- a/checks/tcp_conn_stats +++ b/checks/tcp_conn_stats @@ -43,6 +43,7 @@ tcp_conn_stats_default_levels = { } def inventory_tcp_conn_stats(checkname, info): if len(info) > 0: return [ (None, 'tcp_conn_stats_default_levels') ] + return [] def check_tcp_conn_stats(item, params, info): stats = dict(info) diff --git a/modules/check_mk.py b/modules/check_mk.py index 7d76c07..7d45f4b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1670,6 +1670,11 @@ def make_inventory(checkname, hostnamelist, check_only=False): sys.stderr.write("%s: Invalid output from agent or invalid configuration: %s\n" % (hostname, e)) continue + if not isinstance(inventory, list): + sys.stderr.write("%s: Check %s returned invalid inventory data: %s\n" % + (hostname, checkname, repr(inventory))) + continue + for entry in inventory: if len(entry) == 2: # comment is now obsolete item, paramstring = entry

13 years, 8 months

Check_MK Git: check_mk: Updated ChangeLog

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: c19d8d51514612729b41a570ee60c0c71554eb17 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c19d8d51514612… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 4 16:50:28 2010 +0100 Updated ChangeLog --- ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24ae6b6..d3a3559 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ * Packages (MKP): Allow to create and install packages within OMD! Files are installed below ~/local/share/check_mk. No root permissions are neccessary + * setup.sh: fix problem with missing package_info (only appears if setup + is called from another directory) Checks & Agents: * megaraid_pdisks: Using the real enclosure number as check item now

13 years, 8 months

Check_MK Git: check_mk: FIX: fix problem with missing package_info at setup .sh

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: c8b4beac20dbe394b65c7449424f86d97ec2338a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8b4beac20dbe3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 4 16:47:05 2010 +0100 FIX: fix problem with missing package_info at setup.sh This appears only, if setup is not called with ./ from the current directory. --- scripts/setup.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index 1a2287a..ef5dd4a 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -658,7 +658,7 @@ do fi && mkdir -p $DESTDIR$vardir/packages && - install -m 644 package_info $DESTDIR$vardir/packages/check_mk && + install -m 644 $SRCDIR/package_info $DESTDIR$vardir/packages/check_mk && mkdir -p $DESTDIR$apache_config_dir && if [ ! -e $DESTDIR$apache_config_dir/$NAME -a ! -e $DESTDIR$apache_config_dir/zzz_$NAME.conf ]

13 years, 8 months

Check_MK Git: check_mk: heartbeat_nodes: fix Linux agent for hostnames with upper case letters

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: a3e17cf9e4c9b1a717854ca20644d4a286ec7182 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3e17cf9e4c9b1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 4 16:13:15 2010 +0100 heartbeat_nodes: fix Linux agent for hostnames with upper case letters --- ChangeLog | 2 ++ agents/check_mk_agent.linux | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 107cbcb..24ae6b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,8 @@ power-state of IBM Bladecenter blades * win_dhcp_pools: Several cleanups in check * heartbeat_rscstatus: Catching empty output from agent correctly + * heartbeat_nodes: fix Linux agent for hostname with upper case letters (thanks to + Thorsten Robers) Multisite: * The custom open/close states of custom links are now stored for each diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index c3c2f14..ebcf520 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -287,7 +287,7 @@ if which cl_status > /dev/null 2>&1; then echo '<<<heartbeat_nodes>>>' for NODE in $(cl_status listnodes); do - if [ $NODE != $HOSTNAME ]; then + if [ $NODE != $(echo $HOSTNAME | tr 'A-Z' 'a-z') ]; then STATUS=$(cl_status nodestatus $NODE) echo -n "$NODE $STATUS" for LINK in $(cl_status listhblinks $NODE 2>/dev/null); do

13 years, 8 months

Check_MK Git: check_mk: Merge branch 'master' of git@mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8ab59f0741bc877618a921114db31dd41821804b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ab59f0741bc87… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 3 18:39:48 2010 +0100 Merge branch 'master' of git@mathias-kettner.de:check_mk Conflicts: ChangeLog ---

13 years, 8 months

← Newer
1
...
11
12
13
14
15
16
17
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2010