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 this script Python 3 compatible (#311)

Browse Source
This commit is contained in:
Mark Westerterp
2020-06-30 23:56:49 +02:00
committed by GitHub
parent a6380230cc
commit a8cb5b0112
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
agent-local/ceph
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# Copyright (C) 2015 Mark Schouten <mark@tuxis.nl> # Copyright (C) 2015 Mark Schouten <mark@tuxis.nl>
# #
@@ -18,12 +18,12 @@ from subprocess import check_output
import json import json
def cephversion(): def cephversion():
cephv = check_output(["/usr/bin/ceph", "version"]).replace('ceph version ', '') cephv = check_output(["/usr/bin/ceph", "version"]).decode("utf-8").replace('ceph version ', '')
major, minor = cephv.split('.')[0:2] major, minor = cephv.split('.')[0:2]
return [int(major), int(minor)] return [int(major), int(minor)]
def cephdf(): def cephdf():
cephdf = check_output(["/usr/bin/ceph", "-f", "json", "df"]).replace('-inf', '0') cephdf = check_output(["/usr/bin/ceph", "-f", "json", "df"]).decode("utf-8").replace('-inf', '0')
s = json.loads(cephdf) s = json.loads(cephdf)
try: try:
@@ -50,7 +50,7 @@ def cephdf():
def osdperf(): def osdperf():
global major global major
osdperf = check_output(["/usr/bin/ceph", "-f", "json", "osd", "perf"]).replace('-inf', '0') osdperf = check_output(["/usr/bin/ceph", "-f", "json", "osd", "perf"]).decode("utf-8").replace('-inf', '0')
if major > 13: if major > 13:
for o in json.loads(osdperf)['osdstats']['osd_perf_infos']: for o in json.loads(osdperf)['osdstats']['osd_perf_infos']:
@@ -61,7 +61,7 @@ def osdperf():
def poolstats(): def poolstats():
global major global major
poolstats = check_output(["/usr/bin/ceph", "-f", "json", "osd", "pool", "stats"]).replace('-inf', '0') poolstats = check_output(["/usr/bin/ceph", "-f", "json", "osd", "pool", "stats"]).decode("utf-8").replace('-inf', '0')
for p in json.loads(poolstats): for p in json.loads(poolstats):
try: try:
@@ -84,10 +84,10 @@ def poolstats():
major, minor = cephversion() major, minor = cephversion()
print "<<<app-ceph>>>" print ("<<<app-ceph>>>")
print "<poolstats>" print ("<poolstats>")
poolstats() poolstats()
print "<osdperformance>" print ("<osdperformance>")
osdperf() osdperf()
print "<df>" print ("<df>")
cephdf() cephdf()