mirror/librenms-librenms-agent
1
0
Fork 0
mirror of https://github.com/librenms/librenms-agent.git synced 2024-05-09 09:54:52 +00:00
Code Releases Activity

Make python3 version of Nginx extend the default (#284)

Browse Source 
* Rename nginx to nginx-python2, as python2 is EOL

Rename Nginx to Nginx-python2, as python2 is EOL. Shall make python3 version the default version now. Keeping python2 version for legacy.

* Rename nginx-python3.py to nginx
This commit is contained in:
FingerlessGloves
2020-04-12 17:17:16 +01:00
committed by GitHub
parent ca631a3afd
commit 7e6b19f26c
3 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
snmp/nginx
View File

@@ -1,28 +1,28 @@
#!/usr/bin/env python2 #!/usr/bin/env python3
import urllib2 from urllib.request import urlopen
import re import re
data = urllib2.urlopen('http://localhost/nginx-status').read() data = urlopen('http://localhost/nginx-status').read()
params = {} params = {}
for line in data.split("\n"): for line in data.decode().split("\n"):
smallstat = re.match(r"\s?Reading:\s(.*)\sWriting:\s(.*)\sWaiting:\s(.*)$", line) smallstat = re.match(r"\s?Reading:\s(.*)\sWriting:\s(.*)\sWaiting:\s(.*)$", line)
req = re.match(r"\s+(\d+)\s+(\d+)\s+(\d+)", line) req = re.match(r"\s+(\d+)\s+(\d+)\s+(\d+)", line)
if smallstat: if smallstat:
params["Reading"] = smallstat.group(1) params["Reading"] = smallstat.group(1)
params["Writing"] = smallstat.group(2) params["Writing"] = smallstat.group(2)
params["Waiting"] = smallstat.group(3) params["Waiting"] = smallstat.group(3)
elif req: elif req:
params["Requests"] = req.group(3) params["Requests"] = req.group(3)
else: else:
pass pass
dataorder = ["Active", "Reading", "Writing", "Waiting", "Requests"] dataorder = ["Active", "Reading", "Writing", "Waiting", "Requests"]
for param in dataorder: for param in dataorder:
if param == "Active": if param == "Active":
Active = int(params["Reading"]) + int(params["Writing"]) + int(params["Waiting"]) Active = int(params["Reading"]) + int(params["Writing"]) + int(params["Waiting"])
print Active print(Active)
else: else:
print params[param] print(params[param])

28
snmp/nginx-python2 Executable file
View File

@@ -0,0 +1,28 @@
#!/usr/bin/env python2
import urllib2
import re
data = urllib2.urlopen('http://localhost/nginx-status').read()
params = {}
for line in data.split("\n"):
smallstat = re.match(r"\s?Reading:\s(.*)\sWriting:\s(.*)\sWaiting:\s(.*)$", line)
req = re.match(r"\s+(\d+)\s+(\d+)\s+(\d+)", line)
if smallstat:
params["Reading"] = smallstat.group(1)
params["Writing"] = smallstat.group(2)
params["Waiting"] = smallstat.group(3)
elif req:
params["Requests"] = req.group(3)
else:
pass
dataorder = ["Active", "Reading", "Writing", "Waiting", "Requests"]
for param in dataorder:
if param == "Active":
Active = int(params["Reading"]) + int(params["Writing"]) + int(params["Waiting"])
print Active
else:
print params[param]

28
snmp/nginx-python3.py
View File

@@ -1,28 +0,0 @@
#!/usr/bin/env python3
from urllib.request import urlopen
import re
data = urlopen('http://localhost/nginx-status').read()
params = {}
for line in data.decode().split("\n"):
smallstat = re.match(r"\s?Reading:\s(.*)\sWriting:\s(.*)\sWaiting:\s(.*)$", line)
req = re.match(r"\s+(\d+)\s+(\d+)\s+(\d+)", line)
if smallstat:
params["Reading"] = smallstat.group(1)
params["Writing"] = smallstat.group(2)
params["Waiting"] = smallstat.group(3)
elif req:
params["Requests"] = req.group(3)
else:
pass
dataorder = ["Active", "Reading", "Writing", "Waiting", "Requests"]
for param in dataorder:
if param == "Active":
Active = int(params["Reading"]) + int(params["Writing"]) + int(params["Waiting"])
print(Active)
else:
print(params[param])