redisbench-admin 0.11.32__py3-none-any.whl → 0.11.33__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- redisbench_admin/run/metrics.py +28 -23
- redisbench_admin/run/run.py +1 -1
- {redisbench_admin-0.11.32.dist-info → redisbench_admin-0.11.33.dist-info}/METADATA +1 -1
- {redisbench_admin-0.11.32.dist-info → redisbench_admin-0.11.33.dist-info}/RECORD +7 -7
- {redisbench_admin-0.11.32.dist-info → redisbench_admin-0.11.33.dist-info}/LICENSE +0 -0
- {redisbench_admin-0.11.32.dist-info → redisbench_admin-0.11.33.dist-info}/WHEEL +0 -0
- {redisbench_admin-0.11.32.dist-info → redisbench_admin-0.11.33.dist-info}/entry_points.txt +0 -0
redisbench_admin/run/metrics.py
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
#
|
|
6
6
|
import logging
|
|
7
7
|
import datetime as dt
|
|
8
|
-
|
|
8
|
+
import redis
|
|
9
9
|
from jsonpath_ng import parse
|
|
10
10
|
|
|
11
11
|
|
|
@@ -99,28 +99,33 @@ def collect_redis_metrics(
|
|
|
99
99
|
for conn_n, conn in enumerate(redis_conns):
|
|
100
100
|
conn_res = {}
|
|
101
101
|
for section in sections:
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
if
|
|
110
|
-
if
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
if
|
|
114
|
-
overall[section]
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
overall[section]
|
|
102
|
+
try:
|
|
103
|
+
info = conn.info(section)
|
|
104
|
+
conn_res[section] = info
|
|
105
|
+
if section not in overall:
|
|
106
|
+
overall[section] = {}
|
|
107
|
+
for k, v in info.items():
|
|
108
|
+
collect = True
|
|
109
|
+
if section_filter is not None:
|
|
110
|
+
if section in section_filter:
|
|
111
|
+
if k not in section_filter[section]:
|
|
112
|
+
collect = False
|
|
113
|
+
if collect and type(v) is float or type(v) is int:
|
|
114
|
+
if k not in overall[section]:
|
|
115
|
+
overall[section][k] = 0
|
|
116
|
+
overall[section][k] += v
|
|
117
|
+
if collect and type(v) is dict:
|
|
118
|
+
for inner_k, inner_v in v.items():
|
|
119
|
+
if type(inner_v) is float or type(inner_v) is int:
|
|
120
|
+
final_str_k = "{}_{}".format(k, inner_k)
|
|
121
|
+
if multi_shard:
|
|
122
|
+
final_str_k += "_shard_{}".format(conn_n + 1)
|
|
123
|
+
if final_str_k not in overall[section]:
|
|
124
|
+
overall[section][final_str_k] = inner_v
|
|
125
|
+
except redis.exceptions.ConnectionError as e:
|
|
126
|
+
logging.warning(
|
|
127
|
+
f"Unable to collect section {section} from redis. error: {e.__str__}"
|
|
128
|
+
)
|
|
124
129
|
|
|
125
130
|
res.append(conn_res)
|
|
126
131
|
|
redisbench_admin/run/run.py
CHANGED
|
@@ -86,7 +86,7 @@ def define_benchmark_plan(benchmark_definitions, default_specs):
|
|
|
86
86
|
setup_contains_dbconfig = False
|
|
87
87
|
if "dbconfig" in setup_settings:
|
|
88
88
|
setup_contains_dbconfig = True
|
|
89
|
-
logging.
|
|
89
|
+
logging.debug(
|
|
90
90
|
f"setup ({setup_name}): {setup_settings}. contains dbconfig {setup_contains_dbconfig}"
|
|
91
91
|
)
|
|
92
92
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: redisbench-admin
|
|
3
|
-
Version: 0.11.
|
|
3
|
+
Version: 0.11.33
|
|
4
4
|
Summary: Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... ).
|
|
5
5
|
Author: filipecosta90
|
|
6
6
|
Author-email: filipecosta.90@gmail.com
|
|
@@ -183,14 +183,14 @@ redisbench_admin/run/git.py,sha256=6UYGcTN0MPzf4QDVoJnFkou0yZasLF6jLG7f0zoySq8,3
|
|
|
183
183
|
redisbench_admin/run/grafana.py,sha256=iMDgMyJKinpZMTD43rZ1IcRGkadjFjCxaB48mYWkvG4,9421
|
|
184
184
|
redisbench_admin/run/memtier_benchmark/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
|
|
185
185
|
redisbench_admin/run/memtier_benchmark/memtier_benchmark.py,sha256=wTd2olovvFBZ98mOSr6DM5BJsdaiuPteEZzBqeSgbkE,4246
|
|
186
|
-
redisbench_admin/run/metrics.py,sha256=
|
|
186
|
+
redisbench_admin/run/metrics.py,sha256=uOOwOC9vTC97y2hxSKwt_RJqxpkLJmSR3oOv_WWnS9o,7630
|
|
187
187
|
redisbench_admin/run/modules.py,sha256=9To85oDw2tmUNmTDxOgvKls_46oZRcd2cCt6xNjIWiA,1691
|
|
188
188
|
redisbench_admin/run/redis_benchmark/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
|
|
189
189
|
redisbench_admin/run/redis_benchmark/redis_benchmark.py,sha256=e-Az2uTlt3z2W4uzlUsdxeT8GITpxpGb-Mjb6JxrSWc,6848
|
|
190
190
|
redisbench_admin/run/redisgraph_benchmark_go/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
|
|
191
191
|
redisbench_admin/run/redisgraph_benchmark_go/redisgraph_benchmark_go.py,sha256=DijIoWr73e2t7Zy-UmODzC51IjUh6hH5I0LaPRJW4Vk,2241
|
|
192
192
|
redisbench_admin/run/redistimeseries.py,sha256=x3PA7QoHXu53zs5v0ekK2sVmUnA9_ZF2JxgCDf1Mui4,21331
|
|
193
|
-
redisbench_admin/run/run.py,sha256=
|
|
193
|
+
redisbench_admin/run/run.py,sha256=mbP9A01dU-ITLhoEfWbVWskxe0YhIeU5iRerNIJVF74,5588
|
|
194
194
|
redisbench_admin/run/s3.py,sha256=pXQXZ1rrwDCWeBegGR4aKzbKqWWwMrmqvIjFxEB3bh4,442
|
|
195
195
|
redisbench_admin/run/ssh.py,sha256=gRW6ROoTKlaxLKhS5tM-Ejjd6zk2iO1KN9dzBzw7GOk,2835
|
|
196
196
|
redisbench_admin/run/tsbs_run_queries_redistimeseries/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
|
|
@@ -235,8 +235,8 @@ redisbench_admin/utils/utils.py,sha256=YxuSPS6dtBw7T8e09678rUNNiCSkuFtVXNc05-qyt
|
|
|
235
235
|
redisbench_admin/watchdog/__init__.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdUHP20,95
|
|
236
236
|
redisbench_admin/watchdog/args.py,sha256=nKsG1G6ATOZlAMHMtT9u3kXxduKCbejSZ5x8oB_ynZ8,1312
|
|
237
237
|
redisbench_admin/watchdog/watchdog.py,sha256=0wWYge3x_OMxWrzazNhJif2NK4tKsI963HVZqjczRag,6189
|
|
238
|
-
redisbench_admin-0.11.
|
|
239
|
-
redisbench_admin-0.11.
|
|
240
|
-
redisbench_admin-0.11.
|
|
241
|
-
redisbench_admin-0.11.
|
|
242
|
-
redisbench_admin-0.11.
|
|
238
|
+
redisbench_admin-0.11.33.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
|
|
239
|
+
redisbench_admin-0.11.33.dist-info/METADATA,sha256=Fi_pgrXLQzVcxZvmg4MlYomR14jh5TVhCCtsPsoz2_Y,5389
|
|
240
|
+
redisbench_admin-0.11.33.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
|
|
241
|
+
redisbench_admin-0.11.33.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
|
|
242
|
+
redisbench_admin-0.11.33.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|