Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64363 discussions

Check_MK Git: check_mk: mkeventd: replication finished, still some tests and docu missing

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ac88f01e25b0077fc10487dd244d3a6a5f194967 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac88f01e25b007… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 14 21:00:34 2012 +0100 mkeventd: replication finished, still some tests and docu missing --- ChangeLog | 2 + mkeventd/bin/mkeventd | 46 +++++++++++++++- mkeventd/web/htdocs/mkeventd.py | 8 +++ mkeventd/web/plugins/wato/mkeventd.py | 91 +++++++++++++++++++++++++++++++- 4 files changed, 141 insertions(+), 6 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ac88f01e25…

11 years, 10 months

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: 28ffa844e0e5f6b14b952f132583669c14b8d95e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28ffa844e0e5f6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 15 19:09:46 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 10 months

Check_MK Git: check_mk: FreeBSD agent: send tcp connection stats

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fb3c6c5b84dbd46510090c0c578ad88e5e575d8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb3c6c5b84dbd4… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Thu Nov 15 18:48:54 2012 +0100 FreeBSD agent: send tcp connection stats --- agents/check_mk_agent.freebsd | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 81f681a..f6b863f 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -264,6 +264,11 @@ fi # done #fi +# Number of TCP connections in the various states +echo '<<<tcp_conn_stats>>>' +netstat -na | awk ' /^tcp/ { c[$7]++; } END { for (x in c) { print x, c[x]; } }' + + # Postfix mailqueue monitoring # # Only handle mailq when postfix user is present. The mailq command is also

11 years, 10 months

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: bfd9716e2fa9779c8698a9dc83d97339ca4ad413 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfd9716e2fa977… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 15 14:17:06 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0736

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 61ab6cbcf9fe075a2398ab1a0eb4aca412a9ee50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61ab6cbcf9fe07… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 15 14:17:02 2012 +0100 Updated bug entries #0736 --- .bugs/736 | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/736 b/.bugs/736 index f575c61..9431726 100644 --- a/.bugs/736 +++ b/.bugs/736 @@ -1,9 +1,9 @@ Title: Livechecks goes zoombie Component: livecheck -State: open +Class: bug +State: done Date: 2012-08-08 11:32:12 Targetversion: future -Class: bug Have been using livecheck and came across this rather nasty bug. We use livecheck for a whole bunch of http checks (check_http) and after @@ -44,3 +44,7 @@ in time) has been detected. Compensating... Reference in Ticket System: #110644 + +2012-11-12 08:00:27: changed state open -> done +kill process group of called plugin if timeout is reached + -> preventing possible freeze of livecheck

11 years, 10 months

