Skip to content

Commit

Permalink
Merge branch 'main' into 196142-redirect-ecs-k8s-entities
Browse files Browse the repository at this point in the history
  • Loading branch information
@elasticmachine
elasticmachine authored Nov 4, 2024
2 parents fb035c0 + 12dc826 commit 201816c
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 19 deletions.
20 changes: 10 additions & 10 deletions .buildkite/scripts/steps/cloud/deploy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"plan": {
"cluster_topology": [
{
"instance_configuration_id": "gcp.integrationsserver.1",
"instance_configuration_id": "gcp.integrationsserver.n2.68x32x45",
"zone_count": 1,
"size": {
"resource": "memory",
Expand All @@ -32,7 +32,7 @@
"cluster_topology": [
{
"zone_count": 1,
"instance_configuration_id": "gcp.coordinating.1",
"instance_configuration_id": "gcp.es.coordinating.n2.68x16x45",
"node_roles": [
"ingest",
"remote_cluster_client"
Expand All @@ -50,7 +50,7 @@
"data": "hot"
}
},
"instance_configuration_id": "gcp.data.highio.1",
"instance_configuration_id": "gcp.es.datahot.n2.68x32x45",
"node_roles": [
"master",
"ingest",
Expand All @@ -72,7 +72,7 @@
"data": "warm"
}
},
"instance_configuration_id": "gcp.data.highstorage.1",
"instance_configuration_id": "gcp.es.datawarm.n2.68x10x190",
"node_roles": [
"data_warm",
"remote_cluster_client"
Expand All @@ -90,7 +90,7 @@
"data": "cold"
}
},
"instance_configuration_id": "gcp.data.highstorage.1",
"instance_configuration_id": "gcp.es.datacold.n2.68x10x190",
"node_roles": [
"data_cold",
"remote_cluster_client"
Expand All @@ -108,7 +108,7 @@
"data": "frozen"
}
},
"instance_configuration_id": "gcp.es.datafrozen.n1.64x10x95",
"instance_configuration_id": "gcp.es.datafrozen.n2.68x10x90",
"node_roles": [
"data_frozen"
],
Expand All @@ -120,7 +120,7 @@
},
{
"zone_count": 1,
"instance_configuration_id": "gcp.master.1",
"instance_configuration_id": "gcp.es.master.n2.68x32x45",
"node_roles": [
"master",
"remote_cluster_client"
Expand All @@ -142,7 +142,7 @@
},
"autoscaling_tier_override": true,
"id": "ml",
"instance_configuration_id": "gcp.ml.1",
"instance_configuration_id": "gcp.es.ml.n2.68x32x45",
"node_roles": [
"ml",
"remote_cluster_client"
Expand All @@ -155,7 +155,7 @@
"enabled_built_in_plugins": []
},
"deployment_template": {
"id": "gcp-io-optimized-v2"
"id": "gcp-cpu-optimized"
}
},
"ref_id": "main-elasticsearch"
Expand All @@ -168,7 +168,7 @@
"plan": {
"cluster_topology": [
{
"instance_configuration_id": "gcp.kibana.1",
"instance_configuration_id": "gcp.kibana.n2.68x32x45",
"zone_count": 1,
"size": {
"value": 2048,
Expand Down
4 changes: 2 additions & 2 deletions packages/content-management/table_list_view_table/src/table_list_view.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,8 @@ describe('TableListView', () => {
const updatedAtValues: Moment[] = [];

const updatedHits = hits.map(({ id, attributes, references }, i) => {
const updatedAt = new Date(new Date().setDate(new Date().getDate() - (7 + i)));
updatedAtValues.push(moment(updatedAt));
const updatedAt = moment().subtract(7 + i, 'days');
updatedAtValues.push(updatedAt);

return {
id,
Expand Down
1 change: 0 additions & 1 deletion src/plugins/unified_search/public/query_string_input/esql_menu_popover.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ export const ESQLMenuPopover: React.FC<ESQLMenuPopoverProps> = ({
},
{
id: 1,
initialFocusedItemIndex: 1,
title: i18n.translate('unifiedSearch.query.queryBar.esqlMenu.exampleQueries', {
defaultMessage: 'Recommended queries',
}),
Expand Down
8 changes: 2 additions & 6 deletions ...rvability_solution/apm/public/components/routing/templates/apm_service_template/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import { EuiFlexGroup, EuiFlexItem, EuiLoadingLogo, EuiSpacer, EuiTitle } from '@elastic/eui';
import React from 'react';
import { useHistory, useLocation } from 'react-router-dom';
import { isLogsOnlySignal } from '../../../../utils/get_signal_type';
import { isMobileAgentName } from '../../../../../common/agent_name';
import { ApmServiceContextProvider } from '../../../../context/apm_service/apm_service_context';
import { useApmServiceContext } from '../../../../context/apm_service/use_apm_service_context';
Expand Down Expand Up @@ -55,7 +54,7 @@ function TemplateWithContext({ title, children, selectedTab, searchBarOptions }:

const tabs = useTabs({ selectedTab });

const { agentName, serviceAgentStatus, serviceEntitySummary } = useApmServiceContext();
const { agentName, serviceAgentStatus } = useApmServiceContext();

const isPendingServiceAgent = !agentName && isPending(serviceAgentStatus);

Expand All @@ -76,9 +75,6 @@ function TemplateWithContext({ title, children, selectedTab, searchBarOptions }:
});
}

const hasLogsOnlySignal =
serviceEntitySummary?.dataStreamTypes && isLogsOnlySignal(serviceEntitySummary.dataStreamTypes);

return (
<ApmMainTemplate
pageHeader={{
Expand Down Expand Up @@ -119,7 +115,7 @@ function TemplateWithContext({ title, children, selectedTab, searchBarOptions }:
</EuiFlexGroup>
) : (
<>
{!hasLogsOnlySignal && <SearchBar {...searchBarOptions} />}
<SearchBar {...searchBarOptions} />
<ServiceAnomalyTimeseriesContextProvider>
{children}
</ServiceAnomalyTimeseriesContextProvider>
Expand Down

0 comments on commit 201816c

Please sign in to comment.