Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Collect version metadata #6556

Merged
merged 2 commits into from
Oct 6, 2020
Merged

Collect version metadata #6556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c3176f
Collect version metadata
ofek May 1, 2020
6cf14fa
fix
ofek Oct 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions kafka_consumer/datadog_checks/kafka_consumer/kafka_consumer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ def check(self, instance):
self._report_highwater_offsets(self._context_limit)
self._report_consumer_offsets_and_lag(self._context_limit - len(self._highwater_offsets))

self._collect_broker_metadata()

def _create_kafka_admin_client(self, api_version):
"""Return a KafkaAdminClient."""
kafka_connect_str = self.instance.get('kafka_connect_str')
Expand Down Expand Up @@ -458,6 +460,15 @@ def _send_event(self, title, text, tags, event_type, aggregation_key, severity='
}
self.event(event_dict)

@AgentCheck.metadata_entrypoint
def _collect_broker_metadata(self):
version_data = [str(part) for part in self.kafka_client._client.check_version()]
version_parts = {name: part for name, part in zip(('major', 'minor', 'patch'), version_data)}

self.set_metadata(
'version', '.'.join(version_data), scheme='parts', final_scheme='semver', part_map=version_parts
)

@classmethod
def _determine_kafka_version(cls, init_config, instance):
"""Return the Kafka cluster version as a tuple."""
Expand Down
18 changes: 18 additions & 0 deletions kafka_consumer/tests/test_kafka_consumer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# (C) Datadog, Inc. 2018-present
# All rights reserved
# Licensed under Simplified BSD License (see LICENSE)
import os

import pytest

from datadog_checks.kafka_consumer import KafkaCheck
Expand Down Expand Up @@ -95,3 +97,19 @@ def test_no_partitions(aggregator, kafka_instance):
kafka_consumer_check.check(kafka_instance)

assert_check_kafka(aggregator, {'my_consumer': {'marvel': [0]}})


@pytest.mark.skipif(os.environ.get('KAFKA_VERSION', '').startswith('0.9'), reason='Old Kafka version')
@pytest.mark.integration
@pytest.mark.usefixtures('dd_environment')
def test_version_metadata(datadog_agent, kafka_instance):
kafka_consumer_check = KafkaCheck('kafka_consumer', {}, [kafka_instance])
kafka_consumer_check.check_id = 'test:123'

version_data = [str(part) for part in kafka_consumer_check.kafka_client._client.check_version()]
version_parts = {'version.{}'.format(name): part for name, part in zip(('major', 'minor', 'patch'), version_data)}
version_parts['version.scheme'] = 'semver'
version_parts['version.raw'] = '.'.join(version_data)

kafka_consumer_check.check(kafka_instance)
datadog_agent.assert_metadata('test:123', version_parts)