Check_MK Git: check_mk: livestatus iReport: now uses KeepAlive on:

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e6c25f0a87fe8605fe0d024f811c3e229b57f4ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6c25f0a87fe86… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 15 14:16:13 2012 +0100 livestatus iReport: now uses KeepAlive on: --- doc/jasperreports/livestatus.jar | Bin 7609 -> 9737 bytes doc/jasperreports/src/LivestatusDatasource.java | 12 ++++- .../src/LivestatusFieldsProvider.java | 9 ++-- doc/jasperreports/src/LivestatusQueryExecuter.java | 40 +++++++++++++------ .../src/LivestatusQueryExecuterFactory.java | 26 +++++++++++- 5 files changed, 63 insertions(+), 24 deletions(-) diff --git a/doc/jasperreports/livestatus.jar b/doc/jasperreports/livestatus.jar index 84fe8d8..1f6e9c7 100644 Binary files a/doc/jasperreports/livestatus.jar and b/doc/jasperreports/livestatus.jar differ diff --git a/doc/jasperreports/src/LivestatusDatasource.java b/doc/jasperreports/src/LivestatusDatasource.java index aa8d561..b64c026 100644 --- a/doc/jasperreports/src/LivestatusDatasource.java +++ b/doc/jasperreports/src/LivestatusDatasource.java @@ -29,7 +29,10 @@ public class LivestatusDatasource implements JRDataSource, JRRewindableDataSourc protected String getFieldDescription(String fieldname){ try{ - return map_fielddescr.get(fieldname); + if (map_fielddescr.containsKey(fieldname)) + return map_fielddescr.get(fieldname); + else + return ""; }catch(Exception ex){ return ""; } @@ -37,7 +40,10 @@ public class LivestatusDatasource implements JRDataSource, JRRewindableDataSourc protected String getFieldType(String fieldname){ try{ - return map_fieldtypes.get(fieldname); + if (map_fieldtypes.containsKey(fieldname)) + return map_fieldtypes.get(fieldname); + else + return ""; }catch(Exception ex){ return ""; } @@ -66,7 +72,6 @@ public class LivestatusDatasource implements JRDataSource, JRRewindableDataSourc }else if(fieldtype.equals("list")){ ArrayList<String> res_list = new ArrayList<String>(); String[] tokens = value.split("\\|"); - System.out.println("token value " + value); for( int i = 0; i<tokens.length; i++){ res_list.add(tokens[i]); } @@ -77,6 +82,7 @@ public class LivestatusDatasource implements JRDataSource, JRRewindableDataSourc return value; } + public boolean next() throws JRException { m_nIdx++; return (m_nIdx < data.size()); diff --git a/doc/jasperreports/src/LivestatusFieldsProvider.java b/doc/jasperreports/src/LivestatusFieldsProvider.java index 164bf16..e935378 100644 --- a/doc/jasperreports/src/LivestatusFieldsProvider.java +++ b/doc/jasperreports/src/LivestatusFieldsProvider.java @@ -29,7 +29,7 @@ public class LivestatusFieldsProvider implements FieldsProvider{ @SuppressWarnings("rawtypes") public JRField[] getFields(IReportConnection con, JRDataset dataset, Map parameters) throws JRException, UnsupportedOperationException { - + JRField[] ret = null; try{ Vector<JRDesignField> jr_vector = new Vector<JRDesignField>(); @@ -42,18 +42,17 @@ public class LivestatusFieldsProvider implements FieldsProvider{ int header_count = headers.length; String descr; String type; + for( int i = 0; i < header_count; i++ ){ // Set field name JRDesignField tmp_field = new JRDesignField(); tmp_field.setName(headers[i]); - // Add field description, if available descr = data.getFieldDescription(headers[i]); if( ! descr.equals("") ) tmp_field.setDescription(descr); - // Add field class type type = data.getFieldType(headers[i]); if( ! type.equals("") ){ @@ -81,10 +80,10 @@ public class LivestatusFieldsProvider implements FieldsProvider{ ret = new JRField[jr_vector.size()]; jr_vector.toArray(ret); }catch(JRException jrex){ - throw jrex; + throw new JRException("Jasper Error evaluating query" + jrex.getMessage()); } catch(Exception ex){ - throw new JRException("Error evaluating query"); + throw new JRException("Error evaluating query:" + ex.getMessage()); } return ret; } diff --git a/doc/jasperreports/src/LivestatusQueryExecuter.java b/doc/jasperreports/src/LivestatusQueryExecuter.java index 14a389f..c39308b 100644 --- a/doc/jasperreports/src/LivestatusQueryExecuter.java +++ b/doc/jasperreports/src/LivestatusQueryExecuter.java @@ -13,10 +13,12 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import net.sf.jasperreports.engine.JRDataSource; import net.sf.jasperreports.engine.JRDataset; import net.sf.jasperreports.engine.JRException; import net.sf.jasperreports.engine.query.JRQueryExecuter; + public class LivestatusQueryExecuter implements JRQueryExecuter{ // Connection parameters private String jasper_query; // Query from jasperreports incl. connection details @@ -24,7 +26,7 @@ public class LivestatusQueryExecuter implements JRQueryExecuter{ private String server; // server name private int server_port; // server port private int timeoutInMs = 10*1000; // 10 seconds - private String fixed_appendix = "\nColumnHeaders: on\nResponseHeader: fixed16\nOutputFormat: csv\n\n"; + private String fixed_appendix = "\nColumnHeaders: on\nResponseHeader: fixed16\nSeparators: 10 1 44 124\nOutputFormat: csv\n\n"; // Socket parameters private Socket socket; // socket to server @@ -36,10 +38,17 @@ public class LivestatusQueryExecuter implements JRQueryExecuter{ public static void main(String[] args){ try { //new LivestatusQueryExecuter("localhost 6561\nGET services\nColumns: host_name check_command").createDatasource(); - - String query = "localhost 6561\nGET statehist\nColumns: state host_name service_description\nFilter: time >= 1344195720\nFilter: time <= 1344196820\nFilter: service_description = CPU load\nFilter: host_name = localhost\nStats: sum duration_ok\nStats: sum duration_warning\nStats: sum duration_critical"; - new LivestatusQueryExecuter(query).createDatasource(); - + String query = "localhost 6561\n"+ + "GET statehist\n" + + "Columns: host_name service_description\n"+ + "Filter: time >= 1344195720\n"+ + "Filter: time <= 1344195776\n"+ + "Filter: host_name = localhost\n"+ + "Stats: sum duration_ok\n"+ + "Stats: sum duration_warning\n"+ + "Stats: sum duration_critical"; + + JRDataSource sourci = new LivestatusQueryExecuter(query).createDatasource(); } catch (JRException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -69,10 +78,8 @@ public class LivestatusQueryExecuter implements JRQueryExecuter{ } public boolean cancelQuery() throws JRException { - System.out.println("ABORT QUERY"); try { if( socket.isConnected() ){ - System.out.println("STOPPED !"); socket.close(); return true; } @@ -117,9 +124,11 @@ public class LivestatusQueryExecuter implements JRQueryExecuter{ // setup socket and in/output streams setupSocket(); + // query the column types and their descriptions String table_name = livestatus_query.split("\n")[0].split(" ")[1]; - String desc_query = String.format("GET columns\nFilter: table = %s\nColumnHeaders: off\nResponseHeader: fixed16\nOutputFormat: csv\nKeepAlive: on\n\n", table_name); + String desc_query = String.format("GET columns\nFilter: table = %s\nColumnHeaders: off\nResponseHeader: fixed16\nOutputFormat: csv\nSeparators: 10 1 44 124\nKeepAlive: on\n\n", table_name); + sockOutput.write(desc_query.getBytes(), 0, desc_query.getBytes().length); // read description information @@ -129,13 +138,18 @@ public class LivestatusQueryExecuter implements JRQueryExecuter{ String line; line = in.readLine(); // Skip column headers offset += line.getBytes().length + 1; + String[] tokens; while( offset < response_size ){ - line = in.readLine(); + line = in.readLine(); if( line == null ) break; offset += line.getBytes().length + 1; - map_fielddesc.put(line.split(";")[1],line.split(";")[0]); - map_fieldtype.put(line.split(";")[1],line.split(";")[3]); + tokens = line.split("\001"); + map_fielddesc.put(tokens[1],tokens[0]); + if( tokens[1].startsWith("stats_") ) + map_fieldtype.put(tokens[1],"float"); + else + map_fieldtype.put(tokens[1],tokens[3]); } // send livestatus query to socket @@ -163,12 +177,12 @@ public class LivestatusQueryExecuter implements JRQueryExecuter{ // read content offset = 0; offset += line.getBytes().length + 1; - while( offset < response_size ){ + while( true ){ line = in.readLine(); if( line == null ) break; ArrayList<String> tmp_array = new ArrayList<String>(); - for( String field : line.split(";") ){ + for( String field : line.split("\001") ){ tmp_array.add(field); } livestatus_data.add(tmp_array); diff --git a/doc/jasperreports/src/LivestatusQueryExecuterFactory.java b/doc/jasperreports/src/LivestatusQueryExecuterFactory.java index ff6824c..db0fb84 100644 --- a/doc/jasperreports/src/LivestatusQueryExecuterFactory.java +++ b/doc/jasperreports/src/LivestatusQueryExecuterFactory.java @@ -3,15 +3,35 @@ package livestatus; import java.util.Map; import net.sf.jasperreports.engine.JRDataset; import net.sf.jasperreports.engine.JRException; +import net.sf.jasperreports.engine.JRValueParameter; import net.sf.jasperreports.engine.query.JRQueryExecuter; import net.sf.jasperreports.engine.query.JRQueryExecuterFactory; +@SuppressWarnings("deprecation") public class LivestatusQueryExecuterFactory implements JRQueryExecuterFactory{ - @SuppressWarnings("rawtypes") - public JRQueryExecuter createQueryExecuter(JRDataset dataset, Map parameters) - throws JRException { + public JRQueryExecuter createQueryExecuter(JRDataset dataset, Map<String, + ? extends JRValueParameter> parameters) throws JRException { + // TODO Auto-generated method stub + logFile("Create livestatusQueryExecut0r!\n"); return new LivestatusQueryExecuter(dataset, parameters); + } +static public void logFile(String info){ +// FileWriter writer; +// File file; +// +// file = new File("/tmp/ireport.txt"); +// try { +// writer = new FileWriter(file, true); +// writer.write(info); +// writer.write("\n"); +// writer.flush(); +// writer.close(); +// }catch (IOException e) { +// e.printStackTrace(); +// } + } + public Object[] getBuiltinParameters() { return null;

11 years, 10 months

Check_MK Git: check_mk: FIX: Fixed "access denied" problem with multisite authorization in

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9ea015629e45157769c8bf17c0a83615f2228b6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ea015629e4515… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 15 10:25:36 2012 +0100 FIX: Fixed "access denied" problem with multisite authorization in PNP/NagVis in new OMD sites which use the multisite authorization Conflicts: ChangeLog --- ChangeLog | 2 ++ web/htdocs/index.py | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 416815d..80f308d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,6 +114,8 @@ * FIX: WATO Folder filter not available when WATO disabled * FIX: WATO Folder Filter no longer available in single host views * FIX: Quicksearch converts search text to regex when accessing livestatus + * FIX: Fixed "access denied" problem with multisite authorization in PNP/NagVis + in new OMD sites which use the multisite authorization * FIX: Localize option for not OMD Environments WATO: diff --git a/web/htdocs/index.py b/web/htdocs/index.py index f7e8ebd..6eab289 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -35,7 +35,7 @@ from mod_python import apache, util, Cookie import sys, os, pprint from lib import * import livestatus -import defaults, config, htmllib, login +import defaults, config, htmllib, login, default_permissions # Load page handlers pagehandlers = {} @@ -261,6 +261,10 @@ def handler(req, profiling = True): output_format = html.var("output_format", "html") html.set_output_format(output_format) + # First initialization of the default permissions. Needs to be done before the auth_file + # (auth.php) ist written (it's done during showing the login page for the first time). + default_permissions.load() + # Is the user set by the webserver? otherwise use the cookie based auth if not req.user or type(req.user) != str: config.auth_type = 'cookie' @@ -297,8 +301,7 @@ def handler(req, profiling = True): # All plugins might have to be reloaded due to a language change load_all_plugins() - # Initialize default permissions (maybe reload due to language change) - import default_permissions + # Reload default permissions (maybe reload due to language change) default_permissions.load() # User allowed to login at all?

11 years, 10 months

Check_MK Git: check_mk: FIX: Localize option for not OMD Environments

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 895850c0f486bc8d0a98bef7c7d5131ac778d749 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=895850c0f486bc… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Nov 14 21:52:47 2012 +0100 FIX: Localize option for not OMD Environments --- ChangeLog | 1 + modules/localize.py | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2e224fc..416815d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,6 +114,7 @@ * FIX: WATO Folder filter not available when WATO disabled * FIX: WATO Folder Filter no longer available in single host views * FIX: Quicksearch converts search text to regex when accessing livestatus + * FIX: Localize option for not OMD Environments WATO: * FIX: Users & Contacts uses case-insensitive sorting of 'Full name' column diff --git a/modules/localize.py b/modules/localize.py index f5d4d9c..43d6014 100755 --- a/modules/localize.py +++ b/modules/localize.py @@ -49,10 +49,7 @@ if local_locale_dir: else: locale_base = locale_dir -if os.path.exists(local_locale_dir + '/multisite.pot'): - pot_file = local_locale_dir + '/multisite.pot' -else: - pot_file = locale_base + '/multisite.pot' +pot_file = locale_base + '/multisite.pot' try: os.makedirs(locale_base)

11 years, 10 months

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: 1b2b51336f532b0254b3414ce924dcd6e7720241 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b2b51336f532b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Nov 14 21:28:29 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 10 months

Check_MK Git: check_mk: hp_prolaint: Changes classification of unkown state to ok

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 20a5070de7012e531fb4ec4d9df832054e013ff9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20a5070de7012e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Nov 14 21:27:09 2012 +0100 hp_prolaint: Changes classification of unkown state to ok --- checks/hp_proliant | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/hp_proliant b/checks/hp_proliant index 9e7b7ea..aabc3df 100644 --- a/checks/hp_proliant +++ b/checks/hp_proliant @@ -31,8 +31,8 @@ # '.1.3.6.1.4.1.232.11.2.14.1.1.5.0' => cpqHoFwVerVersion # '.1.3.6.1.4.1.232.11.1.3.0' => cpqHoMibCondition -hp_proliant_generel_status_map = { 1: 'Other', 2: 'Ok', 3: 'Degraded', 4: 'Failed' } -hp_proliant_generel_status2nagios_map = { 'Other': 2, 'Ok': 0, 'Degraded': 1, 'Failed': 2, } +hp_proliant_generel_status_map = { 1: 'Unknown', 2: 'Ok', 3: 'Degraded', 4: 'Failed' } +hp_proliant_generel_status2nagios_map = { 'Unknown': 0, 'Ok': 0, 'Degraded': 1, 'Failed': 2, } def inventory_proliant_general(info): if len(info) > 0 and len(info[0]) > 1:

11 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits