[Monitoring] Re-enable logstash tests (#59815)

* Revert "Skip all logstash pipeline tests" This reverts commit d8aa1fb. * Reenable tests and fix them based on recent changes * Fix more tests Co-authored-by: Elastic Machine <[email protected]>
elastic · Mar 12, 2020 · 73d1013 · 73d1013
1 parent 2d0bf9d
commit 73d1013
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 12 deletions.
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_paginated_pipelines.js b/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_paginated_pipelines.js
@@ -33,7 +33,7 @@ export async function getPaginatedPipelines(
   { clusterUuid, logstashUuid },
   { throughputMetric, nodesCountMetric },
   pagination,
-  sort,
+  sort = { field: null },
   queryText
 ) {
   const sortField = sort.field;

diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/fixtures/multicluster_pipelines.json b/x-pack/test/api_integration/apis/monitoring/logstash/fixtures/multicluster_pipelines.json
@@ -1 +1,53 @@
-{"pipelines":[{"id":"uno","metrics":{"throughput":{"bucket_size":"10 seconds","timeRange":{"min":1573485225266,"max":1573485425399},"metric":{"app":"logstash","field":"logstash_stats.pipelines.events.out","label":"Pipeline Throughput","description":"Number of events emitted per second by the Logstash pipeline at the outputs stage.","units":"e/s","format":"0,0.[00]","hasCalculation":true,"isDerivative":false},"data":[[1573485230000,0]]},"nodesCount":{"bucket_size":"10 seconds","timeRange":{"min":1573485225266,"max":1573485425399},"metric":{"app":"logstash","field":"logstash_stats.logstash.uuid","label":"Pipeline Node Count","description":"Number of nodes on which the Logstash pipeline is running.","units":"","format":"0,0.[00]","hasCalculation":true,"isDerivative":false},"data":[[1573485230000,1]]}},"latestThroughput":0,"latestNodesCount":1}],"clusterStatus":{"node_count":1,"events_in_total":0,"events_out_total":0,"avg_memory":1037959168,"avg_memory_used":203687512,"max_uptime":863288,"pipeline_count":1,"queue_types":{"memory":1,"persisted":0},"versions":["8.0.0"]},"totalPipelineCount":1}
+{
+  "pipelines": [
+    {
+      "id": "uno",
+      "metrics": {
+        "throughput": {
+          "bucket_size": "10 seconds",
+          "timeRange": { "min": 1573485225266, "max": 1573485425399 },
+          "metric": {
+            "app": "logstash",
+            "field": "logstash_stats.pipelines.events.out",
+            "label": "Pipeline Throughput",
+            "description": "Number of events emitted per second by the Logstash pipeline at the outputs stage.",
+            "units": "e/s",
+            "format": "0,0.[00]",
+            "hasCalculation": false,
+            "isDerivative": true
+          },
+          "data": [[1573485230000, 0]]
+        },
+        "nodesCount": {
+          "bucket_size": "10 seconds",
+          "timeRange": { "min": 1573485225266, "max": 1573485425399 },
+          "metric": {
+            "app": "logstash",
+            "field": "logstash_stats.logstash.uuid",
+            "label": "Pipeline Node Count",
+            "description": "Number of nodes on which the Logstash pipeline is running.",
+            "units": "",
+            "format": "0,0.[00]",
+            "hasCalculation": true,
+            "isDerivative": false
+          },
+          "data": [[1573485230000, 1]]
+        }
+      },
+      "latestThroughput": 0,
+      "latestNodesCount": 1
+    }
+  ],
+  "clusterStatus": {
+    "node_count": 1,
+    "events_in_total": 0,
+    "events_out_total": 0,
+    "avg_memory": 1037959168,
+    "avg_memory_used": 203687512,
+    "max_uptime": 863288,
+    "pipeline_count": 1,
+    "queue_types": { "memory": 1, "persisted": 0 },
+    "versions": ["8.0.0"]
+  },
+  "totalPipelineCount": 1
+}
diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/fixtures/pipelines.json b/x-pack/test/api_integration/apis/monitoring/logstash/fixtures/pipelines.json
diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines.js b/x-pack/test/api_integration/apis/monitoring/logstash/multicluster_pipelines.js
@@ -11,7 +11,7 @@ export default function({ getService }) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
-  describe.skip('pipelines listing multicluster', () => {
+  describe('pipelines listing multicluster', () => {
     const archive = 'monitoring/logstash_pipelines_multicluster';
     const timeRange = {
       min: '2019-11-11T15:13:45.266Z',

diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/pipelines.js b/x-pack/test/api_integration/apis/monitoring/logstash/pipelines.js
@@ -11,7 +11,7 @@ export default function({ getService }) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 
-  describe.skip('pipelines', () => {
+  describe('pipelines', () => {
     const archive = 'monitoring/logstash/changing_pipelines';
     const timeRange = {
       min: '2019-11-04T15:40:44.855Z',

diff --git a/x-pack/test/functional/apps/monitoring/logstash/pipelines.js b/x-pack/test/functional/apps/monitoring/logstash/pipelines.js
@@ -14,7 +14,7 @@ export default function({ getService, getPageObjects }) {
   const pipelinesList = getService('monitoringLogstashPipelines');
   const lsClusterSummaryStatus = getService('monitoringLogstashSummaryStatus');
 
-  describe.skip('Logstash pipelines', () => {
+  describe('Logstash pipelines', () => {
     const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
     before(async () => {
@@ -50,10 +50,10 @@ export default function({ getService, getPageObjects }) {
       const pipelinesAll = await pipelinesList.getPipelinesAll();
 
       const tableData = [
-        { id: 'main', eventsEmittedRate: '108.3 e/s', nodeCount: '1' },
-        { id: 'nginx_logs', eventsEmittedRate: '29.2 e/s', nodeCount: '1' },
+        { id: 'main', eventsEmittedRate: '162.5 e/s', nodeCount: '1' },
+        { id: 'nginx_logs', eventsEmittedRate: '62.5 e/s', nodeCount: '1' },
         { id: 'test_interpolation', eventsEmittedRate: '0 e/s', nodeCount: '1' },
-        { id: 'tweets_about_labradoodles', eventsEmittedRate: '0.6 e/s', nodeCount: '1' },
+        { id: 'tweets_about_labradoodles', eventsEmittedRate: '1.2 e/s', nodeCount: '1' },
       ];
 
       // check the all data in the table
@@ -74,9 +74,9 @@ export default function({ getService, getPageObjects }) {
 
       const tableData = [
         { id: 'test_interpolation', eventsEmittedRate: '0 e/s', nodeCount: '1' },
-        { id: 'tweets_about_labradoodles', eventsEmittedRate: '0.6 e/s', nodeCount: '1' },
-        { id: 'nginx_logs', eventsEmittedRate: '29.2 e/s', nodeCount: '1' },
-        { id: 'main', eventsEmittedRate: '108.3 e/s', nodeCount: '1' },
+        { id: 'tweets_about_labradoodles', eventsEmittedRate: '1.2 e/s', nodeCount: '1' },
+        { id: 'nginx_logs', eventsEmittedRate: '62.5 e/s', nodeCount: '1' },
+        { id: 'main', eventsEmittedRate: '162.5 e/s', nodeCount: '1' },
       ];
 
       // check the all data in the table