Checkmk git commits December 2018

checkmk-commits@lists.checkmk.com

15 participants
342 discussions

Moved availability logic to dedicated module

by Lars Michelsen

Module: check_mk Branch: master Commit: b296fbc093360cfa6ee5c5182b11fa7c37bf5aa2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b296fbc093360c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 10:08:35 2018 +0100 Moved availability logic to dedicated module Change-Id: If880f985d9300a58722359420b60a54266412336 --- cmk/gui/plugins/views/availability.py | 8 +++--- web/htdocs/js/checkmk.js | 40 --------------------------- web/htdocs/js/index.js | 2 ++ web/htdocs/js/modules/availability.js | 51 +++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 44 deletions(-) diff --git a/cmk/gui/plugins/views/availability.py b/cmk/gui/plugins/views/availability.py index 192472b..84e3f67 100644 --- a/cmk/gui/plugins/views/availability.py +++ b/cmk/gui/plugins/views/availability.py @@ -396,8 +396,8 @@ def render_availability_timeline(what, av_entry, avoptions): for row_nr, row in enumerate(timeline_layout["table"]): table.row( id_="timetable_%d" % row_nr, - onmouseover="timetable_hover(%d, 1);" % row_nr, - onmouseout="timetable_hover(%d, 0);" % row_nr) + onmouseover="cmk.availability.timetable_hover(%d, 1);" % row_nr, + onmouseout="cmk.availability.timetable_hover(%d, 0);" % row_nr) table.cell(_("Links"), css="buttons") if what == "bi": url = html.makeuri([("timewarp", str(int(row["from"])))]) @@ -537,8 +537,8 @@ def render_timeline_bar(timeline_layout, style): if style == "standalone": td_attrs.update({ - "onmouseover": "timeline_hover(%d, 1);" % row_nr, - "onmouseout": "timeline_hover(%d, 0);" % row_nr, + "onmouseover": "cmk.availability.timeline_hover(%d, 1);" % row_nr, + "onmouseout": "cmk.availability.timeline_hover(%d, 0);" % row_nr, }) html.td('', **td_attrs) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index b032bd7..f3edf52 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -2024,46 +2024,6 @@ function host_tag_update_value(prefix, grp) { } //#. -//# .-Availability-------------------------------------------------------. -//# | _ _ _ _ _ _ _ _ | -//# | / \__ ____ _(_) | __ _| |__ (_) (_) |_ _ _ | -//# | / _ \ \ / / _` | | |/ _` | '_ \| | | | __| | | | | -//# | / ___ \ V / (_| | | | (_| | |_) | | | | |_| |_| | | -//# | /_/ \_\_/ \__,_|_|_|\__,_|_.__/|_|_|_|\__|\__, | | -//# | |___/ | -//# +--------------------------------------------------------------------+ -//# | | -//# '--------------------------------------------------------------------' - -function timeline_hover(row_nr, onoff) -{ - var row = document.getElementById("timetable_" + row_nr); - if (!row) - return; - - if (onoff) { - add_class(row, 'hilite'); - } else { - remove_class(row, 'hilite'); - } -} - - -function timetable_hover(row_nr, onoff) -{ - var slice = document.getElementById("timeline_" + row_nr); - if (!slice) - return; - - if (onoff) { - add_class(slice, 'hilite'); - } else { - remove_class(slice, 'hilite'); - } -} - - -//#. //# .--SLA-----------------------------------------------------------------. //# | ____ _ _ | //# | / ___|| | / \ | diff --git a/web/htdocs/js/index.js b/web/htdocs/js/index.js index 578456b..cbf47be 100644 --- a/web/htdocs/js/index.js +++ b/web/htdocs/js/index.js @@ -34,6 +34,7 @@ import * as activation from "activation"; import * as selection from "selection"; import * as element_dragging from "element_dragging"; import * as help from "help"; +import * as availability from "availability"; import * as dashboard from "dashboard"; require("script-loader!./checkmk.js"); @@ -64,6 +65,7 @@ export default { selection: selection, element_dragging: element_dragging, help: help, + availability: availability, dashboard: dashboard }, // TODO: Compatibility for not yet modularized JS code diff --git a/web/htdocs/js/modules/availability.js b/web/htdocs/js/modules/availability.js new file mode 100644 index 0000000..c39f6a2 --- /dev/null +++ b/web/htdocs/js/modules/availability.js @@ -0,0 +1,51 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +// +------------------------------------------------------------------+ +// +// This file is part of Check_MK. +// The official homepage is at http://mathias-kettner.de/check_mk. +// +// check_mk is free software; you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by +// the Free Software Foundation in version 2. check_mk is distributed +// in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +// out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +// PARTICULAR PURPOSE. See the GNU General Public License for more de- +// ails. You should have received a copy of the GNU General Public +// License along with GNU Make; see the file COPYING. If not, write +// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +// Boston, MA 02110-1301 USA. + +import * as utils from "utils"; + +export function timeline_hover(row_nr, onoff) +{ + var row = document.getElementById("timetable_" + row_nr); + if (!row) + return; + + if (onoff) { + utils.add_class(row, "hilite"); + } else { + utils.remove_class(row, "hilite"); + } +} + +export function timetable_hover(row_nr, onoff) +{ + var slice = document.getElementById("timeline_" + row_nr); + if (!slice) + return; + + if (onoff) { + utils.add_class(slice, "hilite"); + } else { + utils.remove_class(slice, "hilite"); + } +}

