Skip to content

Commit 904046c

Browse files
mstyushinmstyushin
committed
fix: get rid of SyntaxWarnings in python3.12
1 parent e1db914 commit 904046c

File tree

4 files changed

+64
-64
lines changed

4 files changed

+64
-64
lines changed

‎mamonsu/plugins/system/linux/disk_stats.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class DiskStats(Plugin):
2323
# Track only physical devices without logical partitions
2424
OnlyPhysicalDevices = True
2525

26-
re_stat = re.compile("^(?:\s+\d+){2}\s+([\w\d]+) (.*)$")
26+
re_stat = re.compile(r"^(?:\s+\d+){2}\s+([\w\d]+) (.*)$")
2727

2828
# rd_ios rd_merges rd_sectors rd_ticks
2929
# wr_ios wr_merges wr_sectors wr_ticks
@@ -43,7 +43,7 @@ def run(self, zbx):
4343
if m is None:
4444
continue
4545
dev, val = m.group(1), m.group(2)
46-
if self.OnlyPhysicalDevices and re.search("\d+$", dev): # get drive name without digits at the end
46+
if self.OnlyPhysicalDevices and re.search(r"\d+$", dev): # get drive name without digits at the end
4747
continue
4848
val = [int(x) for x in val.split()]
4949
read_op, read_sc, write_op, write_sc, ticks = val[0], val[2], val[4], val[6], val[9]

‎mamonsu/plugins/system/linux/memory.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
class Memory(Plugin):
66
AgentPluginType = "sys"
77

8-
query_agent = "cat /proc/meminfo | awk '/^{0}\:/ "
9-
query_agent_used = "MemTotal=$(cat /proc/meminfo | awk '/MemTotal\:/ { print $2 }'); " \
10-
"SUM=$(cat /proc/meminfo | awk '/(MemFree|Buffers|(Swap)?Cached|Slab|PageTables)\:/ " \
8+
query_agent = r"cat /proc/meminfo | awk '/^{0}\:/ "
9+
query_agent_used = r"MemTotal=$(cat /proc/meminfo | awk '/MemTotal\:/ { print $2 }'); " \
10+
r"SUM=$(cat /proc/meminfo | awk '/(MemFree|Buffers|(Swap)?Cached|Slab|PageTables)\:/ " \
1111
"{ SUM += $2 } END {print SUM}'); echo $((($MemTotal-$SUM)*1024))"
1212
query_agent_swap = "expr `grep -Ei 'Swap(Total|Free)' /proc/meminfo | awk '{print $2 * 1024}' | paste -s -d '-' " \
1313
"| sed -E 's/-/ - /g'` "

‎mamonsu/plugins/system/linux/proc_stat.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class ProcStat(Plugin):
1616
# alert fork-rate
1717
ForkRate = 500
1818
# /proc/stat all cpu line
19-
re_stat = re.compile("cpu\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)")
19+
re_stat = re.compile(r"cpu\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)")
2020

