Update to newer paths (#20)

* new paths
nobody43 · Feb 27, 2023 · b0f9125 · b0f9125
1 parent d5c4640
commit b0f9125
Show file tree

Hide file tree

Showing 8 changed files with 290 additions and 290 deletions.
diff --git a/README.md b/README.md
@@ -40,6 +40,6 @@ Verbose mode. Does not detaches or prints LLD. Lists all items sent to zabbix-se
 
 These scripts were tested to work with following configurations:
 
-- Windows 7 / Server (3.0, 5.0) / Agent (3.0, 5.0) / Python (3.1-3.8)
-
-- Windows Server 2012 / Zabbix 3.0 / Python 3.7
+- Windows 10 / Server 6.0 / Agent 4.0 / Python (3.1-3.11)
+- Windows Server 2012 / Server 6.0 / Agent 4.0 / Python 3.11
+- Windows 7 / Server (5.0, 6.0) / Agent (4.0, 5.0) / Python (3.1-3.8)
diff --git a/scripts/hardware_bios_wmi.py b/scripts/hardware_bios_wmi.py
@@ -1,10 +1,10 @@
 ## Installation instructions: https://github.com/nobodysu/zabbix-hardware ##
 
-senderPyPath = r'C:\zabbix-agent\scripts\sender_wrapper.py'
+senderPyPath = r'C:\Program Files\Zabbix Agent\scripts\sender_wrapper.py'
 
-agentConf = r'C:\zabbix_agentd.conf'
+agentConf    = r'C:\Program Files\Zabbix Agent\zabbix_agentd.conf'
 
-senderPath = r'C:\zabbix-agent\bin\win32\zabbix_sender.exe'
+senderPath   = r'C:\Program Files\Zabbix Agent\zabbix_sender.exe'
 
 ## Advanced configuration ##
 
@@ -233,8 +233,8 @@ def findValues(p):
     p_out = p_out_once[0]
     senderData = findValues(p_out)
 
-    timeout = '0'
+    delay = '0'
 
     link = 'https://github.com/nobodysu/zabbix-hardware'
     sendStatusKey = 'hw.bios.info[SendStatus]'
-    processData(senderData, '', agentConf, senderPyPath, senderPath, timeout, host, link, sendStatusKey)
+    processData(senderData, '', agentConf, senderPyPath, senderPath, delay, host, link, sendStatusKey)
diff --git a/scripts/hardware_cpu_wmi.py b/scripts/hardware_cpu_wmi.py
@@ -1,20 +1,20 @@
 ## Installation instructions: https://github.com/nobodysu/zabbix-hardware ##
 
-senderPyPath = r'C:\zabbix-agent\scripts\sender_wrapper.py'
+senderPyPath = r'C:\Program Files\Zabbix Agent\scripts\sender_wrapper.py'
 
-agentConf = r'C:\zabbix_agentd.conf'
+agentConf    = r'C:\Program Files\Zabbix Agent\zabbix_agentd.conf'
 
-senderPath = r'C:\zabbix-agent\bin\win32\zabbix_sender.exe'
+senderPath   = r'C:\Program Files\Zabbix Agent\zabbix_sender.exe'
 
 ## Advanced configuration ##
 
-timeout = '80'
+delay = '50'
 
 cmd = ['wmic', 'CPU', 'list', 'full']
 
 globalTimeout = 25
 unknownCPUshift = 1000
- 
+
 keysandRegexp = (
     ('hw.cpu.AddressWidth',                 r'^AddressWidth\=(.+)'),
     ('hw.cpu.Architecture',                 r'^Architecture\=(.+)'),
@@ -375,4 +375,4 @@ def findCPUnum(cpu_out):
 
     link = 'https://github.com/nobodysu/zabbix-hardware'
     sendStatusKey = 'hw.cpu.info[SendStatus]'
-    processData(senderData, jsonData, agentConf, senderPyPath, senderPath, timeout, host, link, sendStatusKey)
+    processData(senderData, jsonData, agentConf, senderPyPath, senderPath, delay, host, link, sendStatusKey)
diff --git a/scripts/hardware_net_wmi.py b/scripts/hardware_net_wmi.py
@@ -1,16 +1,16 @@
 ## Installation instructions: https://github.com/nobodysu/zabbix-hardware ##
 
-senderPyPath = r'C:\zabbix-agent\scripts\sender_wrapper.py'
+senderPyPath = r'C:\Program Files\Zabbix Agent\scripts\sender_wrapper.py'
 
-agentConf =    r'C:\zabbix_agentd.conf'
+agentConf    = r'C:\Program Files\Zabbix Agent\zabbix_agentd.conf'
 
-senderPath =   r'C:\zabbix-agent\bin\win32\zabbix_sender.exe'
+senderPath   = r'C:\Program Files\Zabbix Agent\zabbix_sender.exe'
 
 
 ## Advanced configuration ##
 
-timeout          = '80'   # Between LLD and data sending
-heavyDebug       = False
+delay          = '50'   # Between LLD and data sending
+heavyDebug     = False
 
 cmd = 'wmic path Win32_NetworkAdapter where PhysicalAdapter=TRUE get /value'
 
@@ -428,4 +428,4 @@ def findSpeedByID(allBlocks_, raw_ifID_):
 
     link = 'https://github.com/nobodysu/zabbix-hardware'
     sendStatusKey = 'hw.net.info[SendStatus]'
-    processData(senderData, jsonData, agentConf, senderPyPath, senderPath, timeout, host, link, sendStatusKey)
+    processData(senderData, jsonData, agentConf, senderPyPath, senderPath, delay, host, link, sendStatusKey)