5 years, 6 months

Moved help toggle to dedicated module

by Lars Michelsen

Module: check_mk Branch: master Commit: 5b9b2ab76ff915d86e9b174de4db745f2e9904e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b9b2ab76ff915… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 10:08:34 2018 +0100 Moved help toggle to dedicated module Change-Id: Iaf6eae77afe6a5a283af083c2238fcee56ba8116 --- cmk/gui/htmllib.py | 4 +-- web/htdocs/js/checkmk.js | 60 ------------------------------- web/htdocs/js/index.js | 2 ++ web/htdocs/js/modules/help.js | 84 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+), 62 deletions(-) diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index a9bf1b1..d3bf147 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -1834,7 +1834,7 @@ class html(HTMLGenerator): _("Toggle context help texts"), "help", id_="helpbutton", - onclick="toggle_help()", + onclick="cmk.help.toggle()", style="display:none", cssclass=cssclass) self.open_a(href="https://mathias-kettner.com", class_="head_logo") @@ -1903,7 +1903,7 @@ class html(HTMLGenerator): def body_end(self): if self.have_help: - self.javascript("enable_help();") + self.javascript("cmk.help.enable();") if self.final_javascript_code: self.javascript(self.final_javascript_code) self.javascript("cmk.visibility_detection.initialize();") diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 75b9248..b032bd7 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1808,66 +1808,6 @@ function vs_update_color_picker(varprefix, hex, update_picker) { vs_color_pickers[varprefix].setHex(hex); } -//#. -//# .-Help Toggle--------------------------------------------------------. -//# | _ _ _ _____ _ | -//# | | | | | ___| |_ __ |_ _|__ __ _ __ _| | ___ | -//# | | |_| |/ _ \ | '_ \ | |/ _ \ / _` |/ _` | |/ _ \ | -//# | | _ | __/ | |_) | | | (_) | (_| | (_| | | __/ | -//# | |_| |_|\___|_| .__/ |_|\___/ \__, |\__, |_|\___| | -//# | |_| |___/ |___/ | -//# +--------------------------------------------------------------------+ -//# | | -//# '--------------------------------------------------------------------' - -function enable_help() -{ - var help = document.getElementById('helpbutton'); - help.style.display = "inline-block"; -} - -function toggle_help() -{ - var help = document.getElementById('helpbutton'); - if (has_class(help, "active")) { - remove_class(help, "active"); - add_class(help, "passive"); - switch_help(false); - } else { - add_class(help, "active"); - remove_class(help, "passive"); - switch_help(true); - } -} - -function switch_help(how) -{ - // recursive scan for all div class=help elements - var helpdivs = document.getElementsByClassName('help'); - for (var i=0; i<helpdivs.length; i++) { - helpdivs[i].style.display = how ? "block" : "none"; - } - - // small hack for wato ruleset lists, toggle the "float" and "nofloat" - // classes on those objects to make the layout possible - var rulesetdivs = document.getElementsByClassName('ruleset'); - for (var i = 0; i < rulesetdivs.length; i++) { - if (how) { - if (has_class(rulesetdivs[i], 'float')) { - remove_class(rulesetdivs[i], 'float'); - add_class(rulesetdivs[i], 'nofloat'); - } - } else { - if (has_class(rulesetdivs[i], 'nofloat')) { - remove_class(rulesetdivs[i], 'nofloat'); - add_class(rulesetdivs[i], 'float'); - } - } - } - - get_url("ajax_switch_help.py?enabled=" + (how ? "yes" : "")); -} - /* Switch filter, commands and painter options */ function view_toggle_form(button, form_id) { var display = "none"; diff --git a/web/htdocs/js/index.js b/web/htdocs/js/index.js index fcaf3c2..578456b 100644 --- a/web/htdocs/js/index.js +++ b/web/htdocs/js/index.js @@ -33,6 +33,7 @@ import * as async_progress from "async_progress"; import * as activation from "activation"; import * as selection from "selection"; import * as element_dragging from "element_dragging"; +import * as help from "help"; import * as dashboard from "dashboard"; require("script-loader!./checkmk.js"); @@ -62,6 +63,7 @@ export default { activation: activation, selection: selection, element_dragging: element_dragging, + help: help, dashboard: dashboard }, // TODO: Compatibility for not yet modularized JS code diff --git a/web/htdocs/js/modules/help.js b/web/htdocs/js/modules/help.js new file mode 100644 index 0000000..69f3eb9 --- /dev/null +++ b/web/htdocs/js/modules/help.js @@ -0,0 +1,84 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +// +------------------------------------------------------------------+ +// +// This file is part of Check_MK. +// The official homepage is at http://mathias-kettner.de/check_mk. +// +// check_mk is free software; you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by +// the Free Software Foundation in version 2. check_mk is distributed +// in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +// out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +// PARTICULAR PURPOSE. See the GNU General Public License for more de- +// ails. You should have received a copy of the GNU General Public +// License along with GNU Make; see the file COPYING. If not, write +// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +// Boston, MA 02110-1301 USA. + +import * as utils from "utils"; +import * as ajax from "ajax"; + +//# .-Help Toggle--------------------------------------------------------. +//# | _ _ _ _____ _ | +//# | | | | | ___| |_ __ |_ _|__ __ _ __ _| | ___ | +//# | | |_| |/ _ \ | '_ \ | |/ _ \ / _` |/ _` | |/ _ \ | +//# | | _ | __/ | |_) | | | (_) | (_| | (_| | | __/ | +//# | |_| |_|\___|_| .__/ |_|\___/ \__, |\__, |_|\___| | +//# | |_| |___/ |___/ | +//# '--------------------------------------------------------------------' + +export function enable() +{ + var help = document.getElementById("helpbutton"); + help.style.display = "inline-block"; +} + +export function toggle() +{ + var help = document.getElementById("helpbutton"); + if (utils.has_class(help, "active")) { + utils.remove_class(help, "active"); + utils.add_class(help, "passive"); + switch_help(false); + } else { + utils.add_class(help, "active"); + utils.remove_class(help, "passive"); + switch_help(true); + } +} + +function switch_help(how) +{ + // recursive scan for all div class=help elements + var helpdivs = document.getElementsByClassName("help"); + var i; + for (i=0; i<helpdivs.length; i++) { + helpdivs[i].style.display = how ? "block" : "none"; + } + + // small hack for wato ruleset lists, toggle the "float" and "nofloat" + // classes on those objects to make the layout possible + var rulesetdivs = document.getElementsByClassName("ruleset"); + for (i = 0; i < rulesetdivs.length; i++) { + if (how) { + if (utils.has_class(rulesetdivs[i], "float")) { + utils.remove_class(rulesetdivs[i], "float"); + utils.add_class(rulesetdivs[i], "nofloat"); + } + } else { + if (utils.has_class(rulesetdivs[i], "nofloat")) { + utils.remove_class(rulesetdivs[i], "nofloat"); + utils.add_class(rulesetdivs[i], "float"); + } + } + } + + ajax.get_url("ajax_switch_help.py?enabled=" + (how ? "yes" : "")); +}

