Bumped YAPF 0.30.0 => 0.31.1.

Fixed some typos on the way. Change-Id: I6a3e6326373051b4884fde12384d5ba8869dd31a
Checkmk · May 25, 2021 · ffa85d9 · ffa85d9
1 parent 9c07a12
commit ffa85d9
Show file tree

Hide file tree

Showing 215 changed files with 220 additions and 11 deletions.
diff --git a/Pipfile b/Pipfile
@@ -130,7 +130,7 @@ dnspython = "==1.16.0"  # needed by python-active-directory
 python-active-directory = "==1.0.5"
 rrdtool = "==0.1.15"  # Actually we ship the binding which comes with rrdtool itself...
 docstring_parser = "==0.7.2"  # direct dependency
-yapf = "==0.30.0"  # formatter for REST-API documentation code examples
+yapf = "==0.31.0"  # formatter for REST-API documentation code examples
 pyprof2calltree = "==1.4.5"  # used for GUI/API profiling
 repoze-profile = "==2.3"  # used for GUI/API profiling
 pyparsing = "==2.4.7"  # direct dependency

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/active_checks/check_elasticsearch_query b/active_checks/check_elasticsearch_query
@@ -11,6 +11,7 @@ import requests
 import urllib3  # type: ignore[import]
 from cmk.utils.exceptions import MKGeneralException
 import cmk.utils.password_store
+
 cmk.utils.password_store.replace_passwords()
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 

diff --git a/active_checks/check_sql b/active_checks/check_sql
@@ -16,6 +16,7 @@ import os
 import sys
 
 import cmk.utils.password_store
+
 cmk.utils.password_store.replace_passwords()
 
 LOG = logging.getLogger(__name__)

