Skip to content

Commit d2ea72a

Browse files
committed
address comments
1 parent 17a885b commit d2ea72a

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

lib/krane/cluster_resource_discovery.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,14 @@ def crds
2020

2121
def prunable_resources(namespaced:)
2222
black_list = %w(Namespace Node ControllerRevision Event Elasticsearch)
23-
result = fetch_resources(namespaced: namespaced).map do |resource|
23+
fetch_resources(namespaced: namespaced).map do |resource|
2424
next unless resource["verbs"].one? { |v| v == "delete" }
2525
if resource["kind"] == "Elasticsearch"
26-
StatsD.client.count('elasticsearch_resource_deletion_attempt.count', 1, tags: @namespace_tags)
26+
StatsD.client.count('elasticsearch_resource_deletion_attempt.count', 1, tags: namespace)
2727
end
2828
next if black_list.include?(resource["kind"])
2929
[resource["apigroup"], resource["version"], resource["kind"]].compact.join("/")
3030
end.compact
31-
32-
result
3331
end
3432

3533
def fetch_resources(namespaced: false)

test/unit/cluster_resource_discovery_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def test_elasticsearch_statsd_count_not_emitted_when_no_elasticsearch
6969
crd.prunable_resources(namespaced: true)
7070
end
7171

72-
gauge_metric = metrics.find { |m| m.name == 'Krane.elasticsearch_resources.count' && m.type == :c }
73-
assert_nil(gauge_metric, "Expected elasticsearch_resources.count gauge NOT to be emitted when no Elasticsearch exists")
72+
count_metric = metrics.find { |m| m.name == 'Krane.elasticsearch_resource_deletion_attempt.count' && m.type == :c }
73+
assert_nil(count_metric, "Expected elasticsearch_resource_deletion_attempt.count NOT to be emitted when no Elasticsearch exists")
7474
end
7575
end

0 commit comments

Comments
 (0)