Checkmk git commits June 2011

checkmk-commits@lists.checkmk.com

2 participants
128 discussions

Check_MK Git: check_mk: Neues Dashlet für PNP-Graphen

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 01e2953517da870de1bd226af4cc18323b5bc8cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01e2953517da87… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 27 08:27:42 2011 +0200 Neues Dashlet für PNP-Graphen --- web/htdocs/dashboard.py | 24 ++++++++++++++++++++++++ web/htdocs/lib.py | 6 ++++++ web/plugins/pages/shipped.py | 1 + web/plugins/views/painters.py | 7 ------- 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 857afab..f858ee2 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -123,6 +123,11 @@ def render_dashboard(name): refresh_dashlets = [] # Dashlets with automatic refresh, for Javascript for nr, dashlet in enumerate(board["dashlets"]): + # dashlets using the 'urlfunc' method will dynamically compute + # an url (using HTML context variables at their wish). + if "urlfunc" in dashlet: + dashlet["url"] = dashlet["urlfunc"]() + # dashlets using the 'url' method will be refreshed by us. Those # dashlets using static content (such as an iframe) will not be # refreshed by us but need to do that themselves. @@ -513,3 +518,22 @@ context = document.getElementById("%(what)s_stats").getContext('2d'); html.javascript('chart_pie(%f, %f, %r);' % (r, r + perc, color)) r += perc +def dashlet_pnpgraph(): + render_pnpgraph(html.var("site"), html.var("host"), html.var("service"), int(html.var("source", 0))) + +def render_pnpgraph(site, host, service=None, source=0): + if not host: + html.message("Invalid URL to this dashlet. Missing <tt>host</tt>") + return; + if not service: + service = "_HOST_" + + if not site: + base_url = defaults.url_prefix + "/pnp4nagios/index.php/" + else: + base_url = html.site_status[site]["site"]["url_prefix"] + + img_url = base_url + "image?host=%s&srv=%s&view=0&source=%d&theme=multisite" % \ + (pnp_cleanup(host), pnp_cleanup(service), source) + html.write('<img src="%s">' % img_url) + diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 4353a10..88992ad 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -117,3 +117,9 @@ def load_web_plugins(forwhat, globalvars): if fn.endswith(".py"): execfile(local_plugins_path + "/" + fn, globalvars) +def pnp_cleanup(s): + return s \ + .replace(' ', '_') \ + .replace(':', '_') \ + .replace('/', '_') \ + .replace('\\', '_') diff --git a/web/plugins/pages/shipped.py b/web/plugins/pages/shipped.py index b865dd4..e6fcf44 100644 --- a/web/plugins/pages/shipped.py +++ b/web/plugins/pages/shipped.py @@ -65,5 +65,6 @@ pagehandlers.update({ "dashlet_overview" : dashboard.dashlet_overview, "dashlet_hoststats" : dashboard.dashlet_hoststats, "dashlet_servicestats" : dashboard.dashlet_servicestats, + "dashlet_pnpgraph" : dashboard.dashlet_pnpgraph, }) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index cc5a51e..ff227ae 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -115,13 +115,6 @@ icon_columns = [ "acknowledged", "scheduled_downtime_depth", "downtimes_with_inf icon_service_columns = [ "service_description" ] # Intelligent Links to PNP4Nagios 0.6.X -def pnp_cleanup(s): - return s \ - .replace(' ', '_') \ - .replace(':', '_') \ - .replace('/', '_') \ - .replace('\\', '_') - def pnp_url(row, what, how = 'graph'): sitename = row["site"] host = pnp_cleanup(row["host_name"])

13 years, 3 months

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 01d5138c69e526e3b8a177cb4b25ffea8d9efb54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01d5138c69e526… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 24 17:16:46 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 3 months