5 years, 6 months

Improve error handling in EC active check.

by Sven Panne

Module: check_mk Branch: master Commit: 2e1d243567b027388df42524766e8163fb342c25 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e1d243567b027… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Dec 21 11:10:41 2018 +0100 Improve error handling in EC active check. Various cleanup and tiny fixes on the way. CMK-1495 Change-Id: Ic33f722ac1933d372f6c27bd20eda26399a613ef --- active_checks/check_mkevents.cc | 153 ++++++++++++++++++++++------------------ 1 file changed, 86 insertions(+), 67 deletions(-) diff --git a/active_checks/check_mkevents.cc b/active_checks/check_mkevents.cc index e448318..1925e92 100644 --- a/active_checks/check_mkevents.cc +++ b/active_checks/check_mkevents.cc @@ -71,21 +71,25 @@ std::ostream &operator<<(std::ostream &os, const State &state) { exit(static_cast<int>(state)); } - [[noreturn]] void ioError(const std::string &message) { +[[noreturn]] void ioError(const std::string &message) { reply(State::unknown, message + " (" + strerror(errno) + ")"); } -[[noreturn]] void tcpError(const std::string &message, const std::string &addr, - int port) { - ioError(message + " to event daemon via TCP " + addr + ":" + - std::to_string(port)); +[[noreturn]] void missingHeader(const std::string &header, + const std::string &query, + const std::stringstream &response) { + auto resp = response.str(); + reply(State::unknown, + "Event console answered with incorrect header (missing " + header + + ")\nQuery was:\n" + query + "\nReceived " + + std::to_string(resp.size()) + " byte response:\n" + resp); } void usage() { reply( State::unknown, "Usage: check_mkevents [-s SOCKETPATH] [-H REMOTE:PORT] [-a] HOST [APPLICATION]\n" - " -a do not take into account acknowledged events.\n" + " -a do not take acknowledged events into account.\n" " HOST may be a hostname, and IP address or hostname/IP-address."); } @@ -107,8 +111,6 @@ int main(int argc, char **argv) { // Parse arguments char *host = nullptr; char *remote_host = nullptr; - char remote_hostipaddress[64]; - int remote_port = 6558; char *application = nullptr; bool ignore_acknowledged = false; std::string unixsocket_path; @@ -140,46 +142,36 @@ int main(int argc, char **argv) { usage(); } - // Get omd environment - if (unixsocket_path.empty() && remote_host == nullptr) { - char *omd_path = getenv("OMD_ROOT"); - if (omd_path == nullptr) { - reply(State::unknown, - "OMD_ROOT is not set, no socket path is defined."); - } - unixsocket_path = std::string(omd_path) + "/tmp/run/mkeventd/status"; - } - + int sock; if (remote_host != nullptr) { - struct hostent *he; - struct in_addr **addr_list; char *remote_hostaddress = strtok(remote_host, ":"); - if ((he = gethostbyname(remote_hostaddress)) == nullptr) { + struct hostent *he = gethostbyname(remote_hostaddress); + if (he == nullptr) { reply(State::unknown, "Unable to resolve remote host address: " + std::string(remote_hostaddress)); } - addr_list = reinterpret_cast<struct in_addr **>(he->h_addr_list); + + auto addr_list = reinterpret_cast<struct in_addr **>(he->h_addr_list); + char remote_hostipaddress[64]; for (int i = 0; addr_list[i] != nullptr; i++) { strncpy(remote_hostipaddress, inet_ntoa(*addr_list[i]), sizeof(remote_hostipaddress)); } char *port_str = strtok(nullptr, ":"); - if (port_str != nullptr) { - remote_port = atoi(port_str); - } - } + int remote_port = port_str != nullptr ? atoi(port_str) : 6558; - // Create socket and setup connection - int sock; - struct timeval tv; - if (remote_host != nullptr) { sock = socket(AF_INET, SOCK_STREAM, 0); + if (sock == -1) { + ioError("Cannot create client socket"); + } + + struct timeval tv; tv.tv_sec = 10; - setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(struct timeval)); - // Right now, there is no send timeout.. - // setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (struct timeval *)&tv, - // sizeof(struct timeval)); + if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv, + sizeof(struct timeval)) == -1) { + ioError("Cannot set socket reveive timeout"); + } struct sockaddr_in addr; memset(&addr, 0, sizeof(addr)); @@ -187,27 +179,46 @@ int main(int argc, char **argv) { inet_aton(remote_hostipaddress, &addr.sin_addr); addr.sin_port = htons(remote_port); - if (0 > connect(sock, reinterpret_cast<struct sockaddr *>(&addr), - sizeof(struct sockaddr_in))) { - tcpError("Cannot connect", remote_hostipaddress, remote_port); + if (connect(sock, reinterpret_cast<struct sockaddr *>(&addr), + sizeof(struct sockaddr_in)) == -1) { + ioError("Cannot connect to event console at " + + std::string(remote_hostipaddress) + ":" + + std::to_string(remote_port)); } + } else { + // Get omd environment + if (unixsocket_path.empty()) { + char *omd_path = getenv("OMD_ROOT"); + if (omd_path == nullptr) { + reply(State::unknown, + "OMD_ROOT is not set, no socket path is defined."); + } + unixsocket_path = + std::string(omd_path) + "/tmp/run/mkeventd/status"; + } + sock = socket(PF_UNIX, SOCK_STREAM, 0); - if (sock < 0) { + if (sock == -1) { ioError("Cannot create client socket"); } + struct timeval tv; tv.tv_sec = 3; - setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(struct timeval)); + if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv, + sizeof(struct timeval)) == -1) { + ioError("Cannot set socket reveive timeout"); + } - struct sockaddr_un sockaddr; - sockaddr.sun_family = AF_UNIX; - strncpy(sockaddr.sun_path, unixsocket_path.c_str(), - sizeof(sockaddr.sun_path) - 1); - sockaddr.sun_path[sizeof(sockaddr.sun_path) - 1] = '\0'; + struct sockaddr_un addr; + memset(&addr, 0, sizeof(addr)); + addr.sun_family = AF_UNIX; + strncpy(addr.sun_path, unixsocket_path.c_str(), + sizeof(addr.sun_path) - 1); + addr.sun_path[sizeof(addr.sun_path) - 1] = '\0'; - if (0 > connect(sock, reinterpret_cast<struct sockaddr *>(&sockaddr), - sizeof(sockaddr))) { + if (connect(sock, reinterpret_cast<struct sockaddr *>(&addr), + sizeof(addr)) == -1) { ioError("Cannot connect to event daemon via UNIX socket " + unixsocket_path); } @@ -242,35 +253,40 @@ int main(int argc, char **argv) { while (bytes_to_write > 0) { ssize_t bytes_written = write(sock, buffer, bytes_to_write); if (bytes_written == -1) { - tcpError("Cannot send query", remote_hostipaddress, - remote_port); + ioError("Cannot send query to event console"); } buffer += bytes_written; bytes_to_write -= bytes_written; } if (shutdown(sock, SHUT_WR) == -1) { - tcpError("Cannot shutdown socket", remote_hostipaddress, - remote_port); + ioError("Cannot shutdown socket to event console"); } } // Get response - char response_chunk[4096]; - memset(response_chunk, 0, sizeof(response_chunk)); std::stringstream response_stream; - ssize_t read_length; - while (0 < - (read_length = read(sock, response_chunk, sizeof(response_chunk)))) { - // replace binary 0 in response with space - for (int i = 0; i < read_length; i++) { - if (response_chunk[i] == 0) { - response_chunk[i] = ' '; + while (true) { + char response_chunk[4096]; + memset(response_chunk, 0, sizeof(response_chunk)); + ssize_t bytes_read = read(sock, response_chunk, sizeof(response_chunk)); + if (bytes_read == -1) { + if (errno != EINTR) { + ioError("Error while reading response"); + } + } else if (bytes_read == 0) { + break; + } else { + for (int i = 0; i < bytes_read; i++) { + if (response_chunk[i] == 0) { + response_chunk[i] = ' '; + } } + response_stream << std::string(response_chunk, bytes_read); } - response_stream << std::string(response_chunk, read_length); - memset(response_chunk, 0, sizeof(response_chunk)); } - close(sock); + if (close(sock) == -1) { + ioError("Error while closing connection"); + } // Start processing data std::string line; @@ -299,11 +315,14 @@ int main(int argc, char **argv) { } // Basic header validation - if (idx_event_phase == -1 || idx_event_state == -1 || - idx_event_text == -1) { - reply(State::unknown, "Invalid answer from event daemon\n" + - response_stream.str() + "\nQuery was:\n" + - query_message); + if (idx_event_phase == -1) { + missingHeader("event_phase", query_message, response_stream); + } + if (idx_event_state == -1) { + missingHeader("event_state", query_message, response_stream); + } + if (idx_event_text == -1) { + missingHeader("event_text", query_message, response_stream); } // Get data

5 years, 6 months

agent_aws: Refactored EBS; merged summary and health sections

by Simon Betz

Module: check_mk Branch: master Commit: 6e2607d95ed68b0810c747ccbb5359fb7652dc96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e2607d95ed68b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Dec 21 11:57:39 2018 +0100 agent_aws: Refactored EBS; merged summary and health sections Change-Id: I6386775a94f42bacefe973709f0cc4df5073e94a --- agents/special/agent_aws | 68 ++++++---------------- .../{aws_ebs_health => aws_ebs_summary.health} | 0 checks/aws_ebs_health | 46 --------------- checks/aws_ebs_summary | 39 +++++++++++-- 4 files changed, 54 insertions(+), 99 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index e8a1a9b..f9fd920 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -579,66 +579,40 @@ class EBSSummary(AWSSection): return 300 def _get_raw_result(self): - return self._client.describe_volumes() - - def _extract_content_from(self, raw_result): + response = self._client.describe_volumes() try: - return raw_result['Volumes'] + volumes = {r['VolumeId']: r for r in response['Volumes']} except KeyError, e: - logging.info("%s: KeyError %s; Available are %s", self.name, e, raw_result.keys()) - return [] - - def _format_content(self, content): - instance_ids = self._received_results.get('ec2_summary', {})\ - .get('mapping', {}) - content_by_piggyback_hosts = {} - for row in content: - for attachment in row['Attachments']: - attachment_id = attachment['InstanceId'] - instance_name = instance_ids.get(attachment_id, attachment_id) - content_by_piggyback_hosts.setdefault(instance_name, [])\ - .append(row) - return [ - AWSSectionResult(piggyback_hostname, rows) - for piggyback_hostname, rows in content_by_piggyback_hosts.iteritems() - ] - - -class EBSHealth(AWSSection): - @property - def name(self): - return "ebs_health" + logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) + volumes = [] - @property - def interval(self): - return 300 + response = self._client.describe_volume_status() + try: + volume_states = {r['VolumeId']: r for r in response['VolumeStatuses']} + except KeyError, e: + logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) + volume_states = [] - def _get_raw_result(self): - volumes = [] - for entry in self._received_results.get('ebs_summary', []): - volumes.append(entry['VolumeId']) - return self._client.describe_volume_status(VolumeIds=volumes) + raw_result = [] + for volume_id in set(volumes.keys()).union(set(volume_states.keys())): + volume = volumes.get(volume_id, {}) + volume.update(volume_states.get(volume_id, {})) + raw_result.append(volume) + return raw_result def _extract_content_from(self, raw_result): - content = {} - for row in raw_result.get('VolumeStatuses', []): - try: - content.setdefault(row['VolumeId'], row['VolumeStatus']) - except KeyError, e: - logging.info("%s: KeyError %s; Available are %s", self.name, e, row.keys()) - return content + return raw_result def _format_content(self, content): instance_ids = self._received_results.get('ec2_summary', {})\ .get('mapping', {}) content_by_piggyback_hosts = {} - for row in self._received_results.get('ebs_summary', []): - vol_id = row['VolumeId'] + for row in content: for attachment in row['Attachments']: attachment_id = attachment['InstanceId'] instance_name = instance_ids.get(attachment_id, attachment_id) content_by_piggyback_hosts.setdefault(instance_name, [])\ - .append({vol_id: content[vol_id]}) + .append(row) return [ AWSSectionResult(piggyback_hostname, rows) for piggyback_hostname, rows in content_by_piggyback_hosts.iteritems() @@ -851,17 +825,14 @@ class AWSSections(object): ec2 = EC2(cloudwatch_client) elb_health = ELBHealth(elb_client) elb = ELB(cloudwatch_client) - ebs_health = EBSHealth(ec2_client) ebs = EBS(cloudwatch_client) #---register sections to distributors------------------------------- ec2_summary_distributor.add(ec2) ec2_summary_distributor.add(ebs_summary) - ec2_summary_distributor.add(ebs_health) ec2_summary_distributor.add(ebs) elb_summary_distributor.add(elb_health) elb_summary_distributor.add(elb) - ebs_summary_distributor.add(ebs_health) ebs_summary_distributor.add(ebs) #---register sections with distributors for execution--------------- @@ -874,7 +845,6 @@ class AWSSections(object): self._sections.append(s3) self._sections.append(elb_health) self._sections.append(elb) - self._sections.append(ebs_health) self._sections.append(ebs) def _init_client(self, client_key): diff --git a/checkman/aws_ebs_health b/checkman/aws_ebs_summary.health similarity index 100% rename from checkman/aws_ebs_health rename to checkman/aws_ebs_summary.health diff --git a/checks/aws_ebs_health b/checks/aws_ebs_health deleted file mode 100644 index 37d2a0d..0000000 --- a/checks/aws_ebs_health +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/python -# -*- encoding: utf-8; py-indent-offset: 4 -*- -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2018 mk(a)mathias-kettner.de | -# +------------------------------------------------------------------+ -# -# This file is part of Check_MK. -# The official homepage is at http://mathias-kettner.de/check_mk. -# -# check_mk is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation in version 2. check_mk is distributed -# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- -# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU General Public License for more de- -# tails. You should have received a copy of the GNU General Public -# License along with GNU Make; see the file COPYING. If not, write -# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, -# Boston, MA 02110-1301 USA. - - -def parse_aws_health(info): - return {k: v for row in parse_aws(info) for k, v in row.iteritems()} - - -@get_parsed_item_data -def check_aws_ebs_health(item, params, metrics): - ebs_status = metrics["Status"] - yield 0 if ebs_status.lower() == 'ok' else 2, "Status: %s" % ebs_status - for row in metrics['Details']: - yield 0, "%s: %s" % (row['Name'], row['Status']) - - -check_info['aws_ebs_health'] = { - 'parse_function': parse_aws_health, - 'inventory_function': discover(), - 'check_function': check_aws_ebs_health, - 'service_description': 'AWS/EBS Health %s', - 'includes': ['aws.include'], -} diff --git a/checks/aws_ebs_summary b/checks/aws_ebs_summary index ea818e4..09de4f6 100644 --- a/checks/aws_ebs_summary +++ b/checks/aws_ebs_summary @@ -41,9 +41,14 @@ def parse_aws_summary(info): return parsed -def inventory_aws_ebs_summary(parsed): - if parsed: - return [(None, {})] +# .--summary-------------------------------------------------------------. +# | | +# | ___ _ _ _ __ ___ _ __ ___ __ _ _ __ _ _ | +# | / __| | | | '_ ` _ \| '_ ` _ \ / _` | '__| | | | | +# | \__ \ |_| | | | | | | | | | | | (_| | | | |_| | | +# | |___/\__,_|_| |_| |_|_| |_| |_|\__,_|_| \__, | | +# | |___/ | +# '----------------------------------------------------------------------' def check_aws_ebs_summary(item, params, parsed): @@ -69,8 +74,34 @@ def check_aws_ebs_summary(item, params, parsed): check_info['aws_ebs_summary'] = { 'parse_function': parse_aws_summary, - 'inventory_function': inventory_aws_ebs_summary, + 'inventory_function': discover_single, 'check_function': check_aws_ebs_summary, 'service_description': 'AWS/EBS Summary', 'includes': ['aws.include'], } + +#. +# .--health--------------------------------------------------------------. +# | _ _ _ _ | +# | | |__ ___ __ _| | |_| |__ | +# | | '_ \ / _ \/ _` | | __| '_ \ | +# | | | | | __/ (_| | | |_| | | | | +# | |_| |_|\___|\__,_|_|\__|_| |_| | +# | | +# '----------------------------------------------------------------------' + + +@get_parsed_item_data +def check_aws_ebs_summary_health(item, params, ebs_data): + metrics = ebs_data['VolumeStatus'] + ebs_status = metrics["Status"] + yield 0 if ebs_status.lower() == 'ok' else 2, "Status: %s" % ebs_status + for row in metrics['Details']: + yield 0, "%s: %s" % (row['Name'], row['Status']) + + +check_info['aws_ebs_summary.health'] = { + 'inventory_function': discover(), + 'check_function': check_aws_ebs_summary_health, + 'service_description': 'AWS/EBS Health %s', +}

5 years, 6 months

wato.js: Fixed quoting

by Lars Michelsen

Module: check_mk Branch: master Commit: 5f75a99c355c664ac14f908a820c6277c082a2ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f75a99c355c66… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 10:08:32 2018 +0100 wato.js: Fixed quoting Change-Id: I62b5edbcdaef3a494bb8ca672ef7b3012129dbef --- web/htdocs/js/wato.js | 102 +++++++++++++++++++++++++------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5f75a99c35…

5 years, 6 months

wato.js: Fixed identation

by Lars Michelsen

Module: check_mk Branch: master Commit: a427280f1288c2222f09b6fbc297745a65c32266 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a427280f1288c2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 10:08:32 2018 +0100 wato.js: Fixed identation Change-Id: I9fe124b5ce8b8dc1185f1c5af0feb71a724d74c6 --- web/htdocs/js/wato.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 9ce48e4..1b72e72 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -304,14 +304,14 @@ function handle_async_progress_update(handler_data, response_json) } else { handler_data.update_function(handler_data, response.result); - if (!handler_data.is_finished_function(response.result)) { + if (!handler_data.is_finished_function(response.result)) { setTimeout(function() { - return monitor_async_progress(handler_data); - }, 500); - } - else { + return monitor_async_progress(handler_data); + }, 500); + } + else { handler_data.finish_function(response.result); - } + } } }

