Checkmk git commits November 2011

checkmk-commits@lists.checkmk.com

2 participants
196 discussions

Check_MK Git: check_mk: New icon on a service whos host is in downtime

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1d9cfa0554e2e7b6a3610a822be6f575d57852ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d9cfa0554e2e7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 15 16:22:49 2011 +0100 New icon on a service whos host is in downtime --- ChangeLog | 1 + web/htdocs/images/icon_hostdowntime.png | Bin 0 -> 2966 bytes web/plugins/icons/builtin.py | 14 ++++++++++++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc3866b..f8c8d5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ * New filter for the (new) state in host/service alerts * New command for sending custom notifications * FIX: Fixed encoding problem when opening dashboard + * New icon on a service whos host is in downtime WATO: * Evolved to full featured monitoring configuration tool! diff --git a/web/htdocs/images/icon_hostdowntime.png b/web/htdocs/images/icon_hostdowntime.png new file mode 100644 index 0000000..03a7ee6 Binary files /dev/null and b/web/htdocs/images/icon_hostdowntime.png differ diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 6add96d..88b0b75 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -237,10 +237,20 @@ def paint_downtimes(what, row, tags, custom_vars): # Currently we are in a downtime + link to list of downtimes # for this host / service if row[what + "_scheduled_downtime_depth"] > 0: - return link_to_view('<img class=icon title="%s" src="images/icon_downtime.png">' % - _("Currently in downtime"), row, 'downtimes_of_' + what) + if what == "host": + icon = "hostdowntime" + else: + icon = "downtime" + return link_to_view('<img class=icon title="%s" src="images/icon_%s.png">' % + (_("Currently in downtime"), icon), row, 'downtimes_of_' + what) + elif what == "service" and row["host_scheduled_downtime_depth"] > 0: + return link_to_view('<img class=icon title="%s" src="images/icon_hostdowntime.png">' % + _("The host is currently in downtime"), row, 'downtimes_of_host') + + multisite_icons.append({ + 'host_columns': [ 'scheduled_downtime_depth' ], 'columns': [ 'scheduled_downtime_depth' ], 'paint': paint_downtimes, })

12 years, 7 months

Check_MK Git: check_mk: Fixed typo in ChangeLog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ee4642c2cd5a6a4a3ee8a7097802597b56763404 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee4642c2cd5a6a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 15 15:52:35 2011 +0100 Fixed typo in ChangeLog --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 00e3515..2297951 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,7 +72,7 @@ * FIX: Do not show WATO button in views if WATO is disabled * FIX: Remove WATO Folder filter if WATO is disabled * FIX: Snapin 'Performance': fix text align for numbers - * FIX: Disallow settings downtimes that end in the past + * FIX: Disallow setting downtimes that end in the past * FIX: Fix links to downtime services in dashboard 1.1.12p1:

12 years, 7 months