Check_MK Git: check_mk: Dashboard: Fixed typos in text

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 91b179afc2cb62562f36c23018a89a477b1472d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91b179afc2cb62… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 24 08:31:56 2011 +0200 Dashboard: Fixed typos in text --- web/htdocs/dashboard.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index c4bb0cf..2e97ca9 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -344,8 +344,8 @@ def dashlet_overview(): '</td>' '<td><h2>Check_MK Multisite</h2>' 'Welcome to Check_MK Multisite. If you want to learn more about Multsite, please visit ' - 'out <a href="http://mathias-kettner.de/checkmk_multisite.html">online documentation</a>. ' - 'Multisite is part of <a href="http://mathias-kettner.de/check_mk.html">Check_MK</a> - on Open Source ' + 'our <a href="http://mathias-kettner.de/checkmk_multisite.html">online documentation</a>. ' + 'Multisite is part of <a href="http://mathias-kettner.de/check_mk.html">Check_MK</a> - an Open Source ' 'project by <a href="http://mathias-kettner.de">Mathias Kettner</a>.' '</td>' )

13 years, 3 months

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 95ebb6a14073fccabc244a1c60228a6486968a22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95ebb6a14073fc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 28 00:08:31 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 3 months

Check_MK Git: check_mk: Livestatus: new hosts column filename

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 68aa067ddced1910744330279877a59b118b4bae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68aa067ddced19… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 26 15:17:48 2011 +0200 Livestatus: new hosts column filename It returns the value of the custom variable _FILENAME --- ChangeLog | 1 + livestatus/src/CustomVarsExplicitColumn.cc | 44 ++++++++++++++++++++++++ livestatus/src/CustomVarsExplicitColumn.h | 50 ++++++++++++++++++++++++++++ livestatus/src/Makefile.am | 2 +- livestatus/src/TableHosts.cc | 7 ++++ 5 files changed, 103 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92bd478..5e2d238 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,7 @@ * Column aggregation (Stats) now also works for perf_data * hosts, services & contacts: new column custom_variables (this is a dictionary of all custom variables) + * new column 'filename' in table host (value of variable _FILENAME) * Updated Python-API to most current version 1.1.11i1: diff --git a/livestatus/src/CustomVarsExplicitColumn.cc b/livestatus/src/CustomVarsExplicitColumn.cc new file mode 100644 index 0000000..80bd29a --- /dev/null +++ b/livestatus/src/CustomVarsExplicitColumn.cc @@ -0,0 +1,44 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2010 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. + +#include "CustomVarsExplicitColumn.h" + +char *CustomVarsExplicitColumn::getValue(void *data) +{ + customvariablesmember *cvm = getCVM(data); + while (cvm) { + if (cvm->variable_name == _varname) + return cvm->variable_value; + cvm = cvm->next; + } + return (char *)""; +} + +customvariablesmember *CustomVarsExplicitColumn::getCVM(void *data) +{ + if (!data) return 0; + data = shiftPointer(data); + if (!data) return 0; + return *(customvariablesmember **)((char *)data + _offset); +} diff --git a/livestatus/src/CustomVarsExplicitColumn.h b/livestatus/src/CustomVarsExplicitColumn.h new file mode 100644 index 0000000..3300195 --- /dev/null +++ b/livestatus/src/CustomVarsExplicitColumn.h @@ -0,0 +1,50 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2010 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. + +#ifndef CustomVarsExplicitColumn_h +#define CustomVarsExplicitColumn_h + +#include "StringColumn.h" +#include "nagios.h" + +using namespace std; + + +class CustomVarsExplicitColumn : public StringColumn +{ + int _offset; // within data structure (differs from host/service) + std::string _varname; + +public: + CustomVarsExplicitColumn(string name, string description, int offset, int indirect_offset, char *varname) + : StringColumn(name, description, indirect_offset), _offset(offset), _varname(varname) {} + char *getValue(void *data); +private: + customvariablesmember *getCVM(void *data); +}; + + +#endif // CustomVarsExplicitColumn_h + + diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index abd1280..9c38a67 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -28,7 +28,7 @@ unixcat_LDADD = -lpthread pkglib_LIBRARIES = livestatus.so livestatus_so_SOURCES = \ - AndingFilter.cc ClientQueue.cc Column.cc ColumnsColumn.cc \ + AndingFilter.cc ClientQueue.cc Column.cc ColumnsColumn.cc CustomVarsExplicitColumn.cc \ ContactsColumn.cc CustomVarsColumn.cc CustomVarsFilter.cc DoubleColumn.cc \ DoubleColumnFilter.cc DowntimeOrComment.cc DownCommColumn.cc EmptyColumn.cc \ Filter.cc GlobalCountersColumn.cc HostContactsColumn.cc HostgroupsColumn.cc \ diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index 7b622ca..3af4998 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -37,6 +37,7 @@ #include "HostContactsColumn.h" #include "DownCommColumn.h" #include "CustomVarsColumn.h" +#include "CustomVarsExplicitColumn.h" #include "HostlistColumn.h" #include "ServicelistColumn.h" #include "ServicelistStateColumn.h" @@ -253,6 +254,12 @@ void TableHosts::addColumns(Table *table, string prefix, int indirect_offset) table->addColumn(new CustomVarsColumn(prefix + "custom_variables", "A dictionary of the custom variables", (char *)(&hst.custom_variables) - ref, indirect_offset, CVT_DICT)); + // Add direct access to the custom macro _FILENAME. In a future version of Livestatus + // this will probably be configurable so access to further custom variable can be + // added, such that those variables are presented like ordinary Nagios columns. + table->addColumn(new CustomVarsExplicitColumn(prefix + "filename", + "The value of the custom variable FILENAME", (char *)(&hst.custom_variables) - ref, indirect_offset, "FILENAME")); + table->addColumn(new HostlistColumn(prefix + "parents", "A list of all direct parents of the host", (char *)(&hst.parent_hosts) - ref, indirect_offset, false)); table->addColumn(new HostlistColumn(prefix + "childs",