5 years, 6 months

Refactoring: Moved more application check parameters from unsorted.py to dedicated modules (CMK-1393)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 379fa949663c88fd133579bfa92c657a3f43914e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=379fa949663c88… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Dec 20 14:10:02 2018 +0100 Refactoring: Moved more application check parameters from unsorted.py to dedicated modules (CMK-1393) Change-Id: I1aff984513e7a0da0ee65789082a8d1d37626edf --- .../wato/check_parameters/acme_certificates.py | 51 +++++ .../plugins/wato/check_parameters/clr_memory.py | 59 ++++++ .../plugins/wato/check_parameters/jvm_memory.py | 111 ++++++++++ cmk/gui/plugins/wato/check_parameters/jvm_queue.py | 61 ++++++ .../plugins/wato/check_parameters/jvm_requests.py | 69 +++++++ .../plugins/wato/check_parameters/jvm_sessions.py | 69 +++++++ .../plugins/wato/check_parameters/jvm_uptime.py | 68 ++++++ cmk/gui/plugins/wato/check_parameters/unsorted.py | 230 --------------------- 8 files changed, 488 insertions(+), 230 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=379fa94966…

5 years, 6 months

wato.js: moved async progress to dedicated module

by Lars Michelsen

Module: check_mk Branch: master Commit: 9073a3d79b73000093b4029e28816f9c58d6c4a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9073a3d79b7300… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 10:08:33 2018 +0100 wato.js: moved async progress to dedicated module Change-Id: I88bac1ca1433b54baaaafdee26f32de04c805268 --- web/htdocs/js/checkmk.js | 9 +-- web/htdocs/js/index.js | 2 + web/htdocs/js/modules/async_progress.js | 123 ++++++++++++++++++++++++++++++ web/htdocs/js/modules/utils.js | 4 + web/htdocs/js/wato.js | 131 +++++--------------------------- 5 files changed, 148 insertions(+), 121 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9073a3d79b…

