Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64625 discussions

Check_MK Git: check_mk: online help text for host creation in WATO now also explains hostname caching

by Götz Golla

Module: check_mk Branch: master Commit: b2049a8d2fadda3241928c8f648400e6bea6f74e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2049a8d2fadda… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Apr 23 11:56:31 2014 +0200 online help text for host creation in WATO now also explains hostname caching --- .werks/607 | 8 ++++++++ ChangeLog | 1 + web/plugins/wato/builtin_attributes.py | 16 +++++++++++----- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.werks/607 b/.werks/607 new file mode 100644 index 0000000..4a4e281 --- /dev/null +++ b/.werks/607 @@ -0,0 +1,8 @@ +Title: online help text for host creation in WATO now also explains hostname caching +Level: 1 +Component: wato +Version: 1.2.5i3 +Date: 1398246911 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index c7c2262..21b06c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ WATO: * 0784 Improved security of WATO bulk inventory by using transaction ids * 0880 Added support for 389 Directory Server to LDAP connector + * 0607 online help text for host creation in WATO now also explains hostname caching * 0781 FIX: host diag page: fixed problem with update of diagnose subwindows... Notifications: diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index ea3c261..05876b2 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -37,11 +37,17 @@ declare_host_attribute(NagiosTextAttribute("alias", "alias", _("Alias"), declare_host_attribute(TextAttribute("ipaddress", _("IP address"), _("In case the name of the host is not resolvable via <tt>/etc/hosts</tt> " "or DNS by your monitoring server, you can specify an explicit IP " - "address or a resolvable DNS name of the host here. Note: If you leave " - "this attribute empty, then DNS resolution will be done when you activate " - "the configuration. When you enter a DNS name here, the DNS resolution will " - "be done each time the host is checked. Use this only for hosts with " - "dynamic IP addresses."), + "address or a resolvable DNS name of the host here. Notes: " + "1. If you leave this attribute empty, hostname resolution will be done when " + "you activate the configuration. " + "Check_MKs builtin DNS cache is activated per default in the global " + "configuration to speed up the activation process. The cache is normally " + "updated daily with a cron job. You can manually update the cache with the " + "command <tt>cmk -v --update-dns-cache</tt>. " + "2. If you enter a DNS name here, the DNS resolution will be carried out " + "each time the host is checked. Check_MKs DNS cache will NOT be queried. " + "Use this only for hosts with dynamic IP addresses." + ), allow_empty = False), show_in_table = True, show_in_folder = False)

10 years, 5 months

Check_MK Git: check_mk: Added draft for virtual host trees

by Mathias Kettner

Module: check_mk Branch: master Commit: 01d2b4c69488f3f112572cb2306904b78f9be8a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01d2b4c69488f3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 23 11:16:45 2014 +0200 Added draft for virtual host trees --- doc/drafts/LIESMICH.baum_anhand_von_tags | 52 ++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/doc/drafts/LIESMICH.baum_anhand_von_tags b/doc/drafts/LIESMICH.baum_anhand_von_tags new file mode 100644 index 0000000..c14a81d --- /dev/null +++ b/doc/drafts/LIESMICH.baum_anhand_von_tags @@ -0,0 +1,52 @@ +Konzept für ein automatisches Erzeugen eines Baumes +--------------------------------------------------- + +Ausgangspunkt: WATO sieht über die Ordnerstruktur für Hosts vor, dass man +diese hierarchisch organisieren kann. Nun gibt es hier leider nur einen +Baum. Manchmal möchte man die Hosts nur unter dem Gesichtspunkt von +anderen Hierarchien sehen. + +Die Idee ist jetzt, dass man dazu die vorhandenen Hosttag-Gruppen +verwendet. Denn jeder Host hat in jeder Taggruppe genau einen +Wert. Der Benutzer könnte jetzt eine Anzahl von Taggruppen +herauspicken, z.B.: + +1. Standort +2. Anwendung +3. Kritikalität + +Diese können dann in hierarchieebenen eines logischen Baumes +umgewandelt werden. Auf der obersten Ebene wäre der Standort, +darunter die Anwendung, darunter die Kritikalität. + +Das ganze könnte man wie folgt umsetzen: + +1. In den globalen Einstellungen für Multisite fügen wir eine neue Option ein, +mit der man beliebige virtuelle Baumansichten anlegen kann. Das wird als +Liste realisiert. Dort kann man pro Eintrag eingeben: + - Einen Titel für die Ansicht + - Eine sortierte Liste von Hosttaggruppen, die den Baum bilden sollen. + +2. Ein neues Sidebar-Snanip "Virtuelle Baumansicht" wird geschrieben. Dieses + erlaubt die Auswahl einer der oben realisierten virtuellen Bäume (falls + es mehr als einen gibt). Es stellt dann diesen Baum zum Aufklappen dar. + + Wenn man auf einen Ast klickt, ergibt sich dadurch eine Liste von + Hosttags bzw. von nicht vorhandenen Hosttags (wenn man bei Checkbox- + Hosttags den negativen Wert wählt, oder ein Tag leer ist). + + Man landet dann auf der Ansicht "All Hosts", bei welcher der Filter + für die Host-Tags vorausgefüllt ist. + +3. Die Ansicht "All Hosts" bekommt standardmäßig immer den Filter für + die Host Tags. + + +Eine mögliche Ausbaustufe wäre, dass man das Verhalten des neuen +Snapins analog zu dem "Folders"-Snapin macht. Das würde bedeuten, +dass man nicht immer auf die Ansicht "All Hosts" gelangt, sondern +auf die jeweils gewählte Ansicht. Dazu müsste in jeder Ansicht +der Hosttag-Filter implizit vorhanden sein. Außerdem müsste +der kombinierte Filter aus Ordner und Tags dann sauber funktionieren. +Frage ist, ob das nicht zu komplex wird. +

10 years, 5 months

Check_MK Git: check_mk: BI availability: fix exception on timewarp to non-existing time

by Mathias Kettner

Module: check_mk Branch: master Commit: 9579afcce723750906736a25b98b5818654568d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9579afcce72375… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 23 10:27:18 2014 +0200 BI availability: fix exception on timewarp to non-existing time --- web/plugins/views/availability.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 817522b..601d313 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -1367,7 +1367,7 @@ def render_bi_availability(title, aggr_rows): timewarp = None these_rows, tree_state = get_bi_timeline(tree, aggr_row["aggr_group"], avoptions, timewarp) rows += these_rows - if timewarp: + if timewarp and tree_state: state, assumed_state, node, subtrees = tree_state eff_state = state if assumed_state != None:

10 years, 5 months

Check_MK Git: check_mk: BI: speedup availability computation

by Mathias Kettner

Module: check_mk Branch: master Commit: 66e2e1d254c95c8454a8374c8fc867ff9a97810f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66e2e1d254c95c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 23 10:07:43 2014 +0200 BI: speedup availability computation --- web/plugins/views/availability.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 5a60a48..817522b 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -1422,9 +1422,22 @@ def get_bi_timeline(tree, aggr_group, avoptions, timewarp): "Columns: " + " ".join(columns) + "\n" +\ "Filter: time >= %d\nFilter: time <= %d\n" % range - for host in hosts: + # Create a specific filter. We really only want the services and hosts + # of the aggregation in question. That prevents status changes + # irrelevant services from introducing new phases. + by_host = {} + for site, host, service in bi.find_all_leaves(tree): + by_host.setdefault(host, set([])).add(service) + + for host, services in by_host.items(): query += "Filter: host_name = %s\n" % host - query += "Or: %d\n" % len(hosts) + query += "Filter: service_description = \n" + for service in services: + query += "Filter: service_description = %s\n" % service + query += "Or: %d\nAnd: 2\n" % (len(services) + 1) + if len(hosts) != 1: + query += "Or: %d\n" % len(hosts) + data = html.live.query(query) if not data: raise MKGeneralException(_("No historical data available for this aggregation. Query was: <pre>%s</pre>") % query)

10 years, 5 months

Check_MK Git: check_mk: fixed typographic errors, especially missing blank between number and unit

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 2c1789c0cd5317ded32684b009133c1d98eb3e3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c1789c0cd5317… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Apr 22 19:59:30 2014 +0200 fixed typographic errors, especially missing blank between number and unit --- checks/cpu_util.include | 4 ++-- checks/df.include | 10 +++++----- checks/ibm_svc_nodestats | 6 +++--- checks/ibm_svc_systemstats | 6 +++--- modules/check_mk_base.py | 32 ++++++++++++++++---------------- web/plugins/perfometer/check_mk.py | 14 +++++++------- 6 files changed, 36 insertions(+), 36 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2c1789c0cd…

10 years, 5 months

Check_MK Git: check_mk: ibm_svc_nodestats.disk_latency, ibm_svc_systemstats .disk_latency: New Checks for Disk Latency in IBM SVC / Storwize V3700 / V7000 devices

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 243bbf3534a17fc214160c8114ec006dc797570c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=243bbf3534a17f… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Apr 22 18:42:17 2014 +0200 ibm_svc_nodestats.disk_latency, ibm_svc_systemstats.disk_latency: New Checks for Disk Latency in IBM SVC / Storwize V3700 / V7000 devices --- .werks/898 | 8 +++ ChangeLog | 1 + checkman/ibm_svc_nodestats.disk_latency | 24 +++++++ checkman/ibm_svc_systemstats.disk_latency | 24 +++++++ checks/ibm_svc_nodestats | 67 +++++++++++++++----- checks/ibm_svc_systemstats | 47 ++++++++++++-- .../check_mk-ibm_svc_nodestats.disk_latency.php | 59 +++++++++++++++++ .../check_mk-ibm_svc_systemstats.disk_latency.php | 1 + web/plugins/perfometer/check_mk.py | 10 +++ 9 files changed, 220 insertions(+), 21 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=243bbf3534…

10 years, 5 months

Check_MK Git: check_mk: improving check manpage for wagner_titanus_topsense .airflow_deviation

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 2ad7e7167b23b3516b821cd201f6569422ddd6d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ad7e7167b23b3… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Apr 22 17:16:20 2014 +0200 improving check manpage for wagner_titanus_topsense.airflow_deviation --- checkman/wagner_titanus_topsense.airflow_deviation | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/checkman/wagner_titanus_topsense.airflow_deviation b/checkman/wagner_titanus_topsense.airflow_deviation index 2875f97..2db4c6f 100644 --- a/checkman/wagner_titanus_topsense.airflow_deviation +++ b/checkman/wagner_titanus_topsense.airflow_deviation @@ -37,17 +37,17 @@ examples: ] [parameters] -lower_crit(float): If the airflow deviation in percent from the set point - is lower or equal this value, the check returns {CRIT}. -lower_warn(float): If the airflow deviation in percent from the set point - is lower or equal this value, the check returns {WARN}. -upper_warn(float): If the airflow deviation in percent from the set point - is higher or equal this value, the check returns {WARN}. -upper_crit(float): If the airflow deviation in percent from the set point - is higher or equal this value, the check returns {CRIT}. +parameters (tuple): Containing the four numbers lower_crit, lower_warn, upper_warn, upper_crit. + If the airflow deviation in percent from the set point + is lower or equal lower_crit, the check returns {CRIT}. + If the airflow deviation in percent from the set point + is lower or equal lower_warn, the check returns {WARN}. + If the airflow deviation in percent from the set point + is higher or equal upper_warn, the check returns {WARN}. + If the airflow deviation in percent from the set point + is higher or equal upper_crit, the check returns {CRIT}. [configuration] wagner_titanus_topsense_airflow_deviation_default_values(float, float, float, float): - Lower level for critical, lower level for warning, upper level for warning, - upper level for critical, all in percent. - Defaults to (-20.0, -20.0, 20.0, 20.0) + Default values for lower_crit, lower_warn, upper_warn, upper_crit, + preset to (-20.0, -20.0, 20.0, 20.0)