13 years, 3 months

Check_MK Git: check_mk: URL encode filename in links

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a12229a53d388e4c63369f823e3d8dbc4f94e4b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a12229a53d388e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 26 15:50:38 2011 +0200 URL encode filename in links --- web/htdocs/js/sidebar.js | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 8cdc7f3..3b91d5e 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -704,9 +704,9 @@ function wato_tree_click(filename) { else if (href.indexOf("/dashboard.py") >= 0) href = add_html_var(href, "filename", filename); else if (href.indexOf("/wato.py") >= 0) - href = "wato.py?filename=" + filename; + href = "wato.py?filename=" + escape(filename); else - href = "view.py?view_name=allhosts&filename=" + filename; + href = "view.py?view_name=allhosts&filename=" + escape(filename); parent.frames[1].location = href; } @@ -719,9 +719,9 @@ function add_html_var(url, varname, value) { var re = new RegExp('&' + varname + '=[^&]*'); var new_url = url.replace(re, ""); if (new_url.indexOf('?') != '-1') - new_url += "&" + varname + "=" + value; + new_url += "&" + varname + "=" + escape(value); else - new_url += "?" + varname + "=" + value; + new_url += "?" + varname + "=" + escape(value); return new_url; }

13 years, 3 months

Check_MK Git: check_mk: Make use of new column host_filename

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 81b5963b053cdac52c3afaa0a0c582a98fbee755 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81b5963b053cda… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 26 15:21:33 2011 +0200 Make use of new column host_filename --- web/htdocs/dashboard.py | 2 +- web/plugins/views/wato.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index c3111dd..857afab 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -455,7 +455,7 @@ def render_statistics(what, table, filter): filename = html.var("filename") if filename and filename != "/": # filter += "Filter: host_state = 0" - filter += "Filter: host_custom_variables ~ FILENAME ^%s\n" % filename.replace("\n", "") + filter += "Filter: host_filename ~ ^%s\n" % filename.replace("\n", "") query = "GET %s\n" % what for entry in table: diff --git a/web/plugins/views/wato.py b/web/plugins/views/wato.py index e8e27df..4d9bba6 100644 --- a/web/plugins/views/wato.py +++ b/web/plugins/views/wato.py @@ -40,7 +40,7 @@ class FilterWatoFile(Filter): def filter(self, infoname): current = html.var(self.name) if current and current in self.path_to_tree: - return "Filter: host_custom_variables ~ FILENAME ^%s\n" % current.replace("\n", "") # prevent insertions attack + return "Filter: host_filename ~ ^%s\n" % current.replace("\n", "") # prevent insertions attack else: return ""

