From 6c6e4b3fa4627b8ff9d3ce22cbd18c4df5b5b7da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Ferna=CC=81ndez=20Haro?=
 <alejandro.haro@elastic.co>
Date: Mon, 28 Sep 2020 10:58:45 +0100
Subject: [PATCH] New `monitoring` collector with arrays

---
 .../collectors/get_usage_collector.test.ts    |  55 +++----
 .../collectors/get_usage_collector.ts         | 109 +++++++-------
 .../schema/xpack_plugins.json                 | 139 +++++++++---------
 3 files changed, 156 insertions(+), 147 deletions(-)

diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.test.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.test.ts
index 17caf80eef22bd..2f63a878b0cde3 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.test.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.test.ts
@@ -80,33 +80,36 @@ describe('getMonitoringUsageCollector', () => {
     expect(args[0].schema).toStrictEqual({
       hasMonitoringData: { type: 'boolean' },
       clusters: {
-        license: { type: 'keyword' },
-        clusterUuid: { type: 'keyword' },
-        metricbeatUsed: { type: 'boolean' },
-        elasticsearch: {
-          enabled: { type: 'boolean' },
-          count: { type: 'long' },
-          metricbeatUsed: { type: 'boolean' },
-        },
-        kibana: {
-          enabled: { type: 'boolean' },
-          count: { type: 'long' },
-          metricbeatUsed: { type: 'boolean' },
-        },
-        logstash: {
-          enabled: { type: 'boolean' },
-          count: { type: 'long' },
-          metricbeatUsed: { type: 'boolean' },
-        },
-        beats: {
-          enabled: { type: 'boolean' },
-          count: { type: 'long' },
-          metricbeatUsed: { type: 'boolean' },
-        },
-        apm: {
-          enabled: { type: 'boolean' },
-          count: { type: 'long' },
+        type: 'array',
+        items: {
+          license: { type: 'keyword' },
+          clusterUuid: { type: 'keyword' },
           metricbeatUsed: { type: 'boolean' },
+          elasticsearch: {
+            enabled: { type: 'boolean' },
+            count: { type: 'long' },
+            metricbeatUsed: { type: 'boolean' },
+          },
+          kibana: {
+            enabled: { type: 'boolean' },
+            count: { type: 'long' },
+            metricbeatUsed: { type: 'boolean' },
+          },
+          logstash: {
+            enabled: { type: 'boolean' },
+            count: { type: 'long' },
+            metricbeatUsed: { type: 'boolean' },
+          },
+          beats: {
+            enabled: { type: 'boolean' },
+            count: { type: 'long' },
+            metricbeatUsed: { type: 'boolean' },
+          },
+          apm: {
+            enabled: { type: 'boolean' },
+            count: { type: 'long' },
+            metricbeatUsed: { type: 'boolean' },
+          },
         },
       },
     });
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.ts
index b743a5f8e0b4fa..278a6c163c0adf 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.ts
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.ts
@@ -28,68 +28,71 @@ export function getMonitoringUsageCollector(
         type: 'boolean',
       },
       clusters: {
-        license: {
-          type: 'keyword',
-        },
-        clusterUuid: {
-          type: 'keyword',
-        },
-        metricbeatUsed: {
-          type: 'boolean',
-        },
-        elasticsearch: {
-          enabled: {
-            type: 'boolean',
+        type: 'array',
+        items: {
+          license: {
+            type: 'keyword',
           },
-          count: {
-            type: 'long',
+          clusterUuid: {
+            type: 'keyword',
           },
           metricbeatUsed: {
             type: 'boolean',
           },
-        },
-        kibana: {
-          enabled: {
-            type: 'boolean',
-          },
-          count: {
-            type: 'long',
+          elasticsearch: {
+            enabled: {
+              type: 'boolean',
+            },
+            count: {
+              type: 'long',
+            },
+            metricbeatUsed: {
+              type: 'boolean',
+            },
           },
-          metricbeatUsed: {
-            type: 'boolean',
+          kibana: {
+            enabled: {
+              type: 'boolean',
+            },
+            count: {
+              type: 'long',
+            },
+            metricbeatUsed: {
+              type: 'boolean',
+            },
           },
-        },
-        logstash: {
-          enabled: {
-            type: 'boolean',
+          logstash: {
+            enabled: {
+              type: 'boolean',
+            },
+            count: {
+              type: 'long',
+            },
+            metricbeatUsed: {
+              type: 'boolean',
+            },
           },
-          count: {
-            type: 'long',
-          },
-          metricbeatUsed: {
-            type: 'boolean',
+          beats: {
+            enabled: {
+              type: 'boolean',
+            },
+            count: {
+              type: 'long',
+            },
+            metricbeatUsed: {
+              type: 'boolean',
+            },
           },
-        },
-        beats: {
-          enabled: {
-            type: 'boolean',
-          },
-          count: {
-            type: 'long',
-          },
-          metricbeatUsed: {
-            type: 'boolean',
-          },
-        },
-        apm: {
-          enabled: {
-            type: 'boolean',
-          },
-          count: {
-            type: 'long',
-          },
-          metricbeatUsed: {
-            type: 'boolean',
+          apm: {
+            enabled: {
+              type: 'boolean',
+            },
+            count: {
+              type: 'long',
+            },
+            metricbeatUsed: {
+              type: 'boolean',
+            },
           },
         },
       },
diff --git a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
index 2dd92b1b1093e1..bc89d9e0c812d1 100644
--- a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
+++ b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
@@ -549,78 +549,81 @@
           "type": "boolean"
         },
         "clusters": {
-          "properties": {
-            "license": {
-              "type": "keyword"
-            },
-            "clusterUuid": {
-              "type": "keyword"
-            },
-            "metricbeatUsed": {
-              "type": "boolean"
-            },
-            "elasticsearch": {
-              "properties": {
-                "enabled": {
-                  "type": "boolean"
-                },
-                "count": {
-                  "type": "long"
-                },
-                "metricbeatUsed": {
-                  "type": "boolean"
+          "type": "array",
+          "items": {
+            "properties": {
+              "license": {
+                "type": "keyword"
+              },
+              "clusterUuid": {
+                "type": "keyword"
+              },
+              "metricbeatUsed": {
+                "type": "boolean"
+              },
+              "elasticsearch": {
+                "properties": {
+                  "enabled": {
+                    "type": "boolean"
+                  },
+                  "count": {
+                    "type": "long"
+                  },
+                  "metricbeatUsed": {
+                    "type": "boolean"
+                  }
                 }
-              }
-            },
-            "kibana": {
-              "properties": {
-                "enabled": {
-                  "type": "boolean"
-                },
-                "count": {
-                  "type": "long"
-                },
-                "metricbeatUsed": {
-                  "type": "boolean"
+              },
+              "kibana": {
+                "properties": {
+                  "enabled": {
+                    "type": "boolean"
+                  },
+                  "count": {
+                    "type": "long"
+                  },
+                  "metricbeatUsed": {
+                    "type": "boolean"
+                  }
                 }
-              }
-            },
-            "logstash": {
-              "properties": {
-                "enabled": {
-                  "type": "boolean"
-                },
-                "count": {
-                  "type": "long"
-                },
-                "metricbeatUsed": {
-                  "type": "boolean"
+              },
+              "logstash": {
+                "properties": {
+                  "enabled": {
+                    "type": "boolean"
+                  },
+                  "count": {
+                    "type": "long"
+                  },
+                  "metricbeatUsed": {
+                    "type": "boolean"
+                  }
                 }
-              }
-            },
-            "beats": {
-              "properties": {
-                "enabled": {
-                  "type": "boolean"
-                },
-                "count": {
-                  "type": "long"
-                },
-                "metricbeatUsed": {
-                  "type": "boolean"
+              },
+              "beats": {
+                "properties": {
+                  "enabled": {
+                    "type": "boolean"
+                  },
+                  "count": {
+                    "type": "long"
+                  },
+                  "metricbeatUsed": {
+                    "type": "boolean"
+                  }
                 }
-              }
-            },
-            "apm": {
-              "properties": {
-                "enabled": {
-                  "type": "boolean"
-                },
-                "count": {
-                  "type": "long"
-                },
-                "metricbeatUsed": {
-                  "type": "boolean"
+              },
+              "apm": {
+                "properties": {
+                  "enabled": {
+                    "type": "boolean"
+                  },
+                  "count": {
+                    "type": "long"
+                  },
+                  "metricbeatUsed": {
+                    "type": "boolean"
+                  }
                 }
               }
             }