Skip to content

Commit 10e66fe

Browse files
-
1 parent 91b8b22 commit 10e66fe

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

src/Controller/ElasticsearchShardController.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ public function stats(Request $request): Response
9898
$data['totals']['shards_total'] = 0;
9999
$data['totals']['shards_total_primary'] = 0;
100100
$data['totals']['shards_total_unassigned'] = 0;
101-
$data['totals']['shards_total_unassigned_reason'] = 0;
102101
if (true === isset($clusterStats['indices']['shards']['replication'])) {
103102
$data['totals']['shards_replication'] = round($clusterStats['indices']['shards']['replication']*100, 2).'%';
104103
}
@@ -118,9 +117,6 @@ public function stats(Request $request): Response
118117
if ('unassigned' == $shard->getState()) {
119118
$data['totals']['shards_total_unassigned']++;
120119
}
121-
if ($shard->getUnassignedReason()) {
122-
$data['totals']['shards_total_unassigned_reason']++;
123-
}
124120
$data['totals']['shards_total_documents'] += $shard->getDocuments();
125121
$data['totals']['shards_total_size'] += $shard->getSize();
126122

@@ -143,7 +139,9 @@ public function stats(Request $request): Response
143139
$key = $shard->getState();
144140
break;
145141
case 'shards_by_unassigned_reason':
146-
$key = $shard->getUnassignedReason();
142+
if ('unassigned' == $shard->getState()) {
143+
$key = $shard->getUnassignedReason();
144+
}
147145
break;
148146
case 'shards_by_type':
149147
$key = $shard->isPrimary() ? 'primary' : 'replica';

templates/Modules/shard/shard_stats.html.twig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
{% else %}
3030
{{ appImport.dashboardKpi({'title': ('stats_data.' ~ key)|trans, 'badge': {'title': total}}) }}
3131
{% endif %}
32-
{% elseif 'shards_total_unassigned_reason' == key %}
3332
{% elseif 'shards_total_unassigned' == key %}
3433
{% if is_granted('SHARDS', 'global') and 0 < total %}
3534
{{ appImport.dashboardKpi({'title': ('stats_data.' ~ key)|trans, 'badge': {'title': total, 'context': 'danger', 'link': path('shards', {'state[]': 'unassigned'})}}) }}
@@ -55,7 +54,7 @@
5554
{% block content %}
5655
{% for row in results %}
5756
{% if 'shards_by_unassigned_reason' == key %}
58-
{% set percent = appImport.getPercent(data.totals.shards_total_unassigned_reason, row.total, 1) %}
57+
{% set percent = appImport.getPercent(data.totals.shards_total_unassigned, row.total, 1) %}
5958
{% else %}
6059
{% set percent = appImport.getPercent(data.totals.shards_total, row.total, 1) %}
6160
{% endif %}

0 commit comments

Comments
 (0)