@@ -52,7 +52,7 @@ def __init__(self, config):
52
52
try :
53
53
release_file = open (os_release_file , 'r' ).readlines ()
54
54
except Exception as e :
55
- self .log .info (f 'Cannot read file { os_release_file } : { e } ' )
55
+ self .log .info ('Cannot read file {os_release_file} : {e}' . format ( os_release_file = os_release_file , e = e ) )
56
56
release_file = None
57
57
58
58
if release_file :
@@ -81,7 +81,7 @@ def run(self, zbx):
81
81
or (not self .os_name and not self .os_version ):
82
82
for pid in pids :
83
83
try :
84
- statm = open (f '/proc/{ pid } /statm' , 'r' ).read ().split (' ' )
84
+ statm = open ('/proc/{pid}/statm' . format ( pid = pid ) , 'r' ).read ().split (' ' )
85
85
except FileNotFoundError :
86
86
continue
87
87
@@ -92,11 +92,14 @@ def run(self, zbx):
92
92
diffs .append ({'pid' : pid , 'RES' : RES , 'SHR' : SHR , 'diff' : self .diff })
93
93
if diffs :
94
94
for diff in diffs :
95
- msg_text += 'pid: {pid}, RES {RES} - SHR {SHR} more then {diff}\n ' .format_map (diff )
95
+ msg_text += 'pid: {pid}, RES {RES} - SHR {SHR} more then {diff}\n ' .format (pid = diff .get ('pid' ),
96
+ RES = diff .get ('RES' ),
97
+ SHR = diff .get ('SHR' ),
98
+ diff = diff .get ('diff' ))
96
99
else :
97
100
for pid in pids :
98
101
try :
99
- statm = open (f '/proc/{ pid } /status' , 'r' ).readlines ()
102
+ statm = open ('/proc/{pid}/status' . format ( pid = pid ) , 'r' ).readlines ()
100
103
except FileNotFoundError :
101
104
continue
102
105
@@ -123,7 +126,12 @@ def run(self, zbx):
123
126
if diffs :
124
127
for diff in diffs :
125
128
msg_text += 'pid: {pid}, RssAnon {RssAnon} more then {diff}, VmRSS {VmRSS}, ' \
126
- 'RssFile {RssFile}, RssShmem {RssShmem} \n ' .format_map (diff )
129
+ 'RssFile {RssFile}, RssShmem {RssShmem} \n ' .format (pid = diff .get ('pid' ),
130
+ RssAnon = diff .get ('RssAnon' ),
131
+ diff = diff .get ('diff' ),
132
+ VmRSS = diff .get ('VmRSS' ),
133
+ RssFile = diff .get ('RssFile' ),
134
+ RssShmem = diff .get ('RssShmem' ))
127
135
128
136
zbx .send (self .key_count_diff , int (count_diff ))
129
137
zbx .send (self .key_count_diff_error , msg_text )
0 commit comments