Skip to content

Commit 8ae8466

Browse files
author
Mike Holloway
committed
update examples to new consistent NetData dimension labels (MB->MiB)
1 parent 7841ea1 commit 8ae8466

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

promql.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ def lowestcpufree(self):
9393
def lowestmemfree(self):
9494
"""Current lowest free memory NetData from Prometheus"""
9595
try:
96-
req = requests.get('%s/query?query=%s' % (self.config['PROMQL_URL'], urllib.parse.quote_plus('floor( bottomk(1, 100 / sum(netdata_system_ram_MB_average) by (job) * sum(netdata_system_ram_MB_average{dimension=~"free|cached"} ) by (job) ) )')))
96+
req = requests.get('%s/query?query=%s' % (self.config['PROMQL_URL'], urllib.parse.quote_plus('floor( bottomk(1, 100 / sum(netdata_system_ram_MiB_average) by (job) * sum(netdata_system_ram_MiB_average{dimension=~"free|cached"} ) by (job) ) )')))
9797
if req.status_code == 200:
9898
req = req.json()
9999
for i in req['data']['result']:
100-
str1 = 'netdata_mem_available_MB_average{job="%s"}' % i['metric']['job']
100+
str1 = 'netdata_mem_available_MiB_average{job="%s"}' % i['metric']['job']
101101
req2 = requests.get('%s/query?query=%s' % (self.config['PROMQL_URL'], urllib.parse.quote_plus(str1)))
102102
if req2.status_code == 200:
103103
req2 = req2.json()
@@ -116,11 +116,11 @@ def lowestmemfree(self):
116116
def lowestrootfree(self):
117117
"""Current lowest free root filesystem via NetData from Prometheus"""
118118
try:
119-
req = requests.get('%s/query?query=%s' % (self.config['PROMQL_URL'], urllib.parse.quote_plus('floor( bottomk(1, 100 / sum(netdata_disk_space_GB_average{family="/"}) by (job) * sum(netdata_disk_space_GB_average{family="/",dimension="avail"} ) by (job) ) )')))
119+
req = requests.get('%s/query?query=%s' % (self.config['PROMQL_URL'], urllib.parse.quote_plus('floor( bottomk(1, 100 / sum(netdata_disk_space_GiB_average{family="/"}) by (job) * sum(netdata_disk_space_GiB_average{family="/",dimension="avail"} ) by (job) ) )')))
120120
if req.status_code == 200:
121121
req = req.json()
122122
for i in req['data']['result']:
123-
str1 = 'netdata_disk_space_GB_average{job="%s", family="/", dimension="avail"}' % i['metric']['job']
123+
str1 = 'netdata_disk_space_GiB_average{job="%s", family="/", dimension="avail"}' % i['metric']['job']
124124
req2 = requests.get('%s/query?query=%s' % (self.config['PROMQL_URL'], urllib.parse.quote_plus(str1)))
125125
if req2.status_code == 200:
126126
req2 = req2.json()
@@ -166,12 +166,12 @@ def promql_lowestrootfree(self, msg, args):
166166
def promql_memfree(self, msg, args):
167167
"""Current free memory of all or partial host via NetData from Prometheus"""
168168
try:
169-
str1 = 'floor( 100 / sum(netdata_system_ram_MB_average{job=~".*%s.*"}) by (job) * sum(netdata_system_ram_MB_average{dimension=~"free|cached",job=~".*%s.*"} ) by (job) )' % (args.strip(), args.strip())
169+
str1 = 'floor( 100 / sum(netdata_system_ram_MiB_average{job=~".*%s.*"}) by (job) * sum(netdata_system_ram_MiB_average{dimension=~"free|cached",job=~".*%s.*"} ) by (job) )' % (args.strip(), args.strip())
170170
req = requests.get('%s/query?query=%s' % (self.config['PROMQL_URL'], urllib.parse.quote_plus(str1)))
171171
if req.status_code == 200:
172172
req = req.json()
173173
for i in req['data']['result']:
174-
str1 = 'netdata_mem_available_MB_average{job="%s"}' % i['metric']['job']
174+
str1 = 'netdata_mem_available_MiB_average{job="%s"}' % i['metric']['job']
175175
req2 = requests.get('%s/query?query=%s' % (self.config['PROMQL_URL'], urllib.parse.quote_plus(str1)))
176176
if req2.status_code == 200:
177177
req2 = req2.json()
@@ -203,12 +203,12 @@ def promql_raw(self, msg, args):
203203
def promql_rootfree(self, msg, args):
204204
"""Current free root filesystem of all or partial host via NetData from Prometheus"""
205205
try:
206-
str1 = 'floor( 100 / sum(netdata_disk_space_GB_average{family="/",job=~".*%s.*"}) by (job) * sum(netdata_disk_space_GB_average{family="/",dimension="avail",job=~".*%s.*"} ) by (job) )' % (args.strip(), args.strip())
206+
str1 = 'floor( 100 / sum(netdata_disk_space_GiB_average{family="/",job=~".*%s.*"}) by (job) * sum(netdata_disk_space_GiB_average{family="/",dimension="avail",job=~".*%s.*"} ) by (job) )' % (args.strip(), args.strip())
207207
req = requests.get('%s/query?query=%s' % (self.config['PROMQL_URL'], urllib.parse.quote_plus(str1)))
208208
if req.status_code == 200:
209209
req = req.json()
210210
for i in req['data']['result']:
211-
str1 = 'netdata_disk_space_GB_average{job="%s", family="/", dimension="avail"}' % i['metric']['job']
211+
str1 = 'netdata_disk_space_GiB_average{job="%s", family="/", dimension="avail"}' % i['metric']['job']
212212
req2 = requests.get('%s/query?query=%s' % (self.config['PROMQL_URL'], urllib.parse.quote_plus(str1)))
213213
if req2.status_code == 200:
214214
req2 = req2.json()
@@ -285,7 +285,7 @@ def promql_rootfree(self, msg, args):
285285
# }
286286

287287
#promql lowestroot
288-
# floor( bottomk(1, 100 / sum(netdata_disk_space_GB_average{family="/"}) by (job) * sum(netdata_disk_space_GB_average{family="/",dimension="avail"} ) by (job) ) )
288+
# floor( bottomk(1, 100 / sum(netdata_disk_space_GiB_average{family="/"}) by (job) * sum(netdata_disk_space_GiB_average{family="/",dimension="avail"} ) by (job) ) )
289289
# {
290290
# 'status':'success',
291291
# 'data':{

0 commit comments

Comments
 (0)