From 3b34027be307a99af68abbfd7dec4a52ac639071 Mon Sep 17 00:00:00 2001
From: "Th.L" <thl-cmk@outlook.com>
Date: Thu, 18 Mar 2021 19:11:32 +0100
Subject: [PATCH] update project
---
agent_based/cisco_asa_sensors.py | 67 ++++++++++++++++---------------
cisco_asa_sensors.mkp | Bin 2952 -> 2988 bytes
2 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/agent_based/cisco_asa_sensors.py b/agent_based/cisco_asa_sensors.py
index f1bb35e..e13699a 100644
--- a/agent_based/cisco_asa_sensors.py
+++ b/agent_based/cisco_asa_sensors.py
@@ -169,39 +169,40 @@ def parse_cisco_asa_sensors(string_table: List[StringTable]) -> Dict:
}
for sensorname, sensortype, sensorvalue, sensorstatus, sensorunits in string_table[0]:
- if sensorstatus.isdigit():
- state_readable = get_state_readable(sensorstatus)
- sensorstatus = get_sensor_status(sensorstatus)
-
- if sensortype == '8': # Temperature
- sensorname = sensorname.replace('Temperature ', '')
-
- sensors['temp'].update({sensorname: CiscoAsaSensor(
- value=to_celsius(float(sensorvalue), sensorunits),
- unit=sensorunits,
- status=sensorstatus,
- state_readable=state_readable,
- )})
-
- if sensortype == '10': # Fan
- sensorname = sensorname.replace('Fan ', '')
-
- sensors['fan'].update({sensorname: CiscoAsaSensor(
- value=int(sensorvalue),
- unit=sensorunits,
- status=sensorstatus,
- state_readable=state_readable,
- )})
-
- if sensortype == '12': # Power supply
- sensorname = sensorname.replace('Power ', '')
-
- sensors['power'].update({sensorname: CiscoAsaSensor(
- value=0,
- unit='',
- status=sensorstatus,
- state_readable=state_readable,
- )})
+ if sensorname != '': # for asa context, there are no real sensors.
+ if sensorstatus.isdigit():
+ state_readable = get_state_readable(sensorstatus)
+ sensorstatus = get_sensor_status(sensorstatus)
+
+ if sensortype == '8': # Temperature
+ sensorname = sensorname.replace('Temperature ', '')
+
+ sensors['temp'].update({sensorname: CiscoAsaSensor(
+ value=to_celsius(float(sensorvalue), sensorunits),
+ unit=sensorunits,
+ status=sensorstatus,
+ state_readable=state_readable,
+ )})
+
+ if sensortype == '10': # Fan
+ sensorname = sensorname.replace('Fan ', '')
+
+ sensors['fan'].update({sensorname: CiscoAsaSensor(
+ value=int(sensorvalue),
+ unit=sensorunits,
+ status=sensorstatus,
+ state_readable=state_readable,
+ )})
+
+ if sensortype == '12': # Power supply
+ sensorname = sensorname.replace('Power ', '')
+
+ sensors['power'].update({sensorname: CiscoAsaSensor(
+ value=0,
+ unit='',
+ status=sensorstatus,
+ state_readable=state_readable,
+ )})
return sensors
diff --git a/cisco_asa_sensors.mkp b/cisco_asa_sensors.mkp
index 4af47594e392f0c606e8bc2dc255cd3079e33f16..41987e5fd8761009cd26dda965c04516c6642432 100644
GIT binary patch
delta 2917
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
P3k39k!^2Wi0C)fZnwqan
delta 2880
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
--
GitLab