Skip to content

Commit

Permalink
New monitoring collector with arrays
Browse files Browse the repository at this point in the history
  • Loading branch information
@afharo
afharo committed Sep 28, 2020
1 parent 2044602 commit 6c6e4b3
Show file tree
Hide file tree
Showing 3 changed files with 156 additions and 147 deletions.
55 changes: 29 additions & 26 deletions x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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' },
},
},
},
});
Expand Down
109 changes: 56 additions & 53 deletions x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_usage_collector.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
},
},
},
Expand Down
139 changes: 71 additions & 68 deletions x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
}
Expand Down

0 comments on commit 6c6e4b3

Please sign in to comment.