james/pgmon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Move all includes back to global, modify agent arguments

Browse Source
This commit is contained in:
James Campbell 2024-05-16 15:09:09 -04:00
parent 3abbc1d83b
commit 3a937ca3bd
Signed by: james
GPG Key ID: 2287C33A40DC906A
2 changed files with 27 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pgmon.py
View File

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

1
pgmon_userparameter.conf Normal file
View File

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