Module: check_mk
Branch: master
Commit: 44c0d7562411cc11e7527f31ff8b8394e0cf6567
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44c0d7562411cc…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Dec 16 18:40:08 2016 +0100
Cleaned up some unused variables
Change-Id: I5c91cabd694094cb8bc38e4e22c51a74f901b469
---
bin/mkeventd | 2 +-
checks/akcp_sensor.include | 6 +++---
checks/cmciii.include | 2 +-
checks/cpu_util.include | 4 ++--
checks/df_netapp.include | 2 +-
checks/filerdisks.include | 2 --
checks/fjdarye.include | 2 +-
checks/mssql.include | 4 ++--
checks/printer_io.include | 2 +-
cmk_base/localize.py | 2 +-
doc/treasures/active_checks/check_bi_aggr | 2 +-
modules/events.py | 4 ++--
modules/notify.py | 2 +-
13 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/bin/mkeventd b/bin/mkeventd
index d86d5f3..9b68d71 100755
--- a/bin/mkeventd
+++ b/bin/mkeventd
@@ -4166,7 +4166,7 @@ def rbn_groups_contacts(groups):
except livestatus.MKLivestatusNotFoundError:
return []
- except Exception, e:
+ except Exception:
if cmk.debug.enabled():
raise
return []
diff --git a/checks/akcp_sensor.include b/checks/akcp_sensor.include
index acdc3fb..586633d 100644
--- a/checks/akcp_sensor.include
+++ b/checks/akcp_sensor.include
@@ -72,7 +72,7 @@ def inventory_akcp_sensor_no_params(info):
akcp_humidity_defaultlevels = (30, 35, 60, 65)
def inventory_akcp_humidity(info):
- for description, percent, status, online in info:
+ for description, _percent, _status, online in info:
if online == "1":
yield description, "akcp_humidity_defaultlevels"
@@ -224,9 +224,9 @@ def check_akcp_sensor_drycontact(item, _no_params, info):
for line in info:
if item == line[0]:
if len(line) == 5:
- description, status, crit_desc, normal_desc, online = line
+ status, crit_desc, normal_desc, online = line[1:]
else:
- description, status, online = line
+ status, online = line[1:]
normal_desc = "Drycontact OK"
crit_desc = "Drycontact on Error"
diff --git a/checks/cmciii.include b/checks/cmciii.include
index d1f32a4..1ec289c 100644
--- a/checks/cmciii.include
+++ b/checks/cmciii.include
@@ -60,7 +60,7 @@ def inventory_cmciii_lcp_fanunit(zone, direction, info):
def check_cmciii_lcp_fanunit(item, params, info):
if params == None:
params = {}
- unit_desc, unit_status, desc, status = info[0][0:4]
+ _unit_desc, unit_status, _desc, status = info[0][1:4]
temps = extract_cmciii_lcp_temps(info[0][4:])
status, message, perfdata = check_temperature(
diff --git a/checks/cpu_util.include b/checks/cpu_util.include
index a277242..ba0d7ee 100644
--- a/checks/cpu_util.include
+++ b/checks/cpu_util.include
@@ -139,7 +139,7 @@ def check_cpu_util_unix(values, params, cores = None):
for v in values:
n += 1
countername = "cpu.util.%d" % n
- last_time, last_val = get_item_state(countername, (0, 0))
+ last_val = get_item_state(countername, (0, 0))[1]
diff_values.append(v - last_val)
set_item_state(countername, (this_time, v))
@@ -210,7 +210,7 @@ def check_cpu_util_unix(values, params, cores = None):
"core_util_time" in params):
core_counter = 0
cores_padded = [line + [0] * (11 - len(line)) for line in cores]
- for core, user, nice, system, idle, iowait,\
+ for core, user, nice, system, _idle, iowait,\
irq, softirq, steal, guest, guest_nice in cores_padded:
total = user + nice + system + iowait + irq + softirq + steal + guest +
guest_nice
diff --git a/checks/df_netapp.include b/checks/df_netapp.include
index d108640..edc1428 100644
--- a/checks/df_netapp.include
+++ b/checks/df_netapp.include
@@ -26,7 +26,7 @@
def inventory_df_netapp(info):
mplist = []
- for volume, size_kb, used_kb in info:
+ for volume, size_kb, _used_kb in info:
if saveint(size_kb) > 0: # Exclude filesystems with zero size (some
snapshots)
mplist.append(volume)
return df_inventory(mplist)
diff --git a/checks/filerdisks.include b/checks/filerdisks.include
index 766678e..40aa1e3 100644
--- a/checks/filerdisks.include
+++ b/checks/filerdisks.include
@@ -43,8 +43,6 @@ def check_filer_disks(disks, params):
state['spare'] = []
total_capacity = 0
- prefaild_data_disk_count = 0
- prefaild_parity_disk_count = 0
for disk in disks:
total_capacity += disk.get("capacity", 0)
diff --git a/checks/fjdarye.include b/checks/fjdarye.include
index ed53565..eb96d1a 100644
--- a/checks/fjdarye.include
+++ b/checks/fjdarye.include
@@ -68,7 +68,7 @@ fjdarye_disks_status = { 1: 'available', 2: 'broken', 3:
'notavailable',
def fjdarye_disks_summary(info):
# compute the number of disks in each state.
states = {}
- for index, state in info:
+ for _index, state in info:
state = int(state)
statename = fjdarye_disks_status[state]
if state != 3:
diff --git a/checks/mssql.include b/checks/mssql.include
index 7ac4ea5..2ba0a7f 100644
--- a/checks/mssql.include
+++ b/checks/mssql.include
@@ -124,10 +124,10 @@ def check_mssql_datafiles(item, params, info):
found = False
for row in info:
if len(row) == 8:
- inst, database, file_name, physical_name, max_size, allocated_size,
used_size, unlimited = row
+ inst, database, file_name, _physical_name, max_size, allocated_size,
used_size, unlimited = row
unlimited = unlimited == '1'
else:
- database, file_name, physical_name, max_size, allocated_size, used_size =
row
+ database, file_name, _physical_name, max_size, allocated_size, used_size =
row
inst = None
unlimited = False
diff --git a/checks/printer_io.include b/checks/printer_io.include
index 26aa7d6..dc8c487 100644
--- a/checks/printer_io.include
+++ b/checks/printer_io.include
@@ -73,7 +73,7 @@ def inventory_printer_io(info):
index, name, descr, status = line[:4]
if descr == '':
continue
- snmp_status, capacity_unit, capacity_max, level = line[3:]
+ snmp_status, _capacity_unit, capacity_max, _level = line[3:]
if capacity_max == '0': # useless
continue
diff --git a/cmk_base/localize.py b/cmk_base/localize.py
index 1ee0547..f23bc43 100644
--- a/cmk_base/localize.py
+++ b/cmk_base/localize.py
@@ -171,7 +171,7 @@ def localize_sniff():
sniff_files = []
for path in paths:
- for root, dirs, files in os.walk(path):
+ for root, _dirs, files in os.walk(path):
for f in files:
if f.endswith(".py") or f.endswith(".mk"):
sniff_files.append(os.path.join(root, f))
diff --git a/doc/treasures/active_checks/check_bi_aggr
b/doc/treasures/active_checks/check_bi_aggr
index 30e9ad5..07edef6 100755
--- a/doc/treasures/active_checks/check_bi_aggr
+++ b/doc/treasures/active_checks/check_bi_aggr
@@ -142,7 +142,7 @@ def init_auth():
if auth_mode == 'kerberos':
from requests_kerberos import HTTPKerberosAuth
- from subprocess import Popen, PIPE, check_call
+ from subprocess import Popen, PIPE
kinit = Popen(["kinit", username], stdin=PIPE, stdout=PIPE,
stderr=PIPE)
output, errors = kinit.communicate("%s\n" % password)
kinit.wait()
diff --git a/modules/events.py b/modules/events.py
index 4154b73..1bddd32 100644
--- a/modules/events.py
+++ b/modules/events.py
@@ -212,8 +212,8 @@ def livestatus_fetch_contacts(host, service):
# Service not found: try again with contacts of host!
return livestatus_fetch_contacts(host, None)
- except Exception, e:
- if True or cmk.debug.enabled():
+ except Exception:
+ if cmk.debug.enabled():
raise
return None # We must allow notifications without Livestatus access
diff --git a/modules/notify.py b/modules/notify.py
index 41d9201..06c8d11 100644
--- a/modules/notify.py
+++ b/modules/notify.py
@@ -816,7 +816,7 @@ def rbn_groups_contacts(groups):
except livestatus.MKLivestatusNotFoundError:
return []
- except Exception, e:
+ except Exception:
if cmk.debug.enabled():
raise
return []