lists.checkmk.com
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
List overview
Download
Checkmk git commits
April 2019
----- 2024 -----
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
checkmk-commits@lists.checkmk.com
15 participants
599 discussions
Start a n
N
ew thread
agent_vsphere: refactor for testing with tracefile (IV)
by Moritz Kiemer
Module: check_mk Branch: master Commit: da2244d64dea5b6f94625c3957e49accc1b1d976 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da2244d64dea5b…
Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Apr 10 08:40:07 2019 +0200 agent_vsphere: refactor for testing with tracefile (IV) Change-Id: I20f4e5df032feb63780f205c443909d163a02d1c --- agents/special/agent_vsphere | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 40541f1..1cb3d7b 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -975,7 +975,7 @@ class ESXConnection(object): "osType", ] - reply_data = self.query_server(telegram_list["systeminfo"])[1] + reply_data = self.query_server(telegram_list["systeminfo"]) for entry in systemfields: element = get_pattern("<%(entry)s.*>(.*)</%(entry)s>" % {"entry": entry}, reply_data) if element: @@ -1035,7 +1035,8 @@ class ESXConnection(object): def query_server(self, payload, payload_params=None): soapdata, payload_params = self.prepare_soapdata(payload, payload_params) - return self.send_soapdata(soapdata, payload_params) + _respose_object, response_text = self.send_soapdata(soapdata, payload_params) + return response_text def _init_headers(self, soapdata): self._server_handle.putrequest("POST", "/sdk") @@ -1066,9 +1067,8 @@ class ESXConnection(object): return self._host_cookie_path.open(encoding="utf-8").read() payload = telegram_list["login"] - response, reply_data = \ - self.query_server(payload, payload_params = {"username": encode_url(user), - "password": encode_url(secret)}) + payload_params = {"username": encode_url(user), "password": encode_url(secret)} + response, reply_data = self.send_soapdata(*self.prepare_soapdata(payload, payload_params)) if "InvalidLogin" in reply_data: raise MKGeneralException( @@ -1120,7 +1120,7 @@ def output_aggregated_snapshots(vms, hostsystems=None): def section_systemtime(connection): try: - response = connection.query_server(telegram_list["systemtime"])[1] + response = connection.query_server(telegram_list["systemtime"]) elements = get_pattern('<returnval>(.*)</returnval>', response) if elements: naive = datetime.datetime.strptime(elements[0], "%Y-%m-%dT%H:%M:%S.%fZ") @@ -1197,7 +1197,7 @@ def eval_datastores(info, datastores): def fetch_host_systems(connection): - hostsystems_response = connection.query_server(telegram_list["hostsystems"])[1] + hostsystems_response = connection.query_server(telegram_list["hostsystems"]) elements = get_pattern( '<obj type="HostSystem">(.*?)</obj>.*?<val xsi:type="xsd:string">(.*?)</val>', hostsystems_response) @@ -1214,7 +1214,7 @@ def fetch_host_systems(connection): def fetch_datastores(connection): - datastores_response = connection.query_server(telegram_list["datastores"])[1] + datastores_response = connection.query_server(telegram_list["datastores"]) elements = get_pattern('<objects><obj type="Datastore">(.*?)</obj>(.*?)</objects>', datastores_response) datastores = {} @@ -1233,7 +1233,7 @@ def fetch_counters_syntax(connection): counter_data.append("<ns1:counterId>%s</ns1:counterId>" % entry) counters_syntax_response = connection.query_server( - counter_syntax_payload, payload_params={"counters": "".join(counter_data)})[1] + counter_syntax_payload, payload_params={"counters": "".join(counter_data)}) counters_syntax = {} elements = get_pattern('<returnval><key>(.*?)</key>.*?<key>(.*?)</key>.*?'\ @@ -1251,7 +1251,7 @@ def fetch_extra_interface_counters(connection): return [] net_extra_info = [] - networksystem_response = connection.query_server(telegram_list["networksystem"])[1] + networksystem_response = connection.query_server(telegram_list["networksystem"]) nic_objects = get_pattern('<pnic><key>(.*?)</pnic>', networksystem_response) for nic in nic_objects: nic_if = get_pattern('(.*?)</key><device>(.*?)</device>(.*)<mac>(.*?)</mac>', nic) @@ -1389,7 +1389,7 @@ def output_datastores(datastores): def fetch_hostsystem_data(connection): - esxhostdetails_response = connection.query_server(telegram_list["esxhostdetails"])[1] + esxhostdetails_response = connection.query_server(telegram_list["esxhostdetails"]) hostsystems_objects = get_pattern('<objects>(.*?)</objects>', esxhostdetails_response) hostsystems_properties, hostsystems_sensors = {}, {} @@ -1471,7 +1471,7 @@ def process_counters(connection, hostsystems, datastores): ### TODO: try to get esx hosts perfdata from vCenter counter_avail = telegram_list["perfcounteravail"] counter_avail_response = connection.query_server( - counter_avail, payload_params={"esxhost": host})[1] + counter_avail, payload_params={"esxhost": host}) counters_avail = {} elements = get_pattern("<counterId>([0-9]*)</counterId><instance>([^<]*)", @@ -1492,7 +1492,7 @@ def process_counters(connection, hostsystems, datastores): "esxhost": host, "counters": "".join(counter_data), "samples": max_samples - })[1] + }) # Python regex only supports up to 100 match groups in a regex.. # We are only extracting the whole value line and split it later on # This is a perfect candidate for "Catastrophic Backtracking" :) @@ -1538,7 +1538,7 @@ def fetch_virtual_machines(connection, hostsystems, datastores): vms, vm_esx_host = {}, {} # <objects><propSet><name>...</name><val ..>...</val></propSet></objects> - vmdetails_response = connection.query_server(telegram_list["vmdetails"])[1] + vmdetails_response = connection.query_server(telegram_list["vmdetails"]) elements = get_pattern("<objects>(.*?)</objects>", vmdetails_response) for entry in elements: @@ -1583,11 +1583,11 @@ def process_clusters(connection, vm_esx_host): if opt_direct: return - response = connection.query_server(telegram_list["datacenters"])[1] + response = connection.query_server(telegram_list["datacenters"]) datacenters = get_pattern('<objects><obj type="Datacenter">(.*?)</obj>', response) for datacenter in datacenters: response = connection.query_server( - telegram_list["clustersofdatacenter"], payload_params={"datacenter": datacenter})[1] + telegram_list["clustersofdatacenter"], payload_params={"datacenter": datacenter}) clusters = get_pattern( '<objects><obj type="ClusterComputeResource">(.*?)</obj>.*?string">(.*?)</val></propSet></objects>', response) @@ -1595,7 +1595,7 @@ def process_clusters(connection, vm_esx_host): output("<<<esx_vsphere_clusters:sep(9)>>>") for cluster in clusters: response = connection.query_server( - telegram_list["esxhostsofcluster"], payload_params={"clustername": cluster[0]})[1] + telegram_list["esxhostsofcluster"], payload_params={"clustername": cluster[0]}) cluster_vms = [] hosts = get_pattern( '<objects><obj type="HostSystem">.*?string">(.*?)</val></propSet></objects>', @@ -1621,7 +1621,7 @@ def fetch_data(connection): # Licenses ########################### if "licenses" in query_objects: - licenses_response = connection.query_server(telegram_list["licensesused"])[1] + licenses_response = connection.query_server(telegram_list["licensesused"]) output_licenses(licenses_response) ###########################
5 years, 5 months
1
0
0
0
Improve readability: Handle non disk folder as early exit
by Lars Michelsen
Module: check_mk Branch: master Commit: 113a67a15d40c5058c6a0fcf90a6a7aed12868fc URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=113a67a15d40c5…
Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 10 11:34:02 2019 +0200 Improve readability: Handle non disk folder as early exit Change-Id: I99b6ff4475e04af302139aa8685280ca652fe3c7 --- cmk/gui/wato/pages/folders.py | 91 +++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 46 deletions(-) diff --git a/cmk/gui/wato/pages/folders.py b/cmk/gui/wato/pages/folders.py index d095e39..03e1e8a 100644 --- a/cmk/gui/wato/pages/folders.py +++ b/cmk/gui/wato/pages/folders.py @@ -76,55 +76,54 @@ class ModeFolder(WatoMode): def buttons(self): global_buttons() - if self._folder.is_disk_folder(): - if config.user.may("wato.rulesets") or config.user.may("wato.seeall"): - html.context_button( - _("Rulesets"), watolib.folder_preserving_link([("mode", "ruleeditor")]), - "rulesets") - html.context_button( - _("Manual Checks"), watolib.folder_preserving_link([("mode", "static_checks")]), - "static_checks") - if self._folder.may("read"): - html.context_button( - _("Folder Properties"), self._folder.edit_url(backfolder=self._folder), "edit") - if not self._folder.locked_subfolders() and config.user.may( - "wato.manage_folders") and self._folder.may("write"): - html.context_button( - _("New folder"), self._folder.url([("mode", "newfolder")]), "newfolder") - if not self._folder.locked_hosts() and config.user.may( - "wato.manage_hosts") and self._folder.may("write"): - html.context_button(_("New host"), self._folder.url([("mode", "newhost")]), "new") - html.context_button( - _("New cluster"), self._folder.url([("mode", "newcluster")]), "new_cluster") - html.context_button( - _("Bulk import"), self._folder.url([("mode", "bulk_import")]), "bulk_import") - if config.user.may("wato.services"): - html.context_button( - _("Bulk discovery"), self._folder.url([("mode", "bulkinventory"), - ("all", "1")]), "inventory") - if config.user.may("wato.rename_hosts"): - html.context_button( - _("Bulk renaming"), self._folder.url([("mode", "bulk_rename_host")]), - "rename_host") - if config.user.may("wato.custom_attributes"): - html.context_button( - _("Custom attributes"), - watolib.folder_preserving_link([("mode", "host_attrs")]), "custom_attr") - if not self._folder.locked_hosts() and config.user.may( - "wato.parentscan") and self._folder.may("write"): - html.context_button( - _("Parent scan"), self._folder.url([("mode", "parentscan"), ("all", "1")]), - "parentscan") - folder_status_button() - if config.user.may("wato.random_hosts"): - html.context_button( - _("Random Hosts"), self._folder.url([("mode", "random_hosts")]), "random") - html.context_button( - _("Search"), watolib.folder_preserving_link([("mode", "search")]), "search") - else: + if not self._folder.is_disk_folder(): html.context_button(_("Back"), self._folder.parent().url(), "back") html.context_button( _("Refine Search"), self._folder.url([("mode", "search")]), "search") + return + + if config.user.may("wato.rulesets") or config.user.may("wato.seeall"): + html.context_button( + _("Rulesets"), watolib.folder_preserving_link([("mode", "ruleeditor")]), "rulesets") + html.context_button( + _("Manual Checks"), watolib.folder_preserving_link([("mode", "static_checks")]), + "static_checks") + if self._folder.may("read"): + html.context_button( + _("Folder Properties"), self._folder.edit_url(backfolder=self._folder), "edit") + if not self._folder.locked_subfolders() and config.user.may( + "wato.manage_folders") and self._folder.may("write"): + html.context_button( + _("New folder"), self._folder.url([("mode", "newfolder")]), "newfolder") + if not self._folder.locked_hosts() and config.user.may( + "wato.manage_hosts") and self._folder.may("write"): + html.context_button(_("New host"), self._folder.url([("mode", "newhost")]), "new") + html.context_button( + _("New cluster"), self._folder.url([("mode", "newcluster")]), "new_cluster") + html.context_button( + _("Bulk import"), self._folder.url([("mode", "bulk_import")]), "bulk_import") + if config.user.may("wato.services"): + html.context_button( + _("Bulk discovery"), self._folder.url([("mode", "bulkinventory"), ("all", "1")]), + "inventory") + if config.user.may("wato.rename_hosts"): + html.context_button( + _("Bulk renaming"), self._folder.url([("mode", "bulk_rename_host")]), "rename_host") + if config.user.may("wato.custom_attributes"): + html.context_button( + _("Custom attributes"), watolib.folder_preserving_link([("mode", "host_attrs")]), + "custom_attr") + if not self._folder.locked_hosts() and config.user.may( + "wato.parentscan") and self._folder.may("write"): + html.context_button( + _("Parent scan"), self._folder.url([("mode", "parentscan"), ("all", "1")]), + "parentscan") + folder_status_button() + if config.user.may("wato.random_hosts"): + html.context_button( + _("Random Hosts"), self._folder.url([("mode", "random_hosts")]), "random") + html.context_button( + _("Search"), watolib.folder_preserving_link([("mode", "search")]), "search") def action(self): if html.request.var("_search"): # just commit to search form
5 years, 5 months
1
0
0
0
Fixed deploy script
by Sergey Kipnis
Module: check_mk Branch: master Commit: 590ee92ea70c75dc552b52c53eeaf583aeb73379 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=590ee92ea70c75…
Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Tue Apr 9 20:03:15 2019 +0200 Fixed deploy script - for the case when updating failed, uninstall is performed - when updating failed better diagnostic Change-Id: I6c461791d09626e7b1482377a6faf865bbdcea91 --- agents/wnx/call_deploy.cmd | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/agents/wnx/call_deploy.cmd b/agents/wnx/call_deploy.cmd index 8e4fa9a..010e08e 100644 --- a/agents/wnx/call_deploy.cmd +++ b/agents/wnx/call_deploy.cmd @@ -29,19 +29,27 @@ copy check_mk_agent_update.msi %ALLUSERSPROFILE%\CheckMk\Agent\update\check_mk_a powershell Start-Sleep 20 echo update > control.tmp fc "%ProgramFiles(X86)%\check_mk_service\check_mk.dat" control.tmp > nul +if not "%ERRORLEVEL%" == "0" powershell Write-Host "Update failed" -Foreground Red && fc "%ProgramFiles(X86)%\check_mk_service\check_mk.dat" control.tmp set upd=%errorlevel% del control.tmp > nul :work @rem Uninstall check powershell Write-Host "%svc% is running" -Foreground Green -if not exist %p% powershell Write-Host "Upgrade Protocol file not found" -Foreground Red && set status=5 && goto end +if not exist %p% powershell Write-Host "Upgrade Protocol file not found" -Foreground Red && set status=5 && goto end_uninstall powershell Write-Host "protocol file is found" -Foreground Green powershell Write-Host "%svc% is uninstalling" -Foreground Cyan msiexec /uninstall check_mk_agent.msi /quiet /LV* log.tmp sc query "%svc%1" > null -if %ERRORLEVEL% == 0 powershell Write-Host "Cannot Uninstall Service" -Foreground Red && set status=5 && goto end +if %ERRORLEVEL% == 0 powershell Write-Host "Cannot Uninstall Service" -Foreground Red && set status=6 && goto end powershell Write-Host "%svc% is uninstalled" -Foreground Green set status=0 +goto end +:end_uninstall +powershell Write-Host "%svc% is uninstalling" -Foreground Cyan +msiexec /uninstall check_mk_agent.msi /quiet /LV* log.tmp +sc query "%svc%1" > null +if %ERRORLEVEL% == 0 powershell Write-Host "Cannot Uninstall Service" -Foreground Red && set status=6 && goto end +powershell Write-Host "%svc% is uninstalled" -Foreground Green :end popd del %p%
5 years, 5 months
1
0
0
0
esx_vsphere_datastores: extend test
by Moritz Kiemer
Module: check_mk Branch: master Commit: 48b1b63cdb244c72c204ce9248710e0d0afd5bc6 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48b1b63cdb244c…
Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Apr 9 16:12:10 2019 +0200 esx_vsphere_datastores: extend test Change-Id: Ie7ea04dbe027f6a5f3c66ee74d27c83c03c3d1f0 --- .../datasets/esx_vsphere_datastores_regression.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/unit/checks/generictests/datasets/esx_vsphere_datastores_regression.py b/tests/unit/checks/generictests/datasets/esx_vsphere_datastores_regression.py index 37c9743..76747f8 100644 --- a/tests/unit/checks/generictests/datasets/esx_vsphere_datastores_regression.py +++ b/tests/unit/checks/generictests/datasets/esx_vsphere_datastores_regression.py @@ -46,6 +46,18 @@ checks = {'': [(u'WIN-0100-MCC15-M-L000-SSD', (0, "", [('overprovisioned', 1037195.0, None, None, None, None)]), ]), (u'WIN-0108-MCC35-U-L008-SSD-EXC2', + {'provisioning_levels': (70.0, 80.0)}, + [(0, '78.2% used (9.38 of 12.00 TB), trend: 0.00 B / 24 hours', [ + (u'WIN-0108-MCC35-U-L008-SSD-EXC2', 9836700.0, 10066124.8, 11324390.4, 0, 12582656.0), + ('fs_size', 12582656.0, None, None, None, None), + ('growth', 0.0, None, None, None, None), + ('trend', 0, None, None, 0, 524277.3333333333), + ]), + (0, 'Uncommitted: 0.00 B', [('uncommitted', 0.0, None, None, None, None)]), + (1, 'Provisioning: 78.2% (warn/crit at 70.0%/80.0%)', []), + (0, "", [('overprovisioned', 9836700.0, 8807859.2, 10066124.8, None, None)]), + ]), + (u'WIN-0108-MCC35-U-L008-SSD-EXC2', {'inodes_levels': (10.0, 5.0), 'levels': (80.0, 90.0), 'levels_low': (50.0, 60.0),
5 years, 5 months
1
0
0
0
esx_vsphere_datastores: refactor to yield & check_levels
by Moritz Kiemer
Module: check_mk Branch: master Commit: db10a491b838b38fe4fb0cf10efa5de69a23a5c7 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db10a491b838b3…
Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Apr 9 16:08:06 2019 +0200 esx_vsphere_datastores: refactor to yield & check_levels Change-Id: I477dadd24ffb8621029fa4aae9022a1cbb7e83ce --- checks/esx_vsphere_datastores | 77 ++++++++++------------ .../datasets/esx_vsphere_datastores_regression.py | 47 ++++++------- 2 files changed, 54 insertions(+), 70 deletions(-) diff --git a/checks/esx_vsphere_datastores b/checks/esx_vsphere_datastores index 887d556..9a7f7c8 100644 --- a/checks/esx_vsphere_datastores +++ b/checks/esx_vsphere_datastores @@ -59,52 +59,41 @@ def parse_esx_vsphere_datastores(info): @get_parsed_item_data def check_esx_vsphere_datastores(item, params, data): - mib = 1024.0**2 - size_bytes = data["capacity"] - avail_bytes = data["freeSpace"] - #size_mb = store["capacity"] / mib - #avail_mb = store["freeSpace"] / mib - - state, infotext, perfdata = df_check_filesystem_single(item, size_bytes / mib, - avail_bytes / mib, 0, None, None, params) - - if 'uncommitted' in data: - uncommitted_bytes = data["uncommitted"] - used_bytes = size_bytes - avail_bytes - prov_bytes = used_bytes + uncommitted_bytes - if size_bytes == 0: - prov_percent = 0 - else: - prov_percent = (prov_bytes * 100.) / size_bytes - - prov_txt = '' - warn, crit = None, None - if 'provisioning_levels' in params: - warn, crit = params['provisioning_levels'] - levels_text = " (warn/crit at %.1f%%/%.1f%%)" % (warn, crit) - if prov_percent >= crit: - state = max(state, 2) - prov_txt = levels_text + '(!!)' - elif prov_percent >= warn: - state = max(state, 1) - prov_txt = levels_text + '(!)' - - infotext += ", uncommitted: %s, provisioning: %s%s" % (get_bytes_human_readable( - uncommitted_bytes), get_percent_human_readable(prov_percent), prov_txt) - - if perfdata: - perfdata.append(('uncommitted', uncommitted_bytes / mib)) - if warn: - scale = size_bytes / mib / 100. - perfdata.append(('overprovisioned', prov_bytes / mib, scale * warn, scale * crit)) - else: - perfdata.append(('overprovisioned', prov_bytes / mib)) - if not data["accessible"]: - state = 2 - infotext = "inaccessible(!!), " + infotext + yield 2, "inaccessible" - return state, infotext, perfdata + mib = 1024.0**2 + size_bytes = data.get("capacity") + avail_bytes = data.get("freeSpace") + if size_bytes is None or avail_bytes is None: + return + + yield df_check_filesystem_single( # pylint: disable=undefined-variable + item, size_bytes / mib, avail_bytes / mib, 0, None, None, params) + + uncommitted_bytes = data.get("uncommitted") + if uncommitted_bytes is None: + return + text_uncommitted = "Uncommitted: %s" % get_bytes_human_readable(uncommitted_bytes) + yield 0, text_uncommitted, [('uncommitted', uncommitted_bytes / mib)] + + used_bytes = size_bytes - avail_bytes + prov_bytes = used_bytes + uncommitted_bytes + prov_percent = (prov_bytes * 100.) / size_bytes if size_bytes != 0 else 0 + + warn, crit = params.get('provisioning_levels', (None, None)) + yield check_levels( + prov_percent, + None, (warn, crit), + human_readable_func=get_percent_human_readable, + infoname="Provisioning") + + if warn is not None: + # convert percent to abs MiB + scale = size_bytes / mib / 100. + yield 0, "", [('overprovisioned', prov_bytes / mib, scale * warn, scale * crit)] + else: + yield 0, "", [('overprovisioned', prov_bytes / mib)] check_info['esx_vsphere_datastores'] = { diff --git a/tests/unit/checks/generictests/datasets/esx_vsphere_datastores_regression.py b/tests/unit/checks/generictests/datasets/esx_vsphere_datastores_regression.py index 273ba3a..37c9743 100644 --- a/tests/unit/checks/generictests/datasets/esx_vsphere_datastores_regression.py +++ b/tests/unit/checks/generictests/datasets/esx_vsphere_datastores_regression.py @@ -35,19 +35,16 @@ checks = {'': [(u'WIN-0100-MCC15-M-L000-SSD', 'show_reserved': False, 'trend_perfdata': True, 'trend_range': 24}, - [(0, - '24.7% used (1012.89 GB of 4.00 TB), trend: 0.00 B / 24 hours, uncommitted: 0.00 B, provisioning: 24.7%', - [(u'WIN-0100-MCC15-M-L000-SSD', - 1037195.0, - 3355238.4, - 3774643.2, - 0, - 4194048.0), - ('fs_size', 4194048.0, None, None, None, None), - ('growth', 0.0, None, None, None, None), - ('trend', 0, None, None, 0, 174752.0), - ('uncommitted', 0.0, None, None, None, None), - ('overprovisioned', 1037195.0, None, None, None, None)])]), + [(0, '24.7% used (1012.89 GB of 4.00 TB), trend: 0.00 B / 24 hours', [ + ('WIN-0100-MCC15-M-L000-SSD', 1037195.0, 3355238.4, 3774643.2, 0, 4194048.0), + ('fs_size', 4194048.0, None, None, None, None), + ('growth', 0.0, None, None, None, None), + ('trend', 0, None, None, 0, 174752.0), + ]), + (0, 'Uncommitted: 0.00 B', [('uncommitted', 0.0, None, None, None, None)]), + (0, 'Provisioning: 24.7%', []), + (0, "", [('overprovisioned', 1037195.0, None, None, None, None)]), + ]), (u'WIN-0108-MCC35-U-L008-SSD-EXC2', {'inodes_levels': (10.0, 5.0), 'levels': (80.0, 90.0), @@ -58,16 +55,14 @@ checks = {'': [(u'WIN-0100-MCC15-M-L000-SSD', 'show_reserved': False, 'trend_perfdata': True, 'trend_range': 24}, - [(0, - '78.2% used (9.38 of 12.00 TB), trend: 0.00 B / 24 hours, uncommitted: 0.00 B, provisioning: 78.2%', - [(u'WIN-0108-MCC35-U-L008-SSD-EXC2', - 9836700.0, - 10066124.8, - 11324390.4, - 0, - 12582656.0), - ('fs_size', 12582656.0, None, None, None, None), - ('growth', 0.0, None, None, None, None), - ('trend', 0, None, None, 0, 524277.3333333333), - ('uncommitted', 0.0, None, None, None, None), - ('overprovisioned', 9836700.0, None, None, None, None)])])]} + [(0, '78.2% used (9.38 of 12.00 TB), trend: 0.00 B / 24 hours', [ + (u'WIN-0108-MCC35-U-L008-SSD-EXC2', 9836700.0, 10066124.8, 11324390.4, 0, 12582656.0), + ('fs_size', 12582656.0, None, None, None, None), + ('growth', 0.0, None, None, None, None), + ('trend', 0, None, None, 0, 524277.3333333333), + ]), + (0, 'Uncommitted: 0.00 B', [('uncommitted', 0.0, None, None, None, None)]), + (0, 'Provisioning: 78.2%', []), + (0, "", [('overprovisioned', 9836700.0, None, None, None, None)]), + ])], +}
5 years, 5 months
1
0
0
0
esx_vsphere_datastores: use check API
by Moritz Kiemer
Module: check_mk Branch: master Commit: ae95b7539b96f0d5ec4ed988c8e73e586632090b URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae95b7539b96f0…
Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Apr 9 15:23:50 2019 +0200 esx_vsphere_datastores: use check API Change-Id: I176089f9805ecad39b0cd1559e2e78a80480f723 --- checks/esx_vsphere_datastores | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/checks/esx_vsphere_datastores b/checks/esx_vsphere_datastores index 459472b..887d556 100644 --- a/checks/esx_vsphere_datastores +++ b/checks/esx_vsphere_datastores @@ -34,7 +34,7 @@ # url /vmfs/volumes/513df1e9-12fd7366-ac5a-e41f13e69eaa -def esx_vsphere_datastores_parse(info): +def parse_esx_vsphere_datastores(info): stores = {} for line in info: if line[0].startswith('['): @@ -57,28 +57,19 @@ def esx_vsphere_datastores_parse(info): return stores -def inventory_esx_vsphere_datastores(info): - stores = esx_vsphere_datastores_parse(info) - return [(name, {}) for name in stores] - - -def check_esx_vsphere_datastores(item, params, info): - stores = esx_vsphere_datastores_parse(info) - if item not in stores: - return 3, "Datastore not existing" - store = stores[item] - +@get_parsed_item_data +def check_esx_vsphere_datastores(item, params, data): mib = 1024.0**2 - size_bytes = store["capacity"] - avail_bytes = store["freeSpace"] + size_bytes = data["capacity"] + avail_bytes = data["freeSpace"] #size_mb = store["capacity"] / mib #avail_mb = store["freeSpace"] / mib state, infotext, perfdata = df_check_filesystem_single(item, size_bytes / mib, avail_bytes / mib, 0, None, None, params) - if 'uncommitted' in store: - uncommitted_bytes = store["uncommitted"] + if 'uncommitted' in data: + uncommitted_bytes = data["uncommitted"] used_bytes = size_bytes - avail_bytes prov_bytes = used_bytes + uncommitted_bytes if size_bytes == 0: @@ -109,7 +100,7 @@ def check_esx_vsphere_datastores(item, params, info): else: perfdata.append(('overprovisioned', prov_bytes / mib)) - if not store["accessible"]: + if not data["accessible"]: state = 2 infotext = "inaccessible(!!), " + infotext @@ -117,7 +108,8 @@ def check_esx_vsphere_datastores(item, params, info): check_info['esx_vsphere_datastores'] = { - "inventory_function": inventory_esx_vsphere_datastores, + "parse_function": parse_esx_vsphere_datastores, + "inventory_function": discover(), "check_function": check_esx_vsphere_datastores, "service_description": "Filesystem %s", "includes": ['size_trend.include', 'df.include'],
5 years, 5 months
1
0
0
0
esx_vsphere_datastores: add test
by Moritz Kiemer
Module: check_mk Branch: master Commit: 6fea6cf921a460dcc432b76b4aec1de41b446ee6 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fea6cf921a460…
Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Apr 9 15:13:02 2019 +0200 esx_vsphere_datastores: add test Change-Id: I2083675e4152c2903c218577d08bf3864d58b906 --- .../datasets/esx_vsphere_datastores_regression.py | 73 ++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/tests/unit/checks/generictests/datasets/esx_vsphere_datastores_regression.py b/tests/unit/checks/generictests/datasets/esx_vsphere_datastores_regression.py new file mode 100644 index 0000000..cb7faa1 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/esx_vsphere_datastores_regression.py @@ -0,0 +1,73 @@ +# yapf: disable + + +checkname = 'esx_vsphere_datastores' + + +info = [ + [u'[WIN-0108-MCC35-U-L008-SSD-EXC2]'], + [u'accessible', u'true'], + [u'capacity', u'13193871097856'], + [u'freeSpace', u'2879343558656'], + [u'type', u'VMFS'], + [u'uncommitted', u'0'], + [u'url', u'/vmfs/volumes/5bacc6e6-1f214d64-5023-901b0e6d02d5'], + [u'[WIN-0100-MCC15-M-L000-SSD]'], + [u'accessible', u'true'], + [u'capacity', u'4397778075648'], + [u'freeSpace', u'3310200291328'], + [u'type', u'VMFS'], + [u'uncommitted', u'0'], + [u'url', u'/vmfs/volumes/5bc5b243-c6c57438-bc07-4c52621258cd']] + + +discovery = {'': [(u'WIN-0100-MCC15-M-L000-SSD', {}), + (u'WIN-0108-MCC35-U-L008-SSD-EXC2', {})]} + + +checks = {'': [(u'WIN-0100-MCC15-M-L000-SSD', + {'inodes_levels': (10.0, 5.0), + 'levels': (80.0, 90.0), + 'levels_low': (50.0, 60.0), + 'magic_normsize': 20, + 'show_inodes': 'onlow', + 'show_levels': 'onmagic', + 'show_reserved': False, + 'trend_perfdata': True, + 'trend_range': 24}, + [(0, + '24.7% used (1012.89 GB of 4.00 TB), trend: 0.00 B / 24 hours, uncommitted: 0.00 GB, provisioning: 24.7%', + [(u'WIN-0100-MCC15-M-L000-SSD', + 1037195.0, + 3355238.4, + 3774643.2, + 0, + 4194048.0), + ('fs_size', 4194048.0, None, None, None, None), + ('growth', 0.0, None, None, None, None), + ('trend', 0, None, None, 0, 174752.0), + ('uncommitted', 0.0, None, None, None, None), + ('overprovisioned', 1037195.0, None, None, None, None)])]), + (u'WIN-0108-MCC35-U-L008-SSD-EXC2', + {'inodes_levels': (10.0, 5.0), + 'levels': (80.0, 90.0), + 'levels_low': (50.0, 60.0), + 'magic_normsize': 20, + 'show_inodes': 'onlow', + 'show_levels': 'onmagic', + 'show_reserved': False, + 'trend_perfdata': True, + 'trend_range': 24}, + [(0, + '78.2% used (9.38 of 12.00 TB), trend: 0.00 B / 24 hours, uncommitted: 0.00 GB, provisioning: 78.2%', + [(u'WIN-0108-MCC35-U-L008-SSD-EXC2', + 9836700.0, + 10066124.8, + 11324390.4, + 0, + 12582656.0), + ('fs_size', 12582656.0, None, None, None, None), + ('growth', 0.0, None, None, None, None), + ('trend', 0, None, None, 0, 524277.3333333333), + ('uncommitted', 0.0, None, None, None, None), + ('overprovisioned', 9836700.0, None, None, None, None)])])]}
5 years, 5 months
1
0
0
0
esx_vsphere_datastores: convert bytes as late as possible
by Moritz Kiemer
Module: check_mk Branch: master Commit: eb1136f0a5503d49886ac2f7fe66dd79e816aace URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb1136f0a5503d…
Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Apr 9 15:17:36 2019 +0200 esx_vsphere_datastores: convert bytes as late as possible Change-Id: Ia39640c3598b56d4bdf83060134eeeb06508ee3c --- checks/esx_vsphere_datastores | 39 +++++++++++----------- .../datasets/esx_vsphere_datastores_regression.py | 4 +-- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/checks/esx_vsphere_datastores b/checks/esx_vsphere_datastores index b3916b3..459472b 100644 --- a/checks/esx_vsphere_datastores +++ b/checks/esx_vsphere_datastores @@ -67,20 +67,24 @@ def check_esx_vsphere_datastores(item, params, info): if item not in stores: return 3, "Datastore not existing" store = stores[item] - size_mb = store["capacity"] / 1024.0 / 1024.0 - avail_mb = store["freeSpace"] / 1024.0 / 1024.0 - state, infotext, perfdata = df_check_filesystem_single(item, size_mb, avail_mb, 0, None, None, - params) + mib = 1024.0**2 + size_bytes = store["capacity"] + avail_bytes = store["freeSpace"] + #size_mb = store["capacity"] / mib + #avail_mb = store["freeSpace"] / mib + + state, infotext, perfdata = df_check_filesystem_single(item, size_bytes / mib, + avail_bytes / mib, 0, None, None, params) if 'uncommitted' in store: - uncommitted_mb = store["uncommitted"] / 1024.0 / 1024.0 - used_mb = size_mb - avail_mb - prov_mb = used_mb + uncommitted_mb - if size_mb == 0: + uncommitted_bytes = store["uncommitted"] + used_bytes = size_bytes - avail_bytes + prov_bytes = used_bytes + uncommitted_bytes + if size_bytes == 0: prov_percent = 0 else: - prov_percent = (prov_mb / size_mb) * 100 + prov_percent = (prov_bytes * 100.) / size_bytes prov_txt = '' warn, crit = None, None @@ -94,19 +98,16 @@ def check_esx_vsphere_datastores(item, params, info): state = max(state, 1) prov_txt = levels_text + '(!)' - infotext += ", uncommitted: %.2f GB, provisioning: %.1f%%%s" % (uncommitted_mb / 1024, - prov_percent, prov_txt) + infotext += ", uncommitted: %s, provisioning: %s%s" % (get_bytes_human_readable( + uncommitted_bytes), get_percent_human_readable(prov_percent), prov_txt) + if perfdata: + perfdata.append(('uncommitted', uncommitted_bytes / mib)) if warn: - prov_warn_mb = size_mb / 100 * warn - prov_crit_mb = size_mb / 100 * crit + scale = size_bytes / mib / 100. + perfdata.append(('overprovisioned', prov_bytes / mib, scale * warn, scale * crit)) else: - prov_warn_mb = None - prov_crit_mb = None - perfdata += [ - ('uncommitted', uncommitted_mb), - ('overprovisioned', prov_mb, prov_warn_mb, prov_crit_mb), - ] + perfdata.append(('overprovisioned', prov_bytes / mib)) if not store["accessible"]: state = 2 diff --git a/tests/unit/checks/generictests/datasets/esx_vsphere_datastores_regression.py b/tests/unit/checks/generictests/datasets/esx_vsphere_datastores_regression.py index cb7faa1..273ba3a 100644 --- a/tests/unit/checks/generictests/datasets/esx_vsphere_datastores_regression.py +++ b/tests/unit/checks/generictests/datasets/esx_vsphere_datastores_regression.py @@ -36,7 +36,7 @@ checks = {'': [(u'WIN-0100-MCC15-M-L000-SSD', 'trend_perfdata': True, 'trend_range': 24}, [(0, - '24.7% used (1012.89 GB of 4.00 TB), trend: 0.00 B / 24 hours, uncommitted: 0.00 GB, provisioning: 24.7%', + '24.7% used (1012.89 GB of 4.00 TB), trend: 0.00 B / 24 hours, uncommitted: 0.00 B, provisioning: 24.7%', [(u'WIN-0100-MCC15-M-L000-SSD', 1037195.0, 3355238.4, @@ -59,7 +59,7 @@ checks = {'': [(u'WIN-0100-MCC15-M-L000-SSD', 'trend_perfdata': True, 'trend_range': 24}, [(0, - '78.2% used (9.38 of 12.00 TB), trend: 0.00 B / 24 hours, uncommitted: 0.00 GB, provisioning: 78.2%', + '78.2% used (9.38 of 12.00 TB), trend: 0.00 B / 24 hours, uncommitted: 0.00 B, provisioning: 78.2%', [(u'WIN-0108-MCC35-U-L008-SSD-EXC2', 9836700.0, 10066124.8,
5 years, 5 months
1
0
0
0
Cleaned up EMC VNX manpages
by Martin Hirschvogel
Module: check_mk Branch: master Commit: 5804eacebb35a893a9dae77d7c4eb82faf9c5439 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5804eacebb35a8…
Author: Martin Hirschvogel <mh(a)mathias-kettner.de> Date: Tue Apr 9 11:12:32 2019 +0200 Cleaned up EMC VNX manpages CMK-1834 Change-Id: Ie72d982e3d99e64b8ade73d4690dc05647868981 --- checkman/emcvnx_agent | 2 +- checkman/emcvnx_disks | 2 +- checkman/emcvnx_hba | 2 +- checkman/emcvnx_hwstatus | 2 +- checkman/emcvnx_info | 2 +- checkman/emcvnx_info.config | 2 +- checkman/emcvnx_info.io | 2 +- checkman/emcvnx_info.link | 2 +- checkman/emcvnx_info.storage | 2 +- checkman/emcvnx_mirrorview | 2 +- checkman/emcvnx_raidgroups.capacity | 3 +-- checkman/emcvnx_raidgroups.capacity_contiguous | 3 +-- checkman/emcvnx_raidgroups.list_disks | 2 +- checkman/emcvnx_raidgroups.list_luns | 2 +- checkman/emcvnx_sp_util | 2 +- checkman/emcvnx_writecache | 2 +- checkman/vnx_quotas | 4 ++-- checkman/vnx_version | 4 ++-- cmk/utils/man_pages.py | 2 ++ 19 files changed, 22 insertions(+), 22 deletions(-) diff --git a/checkman/emcvnx_agent b/checkman/emcvnx_agent index 5e6d125..93a9eb7 100644 --- a/checkman/emcvnx_agent +++ b/checkman/emcvnx_agent @@ -1,5 +1,5 @@ title: EMC VNX Storage: Info about the devices the agent controls -agents: emc +agents: emcvnx catalog: hw/storagehw/emc license: GPL distribution: check_mk diff --git a/checkman/emcvnx_disks b/checkman/emcvnx_disks index bbf9526..98c93be 100644 --- a/checkman/emcvnx_disks +++ b/checkman/emcvnx_disks @@ -1,5 +1,5 @@ title: EMC VNX Storage: Status and I/O of Disks -agents: emc +agents: emcvnx catalog: hw/storagehw/emc license: GPL distribution: check_mk diff --git a/checkman/emcvnx_hba b/checkman/emcvnx_hba index 0f8dfb9..1c48d78 100644 --- a/checkman/emcvnx_hba +++ b/checkman/emcvnx_hba @@ -1,5 +1,5 @@ title: EMC VNX Storage: iSCSI traffic on HBAs -agents: emc +agents: emcvnx catalog: hw/storagehw/emc license: GPL distribution: check_mk diff --git a/checkman/emcvnx_hwstatus b/checkman/emcvnx_hwstatus index 8229be9..812db3a 100644 --- a/checkman/emcvnx_hwstatus +++ b/checkman/emcvnx_hwstatus @@ -1,5 +1,5 @@ title: EMC VNX Storage: Hardware Status -agents: emc +agents: emcvnx catalog: hw/storagehw/emc license: GPL distribution: check_mk diff --git a/checkman/emcvnx_info b/checkman/emcvnx_info index 4494247..77c9ccf 100644 --- a/checkman/emcvnx_info +++ b/checkman/emcvnx_info @@ -1,5 +1,5 @@ title: EMC VNX Storage: Info about the IP, system time, serial number and errors -agents: emc +agents: emcvnx catalog: hw/storagehw/emc license: GPL distribution: check_mk diff --git a/checkman/emcvnx_info.config b/checkman/emcvnx_info.config index cf776c8..9710043 100644 --- a/checkman/emcvnx_info.config +++ b/checkman/emcvnx_info.config @@ -1,5 +1,5 @@ title: EMC VNX Storage: Configuration settings -agents: emc +agents: emcvnx catalog: hw/storagehw/emc license: GPL distribution: check_mk diff --git a/checkman/emcvnx_info.io b/checkman/emcvnx_info.io index 989bc6e..b1b629a 100644 --- a/checkman/emcvnx_info.io +++ b/checkman/emcvnx_info.io @@ -1,5 +1,5 @@ title: EMC VNX Storage: Info about IO -agents: emc +agents: emcvnx catalog: hw/storagehw/emc license: GPL distribution: check_mk diff --git a/checkman/emcvnx_info.link b/checkman/emcvnx_info.link index e113c56..770df85 100644 --- a/checkman/emcvnx_info.link +++ b/checkman/emcvnx_info.link @@ -1,5 +1,5 @@ title: EMC VNX Storage: Information about the management port settings -agents: emc +agents: emcvnx catalog: hw/storagehw/emc license: GPL distribution: check_mk diff --git a/checkman/emcvnx_info.storage b/checkman/emcvnx_info.storage index f027417..38d7f4e 100644 --- a/checkman/emcvnx_info.storage +++ b/checkman/emcvnx_info.storage @@ -1,5 +1,5 @@ title: EMC VNX Storage: Information about the Storage Processor -agents: emc +agents: emcvnx catalog: hw/storagehw/emc license: GPL distribution: check_mk diff --git a/checkman/emcvnx_mirrorview b/checkman/emcvnx_mirrorview index 1455b94..2f68641 100644 --- a/checkman/emcvnx_mirrorview +++ b/checkman/emcvnx_mirrorview @@ -1,5 +1,5 @@ title: EMC VNX Storage: Mirror View State -agents: emc +agents: emcvnx catalog: hw/storagehw/emc license: GPL distribution: check_mk diff --git a/checkman/emcvnx_raidgroups.capacity b/checkman/emcvnx_raidgroups.capacity index 81c4d3f..6b2529a 100644 --- a/checkman/emcvnx_raidgroups.capacity +++ b/checkman/emcvnx_raidgroups.capacity @@ -1,5 +1,5 @@ title: EMC VNX Storage: Free Capacity in RAID Groups -agents: emc +agents: emcvnx catalog: hw/storagehw/emc license: GPL distribution: check_mk @@ -18,4 +18,3 @@ item: inventory: Automatically configures one check for every RAID Group listed in the agent output. - diff --git a/checkman/emcvnx_raidgroups.capacity_contiguous b/checkman/emcvnx_raidgroups.capacity_contiguous index 6ec2af5..27fe7d8 100644 --- a/checkman/emcvnx_raidgroups.capacity_contiguous +++ b/checkman/emcvnx_raidgroups.capacity_contiguous @@ -1,5 +1,5 @@ title: EMC VNX Storage: Contiguous Free Capacity in RAID Groups -agents: emc +agents: emcvnx catalog: hw/storagehw/emc license: GPL distribution: check_mk @@ -21,4 +21,3 @@ item: inventory: Automatically configures one check for every RAID Group listed in the agent output. - diff --git a/checkman/emcvnx_raidgroups.list_disks b/checkman/emcvnx_raidgroups.list_disks index e932bb5..8ce1b89 100644 --- a/checkman/emcvnx_raidgroups.list_disks +++ b/checkman/emcvnx_raidgroups.list_disks @@ -1,5 +1,5 @@ title: EMC VNX Storage: RAID Group: List of Disks -agents: emc +agents: emcvnx catalog: hw/storagehw/emc license: GPL distribution: check_mk diff --git a/checkman/emcvnx_raidgroups.list_luns b/checkman/emcvnx_raidgroups.list_luns index 831e8e7..b644b4f 100644 --- a/checkman/emcvnx_raidgroups.list_luns +++ b/checkman/emcvnx_raidgroups.list_luns @@ -1,5 +1,5 @@ title: EMC VNX Storage: RAID Group: List of LUNs -agents: emc +agents: emcvnx catalog: hw/storagehw/emc license: GPL distribution: check_mk diff --git a/checkman/emcvnx_sp_util b/checkman/emcvnx_sp_util index 620a8f4..656d60c 100644 --- a/checkman/emcvnx_sp_util +++ b/checkman/emcvnx_sp_util @@ -1,5 +1,5 @@ title: EMC VNX Storage: Storage Processor Utilization -agents: emc +agents: emcvnx catalog: hw/storagehw/emc license: GPL distribution: check_mk diff --git a/checkman/emcvnx_writecache b/checkman/emcvnx_writecache index 95f5ff7..2639099 100644 --- a/checkman/emcvnx_writecache +++ b/checkman/emcvnx_writecache @@ -1,5 +1,5 @@ title: EMC VNX Storage: Write Cache State -agents: emc +agents: emcvnx catalog: hw/storagehw/emc license: GPL distribution: check_mk diff --git a/checkman/vnx_quotas b/checkman/vnx_quotas index a23f5df..b9c8f87 100644 --- a/checkman/vnx_quotas +++ b/checkman/vnx_quotas @@ -1,6 +1,6 @@ title: VNX NAS DBs: Quotas -agents: vnx -catalog: app/storage/vnx +agents: vnx_quotas +catalog: hw/storagehw/emc license: GPL distribution: check_mk description: diff --git a/checkman/vnx_version b/checkman/vnx_version index 7a4f6f5..c6c52ca 100644 --- a/checkman/vnx_version +++ b/checkman/vnx_version @@ -1,6 +1,6 @@ title: VNX NAS DBs: Version info -agents: vnx -catalog: app/storage/vnx +agents: vnx_quotas +catalog: hw/storagehw/emc license: GPL distribution: check_mk description: diff --git a/cmk/utils/man_pages.py b/cmk/utils/man_pages.py index fdbf7d0..5db732b 100644 --- a/cmk/utils/man_pages.py +++ b/cmk/utils/man_pages.py @@ -254,6 +254,8 @@ check_mk_agents = { "openvms": "OpenVMS", "vsphere": "vSphere", "nutanix": "Nutanix", + "emcvnx": "EMC VNX", + "vnx_quotas": "VNX Quotas" } _manpage_catalog = {} # type: ignore
5 years, 5 months
1
0
0
0
Removed a few useless IYWU pragmas.
by Sven Panne
Module: check_mk Branch: master Commit: 763b1d8d6d54f9932bf03a45866c811b99f2db0d URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=763b1d8d6d54f9…
Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Apr 10 09:41:17 2019 +0200 Removed a few useless IYWU pragmas. Change-Id: I5c313eae7f9a4670bd05a610bfdd0d2aa1002b86 --- livestatus/src/Logfile.cc | 2 -- livestatus/src/PerfdataAggregator.cc | 1 - 2 files changed, 3 deletions(-) diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index c9edd66..7251a1c 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -22,8 +22,6 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. -//
https://github.com/include-what-you-use/include-what-you-use/issues/166
-// IWYU pragma: no_include <ext/alloc_traits.h> #include "Logfile.h" #include <fcntl.h> #include <cstdlib> diff --git a/livestatus/src/PerfdataAggregator.cc b/livestatus/src/PerfdataAggregator.cc index 3a2e334..709710c 100644 --- a/livestatus/src/PerfdataAggregator.cc +++ b/livestatus/src/PerfdataAggregator.cc @@ -22,7 +22,6 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. -// IWYU pragma: no_include <type_traits> #include "PerfdataAggregator.h" #include <cmath> #include <functional>
5 years, 5 months
1
0
0
0
← Newer
1
...
31
32
33
34
35
36
37
...
60
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
Results per page:
10
25
50
100
200