10 years, 5 months

Check_MK Git: check_mk: wagner_titanus_topsense.temp: New Check for Temperature measured by Wagner Titanus Top Sens devices

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: fca5c62bfd8466339fcefed3de39ca3dbb7de976 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fca5c62bfd8466… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Apr 22 17:10:17 2014 +0200 wagner_titanus_topsense.temp: New Check for Temperature measured by Wagner Titanus Top Sens devices --- .werks/897 | 8 ++++ ChangeLog | 3 +- checkman/wagner_titanus_topsense.temp | 43 +++++++++++++++++ checks/wagner_titanus_topsense | 49 +++++++++++++++++++- .../check_mk-wagner_titanus_topsense.temp.php | 1 + web/plugins/perfometer/check_mk.py | 1 + 6 files changed, 103 insertions(+), 2 deletions(-) diff --git a/.werks/897 b/.werks/897 new file mode 100644 index 0000000..e0c01b1 --- /dev/null +++ b/.werks/897 @@ -0,0 +1,8 @@ +Title: wagner_titanus_topsense.temp: New Check for Temperature measured by Wagner Titanus Top Sens devices +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1398179376 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 7c05bee..d51b00a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,8 +32,9 @@ * 0893 wagner_titanus_topsense.alarm: New check for Alarms Triggered on Wagner Titanus Top Sens devices * 0894 wagner_titanus_topsense.smoke: New check for Smoke Detectors in Wagner Titanus Top Sens devices * 0895 wagner_titanus_topsense.chamber_deviation: New Check for Chamber Deviation from Calibration Point in Wagner Titanus Top Sens devices - * 0896 wagner_titanus_topsense.airflow_deviation: New Check for Airflow Deviation in Wagner Titanus Top Sens devices * 0152 fsc_fans: Added support for Wato configuration and upper limits + * 0896 wagner_titanus_topsense.airflow_deviation: New Check for Airflow Deviation in Wagner Titanus Top Sens devices + * 0897 wagner_titanus_topsense.temp: New Check for Temperature measured by Wagner Titanus Top Sens devices * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/checkman/wagner_titanus_topsense.temp b/checkman/wagner_titanus_topsense.temp new file mode 100644 index 0000000..fd34c68 --- /dev/null +++ b/checkman/wagner_titanus_topsense.temp @@ -0,0 +1,43 @@ +title: Wagner Titanus Top Sens: Temperature +agents: snmp +catalog: hw/environment/wagner +license: GPL +distribution: check_mk +description: + Checks the temperature measured by Detectors in Wagner Titanus Top Sens devices. + + Returns {WARN} or {CRIT} if the value exeeds given levels and {OK} otherwise. + +inventory: + Creates two checks per device, one for every Detector. + +item: + The ID of the detector. + +perfdata: + One value: The temperature in degree celsius, together with levels for warning + and critical. + +examples: + # set other default levels + wagner_titanus_topsense_temperature_default_values = (25, 40) + + # check detector 1 with default levels + checks += [ + ("ras", "wagner_titanus_topsense.temp", '1', wagner_titanus_topsense_temperature_default_values) + ] + + # check detector 1 with individual levels + checks += [ + ( "ras", "wagner_titanus_topsense.temp", '1', (20, 50) ) + ] + +[parameters] +parameters (tuple): A pair of numbers for warn and crit level. + If the temperature in degree celsius is higher or equal warn, + the check returns {WARN}. If the temperature in degree celsius is higher + or equal crit, the check returns {CRIT}. + +[configuration] +wagner_titanus_topsense_temperature_default_values(int, int): + Default levels for warning and critical, preset to (30, 35) diff --git a/checks/wagner_titanus_topsense b/checks/wagner_titanus_topsense index 587ccfd..53bee65 100644 --- a/checks/wagner_titanus_topsense +++ b/checks/wagner_titanus_topsense @@ -48,7 +48,9 @@ wagner_titanus_topsense_info = [(".1.3.6.1.2.1.1", [1, # 245950000, # tsD1ChamberValueString 246090000, # tsD2ChamberValueString 245960000, # tsD1AirFlowDeviationString - 246100000]), # tsD2AirFlowDeviationString + 246100000, # tsD2AirFlowDeviationString + 245970000, # tsD1AirTemperatureString + 246110000]), # tsD2AirTemperatureString ] def wagner_titanus_topsense_scan(oid): @@ -295,3 +297,48 @@ check_info["wagner_titanus_topsense.airflow_deviation"] = { } #. +# .--air temp------------------------------------------------------------. +# | _ _ | +# | __ _(_)_ __ | |_ ___ _ __ ___ _ __ | +# | / _` | | '__| | __/ _ \ '_ ` _ \| '_ \ | +# | | (_| | | | | || __/ | | | | | |_) | | +# | \__,_|_|_| \__\___|_| |_| |_| .__/ | +# | |_| | +# '----------------------------------------------------------------------' + +wagner_titanus_topsense_temperature_default_values = (30, 35) + +def inventory_wagner_titanus_topsense_temp(info): + return [ ("1", "wagner_titanus_topsense_temperature_default_values"), + ("2", "wagner_titanus_topsense_temperature_default_values") ] + +def check_wagner_titanus_topsense_temp(item, params, info): + warn, crit = params + status=0 + if item == "1": + temp = float(info[2][0][7]) + elif item == "2": + temp = float(info[2][0][8]) + else: + return 3, "Temperature Detector %s not found in SNMP" % item + + if temp >= warn: + status = 1 + if temp >= crit: + status = 2 + + perfdata = [("temp", str(temp) + "C", warn, crit)] + + return status, "Temperature is %0.2f °C" % temp, perfdata + +check_info["wagner_titanus_topsense.temp"] = { + "check_function" : check_wagner_titanus_topsense_temp, + "inventory_function" : inventory_wagner_titanus_topsense_temp, + "service_description" : "Temperature Detector %s", + "has_perfdata" : True, + "group" : "room_temperature", + "snmp_info" : wagner_titanus_topsense_info, + "snmp_scan_function" : wagner_titanus_topsense_scan +} + +#. diff --git a/pnp-templates/check_mk-wagner_titanus_topsense.temp.php b/pnp-templates/check_mk-wagner_titanus_topsense.temp.php new file mode 120000 index 0000000..23897c1 --- /dev/null +++ b/pnp-templates/check_mk-wagner_titanus_topsense.temp.php @@ -0,0 +1 @@ +check_mk-hitachi_hnas_temp.php \ No newline at end of file diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 94bdf97..166ae6f 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -288,6 +288,7 @@ perfometers["check_mk-dell_chassis_temp"] = perfometer_temperature perfometers["check_mk-innovaphone_temp"] = perfometer_temperature perfometers["check_mk-cmciii.temp"] = perfometer_temperature perfometers["check_mk-ibm_svc_enclosurestats.temp"] = perfometer_temperature +perfometers["check_mk-wagner_titanus_topsense.temp"] = perfometer_temperature def perfometer_temperature_multi(row, check_command, perf_data): display_value = -1

