Skip to content

Commit 12e4287

Browse files
authored
Merge pull request #166 from m0dular/SUP-3681-invalid_auth
(SUP-3681) Check for valid status key in metrics
2 parents 5ed1f75 + 54b701f commit 12e4287

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

files/pe_metrics.rb

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,17 @@ def retrieve_additional_metrics(host, port, use_ssl, metrics_type, metrics)
134134
metrics.each_index do |index|
135135
metric_name = metrics[index]['name']
136136
metric_data = metrics_output[index]
137-
if metric_data['status'] == 200
137+
138+
metric_status = metric_data ? metric_data.dig('status') : nil
139+
next unless metric_status
140+
141+
if metric_status == 200
138142
metrics_array << { 'name' => metric_name, 'data' => metric_data['value'] }
139-
elsif metric_data['status'] == 404
143+
elsif metric_status == 404
140144
metrics_array << { 'name' => metric_name, 'data' => nil }
141145
else
142146
metric_mbean = metrics[index]['mbean']
143-
$error_array << "HTTP Error #{metric_data['status']} for #{metric_mbean}"
147+
$error_array << "HTTP Error #{metric_status} for #{metric_mbean}"
144148
end
145149
end
146150

0 commit comments

Comments
 (0)