Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[6.7] [Monitoring] Restore mappings.json (#30153) #30244

Merged
merged 9 commits into from
Feb 7, 2019
Merged

[6.7] [Monitoring] Restore mappings.json (#30153) #30244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c2a7c9e
Backport #30153
chrisronline Feb 6, 2019
d1b904c
Merge remote-tracking branch 'elastic/6.7' into backport/6.7/pr-30153
chrisronline Feb 6, 2019
8ea162d
Upgrade elasticsearchjs to 15.4
chrisronline Feb 6, 2019
9588431
Bump consistently
chrisronline Feb 6, 2019
4f9de6e
Default to 6.7
chrisronline Feb 6, 2019
d22f206
Revert "Default to 6.7"
chrisronline Feb 7, 2019
4e309c7
Revert "Bump consistently"
chrisronline Feb 7, 2019
42c0b8d
Revert "Upgrade elasticsearchjs to 15.4"
chrisronline Feb 7, 2019
4fb5415
Merge remote-tracking branch 'elastic/6.7' into backport/6.7/pr-30153
chrisronline Feb 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
342 changes: 341 additions & 1 deletion x-pack/test/api_integration/apis/monitoring/cluster/fixtures/multicluster.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,341 @@
[{"cluster_uuid":"6d-9tDFTRe-qT5GoBytdlQ","cluster_name":"clustertwo","version":"7.0.0-alpha1","license":{"status":"active","type":"basic","expiry_date_in_millis":1914278399999},"elasticsearch":{"cluster_stats":{"indices":{"count":1,"docs":{"count":8,"deleted":0},"shards":{"total":1,"primaries":1,"replication":0,"index":{"shards":{"min":1,"max":1,"avg":1},"primaries":{"min":1,"max":1,"avg":1},"replication":{"min":0,"max":0,"avg":0}}},"store":{"size_in_bytes":34095}},"nodes":{"fs":{"total_in_bytes":499065712640,"free_in_bytes":200665341952,"available_in_bytes":200403197952},"count":{"total":1},"jvm":{"max_uptime_in_millis":701043,"mem":{"heap_used_in_bytes":204299464,"heap_max_in_bytes":628555776}}},"status":"green"}},"logstash":{"node_count":0,"events_in_total":0,"events_out_total":0,"avg_memory":0,"avg_memory_used":0,"max_uptime":0,"pipeline_count":0,"queue_types":{"memory":0,"persisted":0},"versions":[]},"kibana":{"status":null,"requests_total":0,"concurrent_connections":0,"response_time_max":0,"memory_size":0,"memory_limit":0,"count":0},"beats":{"totalEvents":0,"bytesSent":0,"beats":{"total":0,"types":[]}},"apm":{"totalEvents":0,"memRss":0,"memTotal":0,"apms":{"total":0}},"alerts":{"alertsMeta":{"enabled":true},"clusterMeta":{"enabled":false,"message":"Cluster [clustertwo] license type [basic] does not support Cluster Alerts"}},"isPrimary":false,"status":"green","isCcrEnabled":true},{"isSupported":true,"cluster_uuid":"lOF8kofiS_2DX58o9mXJ1Q","cluster_name":"monitoring-one","version":"7.0.0-alpha1","license":{"status":"active","type":"trial","expiry_date_in_millis":1505426308997},"elasticsearch":{"cluster_stats":{"indices":{"count":8,"docs":{"count":3997,"deleted":69},"shards":{"total":8,"primaries":8,"replication":0,"index":{"shards":{"min":1,"max":1,"avg":1},"primaries":{"min":1,"max":1,"avg":1},"replication":{"min":0,"max":0,"avg":0}}},"store":{"size_in_bytes":2647163}},"nodes":{"fs":{"total_in_bytes":499065712640,"free_in_bytes":200665792512,"available_in_bytes":200403648512},"count":{"total":1},"jvm":{"max_uptime_in_millis":761002,"mem":{"heap_used_in_bytes":133041176,"heap_max_in_bytes":628555776}}},"status":"yellow"}},"logstash":{"node_count":0,"events_in_total":0,"events_out_total":0,"avg_memory":0,"avg_memory_used":0,"max_uptime":0,"pipeline_count":0,"queue_types":{"memory":0,"persisted":0},"versions":[]},"kibana":{"status":null,"requests_total":0,"concurrent_connections":0,"response_time_max":0,"memory_size":0,"memory_limit":0,"count":0},"beats":{"totalEvents":0,"bytesSent":0,"beats":{"total":0,"types":[]}},"apm":{"totalEvents":0,"memRss":0,"memTotal":0,"apms":{"total":0}},"alerts":{"alertsMeta":{"enabled":true},"count":1,"low":0,"medium":1,"high":0},"isPrimary":false,"status":"yellow","isCcrEnabled":true},{"isSupported":true,"cluster_uuid":"TkHOX_-1TzWwbROwQJU5IA","cluster_name":"clusterone","version":"7.0.0-alpha1","license":{"status":"active","type":"trial","expiry_date_in_millis":1505426327135},"elasticsearch":{"cluster_stats":{"indices":{"count":5,"docs":{"count":150,"deleted":0},"shards":{"total":26,"primaries":13,"replication":1,"index":{"shards":{"min":2,"max":10,"avg":5.2},"primaries":{"min":1,"max":5,"avg":2.6},"replication":{"min":1,"max":1,"avg":1}}},"store":{"size_in_bytes":4838464}},"nodes":{"fs":{"total_in_bytes":499065712640,"free_in_bytes":200666353664,"available_in_bytes":200404209664},"count":{"total":2},"jvm":{"max_uptime_in_millis":741786,"mem":{"heap_used_in_bytes":465621856,"heap_max_in_bytes":1257111552}}},"status":"green"}},"logstash":{"node_count":1,"events_in_total":142,"events_out_total":142,"avg_memory":1038876672,"avg_memory_used":487782224,"max_uptime":570039,"pipeline_count":1,"queue_types":{"memory":1,"persisted":0},"versions":["7.0.0-alpha1"]},"kibana":{"status":"green","requests_total":571,"concurrent_connections":307,"response_time_max":1930,"memory_size":231141376,"memory_limit":1501560832,"count":1},"beats":{"totalEvents":0,"bytesSent":0,"beats":{"total":0,"types":[]}},"apm":{"totalEvents":0,"memRss":0,"memTotal":0,"apms":{"total":0}},"alerts":{"alertsMeta":{"enabled":true}},"isPrimary":false,"status":"green","isCcrEnabled":true}]
[{
"cluster_uuid": "6d-9tDFTRe-qT5GoBytdlQ",
"cluster_name": "clustertwo",
"version": "7.0.0-alpha1",
"license": {
"status": "active",
"type": "basic",
"expiry_date_in_millis": 1914278399999
},
"elasticsearch": {
"cluster_stats": {
"indices": {
"count": 1,
"docs": {
"count": 8,
"deleted": 0
},
"shards": {
"total": 1,
"primaries": 1,
"replication": 0,
"index": {
"shards": {
"min": 1,
"max": 1,
"avg": 1
},
"primaries": {
"min": 1,
"max": 1,
"avg": 1
},
"replication": {
"min": 0,
"max": 0,
"avg": 0
}
}
},
"store": {
"size_in_bytes": 34095
}
},
"nodes": {
"fs": {
"total_in_bytes": 499065712640,
"free_in_bytes": 200665341952,
"available_in_bytes": 200403197952
},
"count": {
"total": 1
},
"jvm": {
"max_uptime_in_millis": 701043,
"mem": {
"heap_used_in_bytes": 204299464,
"heap_max_in_bytes": 628555776
}
}
},
"status": "green"
}
},
"logstash": {
"node_count": 0,
"events_in_total": 0,
"events_out_total": 0,
"avg_memory": 0,
"avg_memory_used": 0,
"max_uptime": 0,
"pipeline_count": 0,
"queue_types": {
"memory": 0,
"persisted": 0
},
"versions": []
},
"kibana": {
"status": null,
"requests_total": 0,
"concurrent_connections": 0,
"response_time_max": 0,
"memory_size": 0,
"memory_limit": 0,
"count": 0
},
"beats": {
"totalEvents": null,
"bytesSent": null,
"beats": {
"total": null,
"types": []
}
},
"apm": {
"totalEvents": null,
"memRss": null,
"memTotal": null,
"apms": {
"total": null
}
},
"alerts": {
"alertsMeta": {
"enabled": true
},
"clusterMeta": {
"enabled": false,
"message": "Cluster [clustertwo] license type [basic] does not support Cluster Alerts"
}
},
"isPrimary": false,
"status": "green",
"isCcrEnabled": true
}, {
"isSupported": true,
"cluster_uuid": "lOF8kofiS_2DX58o9mXJ1Q",
"cluster_name": "monitoring-one",
"version": "7.0.0-alpha1",
"license": {
"status": "active",
"type": "trial",
"expiry_date_in_millis": 1505426308997
},
"elasticsearch": {
"cluster_stats": {
"indices": {
"count": 8,
"docs": {
"count": 3997,
"deleted": 69
},
"shards": {
"total": 8,
"primaries": 8,
"replication": 0,
"index": {
"shards": {
"min": 1,
"max": 1,
"avg": 1
},
"primaries": {
"min": 1,
"max": 1,
"avg": 1
},
"replication": {
"min": 0,
"max": 0,
"avg": 0
}
}
},
"store": {
"size_in_bytes": 2647163
}
},
"nodes": {
"fs": {
"total_in_bytes": 499065712640,
"free_in_bytes": 200665792512,
"available_in_bytes": 200403648512
},
"count": {
"total": 1
},
"jvm": {
"max_uptime_in_millis": 761002,
"mem": {
"heap_used_in_bytes": 133041176,
"heap_max_in_bytes": 628555776
}
}
},
"status": "yellow"
}
},
"logstash": {
"node_count": 0,
"events_in_total": 0,
"events_out_total": 0,
"avg_memory": 0,
"avg_memory_used": 0,
"max_uptime": 0,
"pipeline_count": 0,
"queue_types": {
"memory": 0,
"persisted": 0
},
"versions": []
},
"kibana": {
"status": null,
"requests_total": 0,
"concurrent_connections": 0,
"response_time_max": 0,
"memory_size": 0,
"memory_limit": 0,
"count": 0
},
"beats": {
"totalEvents": null,
"bytesSent": null,
"beats": {
"total": null,
"types": []
}
},
"apm": {
"totalEvents": null,
"memRss": null,
"memTotal": null,
"apms": {
"total": null
}
},
"alerts": {
"alertsMeta": {
"enabled": true
},
"count": 1,
"low": 0,
"medium": 1,
"high": 0
},
"isPrimary": false,
"status": "yellow",
"isCcrEnabled": true
}, {
"isSupported": true,
"cluster_uuid": "TkHOX_-1TzWwbROwQJU5IA",
"cluster_name": "clusterone",
"version": "7.0.0-alpha1",
"license": {
"status": "active",
"type": "trial",
"expiry_date_in_millis": 1505426327135
},
"elasticsearch": {
"cluster_stats": {
"indices": {
"count": 5,
"docs": {
"count": 150,
"deleted": 0
},
"shards": {
"total": 26,
"primaries": 13,
"replication": 1,
"index": {
"shards": {
"min": 2,
"max": 10,
"avg": 5.2
},
"primaries": {
"min": 1,
"max": 5,
"avg": 2.6
},
"replication": {
"min": 1,
"max": 1,
"avg": 1
}
}
},
"store": {
"size_in_bytes": 4838464
}
},
"nodes": {
"fs": {
"total_in_bytes": 499065712640,
"free_in_bytes": 200666353664,
"available_in_bytes": 200404209664
},
"count": {
"total": 2
},
"jvm": {
"max_uptime_in_millis": 741786,
"mem": {
"heap_used_in_bytes": 465621856,
"heap_max_in_bytes": 1257111552
}
}
},
"status": "green"
}
},
"logstash": {
"node_count": 1,
"events_in_total": 142,
"events_out_total": 142,
"avg_memory": 1038876672,
"avg_memory_used": 487782224,
"max_uptime": 570039,
"pipeline_count": 1,
"queue_types": {
"memory": 1,
"persisted": 0
},
"versions": ["7.0.0-alpha1"]
},
"kibana": {
"status": "green",
"requests_total": 571,
"concurrent_connections": 307,
"response_time_max": 1930,
"memory_size": 231141376,
"memory_limit": 1501560832,
"count": 1
},
"beats": {
"totalEvents": null,
"bytesSent": null,
"beats": {
"total": null,
"types": []
}
},
"apm": {
"totalEvents": null,
"memRss": null,
"memTotal": null,
"apms": {
"total": null
}
},
"alerts": {
"alertsMeta": {
"enabled": true
}
},
"isPrimary": false,
"status": "green",
"isCcrEnabled": true
}]
Loading