10 years, 5 months

Check_MK Git: check_mk: BI: Add error message when no statehist data available

by Mathias Kettner

Module: check_mk Branch: master Commit: f1bd57cecc7bfbc0d61917da55e80c82a6083325 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1bd57cecc7bfb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 22 17:09:07 2014 +0200 BI: Add error message when no statehist data available --- web/plugins/views/availability.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index a76f7f0..5a60a48 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -1354,6 +1354,8 @@ def render_bi_availability(title, aggr_rows): html.end_context_buttons() avoptions = render_availability_options() + timewarpcode = "" + if not html.has_user_errors(): rows = [] for aggr_row in aggr_rows: @@ -1424,6 +1426,9 @@ def get_bi_timeline(tree, aggr_group, avoptions, timewarp): query += "Filter: host_name = %s\n" % host query += "Or: %d\n" % len(hosts) data = html.live.query(query) + if not data: + raise MKGeneralException(_("No historical data available for this aggregation. Query was: <pre>%s</pre>") % query) + html.live.set_prepend_site(False) html.live.set_only_sites(None) columns = ["site"] + columns

10 years, 5 months

Check_MK Git: check_mk: wagner_titanus_topsense.chamber_deviation: New Check for Chamber Deviation from Calibration Point in Wagner Titanus Top Sens devices

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: b348a989f9939cb6ec9270b0f39bb55a513a5762 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b348a989f9939c… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Apr 17 16:11:33 2014 +0200 wagner_titanus_topsense.chamber_deviation: New Check for Chamber Deviation from Calibration Point in Wagner Titanus Top Sens devices --- .werks/895 | 8 +++++ ChangeLog | 1 + checkman/wagner_titanus_topsense.chamber_deviation | 21 +++++++++++ checks/wagner_titanus_topsense | 38 +++++++++++++++++++- ...k-wagner_titanus_topsense.chamber_deviation.php | 34 ++++++++++++++++++ web/plugins/perfometer/check_mk.py | 6 ++++ 6 files changed, 107 insertions(+), 1 deletion(-) diff --git a/.werks/895 b/.werks/895 new file mode 100644 index 0000000..41dac2c --- /dev/null +++ b/.werks/895 @@ -0,0 +1,8 @@ +Title: wagner_titanus_topsense.chamber_deviation: New Check for Chamber Deviation from Calibration Point in Wagner Titanus Top Sens devices +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1397743848 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index b4e41b8..fdaa40b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ * 0892 wagner_titanus_topsense: new info check and overall status check for Wagner Titanus Top Sens devices * 0893 wagner_titanus_topsense.alarm: New check for Alarms Triggered on Wagner Titanus Top Sens devices * 0894 wagner_titanus_topsense.smoke: New check for Smoke Detectors in Wagner Titanus Top Sens devices + * 0895 wagner_titanus_topsense.chamber_deviation: New Check for Chamber Deviation from Calibration Point in Wagner Titanus Top Sens devices * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/checkman/wagner_titanus_topsense.chamber_deviation b/checkman/wagner_titanus_topsense.chamber_deviation new file mode 100644 index 0000000..a736b94 --- /dev/null +++ b/checkman/wagner_titanus_topsense.chamber_deviation @@ -0,0 +1,21 @@ +title: Wagner Titanus Top Sens: Chamber Deviation from Calibration Point +agents: snmp +catalog: hw/environment/wagner +license: GPL +distribution: check_mk +description: + Reports the Chamber Deviation from Calibration Point of Detectors in + Wagner Titanus Top Sens devices. The value is in percent from the chamber + deviation limits, where a chamber fault condition occures. + + The check is informational only and returns always {OK}. + +inventory: + Creates two checks, one for every Detector. + +item: + The ID of the detector. + +perfdata: + One value: The chamber deviation in percent from the chamber deviation + limits. diff --git a/checks/wagner_titanus_topsense b/checks/wagner_titanus_topsense index 7fec122..100038f 100644 --- a/checks/wagner_titanus_topsense +++ b/checks/wagner_titanus_topsense @@ -44,7 +44,9 @@ wagner_titanus_topsense_info = [(".1.3.6.1.2.1.1", [1, # (".1.3.6.1.4.1.34187.21501.2.1", [24584008, # tsLSNbusOnline 0 # offline(0),online(1) 245810000, # tsBarGraph1String - 245820000]), # tsBarGraph2String + 245820000, # tsBarGraph2String + 245950000, # tsD1ChamberValueString + 246090000]), # tsD2ChamberValueString ] def wagner_titanus_topsense_scan(oid): @@ -212,3 +214,37 @@ check_info["wagner_titanus_topsense.smoke"] = { } #. +# .--chamber deviation---------------------------------------------------. +# | _ _ _ | +# | ___| |__ __ _ _ __ ___ | |__ ___ _ __ __| | _____ __ | +# | / __| '_ \ / _` | '_ ` _ \| '_ \ / _ \ '__| / _` |/ _ \ \ / / | +# | | (__| | | | (_| | | | | | | |_) | __/ | | (_| | __/\ V / | +# | \___|_| |_|\__,_|_| |_| |_|_.__/ \___|_| \__,_|\___| \_/ | +# | | +# '----------------------------------------------------------------------' + +def inventory_wagner_titanus_topsense_chamber_deviation(info): + return [ ("1", None), ("2", None) ] + +def check_wagner_titanus_topsense_chamber_deviation(item, _no_params, info): + if item == "1": + chamber_deviation = float(info[2][0][3]) + elif item == "2": + chamber_deviation = float(info[2][0][4]) + else: + return 3, "Chamber Deviation Detector %s not found in SNMP" % item + + perfdata = [("chamber_deviation", chamber_deviation)] + + return 0, "%0.6f%% Chamber Deviation" % chamber_deviation, perfdata + +check_info["wagner_titanus_topsense.chamber_deviation"] = { + "check_function" : check_wagner_titanus_topsense_chamber_deviation, + "inventory_function" : inventory_wagner_titanus_topsense_chamber_deviation, + "service_description" : "Chamber Deviation Detector %s", + "has_perfdata" : True, + "snmp_info" : wagner_titanus_topsense_info, + "snmp_scan_function" : wagner_titanus_topsense_scan +} + +#. diff --git a/pnp-templates/check_mk-wagner_titanus_topsense.chamber_deviation.php b/pnp-templates/check_mk-wagner_titanus_topsense.chamber_deviation.php new file mode 100644 index 0000000..f9009e4 --- /dev/null +++ b/pnp-templates/check_mk-wagner_titanus_topsense.chamber_deviation.php @@ -0,0 +1,34 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + +$opt[1] = "--vertical-label \"%\" -l 0 --title \"$hostname / $servicedesc\" "; + +$def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:MAX "; +$def[1] .= "AREA:var1#000080:\"Chamber Deviation\:\" "; +$def[1] .= "GPRINT:var1:LAST:\"%0.6lf%%\" "; +$def[1] .= "LINE1:var1#000080:\"\" "; +$def[1] .= "GPRINT:var1:MAX:\"(Max\: %0.6lf%%,\" "; +$def[1] .= "GPRINT:var1:AVERAGE:\"Avg\: %0.6lf%%)\" "; +?> diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 63d1258..9b9984e 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -937,3 +937,9 @@ def perfometer_smoke_percent(row, command, perf): return "%0.6f%%" % used_perc, perfometer_linear(used_perc, "#404040") perfometers['check_mk-wagner_titanus_topsense.smoke'] = perfometer_smoke_percent + +def perfometer_chamber_deviation(row, command, perf): + chamber_dev = float(perf[0][1]) + return "%0.6f%%" % chamber_dev, perfometer_linear(chamber_dev, "#000080") + +perfometers['check_mk-wagner_titanus_topsense.chamber_deviation'] = perfometer_chamber_deviation

10 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits