From 12342a8dfd31fa10075688359fc73573fea5b702 Mon Sep 17 00:00:00 2001
From: Esther Kim <esther.kim@datadoghq.com>
Date: Mon, 6 Jan 2025 10:45:57 -0500
Subject: [PATCH 1/3] Update reference link to the fluent bit log collection
docs
---
fluentbit/README.md | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/fluentbit/README.md b/fluentbit/README.md
index 480424e287..d6c7efaad2 100644
--- a/fluentbit/README.md
+++ b/fluentbit/README.md
@@ -2,7 +2,7 @@
## Overview
-This check monitors [Fluent Bit][1] metrics through the Datadog Agent. For sending logs to Datadog with Fluent Bit, see the [Fluent Bit][11] documentation to learn about the Datadog Fluent Bit output plugin.
+This check monitors [Fluent Bit][1] metrics through the Datadog Agent. To send logs to Datadog with Fluent Bit and to learn about the Datadog Fluent Bit output plugin, see the [Fluent Bit][11] documentation.
## Fluent Bit configuration
Fluent Bit doesn't expose its internal metrics by default. You need to enable the built-in HTTP server that exposes the metrics endpoint.
@@ -18,8 +18,6 @@ Follow the instructions below to install and configure this check for an Agent r
### Installation
-### Installation
-
For Agent v7.21+ / v6.21+, follow the instructions below to install the Fluent Bit check on your host. See [Use Community Integrations][3] to install with the Docker Agent or earlier versions of the Agent.
1. Run the following command to install the Agent integration:
@@ -46,6 +44,7 @@ For Agent v7.21+ / v6.21+, follow the instructions below to install the Fluent B
2. [Restart the Agent][6].
+
### Validation
[Run the Agent's status subcommand][7] and look for `fluentbit` under the Checks section.
@@ -68,6 +67,12 @@ The Fluent Bit integration does not include any service checks.
Need help? Contact [Datadog support][10].
+## Further Reading
+
+Additional helpful documentation, links, and articles:
+
+- [Send Fluent Bit Logs to Datadog][11]
+
[1]: https://fluentbit.io
[2]: https://docs.fluentbit.io/manual/administration/monitoring
@@ -79,5 +84,5 @@ Need help? Contact [Datadog support][10].
[8]: https://github.com/DataDog/integrations-extras/blob/master/fluentbit/metadata.csv
[9]: https://github.com/DataDog/integrations-extras/blob/master/fluentbit/assets/service_checks.json
[10]: https://docs.datadoghq.com/help/
-[11]: https://docs.datadoghq.com/integrations/fluentbit/
+[11]: https://docs.datadoghq.com/logs/guide/fluentbit/
[12]: https://docs.datadoghq.com/developers/integrations/python/
From b4288676a3e85e7ea343ac7a019b87d1af0dc2d7 Mon Sep 17 00:00:00 2001
From: Esther Kim <esther.kim@datadoghq.com>
Date: Mon, 6 Jan 2025 11:22:47 -0500
Subject: [PATCH 2/3] Update fluentbit/README.md
---
fluentbit/README.md | 1 -
1 file changed, 1 deletion(-)
diff --git a/fluentbit/README.md b/fluentbit/README.md
index d6c7efaad2..37ee377da1 100644
--- a/fluentbit/README.md
+++ b/fluentbit/README.md
@@ -44,7 +44,6 @@ For Agent v7.21+ / v6.21+, follow the instructions below to install the Fluent B
2. [Restart the Agent][6].
-
### Validation
[Run the Agent's status subcommand][7] and look for `fluentbit` under the Checks section.
From b4d9f10d9bf6d9f5303d1d39975be8a3e2357afa Mon Sep 17 00:00:00 2001
From: Kyle-Neale <kyle.neale@datadoghq.com>
Date: Mon, 6 Jan 2025 17:47:10 -0500
Subject: [PATCH 3/3] sync models
---
.../fluentbit/config_models/instance.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/fluentbit/datadog_checks/fluentbit/config_models/instance.py b/fluentbit/datadog_checks/fluentbit/config_models/instance.py
index 3a106bde68..151a4464ed 100644
--- a/fluentbit/datadog_checks/fluentbit/config_models/instance.py
+++ b/fluentbit/datadog_checks/fluentbit/config_models/instance.py
@@ -25,7 +25,7 @@ class AuthToken(BaseModel):
writer: Optional[MappingProxyType[str, Any]] = None
-class ExtraMetric(BaseModel):
+class ExtraMetrics(BaseModel):
model_config = ConfigDict(
arbitrary_types_allowed=True,
extra='allow',
@@ -44,7 +44,7 @@ class MetricPatterns(BaseModel):
include: Optional[tuple[str, ...]] = None
-class Metric(BaseModel):
+class Metrics(BaseModel):
model_config = ConfigDict(
arbitrary_types_allowed=True,
extra='allow',
@@ -64,7 +64,7 @@ class Proxy(BaseModel):
no_proxy: Optional[tuple[str, ...]] = None
-class ShareLabel(BaseModel):
+class ShareLabels(BaseModel):
model_config = ConfigDict(
arbitrary_types_allowed=True,
frozen=True,
@@ -97,7 +97,7 @@ class InstanceConfig(BaseModel):
exclude_metrics: Optional[tuple[str, ...]] = None
exclude_metrics_by_labels: Optional[MappingProxyType[str, Union[bool, tuple[str, ...]]]] = None
extra_headers: Optional[MappingProxyType[str, Any]] = None
- extra_metrics: Optional[tuple[Union[str, MappingProxyType[str, Union[str, ExtraMetric]]], ...]] = None
+ extra_metrics: Optional[tuple[Union[str, MappingProxyType[str, Union[str, ExtraMetrics]]], ...]] = None
headers: Optional[MappingProxyType[str, Any]] = None
histogram_buckets_as_distributions: Optional[bool] = None
hostname_format: Optional[str] = None
@@ -114,7 +114,7 @@ class InstanceConfig(BaseModel):
kerberos_principal: Optional[str] = None
log_requests: Optional[bool] = None
metric_patterns: Optional[MetricPatterns] = None
- metrics: Optional[tuple[Union[str, MappingProxyType[str, Union[str, Metric]]], ...]] = None
+ metrics: Optional[tuple[Union[str, MappingProxyType[str, Union[str, Metrics]]], ...]] = None
metrics_endpoint: str
min_collection_interval: Optional[float] = None
namespace: Optional[str] = Field(None, pattern='\\w*')
@@ -130,7 +130,7 @@ class InstanceConfig(BaseModel):
rename_labels: Optional[MappingProxyType[str, Any]] = None
request_size: Optional[float] = None
service: Optional[str] = None
- share_labels: Optional[MappingProxyType[str, Union[bool, ShareLabel]]] = None
+ share_labels: Optional[MappingProxyType[str, Union[bool, ShareLabels]]] = None
skip_proxy: Optional[bool] = None
tag_by_endpoint: Optional[bool] = None
tags: Optional[tuple[str, ...]] = None