Move all includes back to global, modify agent arguments

pgmon.py

@@ -5,19 +5,12 @@ import logging
 import socket
 import sys
 import threading
-
-if "pytest" in sys.modules:
-    # Conditional modules are needed for tests, so import them if this is a test
-    import pytest
-
-    @pytest.fixture(scope="session", autouse=True)
-    def pytest_imports():
-        import psycopg2
-        import psycopg2.extras
-        import queue
-        import os
-        import signal
-        import json
+import psycopg2
+import psycopg2.extras
+import queue
+import os
+import signal
+import json
 
 #
 # Errors
@@ -336,7 +329,7 @@ class Agent:
             conn = ipc.connect()
 
             # Send a request
-            ipc.send(conn, "{},{}".format(key, ",".join(args)))
+            ipc.send(conn, "{},{}".format(key, args))
 
             # Wait for a response
             res = ipc.recv(conn)
@@ -355,13 +348,6 @@ class Server:
     """
     @staticmethod
     def run(config):
-        import psycopg2
-        import psycopg2.extras
-        import queue
-        import os
-        import signal
-        import json
-
         # Set up the signal handler
         signal.signal(signal.SIGINT, signal_handler)
 
@@ -397,10 +383,10 @@ class Server:
 
             # Receive ipc request (csv)
             try:
-                (key, args_csv) = req_csv.split(',', 1)
+                (key, args_str) = req_csv.split(',', 1)
                 args_dict = {}
-                if args_csv != "":
-                    for (k, v) in [a.split('=', 1) for a in args_csv.split(',')]:
+                if args_str!= "":
+                    for (k, v) in [a.split('=', 1) for a in args_str.split(';')]:
                         args_dict[k] = v
             except socket.timeout:
                 print("IPC communication timeout receiving request")
@@ -546,7 +532,7 @@ def main():
 
     # Agent options
     parser.add_argument('-k', '--key')
-    parser.add_argument('-a', '--args', nargs='*', default=[])
+    parser.add_argument('-a', '--args')
 
     args = parser.parse_args()
 
@@ -630,7 +616,7 @@ class TestMetric:
 
         # Make sure cache is set
         assert m1.cached is not None
-        assert m1.cached_version is 110003
+        assert m1.cached_version == 110003
 
         # Make sure returned value changes with version
         assert m1.get_version(120000).sql == 'v12.0'

pgmon_userparameter.conf

@@ -0,0 +1 @@
+UserParameter=pgmon[*],/usr/local/bin/pgmon.py -c /etc/zabbix/pgmon.cfg -a "$1"