diff --git a/packages/websphere_application_server/_dev/build/docs/README.md b/packages/websphere_application_server/_dev/build/docs/README.md index de77275dac4..671b27aaba0 100644 --- a/packages/websphere_application_server/_dev/build/docs/README.md +++ b/packages/websphere_application_server/_dev/build/docs/README.md @@ -15,6 +15,10 @@ To open Prometheus endpoint read following [instructions](https://www.ibm.com/do This integration has been tested against WebSphere Application Server traditional version `9.0.5.11`. +### Troubleshooting + +If host.ip is shown conflicted under ``metrics-*`` data view, then this issue can be solved by [reindexing](https://www.elastic.co/guide/en/elasticsearch/reference/current/use-a-data-stream.html#reindex-with-a-data-stream) the ``JDBC``, ``Servlet``, ``Session Manager`` and ``ThreadPool`` data stream's indices. + ## JDBC This data stream collects JDBC (Java Database Connectivity) related metrics. diff --git a/packages/websphere_application_server/changelog.yml b/packages/websphere_application_server/changelog.yml index 2e55bc1d628..df77834dafd 100644 --- a/packages/websphere_application_server/changelog.yml +++ b/packages/websphere_application_server/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "0.8.1" + changes: + - description: Resolve the conflict in host.ip field. + type: bugfix + link: https://github.com/elastic/integrations/pull/7507 - version: "0.8.0" changes: - description: Add compatibility section and update the title. diff --git a/packages/websphere_application_server/data_stream/jdbc/fields/ecs.yml b/packages/websphere_application_server/data_stream/jdbc/fields/ecs.yml index 392e2eb7c5a..7bf8e76ce5b 100644 --- a/packages/websphere_application_server/data_stream/jdbc/fields/ecs.yml +++ b/packages/websphere_application_server/data_stream/jdbc/fields/ecs.yml @@ -1,5 +1,7 @@ - external: ecs name: ecs.version +- external: ecs + name: host.ip - external: ecs name: server.address - external: ecs diff --git a/packages/websphere_application_server/data_stream/servlet/fields/ecs.yml b/packages/websphere_application_server/data_stream/servlet/fields/ecs.yml index 95994b26bcb..ffd8ccfb54d 100644 --- a/packages/websphere_application_server/data_stream/servlet/fields/ecs.yml +++ b/packages/websphere_application_server/data_stream/servlet/fields/ecs.yml @@ -1,5 +1,7 @@ - external: ecs name: ecs.version +- external: ecs + name: host.ip - external: ecs name: server.address - external: ecs diff --git a/packages/websphere_application_server/data_stream/session_manager/fields/ecs.yml b/packages/websphere_application_server/data_stream/session_manager/fields/ecs.yml index 392e2eb7c5a..7bf8e76ce5b 100644 --- a/packages/websphere_application_server/data_stream/session_manager/fields/ecs.yml +++ b/packages/websphere_application_server/data_stream/session_manager/fields/ecs.yml @@ -1,5 +1,7 @@ - external: ecs name: ecs.version +- external: ecs + name: host.ip - external: ecs name: server.address - external: ecs diff --git a/packages/websphere_application_server/data_stream/threadpool/fields/ecs.yml b/packages/websphere_application_server/data_stream/threadpool/fields/ecs.yml index 392e2eb7c5a..7bf8e76ce5b 100644 --- a/packages/websphere_application_server/data_stream/threadpool/fields/ecs.yml +++ b/packages/websphere_application_server/data_stream/threadpool/fields/ecs.yml @@ -1,5 +1,7 @@ - external: ecs name: ecs.version +- external: ecs + name: host.ip - external: ecs name: server.address - external: ecs diff --git a/packages/websphere_application_server/docs/README.md b/packages/websphere_application_server/docs/README.md index 0f0a57f1b86..64f4be2b0fd 100644 --- a/packages/websphere_application_server/docs/README.md +++ b/packages/websphere_application_server/docs/README.md @@ -15,6 +15,10 @@ To open Prometheus endpoint read following [instructions](https://www.ibm.com/do This integration has been tested against WebSphere Application Server traditional version `9.0.5.11`. +### Troubleshooting + +If host.ip is shown conflicted under ``metrics-*`` data view, then this issue can be solved by [reindexing](https://www.elastic.co/guide/en/elasticsearch/reference/current/use-a-data-stream.html#reindex-with-a-data-stream) the ``JDBC``, ``Servlet``, ``Session Manager`` and ``ThreadPool`` data stream's indices. + ## JDBC This data stream collects JDBC (Java Database Connectivity) related metrics. @@ -132,6 +136,7 @@ An example event for `jdbc` looks as following: | event.kind | Event kind | constant_keyword | | event.module | Event module | constant_keyword | | event.type | Event type | constant_keyword | +| host.ip | Host ip addresses. | ip | | server.address | Some event server addresses are defined ambiguously. The event will sometimes list an IP, a domain or a unix socket. You should always store the raw address in the `.address` field. Then it should be duplicated to `.ip` or `.domain`, depending on which one it is. | keyword | | service.address | Address where data about this service was collected from. This should be a URI, network address (ipv4:port or [ipv6]:port) or a resource path (sockets). | keyword | | service.type | The type of the service data is collected from. The type can be used to group and correlate logs and metrics from one service type. Example: If logs or metrics are collected from Elasticsearch, `service.type` would be `elasticsearch`. | keyword | @@ -257,6 +262,7 @@ An example event for `servlet` looks as following: | event.kind | Event kind | constant_keyword | | event.module | Event module | constant_keyword | | event.type | Event type | constant_keyword | +| host.ip | Host ip addresses. | ip | | server.address | Some event server addresses are defined ambiguously. The event will sometimes list an IP, a domain or a unix socket. You should always store the raw address in the `.address` field. Then it should be duplicated to `.ip` or `.domain`, depending on which one it is. | keyword | | service.address | Address where data about this service was collected from. This should be a URI, network address (ipv4:port or [ipv6]:port) or a resource path (sockets). | keyword | | service.type | The type of the service data is collected from. The type can be used to group and correlate logs and metrics from one service type. Example: If logs or metrics are collected from Elasticsearch, `service.type` would be `elasticsearch`. | keyword | @@ -407,6 +413,7 @@ An example event for `session_manager` looks as following: | event.kind | Event kind | constant_keyword | | event.module | Event module | constant_keyword | | event.type | Event type | constant_keyword | +| host.ip | Host ip addresses. | ip | | server.address | Some event server addresses are defined ambiguously. The event will sometimes list an IP, a domain or a unix socket. You should always store the raw address in the `.address` field. Then it should be duplicated to `.ip` or `.domain`, depending on which one it is. | keyword | | service.address | Address where data about this service was collected from. This should be a URI, network address (ipv4:port or [ipv6]:port) or a resource path (sockets). | keyword | | service.type | The type of the service data is collected from. The type can be used to group and correlate logs and metrics from one service type. Example: If logs or metrics are collected from Elasticsearch, `service.type` would be `elasticsearch`. | keyword | @@ -544,6 +551,7 @@ An example event for `threadpool` looks as following: | event.kind | Event kind | constant_keyword | | event.module | Event module | constant_keyword | | event.type | Event type | constant_keyword | +| host.ip | Host ip addresses. | ip | | server.address | Some event server addresses are defined ambiguously. The event will sometimes list an IP, a domain or a unix socket. You should always store the raw address in the `.address` field. Then it should be duplicated to `.ip` or `.domain`, depending on which one it is. | keyword | | service.address | Address where data about this service was collected from. This should be a URI, network address (ipv4:port or [ipv6]:port) or a resource path (sockets). | keyword | | service.type | The type of the service data is collected from. The type can be used to group and correlate logs and metrics from one service type. Example: If logs or metrics are collected from Elasticsearch, `service.type` would be `elasticsearch`. | keyword | diff --git a/packages/websphere_application_server/manifest.yml b/packages/websphere_application_server/manifest.yml index 761f440f6f6..00de4830e17 100644 --- a/packages/websphere_application_server/manifest.yml +++ b/packages/websphere_application_server/manifest.yml @@ -1,7 +1,7 @@ format_version: 1.0.0 name: websphere_application_server title: WebSphere Application Server -version: "0.8.0" +version: "0.8.1" license: basic description: Collects metrics from IBM WebSphere Application Server with Elastic Agent. type: integration