Skip to content

Commit e1013ef

Browse files
committed
fix: fixed Statements userparameters for zabbix native agent
1 parent 37b9672 commit e1013ef

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

mamonsu/plugins/pgsql/statements.py

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -213,25 +213,26 @@ def keys_and_queries(self, template_zabbix):
213213

214214
for i, item in enumerate(all_items):
215215
keys = item[0].split("[")
216-
result.append("{0}[*],$2 $1 -c \"{1}\"".format("{0}{1}.{2}".format(self.key, keys[0], keys[1][:-1]),
217-
self.query[self.extension + "_bootstrap"].format(
218-
columns=", ".join(
219-
[x[0][x[0].find("[") + 1:x[0].find("]")] for x
220-
in
221-
all_items]), metrics=(", ".join(columns)),
222-
extension_schema=extension_schema) if Pooler.is_bootstraped() else
223-
self.query[self.extension].format(
224-
metrics=(", ".join(columns)),
225-
extension_schema=extension_schema)))
216+
result.append("{0}[*],$2 $1 -c \"{1}\" | awk -F '|' '{{print ${2}}}'".format(
217+
"{0}{1}.{2}".format(self.key, keys[0], keys[1][:-1]),
218+
self.query[self.extension + "_bootstrap"].format(
219+
columns=", ".join([x[0][x[0].find("[") + 1:x[0].find("]")] for x in all_items]),
220+
metrics=(", ".join(columns)),
221+
extension_schema=extension_schema) if Pooler.is_bootstraped() else
222+
self.query[self.extension].format(
223+
metrics=(", ".join(columns)),
224+
extension_schema=extension_schema),
225+
i + 1))
226226

227227
if Pooler.server_version_greater("14"):
228228
if self.extension == "pg_stat_statements":
229229
for i, item in enumerate(self.Items_pg_14):
230230
keys = item[0].split("[")
231231
result.append(
232-
"{0}[*],$2 $1 -c \"{1}\"".format("{0}{1}.{2}".format(self.key, keys[0], keys[1][:-1]),
233-
self.query_info.format(metrics=(item[1]),
234-
extension_schema=extension_schema)))
232+
"{0}[*],$2 $1 -c \"{1}\" | awk -F '|' '{{print ${2}}}'".format(
233+
"{0}{1}.{2}".format(self.key, keys[0], keys[1][:-1]),
234+
self.query_info.format(metrics=(item[1]), extension_schema=extension_schema),
235+
i + 1))
235236
return template_zabbix.key_and_query(result)
236237
else:
237238
return

0 commit comments

Comments
 (0)