elastic · r00tu53r · Jan 24, 2022 · Jan 11, 2022
diff --git a/packages/haproxy/_dev/build/build.yml b/packages/haproxy/_dev/build/build.yml
@@ -1,3 +1,3 @@
 dependencies:
   ecs:
-    reference: git@1.12
+    reference: git@8.0
diff --git a/packages/haproxy/_dev/build/docs/README.md b/packages/haproxy/_dev/build/docs/README.md
@@ -14,6 +14,8 @@ The `info` and `stat` datasets were tested with tested with HAProxy versions fro
 
 The `log` dataset collects the HAProxy application logs.
 
+{{event "log"}}
+
 {{fields "log"}}
 
 ## Metrics

diff --git a/packages/haproxy/changelog.yml b/packages/haproxy/changelog.yml
@@ -1,3 +1,8 @@
+- version: "1.1.0"
+  changes:
+    - description: Update to ECS 8.0
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/2488
 # newer versions go on top
 - version: "1.0.2"
   changes:

diff --git a/packages/haproxy/data_stream/log/_dev/test/pipeline/test-default.log-expected.json b/packages/haproxy/data_stream/log/_dev/test/pipeline/test-default.log-expected.json
@@ -5,9 +5,9 @@
                 "name": "haproxy",
                 "pid": 24551
             },
