From 858b423c6b1224a4105eeaf9e79882fe1f8dad69 Mon Sep 17 00:00:00 2001 From: Pete Harverson Date: Mon, 22 Nov 2021 05:58:02 +0000 Subject: [PATCH 1/2] [ML] Fix Nginx ML module manifest query to ignore frozen and cold tiers --- packages/nginx/changelog.yml | 7 ++++++- packages/nginx/kibana/ml_module/nginx-Logs-ml.json | 10 +++++++++- packages/nginx/manifest.yml | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/packages/nginx/changelog.yml b/packages/nginx/changelog.yml index 7503a287d47..3005c4f3599 100644 --- a/packages/nginx/changelog.yml +++ b/packages/nginx/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "1.2.1" + changes: + - description: Fix ML module manifest query to ignore frozen and cold tiers + type: bugfix + link: https://github.com/elastic/integrations/pull - version: "1.2.0" changes: - description: Release nginx package for v8.0.0 @@ -31,7 +36,7 @@ - description: Convert to generated ECS fields type: enhancement link: https://github.com/elastic/integrations/pull/1491 -- version: '0.8.1' +- version: "0.8.1" changes: - description: update to ECS 1.11.0 type: enhancement diff --git a/packages/nginx/kibana/ml_module/nginx-Logs-ml.json b/packages/nginx/kibana/ml_module/nginx-Logs-ml.json index b5710371fb9..53ad2045cdb 100644 --- a/packages/nginx/kibana/ml_module/nginx-Logs-ml.json +++ b/packages/nginx/kibana/ml_module/nginx-Logs-ml.json @@ -31,7 +31,15 @@ "field": "http.response.status_code" } } - ] + ], + "must_not": { + "terms": { + "_tier": [ + "data_frozen", + "data_cold" + ] + } + } } }, "jobs": [ diff --git a/packages/nginx/manifest.yml b/packages/nginx/manifest.yml index 4c7a1a42754..1982ac0ce65 100644 --- a/packages/nginx/manifest.yml +++ b/packages/nginx/manifest.yml @@ -1,7 +1,7 @@ format_version: 1.0.0 name: nginx title: Nginx -version: 1.2.0 +version: 1.2.1 license: basic description: Collect logs and metrics from Nginx HTTP servers with Elastic Agent. type: integration From 0e5cf0f66047076415e2aa3dac79f25bbc80b1cf Mon Sep 17 00:00:00 2001 From: Pete Harverson Date: Mon, 22 Nov 2021 06:02:45 +0000 Subject: [PATCH 2/2] [ML] Fix PR number in changelog.yml --- packages/nginx/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nginx/changelog.yml b/packages/nginx/changelog.yml index 3005c4f3599..ce8f9586beb 100644 --- a/packages/nginx/changelog.yml +++ b/packages/nginx/changelog.yml @@ -3,7 +3,7 @@ changes: - description: Fix ML module manifest query to ignore frozen and cold tiers type: bugfix - link: https://github.com/elastic/integrations/pull + link: https://github.com/elastic/integrations/pull/2219 - version: "1.2.0" changes: - description: Release nginx package for v8.0.0