Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add node_name in node-stats docs for ... #646

Merged
merged 1 commit into from
Feb 13, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions esrally/mechanic/telemetry.py
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ def __init__(self, telemetry_params, cluster_name, client, metrics_store):
self.include_gc_stats = telemetry_params.get("node-stats-include-gc", True)
self.client = client
self.metrics_store = metrics_store
self.metrics_store_meta_data = {"cluster": cluster_name}
self.cluster_name = cluster_name

def __str__(self):
return "node stats"
Expand All @@ -646,6 +646,10 @@ def record(self):
current_sample = self.sample()
for node_stats in current_sample:
node_name = node_stats["name"]
metrics_store_meta_data = {
"cluster": self.cluster_name,
"node_name": node_name
}
collected_node_stats = collections.OrderedDict()
collected_node_stats["name"] = "node-stats"

Expand All @@ -670,7 +674,7 @@ def record(self):
self.metrics_store.put_doc(dict(collected_node_stats),
level=MetaInfoScope.node,
node_name=node_name,
meta_data=self.metrics_store_meta_data)
meta_data=metrics_store_meta_data)

def flatten_stats_fields(self, prefix=None, stats=None):
"""
Expand Down
11 changes: 8 additions & 3 deletions tests/mechanic/telemetry_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -1148,7 +1148,10 @@ def test_stores_default_nodes_stats(self, metrics_store_put_doc):
client = Client(nodes=SubClient(stats=NodeStatsRecorderTests.node_stats_response))
cfg = create_config()
metrics_store = metrics.EsMetricsStore(cfg)
metrics_store_meta_data = {"cluster": "remote"}
node_name = [NodeStatsRecorderTests.node_stats_response["nodes"][node]["name"]
for node in NodeStatsRecorderTests.node_stats_response["nodes"]][0]
metrics_store_meta_data = {"cluster": "remote", "node_name": node_name}

telemetry_params = {}
recorder = telemetry.NodeStatsRecorder(telemetry_params, cluster_name="remote", client=client, metrics_store=metrics_store)
recorder.record()
Expand Down Expand Up @@ -1350,7 +1353,8 @@ def test_stores_all_nodes_stats(self, metrics_store_put_doc):
client = Client(nodes=SubClient(stats=node_stats_response))
cfg = create_config()
metrics_store = metrics.EsMetricsStore(cfg)
metrics_store_meta_data = {"cluster": "remote"}
node_name = [node_stats_response["nodes"][node]["name"] for node in node_stats_response["nodes"]][0]
metrics_store_meta_data = {"cluster": "remote", "node_name": node_name}
telemetry_params = {
"node-stats-include-indices": True
}
Expand Down Expand Up @@ -1626,7 +1630,8 @@ def test_stores_selected_indices_metrics_from_nodes_stats(self, metrics_store_pu
client = Client(nodes=SubClient(stats=node_stats_response))
cfg = create_config()
metrics_store = metrics.EsMetricsStore(cfg)
metrics_store_meta_data = {"cluster": "remote"}
node_name = [node_stats_response["nodes"][node]["name"] for node in node_stats_response["nodes"]][0]
metrics_store_meta_data = {"cluster": "remote", "node_name": node_name}
telemetry_params = {
"node-stats-include-indices-metrics": "refresh,docs"
}
Expand Down