diff --git a/checks/3par_ports b/checks/3par_ports
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.threepar import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings['threepar_ports_default_levels'] = {
     "1_link": 1,
     "2_link": 1,

diff --git a/checks/akcp_daisy_temp b/checks/akcp_daisy_temp
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.temperature import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings["akcp_daisy_temp_defaultlevels"] = {"levels": (28, 32)}
 
 

diff --git a/checks/akcp_sensor_drycontact b/checks/akcp_sensor_drycontact
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.akcp_sensor import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 check_info["akcp_sensor_drycontact"] = {
     "check_function": check_akcp_sensor_drycontact,
     "inventory_function": inventory_akcp_sensor_no_params,

diff --git a/checks/alcatel_cpu b/checks/alcatel_cpu
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.alcatel import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings['alcatel_temp'] = ALCATEL_TEMP_CHECK_DEFAULT_PARAMETERS
 
 check_info["alcatel_cpu"] = {

diff --git a/checks/alcatel_cpu_aos7 b/checks/alcatel_cpu_aos7
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.alcatel import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings['alcatel_temp'] = ALCATEL_TEMP_CHECK_DEFAULT_PARAMETERS
 
 check_info["alcatel_cpu_aos7"] = {

diff --git a/checks/alcatel_fans b/checks/alcatel_fans
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.alcatel import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings['alcatel_temp'] = ALCATEL_TEMP_CHECK_DEFAULT_PARAMETERS
 
 check_info["alcatel_fans"] = {

diff --git a/checks/alcatel_fans_aos7 b/checks/alcatel_fans_aos7
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.alcatel import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings['alcatel_temp'] = ALCATEL_TEMP_CHECK_DEFAULT_PARAMETERS
 
 check_info["alcatel_fans_aos7"] = {

diff --git a/checks/alcatel_power b/checks/alcatel_power
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.alcatel import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings['alcatel_temp'] = ALCATEL_TEMP_CHECK_DEFAULT_PARAMETERS
 
 alcatel_power_operstate_map = {

diff --git a/checks/alcatel_power_aos7 b/checks/alcatel_power_aos7
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.alcatel import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings['alcatel_temp'] = ALCATEL_TEMP_CHECK_DEFAULT_PARAMETERS
 
 alcatel_power_aos7_operability_to_status_mapping = {

diff --git a/checks/alcatel_temp b/checks/alcatel_temp
@@ -14,6 +14,7 @@ from cmk.base.check_legacy_includes.alcatel import *  # pylint: disable=wildcard
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.temperature import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings['alcatel_temp'] = ALCATEL_TEMP_CHECK_DEFAULT_PARAMETERS
 
 check_info["alcatel_temp"] = {

diff --git a/checks/alcatel_temp_aos7 b/checks/alcatel_temp_aos7
@@ -14,6 +14,7 @@ from cmk.base.check_legacy_includes.alcatel import *  # pylint: disable=wildcard
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.temperature import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings['alcatel_temp'] = ALCATEL_TEMP_CHECK_DEFAULT_PARAMETERS
 
 

diff --git a/checks/alcatel_timetra_cpu b/checks/alcatel_timetra_cpu
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.cpu_util import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 alcatel_timetra_cpu_default_levels = (90.0, 95.0)
 
 

diff --git a/checks/apc_humidity b/checks/apc_humidity
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.humidity import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings["apc_humidity_default_levels"] = {
     'levels': (40, 35),
     'levels_lower': (60, 65),

diff --git a/checks/apc_symmetra_ext_temp b/checks/apc_symmetra_ext_temp
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.temperature import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings["apc_symmetra_ext_temp_default_levels"] = {"levels": (30, 35)}
 
 

diff --git a/checks/arris_cmts_cpu b/checks/arris_cmts_cpu
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.arris_cmts import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 arris_cmts_cpu_default_levels = (90, 95)
 
 

diff --git a/checks/arris_cmts_mem b/checks/arris_cmts_mem
@@ -14,6 +14,7 @@ from cmk.base.check_legacy_includes.arris_cmts import *  # pylint: disable=wildc
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.mem import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings["arris_cmts_mem"] = {
     "levels": (80.0, 90.0),
 }

diff --git a/checks/arris_cmts_temp b/checks/arris_cmts_temp
@@ -14,6 +14,7 @@ from cmk.base.check_legacy_includes.arris_cmts import *  # pylint: disable=wildc
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.temperature import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings["arris_cmts_temp_default_levels"] = {"levels": (40, 46)}
 
 

diff --git a/checks/aruba_cpu_util b/checks/aruba_cpu_util
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.cpu_util import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings['aruba_cpu_util_default_levels'] = {
     'levels': (80.0, 90.0),
 }

diff --git a/checks/avaya_45xx_cpu b/checks/avaya_45xx_cpu
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.cpu_util import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings["avaya_45xx_cpu_default_levels"] = {"levels": (90.0, 95.0)}
 
 

diff --git a/checks/avaya_45xx_temp b/checks/avaya_45xx_temp
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.temperature import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings["avaya_45xx_temp_default_levels"] = {
     "levels": (55, 60),
 }

diff --git a/checks/avaya_88xx_cpu b/checks/avaya_88xx_cpu
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.cpu_util import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings["avaya_88xx_cpu_default_levels"] = {
     "levels": (90, 95),
 }

diff --git a/checks/avaya_chassis_temp b/checks/avaya_chassis_temp
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.temperature import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings["avaya_chassis_temp_default_levels"] = {
     "levels": (55, 60),
 }

diff --git a/checks/aws_cloudwatch_alarms_limits b/checks/aws_cloudwatch_alarms_limits
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.aws import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings['aws_cloudwatch_alarms_limits_default_levels'] = {
     'cloudwatch_alarms': (None, 80.0, 90.0),
 }

diff --git a/checks/aws_costs_and_usage b/checks/aws_costs_and_usage
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.aws import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 AWSCostAndUageMetrics = [
     ("Unblended", "UnblendedCost", "unblended"),
 ]

diff --git a/checks/aws_dynamodb_limits b/checks/aws_dynamodb_limits
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.aws import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings['aws_dynamodb_limits_default_levels'] = {
     'number_of_tables': (None, 80.0, 90.0),
     'read_capacity': (None, 80.0, 90.0),

diff --git a/checks/aws_ebs_limits b/checks/aws_ebs_limits
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.aws import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings['aws_ebs_limits_default_levels'] = {
     'block_store_snapshots': (None, 80.0, 90.0),
     'block_store_space_standard': (None, 80.0, 90.0),

diff --git a/checks/aws_ebs_summary b/checks/aws_ebs_summary
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.aws import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 AWSEBSStorageTypes = {
     "gp2": "General Purpose SSD",
     "io1": "Provisioned IOPS SSD",

diff --git a/checks/aws_elb_health b/checks/aws_elb_health
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.aws import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 AWSELBHealthMap = {
     "InService": "in service",
     "OutOfService": "out of service",

diff --git a/checks/aws_elb_limits b/checks/aws_elb_limits
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.aws import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings['aws_elb_limits_default_levels'] = {
     'load_balancers': (None, 80.0, 90.0),
     'load_balancer_listeners': (None, 80.0, 90.0),

diff --git a/checks/aws_elb_summary b/checks/aws_elb_summary
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.aws import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 check_info['aws_elb_summary'] = {
     'parse_function': parse_aws,
     'inventory_function': discover_single,

diff --git a/checks/aws_elbv2_limits b/checks/aws_elbv2_limits
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.aws import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings['aws_elbv2_limits_default_levels'] = {
     'application_load_balancers': (None, 80.0, 90.0),
     'application_load_balancer_rules': (None, 80.0, 90.0),

diff --git a/checks/aws_rds_limits b/checks/aws_rds_limits
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.aws import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings['aws_rds_limits_default_levels'] = {
     "db_instances": (None, 80.0, 90.0),
     "reserved_db_instances": (None, 80.0, 90.0),

diff --git a/checks/aws_s3_limits b/checks/aws_s3_limits
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.aws import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings['aws_s3_limits_default_levels'] = {
     'buckets': (None, 80.0, 90.0),
 }

diff --git a/checks/aws_wafv2_limits b/checks/aws_wafv2_limits
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.aws import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings['aws_wafv2_limits_default_levels'] = {
     'web_acls': (None, 80.0, 90.0),
     'rule_groups': (None, 80.0, 90.0),

diff --git a/checks/azure_sites b/checks/azure_sites
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.azure import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings['levels_azure_sites'] = {
     # https://www.nngroup.com/articles/response-times-3-important-limits/
     'avg_response_time_levels': (1.0, 10.0),

diff --git a/checks/azure_storageaccounts b/checks/azure_storageaccounts
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.azure import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings['levels_azure_storageaccounts'] = {}
 # metrics description:
 # https://docs.microsoft.com/en-US/azure/monitoring-and-diagnostics/monitoring-supported-metrics#microsoftstoragestorageaccounts

diff --git a/checks/azure_usagedetails b/checks/azure_usagedetails
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.azure import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings['levels_azure_usagedetails'] = {}
 
 

diff --git a/checks/blade_bx_load b/checks/blade_bx_load
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.cpu_load import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 blade_bx_cpuload_default_levels = (5, 20)
 
 

diff --git a/checks/brocade_mlx_temp b/checks/brocade_mlx_temp
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.temperature import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings["brocade_mlx_temperature_default_levels"] = {"levels": (105, 110)}
 
 

diff --git a/checks/bvip_link b/checks/bvip_link
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.bvip import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings["bvip_link_default_levels"] = {
     'ok_states': [0, 4, 5],
     'warn_states': [7],

diff --git a/checks/bvip_poe b/checks/bvip_poe
@@ -9,6 +9,7 @@
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.bvip import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 bvip_poe_default_levels = (50, 60)
 
 

diff --git a/checks/bvip_temp b/checks/bvip_temp
@@ -14,6 +14,7 @@ from cmk.base.check_legacy_includes.bvip import *  # pylint: disable=wildcard-im
 # resolving legacy discovery results such as [("SUMMARY", "diskstat_default_levels")]. Furthermore,
 # it might also remove variables needed for accessing discovery rulesets.
 from cmk.base.check_legacy_includes.temperature import *  # pylint: disable=wildcard-import,unused-wildcard-import
+
 factory_settings["bvip_temp_default_levels"] = {"levels": (50, 60)}