13 years, 3 months

Check_MK Git: check_mk: Use _FILENAME instead of _PATH as custom macro

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3c34caf8e5a82aac572b1f5fce92c457346a73fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c34caf8e5a82a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 26 14:47:31 2011 +0200 Use _FILENAME instead of _PATH as custom macro --- modules/check_mk.py | 4 ++-- web/htdocs/dashboard.py | 2 +- web/plugins/views/wato.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 14c3699..f782e16 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1272,7 +1272,7 @@ def create_nagios_hostdefs(outfile, hostname): # WATO folder path path = host_paths.get(hostname) if path: - outfile.write(" _PATH\t\t\t\t%s\n" % path) + outfile.write(" _FILENAME\t\t\t%s\n" % path) # Host groups: If the host has no hostgroups it gets the default @@ -1338,7 +1338,7 @@ def create_nagios_hostdefs(outfile, hostname): outfile.write(" parents\t\t\t%s\n" % hostname) if path: - outfile.write(" _PATH\t\t\t\t%s\n" % path) + outfile.write(" _FILENAME\t\t\t%s\n" % path) hgs = summary_hostgroups_of(hostname) hostgroups = ",".join(hgs) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 5632561..c3111dd 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -455,7 +455,7 @@ def render_statistics(what, table, filter): filename = html.var("filename") if filename and filename != "/": # filter += "Filter: host_state = 0" - filter += "Filter: host_custom_variables ~ PATH ^%s\n" % filename.replace("\n", "") + filter += "Filter: host_custom_variables ~ FILENAME ^%s\n" % filename.replace("\n", "") query = "GET %s\n" % what for entry in table: diff --git a/web/plugins/views/wato.py b/web/plugins/views/wato.py index eb0f032..e8e27df 100644 --- a/web/plugins/views/wato.py +++ b/web/plugins/views/wato.py @@ -40,7 +40,7 @@ class FilterWatoFile(Filter): def filter(self, infoname): current = html.var(self.name) if current and current in self.path_to_tree: - return "Filter: host_custom_variables ~ PATH ^%s\n" % current.replace("\n", "") # prevent insertions attack + return "Filter: host_custom_variables ~ FILENAME ^%s\n" % current.replace("\n", "") # prevent insertions attack else: return ""

13 years, 3 months

Check_MK Git: check_mk: Livestatus: updated Python-API

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5f6838efc81e3240ac48912dfe4adb02ed72bb58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f6838efc81e32… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 26 14:43:56 2011 +0200 Livestatus: updated Python-API --- ChangeLog | 1 + livestatus/api/python/README | 21 +- livestatus/api/python/example.py | 13 +- livestatus/api/python/example_multisite.py | 12 +- livestatus/api/python/livestatus.py | 743 +++++++++++++++++++--------- 5 files changed, 547 insertions(+), 243 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5f6838efc8…

13 years, 3 months

Check_MK Git: check_mk: Multisite: make dashboard folder sensitive

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 248dfe6b8193255e418414efa9116d4d2b4a72a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=248dfe6b819325… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 26 14:29:52 2011 +0200 Multisite: make dashboard folder sensitive --- web/htdocs/dashboard.py | 66 ++++++++++++++++++++++++++++++------- web/htdocs/js/sidebar.js | 7 ++-- web/htdocs/wato.py | 38 ++++++++++++++++++++-- web/plugins/dashboard/builtin.py | 6 ++-- web/plugins/sidebar/shipped.py | 2 + web/plugins/views/wato.py | 2 +- 6 files changed, 98 insertions(+), 23 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=248dfe6b81…

13 years, 3 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2011