Skip to content

Commit

Permalink
[prometheus] Use ecs definition of the 'event.dataset' field (#7667)
Browse files Browse the repository at this point in the history
* Use ecs definition of the 'event.dataset' field

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

* Update changelog.yml

---------

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
  • Loading branch information
tetianakravchenko authored Sep 6, 2023
1 parent 499fe56 commit 2e82e7b
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 16 deletions.
5 changes: 5 additions & 0 deletions packages/prometheus/changelog.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "1.12.0"
changes:
- description: Use ecs definition of the 'event.dataset' field
type: enhancement
link: https://github.com/elastic/integrations/pull/7667
- version: "1.11.0"
changes:
- description: Enable TSDB by default for remote_write datastreams. This improves storage usage and query performance. For more details, see https://www.elastic.co/guide/en/elasticsearch/reference/current/tsds.html
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,3 @@
type: constant_keyword
description: Event module.
value: prometheus
- name: event.dataset
type: constant_keyword
description: Event dataset.
value: prometheus.collector
2 changes: 2 additions & 0 deletions packages/prometheus/data_stream/collector/fields/ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@
- external: ecs
name: agent.id
dimension: true
- external: ecs
name: event.dataset
4 changes: 0 additions & 4 deletions packages/prometheus/data_stream/query/fields/base-fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,3 @@
type: constant_keyword
description: Event module.
value: prometheus
- name: event.dataset
type: constant_keyword
description: Event dataset.
value: prometheus.query
2 changes: 2 additions & 0 deletions packages/prometheus/data_stream/query/fields/ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@
- external: ecs
name: agent.id
dimension: true
- external: ecs
name: event.dataset
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,3 @@
type: constant_keyword
description: Event module.
value: prometheus
- name: event.dataset
type: constant_keyword
description: Event dataset.
value: prometheus.remote_write
2 changes: 2 additions & 0 deletions packages/prometheus/data_stream/remote_write/fields/ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@
- external: ecs
name: agent.id
dimension: true
- external: ecs
name: event.dataset
6 changes: 3 additions & 3 deletions packages/prometheus/docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ The fields reported are:
| data_stream.namespace | Data stream namespace. | constant_keyword | |
| data_stream.type | Data stream type. | constant_keyword | |
| ecs.version | ECS version this event conforms to. `ecs.version` is a required field and must exist in all events. When querying across multiple indices -- which may conform to slightly different ECS versions -- this field lets integrations adjust to the schema version of the events. | keyword | |
| event.dataset | Event dataset. | constant_keyword | |
| event.dataset | Name of the dataset. If an event source publishes more than one type of log or events (e.g. access log, error log), the dataset is used to specify which one the event comes from. It's recommended but not required to start the dataset name with the module name, followed by a dot, then the dataset name. | keyword | |
| event.module | Event module. | constant_keyword | |
| host.architecture | Operating system architecture. | keyword | |
| host.containerized | If the host is a container. | boolean | |
Expand Down Expand Up @@ -414,7 +414,7 @@ The fields reported are:
| data_stream.namespace | Data stream namespace. | constant_keyword | |
| data_stream.type | Data stream type. | constant_keyword | |
| ecs.version | ECS version this event conforms to. `ecs.version` is a required field and must exist in all events. When querying across multiple indices -- which may conform to slightly different ECS versions -- this field lets integrations adjust to the schema version of the events. | keyword | |
| event.dataset | Event dataset. | constant_keyword | |
| event.dataset | Name of the dataset. If an event source publishes more than one type of log or events (e.g. access log, error log), the dataset is used to specify which one the event comes from. It's recommended but not required to start the dataset name with the module name, followed by a dot, then the dataset name. | keyword | |
| event.module | Event module. | constant_keyword | |
| host.architecture | Operating system architecture. | keyword | |
| host.containerized | If the host is a container. | boolean | |
Expand Down Expand Up @@ -637,7 +637,7 @@ The fields reported are:
| data_stream.namespace | Data stream namespace. | constant_keyword | |
| data_stream.type | Data stream type. | constant_keyword | |
| ecs.version | ECS version this event conforms to. `ecs.version` is a required field and must exist in all events. When querying across multiple indices -- which may conform to slightly different ECS versions -- this field lets integrations adjust to the schema version of the events. | keyword | |
| event.dataset | Event dataset. | constant_keyword | |
| event.dataset | Name of the dataset. If an event source publishes more than one type of log or events (e.g. access log, error log), the dataset is used to specify which one the event comes from. It's recommended but not required to start the dataset name with the module name, followed by a dot, then the dataset name. | keyword | |
| event.module | Event module. | constant_keyword | |
| host.architecture | Operating system architecture. | keyword | |
| host.containerized | If the host is a container. | boolean | |
Expand Down
2 changes: 1 addition & 1 deletion packages/prometheus/manifest.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
format_version: 2.10.0
name: prometheus
title: Prometheus
version: 1.11.0
version: 1.12.0
description: Collect metrics from Prometheus servers with Elastic Agent.
type: integration
categories:
Expand Down

0 comments on commit 2e82e7b

Please sign in to comment.