2121
ProcessItems = [
2222
# key, zbx_key, name, delta, color, side

‎mamonsu/plugins/system/linux/scripts.py‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ class Scripts(object):
1414
1515
while getopts "s::a:sj:uphvt:" OPTION; do
1616
case ${OPTION} in
17-
17+
1818
j)
1919
JSON=1
2020
JSON_ATTR=(${OPTARG})
2121
IFS="${IFS_DEFAULT}"
2222
;;
23-
23+
2424
esac
2525
done
2626
@@ -46,18 +46,18 @@ class Scripts(object):
4646
count=1
4747
while read line; do
4848
values=(${line})
49-
if [ $(contains "${list_str}" "," "${values[8]}") -eq 0 ]; then
49+
if [ $(contains "${list_str}" "," "${values[8]}") -eq 0 ]; then
5050
if [[ ${output} != " " ]]; then
5151
echo " ${output}"
52-
fi
52+
fi
5353
output='{ '
5454
output+='"'{#${JSON_ATTR[0]}}'"'
5555
output+=':'
5656
output+='"'${values[4]}'"'
5757
output+=' }'
5858
tmp="${output}"
5959
output="${output},"
60-
fi
60+
fi
6161
let "count=count+1"
6262
done <<< "${rval}"
6363
echo " ${tmp}"
@@ -76,22 +76,22 @@ class Scripts(object):
7676
IFS_DEFAULT="${IFS}"
7777
#
7878
#################################################################################
79-
80-
79+
80+
8181
while getopts "s::a:sj:uphvt:" OPTION; do
8282
case ${OPTION} in
83-
83+
8484
j)
8585
JSON=1
8686
JSON_ATTR=(${OPTARG})
8787
IFS="${IFS_DEFAULT}"
8888
;;
89-
89+
9090
esac
9191
done
92-
92+
9393
#################################################################################
94-
94+
9595
output=" "
9696
rval=`cat /proc/diskstats`
9797
if [[ ${JSON} -eq 1 ]]; then
@@ -102,17 +102,17 @@ class Scripts(object):
102102
while read line; do
103103
if [[ ${line} != '' ]]; then
104104
IFS="|" values=(${line})
105-
106-
if [[ $count == 1 ]]; then # for loop0 case
107-
new_value2=`echo ${values[0]} | sed -n '/[0-9]/s/ \+/ /gp'`
105+
106+
if [[ $count == 1 ]]; then # for loop0 case
107+
new_value2=`echo ${values[0]} | sed -n '/[0-9]/s/ \\+/ /gp'`
108108
new_value3=`echo "$new_value2" | cut -d " " -f 3`
109109
read_op=`echo "$new_value2" | cut -d " " -f 4`
110110
read_sc=`echo "$new_value2" | cut -d " " -f 6`
111111
write_op=`echo "$new_value2" | cut -d " " -f 8`
112112
write_sc=`echo "$new_value2" | cut -d " " -f 10`
113113
ticks=`echo "$new_value2" | cut -d " " -f 13`
114114
else
115-
new_value2=`echo ${values[0]} | sed -n '/[0-9]/s/ \+/ /gp'`
115+
new_value2=`echo ${values[0]} | sed -n '/[0-9]/s/ \\+/ /gp'`
116116
new_value3=`echo "$new_value2" | cut -d " " -f 4`
117117
read_op=`echo "$new_value2" | cut -d " " -f 5`
118118
read_sc=`echo "$new_value2" | cut -d " " -f 7`
@@ -123,8 +123,8 @@ class Scripts(object):
123123
if [[ $new_value3 != *"loop"* ]] && [[ $new_value3 != *"ram"* ]] && [[ $new_value3 != *[0-9]* ]]; then
124124
if [[ ${output} != " " ]]; then
125125
echo " ${output}"
126-
fi
127-
value=$(($read_op+$value))
126+
fi
127+
value=$(($read_op+$value))
128128
output='{ '
129129
output+='"'{#${JSON_ATTR[0]}}'"'
130130
output+=':'
@@ -142,7 +142,7 @@ class Scripts(object):
142142
else
143143
echo "${rval:-0}"
144144
fi
145-
145+
146146
exit ${rcode}
147147
""",
148148

@@ -156,26 +156,26 @@ class Scripts(object):
156156
if [[ ${line} != '' ]]; then
157157
IFS="|" values=(${line})
158158
159-
if [[ $count == 1 ]]; then # for loop0 case
160-
new_value2=`echo ${values[0]} | sed -n '/[0-9]/s/ \+/ /gp'`
159+
if [[ $count == 1 ]]; then # for loop0 case
160+
new_value2=`echo ${values[0]} | sed -n '/[0-9]/s/ \\+/ /gp'`
161161
# echo $new_value2
162162
new_value3=`echo "$new_value2" | cut -d " " -f 3`
163163
read_op=`echo "$new_value2" | cut -d " " -f 4`
164-
164+
165165
else
166-
new_value2=`echo ${values[0]} | sed -n '/[0-9]/s/ \+/ /gp'`
166+
new_value2=`echo ${values[0]} | sed -n '/[0-9]/s/ \\+/ /gp'`
167167
new_value3=`echo "$new_value2" | cut -d " " -f 4`
168168
read_op=`echo "$new_value2" | cut -d " " -f 5`
169-
169+
170170
fi
171171
re='^[0-9]+$'
172-
has_digits='no'
172+
has_digits='no'
173173
if [[ "${new_value3: -1}" =~ $re ]]; then
174174
has_digits='yes'
175175
fi
176176
if [[ $new_value3 != *"loop"* ]] && [[ $new_value3 != *"ram"* ]] && [[ $has_digits == 'no' ]]; then
177-
value=$(($read_op+$value))
178-
177+
value=$(($read_op+$value))
178+
179179
180180
fi
181181
fi
@@ -195,23 +195,23 @@ class Scripts(object):
195195
if [[ ${line} != '' ]]; then
196196
IFS="|" values=(${line})
197197
198-
if [[ $count == 1 ]]; then # for loop0 case
199-
new_value2=`echo ${values[0]} | sed -n '/[0-9]/s/ \+/ /gp'`
198+
if [[ $count == 1 ]]; then # for loop0 case
199+
new_value2=`echo ${values[0]} | sed -n '/[0-9]/s/ \\+/ /gp'`
200200
# echo $new_value2
201-
new_value3=`echo "$new_value2" | cut -d " " -f 3`
201+
new_value3=`echo "$new_value2" | cut -d " " -f 3`
202202
read_sc=`echo "$new_value2" | cut -d " " -f 6`
203203
else
204-
new_value2=`echo ${values[0]} | sed -n '/[0-9]/s/ \+/ /gp'`
204+
new_value2=`echo ${values[0]} | sed -n '/[0-9]/s/ \\+/ /gp'`
205205
new_value3=`echo "$new_value2" | cut -d " " -f 4`
206-
read_sc=`echo "$new_value2" | cut -d " " -f 7`
206+
read_sc=`echo "$new_value2" | cut -d " " -f 7`
207207
fi
208208
re='^[0-9]+$'
209-
has_digits='no'
209+
has_digits='no'
210210
if [[ "${new_value3: -1}" =~ $re ]]; then
211211
has_digits='yes'
212212
fi
213213
if [[ $new_value3 != *"loop"* ]] && [[ $new_value3 != *"ram"* ]] && [[ $has_digits == 'no' ]]; then
214-
value=$(($read_sc+$value))
214+
value=$(($read_sc+$value))
215215
fi
216216
fi
217217
let "count=count+1"
@@ -230,28 +230,28 @@ class Scripts(object):
230230
if [[ ${line} != '' ]]; then
231231
IFS="|" values=(${line})
232232
233-
if [[ $count == 1 ]]; then # for loop0 case
234-
new_value2=`echo ${values[0]} | sed -n '/[0-9]/s/ \+/ /gp'`
235-
new_value3=`echo "$new_value2" | cut -d " " -f 3`
233+
if [[ $count == 1 ]]; then # for loop0 case
234+
new_value2=`echo ${values[0]} | sed -n '/[0-9]/s/ \\+/ /gp'`
235+
new_value3=`echo "$new_value2" | cut -d " " -f 3`
236236
write_op=`echo "$new_value2" | cut -d " " -f 8`
237-
237+
238238
else
239-
new_value2=`echo ${values[0]} | sed -n '/[0-9]/s/ \+/ /gp'`
239+
new_value2=`echo ${values[0]} | sed -n '/[0-9]/s/ \\+/ /gp'`
240240
new_value3=`echo "$new_value2" | cut -d " " -f 4`
241-
241+
242242
write_op=`echo "$new_value2" | cut -d " " -f 9`
243-
243+
244244
fi
245245
re='^[0-9]+$'
246-
has_digits='no'
246+
has_digits='no'
247247
if [[ "${new_value3: -1}" =~ $re ]]; then
248248
has_digits='yes'
249249
fi
250250
if [[ $new_value3 != *"loop"* ]] && [[ $new_value3 != *"ram"* ]] && [[ $has_digits == 'no' ]];then
251-
#echo $write_op
251+
#echo $write_op
252+
253+
value=$(($write_op+$value))
252254
253-
value=$(($write_op+$value))
254-
255255
256256
fi
257257
fi
@@ -270,25 +270,25 @@ class Scripts(object):
270270
if [[ ${line} != '' ]]; then
271271
IFS="|" values=(${line})
272272
273-
if [[ $count == 1 ]]; then # for loop0 case
274-
new_value2=`echo ${values[0]} | sed -n '/[0-9]/s/ \+/ /gp'`
273+
if [[ $count == 1 ]]; then # for loop0 case
274+
new_value2=`echo ${values[0]} | sed -n '/[0-9]/s/ \\+/ /gp'`
275275
new_value3=`echo "$new_value2" | cut -d " " -f 3`
276276
write_sc=`echo "$new_value2" | cut -d " " -f 10`
277277
else
278-
new_value2=`echo ${values[0]} | sed -n '/[0-9]/s/ \+/ /gp'`
278+
new_value2=`echo ${values[0]} | sed -n '/[0-9]/s/ \\+/ /gp'`
279279
new_value3=`echo "$new_value2" | cut -d " " -f 4`
280280
write_sc=`echo "$new_value2" | cut -d " " -f 11`
281281
fi
282282
re='^[0-9]+$'
283-
has_digits='no'
283+
has_digits='no'
284284
if [[ "${new_value3: -1}" =~ $re ]]; then
285285
has_digits='yes'
286286
fi
287287
#echo $values
288288
if [[ $new_value3 != *"loop"* ]] && [[ $new_value3 != *"ram"* ]] && [[ $has_digits == 'no' ]]; then
289-
#echo $write_sc
289+
#echo $write_sc
290290
#echo $new_value3
291-
value=$(($write_sc+$value))
291+
value=$(($write_sc+$value))
292292
fi
293293
fi
294294
let "count=count+1"
@@ -302,7 +302,7 @@ class Scripts(object):
302302
#################################################################################
303303
while getopts "s::a:sj:uphvt:" OPTION; do
304304
case ${OPTION} in
305-
305+
306306
j)
307307
JSON=1
308308
JSON_ATTR=(${OPTARG})
@@ -323,7 +323,7 @@ class Scripts(object):
323323
if [[ "${values[0]}" != *"lo:"* ]] && [[ "${#values[@]}">1 ]]; then
324324
if [[ ${output} != " " ]] && [[ $count > 4 ]]; then
325325
echo " ${output}"
326-
fi
326+
fi
327327
output='{ '
328328
output+='"'{#${JSON_ATTR[0]}}'"'
329329
output+=':'
@@ -332,7 +332,7 @@ class Scripts(object):
332332
output+=' }'
333333
tmp="${output}"
334334
output="${output},"
335-
fi
335+
fi
336336
let "count=count+1"
337337
done <<< "${rval}"
338338
echo " ${tmp}"
@@ -356,19 +356,19 @@ class Scripts(object):
356356
if [[ ${line} != '' ]]; then
357357
IFS="|" values=(${line})
358358
359-
if [[ $count == 1 ]]; then # for loop0 case
360-
new_value2=`echo ${values[0]} | sed -n '/[0-9]/s/ \+/ /gp'`
359+
if [[ $count == 1 ]]; then # for loop0 case
360+
new_value2=`echo ${values[0]} | sed -n '/[0-9]/s/ \\+/ /gp'`
361361
# echo $new_value2
362362
new_value3=`echo "$new_value2" | cut -d " " -f 3`
363363
ticks=`echo "$new_value2" | cut -d " " -f 13`
364364
else
365-
new_value2=`echo ${values[0]} | sed -n '/[0-9]/s/ \+/ /gp'`
365+
new_value2=`echo ${values[0]} | sed -n '/[0-9]/s/ \\+/ /gp'`
366366
new_value3=`echo "$new_value2" | cut -d " " -f 4`
367367
ticks=`echo "$new_value2" | cut -d " " -f 14`
368368
fi
369369
if [[ $new_value3 != *"loop"* ]] && [[ $new_value3 != *"ram"* ]]; then
370-
#echo $ticks
371-
value=$(($ticks+$value))
370+
#echo $ticks
371+
value=$(($ticks+$value))
372372
fi
373373
fi
374374
let "count=count+1"

0 commit comments

Comments
 (0)