@@ -179,26 +179,26 @@ class OsClientFactory:
179
179
180
180
def __init__ (self , cfg ):
181
181
self ._config = cfg
182
- host = self ._config .opts ("reporting " , "datastore.host" )
183
- port = self ._config .opts ("reporting " , "datastore.port" )
184
- secure = convert .to_bool (self ._config .opts ("reporting " , "datastore.secure" ))
185
- user = self ._config .opts ("reporting " , "datastore.user" )
182
+ host = self ._config .opts ("results_publishing " , "datastore.host" )
183
+ port = self ._config .opts ("results_publishing " , "datastore.port" )
184
+ secure = convert .to_bool (self ._config .opts ("results_publishing " , "datastore.secure" ))
185
+ user = self ._config .opts ("results_publishing " , "datastore.user" )
186
186
187
- metrics_amazon_aws_log_in = self ._config .opts ("reporting " , "datastore.amazon_aws_log_in" ,
187
+ metrics_amazon_aws_log_in = self ._config .opts ("results_publishing " , "datastore.amazon_aws_log_in" ,
188
188
default_value = None , mandatory = False )
189
189
metrics_aws_access_key_id = None
190
190
metrics_aws_secret_access_key = None
191
191
metrics_aws_region = None
192
192
metrics_aws_service = None
193
193
194
194
if metrics_amazon_aws_log_in == 'config' :
195
- metrics_aws_access_key_id = self ._config .opts ("reporting " , "datastore.aws_access_key_id" ,
195
+ metrics_aws_access_key_id = self ._config .opts ("results_publishing " , "datastore.aws_access_key_id" ,
196
196
default_value = None , mandatory = False )
197
- metrics_aws_secret_access_key = self ._config .opts ("reporting " , "datastore.aws_secret_access_key" ,
197
+ metrics_aws_secret_access_key = self ._config .opts ("results_publishing " , "datastore.aws_secret_access_key" ,
198
198
default_value = None , mandatory = False )
199
- metrics_aws_region = self ._config .opts ("reporting " , "datastore.region" ,
199
+ metrics_aws_region = self ._config .opts ("results_publishing " , "datastore.region" ,
200
200
default_value = None , mandatory = False )
201
- metrics_aws_service = self ._config .opts ("reporting " , "datastore.service" ,
201
+ metrics_aws_service = self ._config .opts ("results_publishing " , "datastore.service" ,
202
202
default_value = None , mandatory = False )
203
203
elif metrics_amazon_aws_log_in == 'environment' :
204
204
metrics_aws_access_key_id = os .getenv ("OSB_DATASTORE_AWS_ACCESS_KEY_ID" , default = None )
@@ -233,14 +233,14 @@ def __init__(self, cfg):
233
233
password = os .environ ["OSB_DATASTORE_PASSWORD" ]
234
234
except KeyError :
235
235
try :
236
- password = self ._config .opts ("reporting " , "datastore.password" )
236
+ password = self ._config .opts ("results_publishing " , "datastore.password" )
237
237
except exceptions .ConfigError :
238
238
raise exceptions .ConfigError (
239
- "No password configured through [reporting ] configuration or OSB_DATASTORE_PASSWORD environment variable."
239
+ "No password configured through [results_publishing ] configuration or OSB_DATASTORE_PASSWORD environment variable."
240
240
) from None
241
- verify = self ._config .opts ("reporting " , "datastore.ssl.verification_mode" , default_value = "full" , mandatory = False ) != "none"
242
- ca_path = self ._config .opts ("reporting " , "datastore.ssl.certificate_authorities" , default_value = None , mandatory = False )
243
- self .probe_version = self ._config .opts ("reporting " , "datastore.probe.cluster_version" , default_value = True , mandatory = False )
241
+ verify = self ._config .opts ("results_publishing " , "datastore.ssl.verification_mode" , default_value = "full" , mandatory = False ) != "none"
242
+ ca_path = self ._config .opts ("results_publishing " , "datastore.ssl.certificate_authorities" , default_value = None , mandatory = False )
243
+ self .probe_version = self ._config .opts ("results_publishing " , "datastore.probe.cluster_version" , default_value = True , mandatory = False )
244
244
245
245
# Instead of duplicating code, we're just adapting the metrics store specific properties to match the regular client options.
246
246
client_options = {
@@ -280,8 +280,9 @@ class IndexTemplateProvider:
280
280
def __init__ (self , cfg ):
281
281
self ._config = cfg
282
282
self .script_dir = self ._config .opts ("node" , "benchmark.root" )
283
- self ._number_of_shards = self ._config .opts ("reporting" , "datastore.number_of_shards" , default_value = None , mandatory = False )
284
- self ._number_of_replicas = self ._config .opts ("reporting" , "datastore.number_of_replicas" , default_value = None , mandatory = False )
283
+ self ._number_of_shards = self ._config .opts ("results_publishing" , "datastore.number_of_shards" , default_value = None , mandatory = False )
284
+ self ._number_of_replicas = self ._config .opts ("results_publishing" , "datastore.number_of_replicas" ,
285
+ default_value = None , mandatory = False )
285
286
286
287
def metrics_template (self ):
287
288
return self ._read ("metrics-template" )
@@ -357,7 +358,7 @@ def metrics_store(cfg, read_only=True, workload=None, test_procedure=None, provi
357
358
358
359
359
360
def metrics_store_class (cfg ):
360
- if cfg .opts ("reporting " , "datastore.type" ) == "opensearch" :
361
+ if cfg .opts ("results_publishing " , "datastore.type" ) == "opensearch" :
361
362
return OsMetricsStore
362
363
else :
363
364
return InMemoryMetricsStore
@@ -1207,7 +1208,7 @@ def test_execution_store(cfg):
1207
1208
:return: A test_execution store implementation.
1208
1209
"""
1209
1210
logger = logging .getLogger (__name__ )
1210
- if cfg .opts ("reporting " , "datastore.type" ) == "opensearch" :
1211
+ if cfg .opts ("results_publishing " , "datastore.type" ) == "opensearch" :
1211
1212
logger .info ("Creating OS test execution store" )
1212
1213
return CompositeTestExecutionStore (EsTestExecutionStore (cfg ), FileTestExecutionStore (cfg ))
1213
1214
else :
@@ -1222,7 +1223,7 @@ def results_store(cfg):
1222
1223
:return: A test_execution store implementation.
1223
1224
"""
1224
1225
logger = logging .getLogger (__name__ )
1225
- if cfg .opts ("reporting " , "datastore.type" ) == "opensearch" :
1226
+ if cfg .opts ("results_publishing " , "datastore.type" ) == "opensearch" :
1226
1227
logger .info ("Creating OS results store" )
1227
1228
return OsResultsStore (cfg )
1228
1229
else :
@@ -1690,7 +1691,7 @@ def __call__(self):
1690
1691
op_type = task .operation .type
1691
1692
error_rate = self .error_rate (t , op_type )
1692
1693
duration = self .duration (t )
1693
- if task .operation .include_in_reporting or error_rate > 0 :
1694
+ if task .operation .include_in_results_publishing or error_rate > 0 :
1694
1695
self .logger .debug ("Gathering request metrics for [%s]." , t )
1695
1696
result .add_op_metrics (
1696
1697
t ,
0 commit comments