Skip to content

Commit 092d20c

Browse files
Revert "18735 Support upper and lower consumer count thresholds in Queue Lengths check"
This reverts commit 7f68808. Reason for revert: SUP-26393 Change-Id: I43c308a36ad2efc7172f07c66719ec90541fdd06
1 parent f6c09da commit 092d20c

5 files changed

Lines changed: 4 additions & 149 deletions

File tree

.werks/18735.md

Lines changed: 0 additions & 18 deletions
This file was deleted.

cmk/base/legacy_checks/mq_queues.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,12 @@ def check_mq_queues(item, params, info):
3838
for line in info:
3939
if found is True:
4040
size, consumerCount, enqueueCount, dequeueCount = map(int, line)
41-
consumer_count_upper_levels = params["consumerCount"] or (None, None)
42-
consumer_count_lower_levels = params["consumer_count_levels_lower"] or (None, None)
41+
4342
if (
4443
count_result := check_levels(
4544
consumerCount,
4645
None,
47-
consumer_count_upper_levels + consumer_count_lower_levels,
46+
params["consumerCount"],
4847
infoname="Consuming connections",
4948
human_readable_func=str,
5049
)
@@ -79,6 +78,5 @@ def parse_mq_queues(string_table: StringTable) -> StringTable:
7978
check_default_parameters={
8079
"size": None,
8180
"consumerCount": None,
82-
"consumer_count_levels_lower": None,
8381
},
8482
)

cmk/gui/plugins/wato/check_parameters/mq_queues.py

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,9 @@ def _parameter_valuespec_mq_queues():
3333
(
3434
"consumerCount",
3535
SimpleLevels(
36-
title=_("Upper Levels for the consumer count"),
36+
title=_("Levels for the consumer count"),
3737
help=_("Consumer Count is the size of connected consumers to a queue"),
3838
spec=Integer,
39-
direction="upper",
40-
),
41-
),
42-
(
43-
"consumer_count_levels_lower",
44-
SimpleLevels(
45-
title=_("Lower levels for the consumer count"),
46-
help=_("Consumer Count is the size of connected consumers to a queue"),
47-
spec=Integer,
48-
direction="lower",
4939
),
5040
),
5141
],

tests/unit/checks/generictests/datasets/mq_queues_regression.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"": [
2121
(
2222
"Queue_App1_App2",
23-
{"consumerCount": (None, None), "consumer_count_levels_lower": (None, None), "size": (None, None)},
23+
{"consumerCount": (None, None), "size": (None, None)},
2424
[
2525
(
2626
0,

tests/unit/cmk/base/legacy_checks/test_mq_queues.py

Lines changed: 0 additions & 115 deletions
This file was deleted.

0 commit comments

Comments
 (0)