Skip to content

Commit 85c089b

Browse files
-
1 parent 1e84227 commit 85c089b

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

src/Controller/ElasticsearchIndexGraveyardController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function index(Request $request): Response
5050
'page' => $request->query->get('page'),
5151
'size' => 100,
5252
]),
53-
'tombstones_size' => $clusterSettings['cluster.indices.tombstones.size'],
53+
'tombstones_size' => $clusterSettings['cluster.indices.tombstones.size'] ?? null,
5454
]);
5555
}
5656

src/Controller/ElasticsearchNodeController.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ public function stats(Request $request): Response
6767
$data = ['totals' => [], 'tables' => []];
6868
$data['totals']['nodes_total'] = 0;
6969
$data['totals']['nodes_total_disk_avail'] = 0;
70-
$data['totals']['nodes_total_disk_used'] = 0;
70+
if (true === $this->callManager->hasFeature('cat_nodes_disk')) {
71+
$data['totals']['nodes_total_disk_used'] = 0;
72+
}
7173

7274
$tables = [
7375
'nodes_by_disk_avail',
@@ -82,7 +84,9 @@ public function stats(Request $request): Response
8284
foreach ($nodes as $node) {
8385
$data['totals']['nodes_total']++;
8486
$data['totals']['nodes_total_disk_avail'] += $node['disk.avail'];
85-
$data['totals']['nodes_total_disk_used'] += $node['disk.used'];
87+
if (true == isset($node['disk.used'])) {
88+
$data['totals']['nodes_total_disk_used'] += $node['disk.used'];
89+
}
8690

8791
foreach ($tables as $table) {
8892
switch ($table) {

templates/Modules/index_graveyard/index_graveyard_index.html.twig

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515
{% embed 'Embed/card_embed.html.twig' %}
1616
{% import 'Import/app_import.html.twig' as appImport %}
1717
{% block content %}
18-
{{ appImport.heading({'level': 3, 'title': 'list'|trans, 'badge': {'title': tombstones.total ~ '/' ~ tombstones_size}}) }}
18+
{% if tombstones_size %}
19+
{{ appImport.heading({'level': 3, 'title': 'list'|trans, 'badge': {'title': tombstones.total ~ '/' ~ tombstones_size}}) }}
20+
{% else %}
21+
{{ appImport.heading({'level': 3, 'title': 'list'|trans, 'badge': {'title': tombstones.total}}) }}
22+
{% endif %}
1923

2024
{% embed 'Embed/buttons_embed.html.twig' %}
2125
{% import 'Import/app_import.html.twig' as appImport %}

0 commit comments

Comments
 (0)