Skip to content

Commit 473acb0

Browse files
arrange badges for nodes
1 parent 2ae3f38 commit 473acb0

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

src/Manager/ElasticsearchNodeManager.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,10 @@ public function getAll(?array $parameters): array
107107
$nodes[$node['name']]['disk_threshold'] = 'watermark_low';
108108
}
109109
}
110+
} else {
111+
if (true === isset($node['disk.used_percent']) && 90 < $node['disk.used_percent']) {
112+
$nodes[$node['name']]['disk_threshold'] = 'warning';
113+
}
110114
}
111115
}
112116

templates/Modules/node/node_list.html.twig

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{% embed 'Embed/table_embed.html.twig' %}
22
{% import 'Import/app_import.html.twig' as appImport %}
33

4+
{% set percentThreshold = 90 %}
5+
46
{% set columns = {'name': true, 'uptime': true, 'load_average': false, 'cpu': true, 'disk': true, 'memory': true, 'heap': true, 'file_descriptors': true} %}
57

68
{% if true == hasFeature('load_average') %}
@@ -93,12 +95,12 @@
9395
{% if 'cpu' == column %}
9496
<td class="text-nowrap">
9597
{% if row['cpu'] is defined %}
96-
{{ 'usage'|trans }}: {{ appImport.badge({'title': row['cpu'] ~ '%', 'context': 90 < row['cpu'] ? 'danger' : 'info'}) }}
98+
{{ 'usage'|trans }}: {{ appImport.badge({'title': row['cpu'] ~ '%', 'context': percentThreshold < row['cpu'] ? 'warning' : 'info'}) }}
9799
{% if row['stats']['process']['cpu']['percent'] is defined %}
98-
<br><small>{{ 'es_process'|trans }}: {{ appImport.badge({'title': row['stats']['process']['cpu']['percent'] ~ '%', 'context': 90 < row['stats']['process']['cpu']['percent'] ? 'danger' : 'secondary'}) }}</small>
100+
<br><small>{{ 'es_process'|trans }}: {{ appImport.badge({'title': row['stats']['process']['cpu']['percent'] ~ '%', 'context': percentThreshold < row['stats']['process']['cpu']['percent'] ? 'warning' : 'secondary'}) }}</small>
99101
{% endif %}
100102
{% elseif row['stats']['process']['cpu']['percent'] is defined %}
101-
{{ 'es_process'|trans }}: {{ appImport.badge({'title': row['stats']['process']['cpu']['percent'] ~ '%', 'context': 90 < row['stats']['process']['cpu']['percent'] ? 'danger' : 'info'}) }}
103+
{{ 'es_process'|trans }}: {{ appImport.badge({'title': row['stats']['process']['cpu']['percent'] ~ '%', 'context': percentThreshold < row['stats']['process']['cpu']['percent'] ? 'warning' : 'info'}) }}
102104
{% endif %}
103105
{% if row['os']['allocated_processors'] is defined %}
104106
<br><small>{{ 'processors'|trans }}: {{ appImport.badge({'title': row['os']['allocated_processors'], 'context': 'secondary'}) }}</small>
@@ -108,7 +110,7 @@
108110

109111
{% if 'heap' == column %}
110112
<td class="text-nowrap d-none d-xl-table-cell">
111-
{{ 'usage'|trans }}: {{ appImport.badge({'title': row['heap.percent'] ~ '%', 'context': 'info'}) }}
113+
{{ 'usage'|trans }}: {{ appImport.badge({'title': row['heap.percent'] ~ '%', 'context': percentThreshold < row['heap.percent'] ? 'warning' : 'info'}) }}
112114
{% if row['heap.current'] is defined %}
113115
<br><small>{{ 'used'|trans }}: {{ appImport.badge({'title': row['heap.current']|human_filesize, 'context': 'secondary'}) }}</small>
114116
{% endif %}
@@ -118,7 +120,7 @@
118120

119121
{% if 'memory' == column %}
120122
<td class="text-nowrap">
121-
{{ 'usage'|trans }}: {{ appImport.badge({'title': row['ram.percent'] ~ '%', 'context': 'info'}) }}
123+
{{ 'usage'|trans }}: {{ appImport.badge({'title': row['ram.percent'] ~ '%', 'context': percentThreshold < row['ram.percent'] ? 'warning' : 'info'}) }}
122124
{% if row['ram.current'] is defined %}
123125
<br><small>{{ 'used'|trans }}: {{ appImport.badge({'title': row['ram.current']|human_filesize, 'context': 'secondary'}) }}</small>
124126
{% endif %}
@@ -149,14 +151,14 @@
149151
{% if row['load_1m'] is defined and row['load_1m'] %}
150152
{% if row['os']['allocated_processors'] is defined %}
151153
{% set load = ((row['load_1m']*100)/row['os']['allocated_processors'])|round(2) %}
152-
1 min: {{ appImport.badge({'title': load ~ '%', 'context': 100 < load ? 'warning' : 'info'}) }}
154+
1 min: {{ appImport.badge({'title': load ~ '%', 'context': percentThreshold < load ? 'warning' : 'info'}) }}
153155
{% if row['load_5m'] is defined and row['load_5m'] %}
154156
{% set load = ((row['load_5m']*100)/row['os']['allocated_processors'])|round(2) %}
155-
<br><small>5 min: {{ appImport.badge({'title': load ~ '%', 'context': 100 < load ? 'strongwarning' : 'secondary'}) }}</small>
157+
<br><small>5 min: {{ appImport.badge({'title': load ~ '%', 'context': percentThreshold < load ? 'strongwarning' : 'secondary'}) }}</small>
156158
{% endif %}
157159
{% if row['load_15m'] is defined and row['load_15m'] %}
158160
{% set load = ((row['load_15m']*100)/row['os']['allocated_processors'])|round(2) %}
159-
<br><small>15 min: {{ appImport.badge({'title': load ~ '%', 'context': 100 < load ? 'danger' : 'secondary'}) }}</small>
161+
<br><small>15 min: {{ appImport.badge({'title': load ~ '%', 'context': percentThreshold < load ? 'danger' : 'secondary'}) }}</small>
160162
{% endif %}
161163
{% else %}
162164
1 min: {{ appImport.badge({'title': row['load_1m']|round(2), 'context': 'info'}) }}
@@ -173,7 +175,7 @@
173175

174176
{% if 'file_descriptors' == column %}
175177
<td class="text-nowrap d-none d-xl-table-cell">
176-
{{ 'usage'|trans }}: {{ appImport.badge({'title': row['file_desc.percent'] ~ '%', 'context': 'info'}) }}
178+
{{ 'usage'|trans }}: {{ appImport.badge({'title': row['file_desc.percent'] ~ '%', 'context': percentThreshold < row['file_desc.percent'] ? 'warning' : 'info'}) }}
177179
{% if row['file_desc.current'] is defined %}
178180
<br><small>{{ 'used'|trans }}: {{ appImport.badge({'title': row['file_desc.current'], 'context': 'secondary'}) }}</small>
179181
{% endif %}

0 commit comments

Comments
 (0)