Skip to content

Commit 6732fd6

Browse files
authored
Add the docker log template to the Kuma config file. (DataDog#20614)
* Add the docker log template to the Kuma config file. * Add changelog. * Increase timeout for starting Kuma in E2E tests.
1 parent cd94d6b commit 6732fd6

4 files changed

Lines changed: 28 additions & 2 deletions

File tree

kuma/assets/configuration/spec.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,9 @@ files:
1111
overrides:
1212
openmetrics_endpoint.value.example: http://%%host%%:5680/metrics
1313
openmetrics_endpoint.description: |
14-
Set this to the endpoint that Kuma exposes.
14+
Set this to the endpoint that Kuma exposes.
15+
- template: logs
16+
example:
17+
- type: docker
18+
source: kuma
19+
service: <SERVICE>

kuma/changelog.d/20614.fixed

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Added the containerized template for logs to the Kuma config file example.

kuma/datadog_checks/kuma/data/conf.yaml.example

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,3 +633,23 @@ instances:
633633
# - <INCLUDE_REGEX>
634634
# exclude:
635635
# - <EXCLUDE_REGEX>
636+
637+
## Log Section
638+
##
639+
## type - required - Type of log input source (tcp / udp / file / windows_event).
640+
## port / path / channel_path - required - Set port if type is tcp or udp.
641+
## Set path if type is file.
642+
## Set channel_path if type is windows_event.
643+
## source - required - Attribute that defines which integration sent the logs.
644+
## encoding - optional - For file specifies the file encoding. Default is utf-8. Other
645+
## possible values are utf-16-le and utf-16-be.
646+
## service - optional - The name of the service that generates the log.
647+
## Overrides any `service` defined in the `init_config` section.
648+
## tags - optional - Add tags to the collected logs.
649+
##
650+
## Discover Datadog log collection: https://docs.datadoghq.com/logs/log_collection/
651+
#
652+
# logs:
653+
# - type: docker
654+
# source: kuma
655+
# service: <SERVICE>

kuma/tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def setup_kuma():
3737
)
3838

3939

40-
def wait_for_kuma_readiness(api_url, api_port, max_wait=120):
40+
def wait_for_kuma_readiness(api_url, api_port, max_wait=600):
4141
"""Wait for Kuma control plane to be ready by querying the /config endpoint."""
4242
config_url = f'http://{api_url}:{api_port}/config'
4343
start_time = time.monotonic()

0 commit comments

Comments
 (0)