Skip to content

Commit

Permalink
[8.x] [Core] [Telemetry] Update file references (#205603) (#205752)
Browse files Browse the repository at this point in the history 
# Backport

This will backport the following commits from `main` to `8.x`:
- [[Core] [Telemetry] Update file references
(#205603)](#205603)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Ahmad
Bamieh","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-01-06T14:46:46Z","message":"[Core]
[Telemetry] Update file references (#205603)\n\n## Summary\n\nFixed
broken CI. The bug was happening due to moving file roots while\nnot
updating the telemetry.rc file and the .json schema files
properly","sha":"deb52fd9e770d1d3457ed372098115d21adf0708","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","backport:version","v8.18.0"],"number":205603,"url":"https://github.com/elastic/kibana/pull/205603","mergeCommit":{"message":"[Core]
[Telemetry] Update file references (#205603)\n\n## Summary\n\nFixed
broken CI. The bug was happening due to moving file roots while\nnot
updating the telemetry.rc file and the .json schema files
properly","sha":"deb52fd9e770d1d3457ed372098115d21adf0708"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/205603","number":205603,"mergeCommit":{"message":"[Core]
[Telemetry] Update file references (#205603)\n\n## Summary\n\nFixed
broken CI. The bug was happening due to moving file roots while\nnot
updating the telemetry.rc file and the .json schema files
properly","sha":"deb52fd9e770d1d3457ed372098115d21adf0708"}},{"branch":"8.x","label":"v8.18.0","labelRegex":"^v8.18.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Ahmad Bamieh <[email protected]>
  • Loading branch information
@dokmic @Bamieh
dokmic and Bamieh authored Jan 7, 2025
1 parent b2d1a03 commit 6d8b840
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 253 deletions.
8 changes: 4 additions & 4 deletions x-pack/.telemetryrc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
{
"output": "platform/plugins/private/telemetry_collection_xpack/schema/xpack_plugins.json",
"root": "plugins/",
"exclude": [
"platform/plugins/private/monitoring/server/telemetry_collection/"
]
"exclude": []
},
{
"output": "platform/plugins/private/telemetry_collection_xpack/schema/xpack_monitoring.json",
Expand All @@ -14,7 +12,9 @@
{
"output": "platform/plugins/private/telemetry_collection_xpack/schema/xpack_platform.json",
"root": "platform/",
"exclude": []
"exclude": [
"platform/plugins/private/monitoring/server/telemetry_collection/"
]
},
{
"output": "platform/plugins/private/telemetry_collection_xpack/schema/xpack_observability.json",
Expand Down
249 changes: 0 additions & 249 deletions x-pack/platform/plugins/private/telemetry_collection_xpack/schema/xpack_platform.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5238,255 +5238,6 @@
}
}
},
"monitoringTelemetry": {
"properties": {
"stats": {
"type": "array",
"items": {
"properties": {
"timestamp": {
"type": "date"
},
"cluster_uuid": {
"type": "keyword"
},
"cluster_name": {
"type": "keyword"
},
"version": {
"type": "keyword"
},
"cluster_stats": {
"properties": {}
},
"stack_stats": {
"properties": {
"logstash": {
"properties": {
"versions": {
"type": "array",
"items": {
"properties": {
"version": {
"type": "keyword"
},
"count": {
"type": "long"
}
}
}
},
"count": {
"type": "long"
},
"cluster_stats": {
"properties": {
"monitoringClusterUuid": {
"type": "keyword"
},
"collection_types": {
"properties": {
"DYNAMIC_KEY": {
"type": "long"
}
}
},
"queues": {
"properties": {
"DYNAMIC_KEY": {
"type": "long"
}
}
},
"plugins": {
"type": "array",
"items": {
"properties": {
"name": {
"type": "keyword"
},
"count": {
"type": "long"
}
}
}
},
"pipelines": {
"properties": {
"count": {
"type": "long"
},
"batch_size_max": {
"type": "long"
},
"batch_size_avg": {
"type": "long"
},
"batch_size_min": {
"type": "long"
},
"batch_size_total": {
"type": "long"
},
"workers_max": {
"type": "long"
},
"workers_avg": {
"type": "long"
},
"workers_min": {
"type": "long"
},
"workers_total": {
"type": "long"
},
"sources": {
"properties": {
"DYNAMIC_KEY": {
"type": "boolean"
}
}
}
}
}
}
}
}
},
"beats": {
"properties": {
"versions": {
"properties": {
"DYNAMIC_KEY": {
"type": "long"
}
}
},
"types": {
"properties": {
"DYNAMIC_KEY": {
"type": "long"
}
}
},
"outputs": {
"properties": {
"DYNAMIC_KEY": {
"type": "long"
}
}
},
"queue": {
"properties": {
"DYNAMIC_KEY": {
"type": "long"
}
}
},
"count": {
"type": "long"
},
"eventsPublished": {
"type": "long"
},
"hosts": {
"type": "long"
},
"input": {
"properties": {
"count": {
"type": "long"
},
"names": {
"type": "array",
"items": {
"type": "keyword"
}
}
}
},
"module": {
"properties": {
"count": {
"type": "long"
},
"names": {
"type": "array",
"items": {
"type": "keyword"
}
}
}
},
"architecture": {
"properties": {
"count": {
"type": "long"
},
"architectures": {
"type": "array",
"items": {
"properties": {
"name": {
"type": "keyword"
},
"architecture": {
"type": "keyword"
},
"count": {
"type": "long"
}
}
}
}
}
},
"heartbeat": {
"properties": {
"monitors": {
"type": "long"
},
"endpoints": {
"type": "long"
},
"DYNAMIC_KEY": {
"properties": {
"monitors": {
"type": "long"
},
"endpoints": {
"type": "long"
}
}
}
}
},
"functionbeat": {
"properties": {
"functions": {
"properties": {
"count": {
"type": "long"
}
}
}
}
}
}
}
}
},
"collection": {
"type": "keyword"
},
"collectionSource": {
"type": "keyword"
}
}
}
}
}
},
"reporting": {
"properties": {
"available": {
Expand Down

0 comments on commit 6d8b840

Please sign in to comment.