5 years, 6 months

wato.js: moved activation to dedicated module

by Lars Michelsen

Module: check_mk Branch: master Commit: 24179a34aa1f86499407dc0cc38cc87fcc4c9339 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24179a34aa1f86… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 10:08:34 2018 +0100 wato.js: moved activation to dedicated module Change-Id: Idc7ff3735a9291180e03fddeb6ce9c5169375cea --- cmk/gui/htmllib.py | 2 +- cmk/gui/pagetypes.py | 3 +- cmk/gui/plugins/views/layouts.py | 10 +- cmk/gui/views.py | 3 +- cmk/gui/wato/pages/activate_changes.py | 9 +- cmk/gui/wato/pages/folders.py | 11 +- web/htdocs/js/checkmk.js | 223 +------------------------ web/htdocs/js/index.js | 4 + web/htdocs/js/modules/activation.js | 290 +++++++++++++++++++++++++++++++++ web/htdocs/js/modules/selection.js | 44 +++++ web/htdocs/js/modules/utils.js | 214 ++++++++++++++++++++++++ web/htdocs/js/wato.js | 265 +----------------------------- 12 files changed, 583 insertions(+), 495 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=24179a34aa…

5 years, 6 months

wato.js: Fixed different linter issues

by Lars Michelsen

Module: check_mk Branch: master Commit: ca475aeb180b755d4fbd241ba13fc2c647beb8a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca475aeb180b75… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 10:08:33 2018 +0100 wato.js: Fixed different linter issues Change-Id: I8a4d7049c10b949e1ffde421bbd1934c04f7866d --- web/htdocs/js/wato.js | 86 +++++++++++++++++++-------------------------------- 1 file changed, 31 insertions(+), 55 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 1b72e72..a634708 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -26,27 +26,18 @@ // General functions for WATO // ---------------------------------------------------------------------------- -function getElementsByClass(cl) { - var items = new Array(); - var elements = document.getElementsByTagName("*"); - for (var i = 0; i < elements.length; i++) - if (elements[i].className == cl) - items.push(elements[i]); - return items; -} - /* Used to check all checkboxes which have the given class set */ function wato_check_all(css_class) { - var items = getElementsByClass(css_class); + var items = document.getElementsByClassName(css_class); // First check if all boxes are checked - var all_checked = true; - for(var i = 0; i < items.length && all_checked == true; i++) + var all_checked = true, i; + for(i = 0; i < items.length && all_checked == true; i++) if (items[i].checked == false) all_checked = false; // Now set the new state - for(var i = 0; i < items.length; i++) + for(i = 0; i < items.length; i++) items[i].checked = !all_checked; } @@ -57,9 +48,10 @@ function wato_toggle_attribute(oCheckbox, attrname) { // Permanent invisible attributes do // not have attr_entry / attr_default - if( !oEntry ){ - return; + if (!oEntry){ + return; } + if (oCheckbox.checked) { oEntry.style.display = ""; oDefault.style.display = "none"; @@ -84,6 +76,7 @@ function wato_fix_visibility() { stored in the global variable wato_depends_on_tags, which is filled during the creation of the web page. */ + var index; for (var i = 0; i < wato_check_attributes.length; i++) { var attrname = wato_check_attributes[i]; /* Now comes the tricky part: decide whether that attribute should @@ -91,13 +84,13 @@ function wato_fix_visibility() { var display = ""; // Always invisible - if( hide_attributes.indexOf(attrname) > -1 ){ + if (hide_attributes.indexOf(attrname) > -1){ display = "none"; } // Visibility depends on roles - if( display == "" && attrname in wato_depends_on_roles){ - for (var index = 0; index < wato_depends_on_roles[attrname].length; index++) { + if (display == "" && attrname in wato_depends_on_roles) { + for (index = 0; index < wato_depends_on_roles[attrname].length; index++) { var role = wato_depends_on_roles[attrname][index]; var negate = role[0] == "!"; var rolename = negate ? role.substr(1) : role; @@ -110,13 +103,13 @@ function wato_fix_visibility() { } // Visibility depends on tags - if( display == "" && attrname in wato_depends_on_tags){ - for (var index = 0; index < wato_depends_on_tags[attrname].length; index++) { + if (display == "" && attrname in wato_depends_on_tags) { + for (index = 0; index < wato_depends_on_tags[attrname].length; index++) { var tag = wato_depends_on_tags[attrname][index]; - var negate = tag[0] == "!"; - var tagname = negate ? tag.substr(1) : tag; + var negate_tag = tag[0] == "!"; + var tagname = negate_tag ? tag.substr(1) : tag; var have_tag = current_tags.indexOf(tagname) != -1; - if (have_tag == negate) { + if (have_tag == negate_tag) { display = "none"; break; } @@ -133,7 +126,7 @@ function wato_fix_visibility() { // Hidden attributes are not validated at all var oAttrDisp = document.getElementById("attr_display_" + attrname); if (!oAttrDisp) { - var oAttrDisp = document.createElement("input"); + oAttrDisp = document.createElement("input"); oAttrDisp.name = "attr_display_" + attrname; oAttrDisp.id = "attr_display_" + attrname; oAttrDisp.type = "hidden"; @@ -153,9 +146,9 @@ function wato_fix_visibility() { // There is at least one item in this topic -> show it var topic = oTr.parentNode.childNodes[0].textContent; - if( display == "" ){ - var index = hide_topics.indexOf(topic); - if( index != -1 ) + if (display == ""){ + index = hide_topics.indexOf(topic); + if (index != -1) delete hide_topics[index]; } } @@ -261,7 +254,7 @@ function toggle_container(id) } function update_bulk_moveto(val) { - var fields = getElementsByClass("bulk_moveto"); + var fields = document.getElementsByClassName("bulk_moveto"); for(var i = 0; i < fields.length; i++) for(var a = 0; a < fields[i].options.length; a++) if(fields[i].options[a].value == val) @@ -615,24 +608,6 @@ function update_site_progress(site_state) progress.style.width = width + "px"; } -function handle_activation_progress_error(handler_data, status_code, error_msg) -{ - if (time() - handler_data.start_time <= 10 && status_code == 503) { - show_async_progress_info("Failed to fetch activation state. In case you changed site management related " + - "global settings this is normal for a period of some seconds."); - } else { - show_async_progress_error("Failed to fetch activation state ["+status_code+"]: " + error_msg + ". " + - "Retrying in 1 second." + - "<br><br>" + - "In case this error persists for more than some seconds, please verify that all " + - "processes of the site are running."); - } - - setTimeout(function() { - return monitor_activation_progress(handler_data.start_time, handler_data.activation_id); - }, 1000); -} - function finish_activation(response) { show_async_progress_info("Activation has finished. Reloading in 1 second."); @@ -667,7 +642,7 @@ function wato_do_profile_replication(siteid, est, progress_text) { set_profile_replication_result(handler_data["site_id"], success, msg); }, error_handler : function (handler_data, status_code, error_msg) { - set_profile_replication_result(handler_data["site_id"], False, + set_profile_replication_result(handler_data["site_id"], false, "Failed to perform profile replication [" + status_code + "]: " + error_msg); }, method : "POST", @@ -879,8 +854,8 @@ function start_host_diag_test(ident, hostname, transid) { log.innerHTML = "..."; get_url("wato_ajax_diag_host.py?host=" + encodeURIComponent(hostname) - + "&_test=" + encodeURIComponent(ident) + vars, - handle_host_diag_result, { "hostname": hostname, "ident": ident }); + + "&_test=" + encodeURIComponent(ident) + vars, + handle_host_diag_result, { "hostname": hostname, "ident": ident }); // eslint-disable-line indent } //#. @@ -1055,16 +1030,17 @@ function handle_execute_active_check(oDiv, response_json) { var response = JSON.parse(response_json); + var state, statename, output; if (response.result_code == 1) { - var state = 3; - var statename = "UNKN"; - var output = response.result; + state = 3; + statename = "UNKN"; + output = response.result; } else { - var state = response.result.state; + state = response.result.state; if (state == -1) state = "p"; // Pending - var statename = response.result.state_name; - var output = response.result.output; + statename = response.result.state_name; + output = response.result.output; } oDiv.innerHTML = output;

5 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2018