-            "@timestamp": "2021-09-20T15:42:59.000Z",
+            "@timestamp": "2022-09-20T15:42:59.000Z",
             "ecs": {
-                "version": "1.12.0"
+                "version": "8.0.0"
             },
             "related": {
                 "ip": [
@@ -42,7 +42,7 @@
                 "ip": "67.43.156.13"
             },
             "event": {
-                "ingested": "2021-12-14T14:46:40.578911001Z",
+                "ingested": "2022-01-11T00:34:38.600286711Z",
                 "original": "Sep 20 15:42:59 67.43.156.13 haproxy[24551]: Connect from 67.43.156.13:40780 to 67.43.156.13:5000 (main/HTTP)",
                 "category": [
                     "web",

diff --git a/packages/haproxy/data_stream/log/_dev/test/pipeline/test-haproxy.log-expected.json b/packages/haproxy/data_stream/log/_dev/test/pipeline/test-haproxy.log-expected.json
@@ -33,7 +33,7 @@
             ],
             "@timestamp": "2018-07-30T09:03:52.726Z",
             "ecs": {
-                "version": "1.12.0"
+                "version": "8.0.0"
             },
             "related": {
                 "ip": [
@@ -85,7 +85,7 @@
             },
             "event": {
                 "duration": 2000000,
-                "ingested": "2021-12-14T14:46:40.692084383Z",
+                "ingested": "2022-01-11T00:34:39.019318897Z",
                 "original": "Jul 30 09:03:52 localhost haproxy[32450]: 67.43.156.13:38862 [30/Jul/2018:09:03:52.726] incoming~ docs_microservice/docs 0/0/1/0/2 304 168 - - ---- 6/6/0/0/0 0/0 {docs.example.internal||} {|||} \"GET /component---src-pages-index-js-4b15624544f97cf0bb8f.js HTTP/1.1\"",
                 "category": [
                     "web"
@@ -115,7 +115,7 @@
             ],
             "@timestamp": "2021-05-22T02:22:22.222Z",
             "ecs": {
-                "version": "1.12.0"
+                "version": "8.0.0"
             },
             "haproxy": {
                 "server_name": "node2",
@@ -158,7 +158,7 @@
             },
             "event": {
                 "duration": 18000000,
-                "ingested": "2021-12-14T14:46:40.692086776Z",
+                "ingested": "2022-01-11T00:34:39.019322658Z",
                 "original": "May 22 02:22:22 server1 haproxy[5089]: -:22222 [22/May/2021:02:22:22.222] www-https~ myapp/node2 site.domain.com 0/0/0/18/18 200 200 - - ---- 222/222/2/0/0 0/0 \"OPTIONS /api/v2/app/ HTTP/1.1\"",
                 "category": [
                     "web"

diff --git a/...ages/haproxy/data_stream/log/_dev/test/pipeline/test-httplog-no-headers.log-expected.json b/...ages/haproxy/data_stream/log/_dev/test/pipeline/test-httplog-no-headers.log-expected.json
@@ -20,7 +20,7 @@
             ],
             "@timestamp": "2018-12-10T12:01:46.395Z",
             "ecs": {
-                "version": "1.12.0"
+                "version": "8.0.0"
             },
             "related": {
                 "ip": [
@@ -68,7 +68,7 @@
             },
             "event": {
                 "duration": 0,
-                "ingested": "2021-12-14T14:46:40.952826309Z",
+                "ingested": "2022-01-11T00:34:40.217058006Z",
                 "original": "Dec 10 12:01:46 voyager haproxy[19312]: 127.0.0.1:35982 [10/Dec/2018:12:01:46.395] http-webservices http-webservices/\u003cNOSRV\u003e 0/-1/-1/-1/0 503 213 - - SC-- 1/1/0/0/0 0/0 \"GET / HTTP/1.1\"",
                 "category": [
                     "web"
@@ -97,7 +97,7 @@
             ],
             "@timestamp": "2018-12-10T15:46:49.497Z",
             "ecs": {
-                "version": "1.12.0"
+                "version": "8.0.0"
             },
             "related": {
                 "ip": [
@@ -145,7 +145,7 @@
             },
             "event": {
                 "duration": 0,
-                "ingested": "2021-12-14T14:46:40.952829108Z",
+                "ingested": "2022-01-11T00:34:40.217062411Z",
                 "original": "Dec 10 15:46:49 voyager haproxy[29785]: 127.0.0.1:43738 [10/Dec/2018:15:46:49.497] http-webservices http-webservices/\u003cNOSRV\u003e 0/-1/-1/-1/0 503 213 - - SC-- 1/1/0/0/0 0/0 {localhost:8888||} \"GET /foo HTTP/1.1\"",
                 "category": [
                     "web"
@@ -174,7 +174,7 @@
             ],
             "@timestamp": "2018-12-10T15:48:56.017Z",
             "ecs": {
-                "version": "1.12.0"
+                "version": "8.0.0"
             },
             "related": {
                 "ip": [
@@ -226,7 +226,7 @@
             },
             "event": {
                 "duration": 0,
-                "ingested": "2021-12-14T14:46:40.952829521Z",
+                "ingested": "2022-01-11T00:34:40.217063833Z",
                 "original": "Dec 10 15:48:56 voyager haproxy[7873]: 127.0.0.1:44542 [10/Dec/2018:15:48:56.017] http-webservices http-webservices/\u003cNOSRV\u003e 0/-1/-1/-1/0 503 213 - - SC-- 1/1/0/0/0 0/0 {localhost:8888||} {|} \"GET /foo HTTP/1.1\"",
                 "category": [
                     "web"

diff --git a/packages/haproxy/data_stream/log/_dev/test/pipeline/test-tcplog.log-expected.json b/packages/haproxy/data_stream/log/_dev/test/pipeline/test-tcplog.log-expected.json
@@ -8,7 +8,7 @@
             },
             "@timestamp": "2018-09-20T15:44:23.285Z",
             "ecs": {
-                "version": "1.12.0"
+                "version": "8.0.0"
             },
             "related": {
                 "ip": [
@@ -41,7 +41,7 @@
             },
             "event": {
                 "duration": 1000000,
-                "ingested": "2021-12-14T14:46:41.298330789Z",
+                "ingested": "2022-01-11T00:34:41.781854989Z",
                 "original": "Sep 20 15:44:23 127.0.0.1 haproxy[25457]: 127.0.0.1:40962 [20/Sep/2018:15:44:23.285] main app/\u003cNOSRV\u003e -1/-1/1 212 SC 1/1/0/0/0 0/0",
                 "kind": "event"
             },

diff --git a/packages/haproxy/data_stream/log/elasticsearch/ingest_pipeline/default.yml b/packages/haproxy/data_stream/log/elasticsearch/ingest_pipeline/default.yml
@@ -7,7 +7,7 @@ processors:
       value: "{{ _ingest.timestamp }}"
   - set:
       field: ecs.version
-      value: '1.12.0'
+      value: '8.0.0'
   - rename:
       field: message
       target_field: event.original

diff --git a/packages/haproxy/data_stream/log/sample_event.json b/packages/haproxy/data_stream/log/sample_event.json
@@ -0,0 +1,144 @@
+{
+    "@timestamp": "2018-07-30T09:03:52.726Z",
+    "agent": {
+        "ephemeral_id": "7eccbe53-c1e3-424d-8a1b-c290b8c2ca88",
+        "id": "25ee0259-10b8-4a16-9f80-d18ce8ad6442",
+        "name": "docker-fleet-agent",
+        "type": "filebeat",
+        "version": "8.0.0-beta1"
+    },
+    "data_stream": {
+        "dataset": "haproxy.log",
+        "namespace": "ep",
+        "type": "logs"
+    },
+    "ecs": {
+        "version": "8.0.0"
+    },
+    "elastic_agent": {
+        "id": "25ee0259-10b8-4a16-9f80-d18ce8ad6442",
+        "snapshot": false,
+        "version": "8.0.0-beta1"
+    },
+    "event": {
+        "agent_id_status": "verified",
+        "category": [
+            "web"
+        ],
+        "dataset": "haproxy.log",
+        "duration": 2000000,
+        "ingested": "2022-01-11T00:35:53Z",
+        "kind": "event",
+        "outcome": "success",
+        "timezone": "+00:00"
+    },
+    "haproxy": {
+        "backend_name": "docs_microservice",
+        "backend_queue": 0,
+        "bytes_read": 168,
+        "connection_wait_time_ms": 1,
+        "connections": {
+            "active": 6,
+            "backend": 0,
+            "frontend": 6,
+            "retries": 0,
+            "server": 0
+        },
+        "frontend_name": "incoming~",
+        "http": {
+            "request": {
+                "captured_cookie": "-",
+                "captured_headers": [
+                    "docs.example.internal"
+                ],
+                "raw_request_line": "GET /component---src-pages-index-js-4b15624544f97cf0bb8f.js HTTP/1.1",
+                "time_wait_ms": 0,
+                "time_wait_without_data_ms": 0
+            },
+            "response": {
+                "captured_cookie": "-",
+                "captured_headers": []
+            }
+        },
+        "server_name": "docs",
+        "server_queue": 0,
+        "termination_state": "----",
+        "total_waiting_time_ms": 0
+    },
+    "host": {
+        "architecture": "x86_64",
+        "containerized": true,
+        "hostname": "docker-fleet-agent",
+        "id": "4ccba669f0df47fa3f57a9e4169ae7f1",
+        "ip": [
+            "172.18.0.7"
+        ],
+        "mac": [
+            "02:42:ac:12:00:07"
+        ],
+        "name": "docker-fleet-agent",
+        "os": {
+            "codename": "Core",
+            "family": "redhat",
+            "kernel": "5.11.0-43-generic",
+            "name": "CentOS Linux",
+            "platform": "centos",
+            "type": "linux",
+            "version": "7 (Core)"
+        }
+    },
+    "http": {
+        "request": {
+            "method": "GET"
+        },
+        "response": {
+            "bytes": 168,
+            "status_code": 304
+        },
+        "version": "1.1"
+    },
+    "input": {
+        "type": "log"
+    },
+    "log": {
+        "file": {
+            "path": "/tmp/service_logs/haproxy.log"
+        },
+        "offset": 0
+    },
+    "process": {
+        "name": "haproxy",
+        "pid": 32450
+    },
+    "related": {
+        "ip": [
+            "67.43.156.13"
+        ]
+    },
+    "source": {
+        "address": "67.43.156.13",
+        "as": {
+            "number": 35908
+        },
+        "geo": {
+            "continent_name": "Asia",
+            "country_iso_code": "BT",
+            "country_name": "Bhutan",
+            "location": {
+                "lat": 27.5,
+                "lon": 90.5
+            }
+        },
+        "ip": "67.43.156.13",
+        "port": 38862
+    },
+    "tags": [
+        "haproxy-log"
+    ],
+    "temp": {},
+    "url": {
+        "extension": "js",
+        "original": "/component---src-pages-index-js-4b15624544f97cf0bb8f.js",
+        "path": "/component---src-pages-index-js-4b15624544f97cf0bb8f.js"
+    }
+}