Check_MK Git: check_mk: FIX: Fix popup help of reschedule icon

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 62082da1bc437b98537cd05610c5a4d7cfe60946 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62082da1bc437b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 15 16:09:13 2011 +0100 FIX: Fix popup help of reschedule icon --- ChangeLog | 1 + web/htdocs/js/check_mk.js | 7 +++++-- web/plugins/icons/builtin.py | 12 ++++++------ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2297951..dc3866b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,6 +74,7 @@ * FIX: Snapin 'Performance': fix text align for numbers * FIX: Disallow setting downtimes that end in the past * FIX: Fix links to downtime services in dashboard + * FIX: Fix popup help of reschedule icon 1.1.12p1: Core, Setup, etc.: diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 454c138..f9a1b5c 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -423,13 +423,16 @@ function actionResponseHandler(oImg, code) { oImg = null; } -function performAction(oLink, action, type, site, name1, name2) { +function performAction(oLink, action, site, host, service) { var oImg = oLink.childNodes[0]; oImg.src = 'images/icon_reloading.gif'; // Chrome and IE are not animating the gif during sync ajax request // So better use the async request here - get_url('nagios_action.py?action='+action+'&site='+site+'&host='+name1+'&service='+name2, + get_url('nagios_action.py?action=' + action + + '&site=' + escape(site) + + '&host=' + escape(host) + + '&service=' + escape(service), actionResponseHandler, oImg); oImg = null; } diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 44e791a..31cf084 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -408,14 +408,14 @@ def paint_reschedule(what, row, tags, custom_vars): # Reschedule button if row[what + "_active_checks_enabled"] == 1 \ and config.may('action.reschedule'): - name2 = '' + servicedesc = '' if what == 'service': - name2 = row['service_description'] - return '<a href=\"javascript:void(0);\" onclick="performAction(this, \'reschedule\', ' \ - '\'%s\', \'%s\', \'%s\', \'%s\');">' \ + servicedesc = row['service_description'] + return '<a href=\"javascript:void(0);\" ' \ + 'onclick="performAction(this, \'reschedule\', \'%s\', \'%s\', \'%s\');">' \ '<img class=icon title="%s" src="images/icon_reload.gif" /></a>' % \ - (_('Reschedule an immediate check of this %s') % what, \ - row["site"], row["host_name"], name2, what) + (row["site"], row["host_name"], servicedesc, + (_('Reschedule an immediate check of this %s') % _(what))) multisite_icons.append({ 'columns': [ 'active_checks_enabled' ],

12 years, 7 months

Check_MK Git: check_mk: Help popup for downtime icon

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5c0e019c7ff659e744567e621805b55bb7551da6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c0e019c7ff659… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 15 16:09:52 2011 +0100 Help popup for downtime icon --- web/plugins/icons/builtin.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 31cf084..6add96d 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -237,8 +237,8 @@ def paint_downtimes(what, row, tags, custom_vars): # Currently we are in a downtime + link to list of downtimes # for this host / service if row[what + "_scheduled_downtime_depth"] > 0: - return link_to_view('<img class=icon src="images/icon_downtime.gif">', - row, 'downtimes_of_' + what) + return link_to_view('<img class=icon title="%s" src="images/icon_downtime.png">' % + _("Currently in downtime"), row, 'downtimes_of_' + what) multisite_icons.append({ 'columns': [ 'scheduled_downtime_depth' ],

12 years, 7 months

Check_MK Git: check_mk: Simplified implementation of state filters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e44eb828882601b3e6512aeed4a0b4b712e0c8b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e44eb828882601… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 15 15:43:45 2011 +0100 Simplified implementation of state filters --- web/htdocs/htmllib.py | 31 +++++++-------------- web/plugins/views/filters.py | 60 ++++++++++++++++-------------------------- 2 files changed, 33 insertions(+), 58 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 8f1a1d8..b925afa 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -167,6 +167,7 @@ class html: self.output_format = "html" self.status_icons = {} self.link_target = None + self.form_name = None self.form_vars = [] def plugin_stylesheets(self): @@ -410,7 +411,7 @@ class html: (varname, value, checked_text, text)) self.form_vars.append(varname) - def checkbox(self, varname, deflt="", cssclass = '', onclick = None): + def checkbox(self, varname, deflt=False, cssclass = '', onclick = None): error = self.user_errors.get(varname) if error: html = "<x class=inputerror>" @@ -419,15 +420,11 @@ class html: # wether we should add the default value, we need to detect # if the form is printed for the first time. This is the # case if "filled_in" is not set. - if not self.var("filled_in") == self.form_name: # this form filled in - value = self.req.vars.get(varname, deflt) - else: - value = self.req.vars.get(varname, "") + value = self.get_checkbox(varname) + if value == None: # form not yet filled in + value = deflt - if value != "" and value != False: - checked = " CHECKED" - else: - checked = "" + checked = value and " CHECKED" or "" if cssclass: cssclass = ' class="%s"' % cssclass onclick_code = onclick and " onclick=\"%s\"" % (onclick) or "" @@ -442,19 +439,11 @@ class html: # between False and None. The browser does not set the variables for # Checkboxes that are not checked :-( def get_checkbox(self, varname, form_name = None): - if form_name: - try: - if not self.var("filled_in") == self.form_name: # this form filled in - return None - except: - # self.form_name not set, we have no form - if not self.var("filled_in"): - return None - elif not self.var("filled_in"): + if not self.has_var("filled_in") or ( # no form filled in + self.form_name != None and self.var("filled_in") != self.form_name): # wrong form filled in return None - - value = self.req.vars.get(varname, "") - return not not value + else: + return not not self.req.vars.get(varname) def datetime_input(self, varname, default_value): try: diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 2a22f2d..3325604 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -188,37 +188,29 @@ class FilterServiceState(Filter): self.prefix = prefix def display(self): - if html.var("filled_in"): - defval = "" - else: - defval = "on" for var, text in [(self.prefix + "st0", "OK"), (self.prefix + "st1", "WARN"), \ - (self.prefix + "st2", "CRIT"), (self.prefix + "st3", "UNKNOWN"), (self.prefix + "stp", "PENDING")]: - html.checkbox(var, defval) + (self.prefix + "st2", "CRIT"), (self.prefix + "st3", "UNKNOWN"), + (self.prefix + "stp", "PENDING")]: + html.checkbox(var, True) html.write(" %s " % text) def filter(self, infoname): headers = [] - if html.var("filled_in"): - defval = "" - else: - defval = "on" - for i in [0,1,2,3]: - if html.var(self.prefix + "st%d" % i, defval) == "on": + if html.get_checkbox(self.prefix + "st%d" % i) == False: if self.prefix == "hd": column = "service_last_hard_state" else: column = "service_state" - headers.append("Filter: %s = %d\nFilter: service_has_been_checked = 1\nAnd: 2\n" % (column, i)) - if html.var(self.prefix + "stp", defval) == "on": - headers.append("Filter: service_has_been_checked = 0\n") - if len(headers) == 0: - return "Limit: 0\n" # no allowed state - elif len(headers) == 5: # all states allowed + headers.append("Filter: %s = %d\n" + "Filter: service_has_been_checked = 1\n" + "And: 2\nNegate:\n" % (column, i)) + if html.get_checkbox(self.prefix + "stp") == False: + headers.append("Filter: service_has_been_checked = 1\n") + if len(headers) == 5: # none allowed = all allowed (makes URL building easier) return "" else: - return "".join(headers) + ("Or: %d\n" % len(headers)) + return "".join(headers) declare_filter(215, FilterServiceState("svcstate", _("Service states"), "")) declare_filter(216, FilterServiceState("svchardstate", _("Service hard states"), "hd")) @@ -229,30 +221,24 @@ class FilterHostState(Filter): "host", [ "hst0", "hst1", "hst2", "hstp" ], []) def display(self): - if html.var("filled_in"): - defval = "" - else: - defval = "on" - for var, text in [("hst0", _("UP")), ("hst1", _("DOWN")), ("hst2", _("UNREACH")), ("hstp", _("PENDING"))]: - html.checkbox(var, defval) + for var, text in [("hst0", _("UP")), ("hst1", _("DOWN")), + ("hst2", _("UNREACH")), ("hstp", _("PENDING"))]: + html.checkbox(var, True) html.write(" %s " % text) def filter(self, infoname): headers = [] - if html.var("filled_in"): - defval = "" - else: - defval = "on" - for i in [0,1,2]: - if html.var("hst%d" % i, defval) == "on": - headers.append("Filter: host_state = %d\nFilter: host_has_been_checked = 1\nAnd: 2\n" % i) - if html.var("stp", defval) == "on": - headers.append("Filter: host_has_been_checked = 0\n") - if len(headers) == 0: - return "Limit: 0\n" # not allowed state + if html.get_checkbox("hst%d" % i) == False: + headers.append("Filter: host_state = %d\n" + "Filter: host_has_been_checked = 1\n" + "And: 2\nNegate:\n" % i) + if html.get_checkbox("hstp") == False: + headers.append("Filter: host_has_been_checked = 1\n") + if len(headers) == 4: # none allowed = all allowed (makes URL building easier) + return "" else: - return "".join(headers) + ("Or: %d\n" % len(headers)) + return "".join(headers) declare_filter(115, FilterHostState())

12 years, 7 months

Check_MK Git: check_mk: FIX: Fix links to downtime service in dashboard

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f325acedac47631f82975cd5198c800baaa53cc8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f325acedac4763… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 15 15:50:26 2011 +0100 FIX: Fix links to downtime service in dashboard --- ChangeLog | 1 + web/htdocs/dashboard.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 55ac658..00e3515 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,6 +73,7 @@ * FIX: Remove WATO Folder filter if WATO is disabled * FIX: Snapin 'Performance': fix text align for numbers * FIX: Disallow settings downtimes that end in the past + * FIX: Fix links to downtime services in dashboard 1.1.12p1: Core, Setup, etc.: diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 2739242..9763f24 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -478,13 +478,13 @@ def dashlet_servicestats(): "StatsAnd: 5\n"), ( _("in downtime"), "#0af", - "searchsvc&hst0=on&is_in_downtime=1", + "searchsvc&is_in_downtime=1", "Stats: scheduled_downtime_depth > 0\n" \ "Stats: host_scheduled_downtime_depth > 0\n" \ "StatsOr: 2\n"), ( _("on down host"), "#048", - "searchsvc&hst1=on&hst2=on&hstp=on", + "searchsvc&hst1=on&hst2=on&hstp=on&is_in_downtime=0", "Stats: scheduled_downtime_depth = 0\n" \ "Stats: host_scheduled_downtime_depth = 0\n" \ "Stats: host_state != 0\n" \

12 years, 7 months

Check_MK Git: check_mk: check_submission defaults now to "file" (was "pipe" )

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2f784a4bef82bdbe4ab7451e0886dcc8b09fcc2b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f784a4bef82bd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 15 15:02:50 2011 +0100 check_submission defaults now to "file" (was "pipe") --- ChangeLog | 1 + modules/check_mk.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f7e5d73..55ac658 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core, Setup, etc.: * New configuration variable static_checks[] (used by WATO) * New configuration variable checkgroup_parameters (mainly for WATO) + * check_submission defaults now to "file" (was "pipe") Checks & Agents: * if/if64: new ruleset if_disable_if64_hosts, that force if on diff --git a/modules/check_mk.py b/modules/check_mk.py index 8eaf1f6..f9488ee 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -213,7 +213,7 @@ agent_ports = [] snmp_ports = [] # UDP ports used for SNMP tcp_connect_timeout = 5.0 delay_precompile = False # delay Python compilation to Nagios execution -check_submission = "pipe" # alternative: "file" +check_submission = "file" # alternative: "pipe" aggr_summary_hostname = "%s-s" agent_min_version = 0 # warn, if plugin has not at least version check_max_cachefile_age = 0 # per default do not use cache files when checking

12 years, 7 months

Check_MK Git: check_mk: Windows agent: <<<df>>> output junctions now

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1cd1e5931a0f55e18773c380f16f4a43131dc064 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cd1e5931a0f55… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 15 14:23:57 2011 +0100 Windows agent: <<<df>>> output junctions now Other people call them "mount points". --- ChangeLog | 2 + agents/windows/check_mk.ini | 2 +- agents/windows/check_mk_agent.cc | 99 +++++++++++++++++++++++++++++-------- agents/windows/check_mk_agent.exe | Bin 100864 -> 101376 bytes 4 files changed, 81 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e6882e..f7e5d73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,8 @@ <<<local>>> * Windows agent: agent now reuses TCP port even when taskkill'ed, so a system reboot is (hopefully) not neccessary anymore + * Windows agent: section <<<df>>> now also outputs junctions (windows + mount points). No external plugin is needed. * logwatch: allow to classify messages based on their count (see man page of logwatch for details) diff --git a/agents/windows/check_mk.ini b/agents/windows/check_mk.ini index 9c02959..e208b6e 100644 --- a/agents/windows/check_mk.ini +++ b/agents/windows/check_mk.ini @@ -7,7 +7,7 @@ # host = winsrv* zab???ad # Just output certain sections (e.g. for upper hosts) - # sections = check_mk local mrpe + # sections = check_mk df [winperf] diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 421c2b1..7717858 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -302,6 +302,15 @@ char *strip(char *s) return lstrip(s); } +void char_replace(char what, char into, char *in) +{ + while (*in) { + if (*in == what) + *in = into; + in++; + } +} + // .----------------------------------------------------------------------. // | ______ _ _ _ ______ | // | / / / /___ _ _ ___| |_ ___ _ __ ___ | |_(_)_ __ ___ ___\ \ \ \ | @@ -348,6 +357,54 @@ void section_uptime(SOCKET &out) // | | // '----------------------------------------------------------------------' +void df_output_filesystem(SOCKET &out, char *volid) +{ + TCHAR fsname[128]; + TCHAR volume[512]; + DWORD dwSysFlags = 0; + if (!GetVolumeInformation(volid, volume, sizeof(volume), 0, 0, &dwSysFlags, fsname, sizeof(fsname))) + fsname[0] = 0; + + ULARGE_INTEGER free_avail, total, free; + free_avail.QuadPart = 0; + total.QuadPart = 0; + free.QuadPart = 0; + int returnvalue = GetDiskFreeSpaceEx(volid, &free_avail, &total, &free); + if (returnvalue > 0) { + double perc_used = 0; + if (total.QuadPart > 0) + perc_used = 100 - (100 * free_avail.QuadPart / total.QuadPart); + + if (volume[0]) // have a volume name + char_replace(' ', '_', volume); + else + strncpy(volume, volid, sizeof(volume)); + + output(out, "%s %s ", volume, fsname); + output(out, "%s ", llu_to_string(total.QuadPart / KiloByte)); + output(out, "%s ", llu_to_string((total.QuadPart - free_avail.QuadPart) / KiloByte)); + output(out, "%s ", llu_to_string(free_avail.QuadPart / KiloByte)); + output(out, "%3.0f%% ", perc_used); + output(out, "%s\n", volid); + } +} + +void df_output_mountpoints(SOCKET &out, char *volid) +{ + char mountpoint[512]; + HANDLE hPt = FindFirstVolumeMountPoint(volid, mountpoint, sizeof(mountpoint)); + if (hPt != INVALID_HANDLE_VALUE) { + while (true) { + TCHAR combined_path[1024]; + snprintf(combined_path, sizeof(combined_path), "%s%s", volid, mountpoint); + df_output_filesystem(out, combined_path); + if (!FindNextVolumeMountPoint(hPt, mountpoint, sizeof(mountpoint))) + break; + } + FindVolumeMountPointClose(hPt); + } +} + void section_df(SOCKET &out) { output(out, "<<<df>>>\n"); @@ -360,30 +417,30 @@ void section_df(SOCKET &out) UINT drvType = GetDriveType(drive); if (drvType == DRIVE_FIXED) // only process local harddisks { - ULARGE_INTEGER free_avail, total, free; - free_avail.QuadPart = 0; - total.QuadPart = 0; - free.QuadPart = 0; - int returnvalue = GetDiskFreeSpaceEx(drive, &free_avail, &total, &free); - if (returnvalue > 0) { - double perc_used = 0; - if (total.QuadPart > 0) - perc_used = 100 - (100 * free_avail.QuadPart / total.QuadPart); - - TCHAR fsname[128]; - if (!GetVolumeInformation(drive, 0, 0, 0, 0, 0, fsname, 128)) - fsname[0] = 0; - - output(out, "%-10s %-8s ", drive, fsname); - output(out, "%s ", llu_to_string(total.QuadPart / KiloByte)); - output(out, "%s ", llu_to_string((total.QuadPart - free_avail.QuadPart) / KiloByte)); - output(out, "%s ", llu_to_string(free_avail.QuadPart / KiloByte)); - output(out, "%3.0f%% ", perc_used); - output(out, "%s\n", drive); - } + df_output_filesystem(out, drive); + df_output_mountpoints(out, drive); } drive += strlen(drive) + 1; } + + // Output volumes, that have no drive letter. The following code + // works, but then we have no information about the drive letters. + // And if we run both, then volumes are printed twice. So currently + // we output only fixed drives and mount points below those fixed + // drives. + + // HANDLE hVolume; + // char volid[512]; + // hVolume = FindFirstVolume(volid, sizeof(volid)); + // if (hVolume != INVALID_HANDLE_VALUE) { + // df_output_filesystem(out, volid); + // while (true) { + // // df_output_mountpoints(out, volid); + // if (!FindNextVolume(hVolume, volid, sizeof(volid))) + // break; + // } + // FindVolumeClose(hVolume); + // } } // .----------------------------------------------------------------------. diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 6d3b019..19d8e36 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ

12 years, 7 months

Check_MK Git: check_mk: Windows agent: fix example config

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 61dd6006c2cf886eab3d7a6ee46b0b92c88cc185 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61dd6006c2cf88… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 15 12:51:52 2011 +0100 Windows agent: fix example config --- agents/windows/check_mk.ini | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/agents/windows/check_mk.ini b/agents/windows/check_mk.ini index 6de4d40..9c02959 100644 --- a/agents/windows/check_mk.ini +++ b/agents/windows/check_mk.ini @@ -7,7 +7,7 @@ # host = winsrv* zab???ad # Just output certain sections (e.g. for upper hosts) - sections = check_mk local mrpe + # sections = check_mk local mrpe [winperf]

12 years, 7 months

Check_MK Git: check_mk: Windows agent: resuse TCP socket

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: afa40e33d064ba030cbf177f83d649041f7cf7e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=afa40e33d064ba… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 15 12:51:05 2011 +0100 Windows agent: resuse TCP socket --- ChangeLog | 2 ++ agents/windows/check_mk.ini | 2 +- agents/windows/check_mk_agent.cc | 10 ++++------ agents/windows/check_mk_agent.exe | Bin 100864 -> 100864 bytes 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index f9ec8c1..6e6882e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,8 @@ for examples. * Windows agent: do not execute *.txt and *.dir in <<<plugins>>> and <<<local>>> + * Windows agent: agent now reuses TCP port even when taskkill'ed, so + a system reboot is (hopefully) not neccessary anymore * logwatch: allow to classify messages based on their count (see man page of logwatch for details) diff --git a/agents/windows/check_mk.ini b/agents/windows/check_mk.ini index 9c02959..6de4d40 100644 --- a/agents/windows/check_mk.ini +++ b/agents/windows/check_mk.ini @@ -7,7 +7,7 @@ # host = winsrv* zab???ad # Just output certain sections (e.g. for upper hosts) - # sections = check_mk local mrpe + sections = check_mk local mrpe [winperf] diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index c2f2046..421c2b1 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1263,9 +1263,8 @@ bool banned_exec_name(char *name) return false; char *extension = name + strlen(name) - 4; - return (!( - !strcasecmp(extension, ".dir") - || !strcasecmp(extension, ".txt"))); + return ( !strcasecmp(extension, ".dir") + || !strcasecmp(extension, ".txt")); } void run_plugin(SOCKET &out, char *path) @@ -2086,9 +2085,8 @@ void listen_tcp_loop() addr.sin_port = htons(CHECK_MK_AGENT_PORT); addr.sin_addr.s_addr = ADDR_ANY; - // int optval = 1; - // setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char*)&optval, sizeof(optval)); - + int optval = 1; + setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char*)&optval, sizeof(optval)); if (SOCKET_ERROR == bind(s, (SOCKADDR *)&addr, sizeof(SOCKADDR_IN))) { fprintf(stderr, "Cannot bind socket to port %d\n", CHECK_MK_AGENT_PORT); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 0d943cc..6d3b019 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ

12 years, 7 months

← Newer
1
...
6
7
8
9
10
11
12
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2011