Skip to content

Commit

Permalink
Merge branch 'main' into 168607-docviewer-wildcard-field-search
Browse files Browse the repository at this point in the history
  • Loading branch information
jughosta committed Oct 12, 2023
2 parents 523bc75 + 0c34984 commit a3be568
Show file tree
Hide file tree
Showing 22 changed files with 72 additions and 363 deletions.
@@ -0,0 +1,15 @@
# These pipeline steps constitute the quality gate for your service within the production-canary environment.
# Incorporate any necessary additional logic to validate the service's integrity.
# A failure in this pipeline build will prevent further progression to the subsequent stage.

steps:
- label: ":pipeline::rocket::seedling: Trigger control-plane e2e tests"
trigger: "ess-k8s-production-e2e-tests" # https://buildkite.com/elastic/ess-k8s-production-e2e-tests
build:
env:
REGION_ID: aws-us-east-1
NAME_PREFIX: ci_test_kibana-promotion_
message: "${BUILDKITE_MESSAGE} (triggered by pipeline.tests-production-canary.yaml)"

- label: ":cookie: 24h bake time before continuing promotion"
command: "sleep 86400"
@@ -0,0 +1,12 @@
# These pipeline steps constitute the quality gate for your service within the production-noncanary environment.
# Incorporate any necessary additional logic to validate the service's integrity.
# A failure in this pipeline build will prevent further progression to the subsequent stage.

steps:
- label: ":pipeline::rocket::seedling: Trigger control-plane e2e tests"
trigger: "ess-k8s-production-e2e-tests" # https://buildkite.com/elastic/ess-k8s-production-e2e-tests
build:
env:
REGION_ID: aws-us-east-1
NAME_PREFIX: ci_test_kibana-promotion_
message: "${BUILDKITE_MESSAGE} (triggered by pipeline.tests-production-noncanary.yaml)"
Expand Up @@ -2,6 +2,10 @@
# Incorporate any necessary additional logic to validate the service's integrity.
# A failure in this pipeline build will prevent further progression to the subsequent stage.

# DEPRECATION NOTICE:
# PRODUCTION WILL SOON BE SPLIT INTO "CANARY" AND "NONCANARY" AND THIS FILE WILL BE DELETED.
# ENSURE ANY CHANGE MADE TO THIS FILE IS REFLECTED IN THOSE FILES AS WELL.

steps:
- label: ":pipeline::rocket::seedling: Trigger control-plane e2e tests"
trigger: "ess-k8s-production-e2e-tests" # https://buildkite.com/elastic/ess-k8s-production-e2e-tests
Expand Down

This file was deleted.

Expand Up @@ -7,17 +7,10 @@

import { hostMetricFlyoutCharts, hostMetricChartsFullPage } from './host/host_metric_charts';
import { hostKPICharts } from './host/host_kpi_charts';
import { nginxAccessCharts, nginxStubstatusCharts } from './host/nginx_charts';
import { kubernetesCharts } from './host/kubernetes_charts';

export const assetDetailsDashboards = {
host: { hostMetricFlyoutCharts, hostMetricChartsFullPage, hostKPICharts, keyField: 'host.name' },
nginx: {
nginxStubstatusCharts,
nginxAccessCharts,
keyField: 'host.name',
dependsOn: ['nginx.stubstatus', 'nginx.access'],
},
kubernetes: {
kubernetesCharts,
keyField: 'kubernetes.node.name',
Expand Down
Expand Up @@ -6,5 +6,4 @@
*/

export { hostLensFormulas } from './host';
export { nginxLensFormulas } from './nginx';
export { kubernetesLensFormulas } from './kubernetes';

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Expand Up @@ -64,14 +64,6 @@ export const MetricsSectionTitle = () => {
);
};

export const NginxMetricsSectionTitle = () => (
<SectionTitle
title={i18n.translate('xpack.infra.assetDetails.overview.nginxMetricsSectionTitle', {
defaultMessage: 'Nginx Metric',
})}
/>
);

export const KubernetesMetricsSectionTitle = () => (
<SectionTitle
title={i18n.translate('xpack.infra.assetDetails.overview.kubernetesMetricsSectionTitle', {
Expand Down
Expand Up @@ -16,6 +16,5 @@ export const APM_HOST_FILTER_FIELD = 'host.hostname';
export const ASSET_DETAILS_URL_STATE_KEY = 'assetDetails';

export const INTEGRATIONS = {
[INTEGRATION_NAME.nginx]: ['nginx.stubstatus', 'nginx.access'],
[INTEGRATION_NAME.kubernetes]: ['kubernetes.node'],
};
Expand Up @@ -13,7 +13,6 @@ import { EuiFlexGroup } from '@elastic/eui';
import { assetDetailsDashboards } from '../../../../../common/visualizations';
import {
MetricsSectionTitle,
NginxMetricsSectionTitle,
KubernetesMetricsSectionTitle,
} from '../../../components/section_titles';
import { useMetadataStateProviderContext } from '../../../hooks/use_metadata_state';
Expand All @@ -26,7 +25,7 @@ interface Props {
logsDataView?: DataView;
}

const { host, nginx, kubernetes } = assetDetailsDashboards;
const { host, kubernetes } = assetDetailsDashboards;

export const MetricsSection = ({ assetName, metricsDataView, logsDataView, dateRange }: Props) => {
return (
Expand All @@ -53,26 +52,6 @@ export const MetricsSection = ({ assetName, metricsDataView, logsDataView, dateR
data-test-subj="infraAssetDetailsKubernetesMetricsChart"
/>
</Section>
<Section dependsOn={nginx.dependsOn} title={NginxMetricsSectionTitle}>
<MetricsGrid
assetName={assetName}
dateRange={dateRange}
filterFieldName={nginx.keyField}
charts={[
...nginx.nginxStubstatusCharts.map((chart) => ({
...chart,
dependsOn: ['nginx.stubstatus'],
})),
...nginx.nginxAccessCharts.map((chart) => ({
...chart,
dependsOn: ['nginx.access'],
})),
]}
metricsDataView={metricsDataView}
logsDataView={logsDataView}
data-test-subj="infraAssetDetailsNginxMetricsChart"
/>
</Section>
</EuiFlexGroup>
);
};
Expand Down

0 comments on commit a3be568

Please sign in to comment.