Add request disconnects (#47344)

* Add Kibana disconnects to monitoring * Add functional test fixture
elastic · Oct 14, 2019 · cda7eba · cda7eba
1 parent 6ea7940
commit cda7eba
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 8 deletions.
diff --git a/.../legacy/plugins/monitoring/server/lib/metrics/__test__/__snapshots__/metrics.test.js.snap b/.../legacy/plugins/monitoring/server/lib/metrics/__test__/__snapshots__/metrics.test.js.snap
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/kibana/metrics.js b/x-pack/legacy/plugins/monitoring/server/lib/metrics/kibana/metrics.js
@@ -180,7 +180,7 @@ export const metrics = {
     metricAgg: 'max',
     units: ''
   }),
-  kibana_requests: new KibanaMetric({
+  kibana_requests_total: new KibanaMetric({
     field: 'kibana_stats.requests.total',
     label: i18n.translate('xpack.monitoring.metrics.kibanaInstance.clientRequestsLabel', {
       defaultMessage: 'Client Requests'
@@ -191,5 +191,17 @@ export const metrics = {
     format: SMALL_FLOAT,
     metricAgg: 'max',
     units: ''
+  }),
+  kibana_requests_disconnects: new KibanaMetric({
+    field: 'kibana_stats.requests.disconnects',
+    label: i18n.translate('xpack.monitoring.metrics.kibanaInstance.clientRequestsDisconnectsLabel', {
+      defaultMessage: 'Client Disconnects'
+    }),
+    description: i18n.translate('xpack.monitoring.metrics.kibanaInstance.clientRequestsDisconnectsDescription', {
+      defaultMessage: 'Total number of client disconnects to the Kibana instance.'
+    }),
+    format: SMALL_FLOAT,
+    metricAgg: 'max',
+    units: ''
   })
 };
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/kibana/metric_set_instance.js b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/kibana/metric_set_instance.js
@@ -19,5 +19,8 @@ export const metricSet = [
     keys: ['kibana_max_response_times', 'kibana_average_response_times'],
     name: 'kibana_response_times'
   },
-  'kibana_requests'
+  {
+    keys: ['kibana_requests_total', 'kibana_requests_disconnects'],
+    name: 'kibana_requests'
+  }
 ];
diff --git a/x-pack/test/api_integration/apis/monitoring/kibana/fixtures/instance.json b/x-pack/test/api_integration/apis/monitoring/kibana/fixtures/instance.json
@@ -577,18 +577,74 @@
             174
           ]
         ]
+      },
+      {
+        "bucket_size": "10 seconds",
+        "timeRange": {
+          "min": 1504027457000,
+          "max": 1504027568000
+        },
+        "metric": {
+          "app": "kibana",
+          "field": "kibana_stats.requests.disconnects",
+          "metricAgg": "max",
+          "label": "Client Disconnects",
+          "description": "Total number of client disconnects to the Kibana instance.",
+          "units": "",
+          "format": "0.[00]",
+          "hasCalculation": false,
+          "isDerivative": false
+        },
+        "data": [
+          [
+            1504027460000,
+            0
+          ],
+          [
+            1504027470000,
+            0
+          ],
+          [
+            1504027480000,
+            0
+          ],
+          [
+            1504027490000,
+            0
+          ],
+          [
+            1504027500000,
+            0
+          ],
+          [
+            1504027510000,
+            0
+          ],
+          [
+            1504027520000,
+            0
+          ],
+          [
+            1504027530000,
+            0
+          ],
+          [
+            1504027540000,
+            0
+          ]
+        ]
       }
     ]
   },
   "kibanaSummary": {
-    "uuid": "de3b8f2a-7bb9-4931-9bf3-997ba7824cf9",
-    "name": "tsullivan.local",
-    "index": ".kibana",
     "host": "tsullivan.local",
-    "transport_address": "tsullivan.local:5601",
-    "version": "7.0.0-alpha1",
+    "index": ".kibana",
+    "name": "tsullivan.local",
     "snapshot": false,
     "status": "green",
+    "transport_address": "tsullivan.local:5601",
+    "uuid": "de3b8f2a-7bb9-4931-9bf3-997ba7824cf9",
+    "version": "7.0.0-alpha1",
     "availability": false,
     "os_memory_free": 1645989888,
     "uptime": 200102