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

[Stack Monitoring] Fix displaying ES version for external collection #131194

Merged
merged 8 commits into from
May 16, 2022
Merged

[Stack Monitoring] Fix displaying ES version for external collection #131194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3c71d9c
[Stack Monitoring] Fix displaying ES version for external collection …
miltonhultgren Apr 28, 2022
3defa8f
Merge branch 'main' into 126741-sm-wrong-version
kibanamachine May 2, 2022
8708b4a
Merge branch 'main' into 126741-sm-wrong-version
kibanamachine May 12, 2022
007108a
Merge branch 'main' of github.com:elastic/kibana into 126741-sm-wrong…
miltonhultgren May 12, 2022
caeb2fc
Sort node versions and join into display string
miltonhultgren May 12, 2022
4474657
Merge branch 'main' of github.com:elastic/kibana into 126741-sm-wrong…
miltonhultgren May 16, 2022
9ef7cb2
Update test fixture
miltonhultgren May 16, 2022
8cbde61
Update second test fixture
miltonhultgren May 16, 2022
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
9 changes: 8 additions & 1 deletion x-pack/plugins/monitoring/server/lib/cluster/get_clusters_summary.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
ElasticsearchModifiedSource,
ElasticsearchLegacySource,
ElasticsearchSourceKibanaStats,
ElasticsearchMetricbeatSource,
} from '../../../common/types/es';
// @ts-ignore
import { calculateOverallStatus } from '../calculate_overall_status';
Expand Down Expand Up @@ -47,7 +48,7 @@ export function getClustersSummary(
} = cluster;

const license = cluster.license || cluster.elasticsearch?.cluster?.stats?.license;
const version = cluster.version || cluster.elasticsearch?.version;
const version = cluster.version || ecsFormatVersion(cluster);
const clusterUuid = cluster.cluster_uuid || cluster.elasticsearch?.cluster?.id;
const clusterStatsLegacy = cluster.cluster_stats;
const clusterStatsMB = cluster.elasticsearch?.cluster?.stats;
Expand Down Expand Up @@ -161,3 +162,9 @@ export function getClustersSummary(
};
});
}

function ecsFormatVersion(cluster: ElasticsearchMetricbeatSource) {
const versions = cluster.elasticsearch?.cluster?.stats?.nodes?.versions || [];
const sortedVersions = [...versions].sort().reverse();
return sortedVersions.join('/');
}
1 change: 1 addition & 0 deletions x-pack/test/api_integration/apis/monitoring/standalone_cluster/fixtures/cluster.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[
{
"cluster_uuid": "__standalone_cluster__",
"version": "",
"license": {},
"elasticsearch": {
"cluster_stats": {
Expand Down
1 change: 1 addition & 0 deletions x-pack/test/api_integration/apis/monitoring/standalone_cluster/fixtures/clusters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
{
"isSupported": true,
"cluster_uuid": "__standalone_cluster__",
"version": "",
"license": {},
"elasticsearch": {
"cluster_stats": {
Expand Down