Skip to content

Commit

Permalink
Merge branch 'master' into alerting/refresh-on-deletion
Browse files Browse the repository at this point in the history
* master:
  update docs (elastic#74364)
  [Ingest Node Pipelines] Refactor pipeline simulator code (elastic#72328)
  Add README files for Kibana app plugins (elastic#74277)
  [APM] Average for transaction error rate includes null values (elastic#74345)
  [Ingest Manager] Adjust dataset aggs to use datastream fields instead (elastic#74342)
  • Loading branch information
gmmorris committed Aug 5, 2020
2 parents 2024d25 + 8759646 commit d794d96
Show file tree
Hide file tree
Showing 52 changed files with 400 additions and 414 deletions.
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
/x-pack/plugins/discover_enhanced/ @elastic/kibana-app
/x-pack/plugins/lens/ @elastic/kibana-app
/x-pack/plugins/graph/ @elastic/kibana-app
/src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
/src/plugins/dashboard/ @elastic/kibana-app
/src/plugins/discover/ @elastic/kibana-app
/src/plugins/input_control_vis/ @elastic/kibana-app
Expand Down
74 changes: 41 additions & 33 deletions docs/developer/architecture/code-exploration.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ The Charts plugin is a way to create easier integration of shared colors, themes
WARNING: Missing README.
- {kib-repo}blob/{branch}/src/plugins/dashboard[dashboard]
- {kib-repo}blob/{branch}/src/plugins/dashboard/README.md[dashboard]
WARNING: Missing README.
Contains the dashboard application.
- {kib-repo}blob/{branch}/src/plugins/data/README.md[data]
Expand All @@ -76,9 +76,9 @@ Routing will be handled by the id of the dev tool - your dev tool will be mounte
This API doesn't support angular, for registering angular dev tools, bootstrap a local module on mount into the given HTML element.
- {kib-repo}blob/{branch}/src/plugins/discover[discover]
- {kib-repo}blob/{branch}/src/plugins/discover/README.md[discover]
WARNING: Missing README.
Contains the Discover application and the saved search embeddable.
- {kib-repo}blob/{branch}/src/plugins/embeddable/README.md[embeddable]
Expand Down Expand Up @@ -109,9 +109,9 @@ Moves the legacy ui/registry/feature_catalogue module for registering "features"
WARNING: Missing README.
- {kib-repo}blob/{branch}/src/plugins/input_control_vis[inputControlVis]
- {kib-repo}blob/{branch}/src/plugins/input_control_vis/README.md[inputControlVis]
WARNING: Missing README.
Contains the input control visualization allowing to place custom filter controls on a dashboard.
- {kib-repo}blob/{branch}/src/plugins/inspector/README.md[inspector]
Expand Down Expand Up @@ -206,9 +206,10 @@ This plugin adds the Advanced Settings section for the Usage Data collection (ak
WARNING: Missing README.
- {kib-repo}blob/{branch}/src/plugins/timelion[timelion]
- {kib-repo}blob/{branch}/src/plugins/timelion/README.md[timelion]
WARNING: Missing README.
Contains the deprecated timelion application. For the timelion visualization,
which also contains the timelion APIs and backend, look at the vis_type_timelion plugin.
- {kib-repo}blob/{branch}/src/plugins/ui_actions/README.md[uiActions]
Expand All @@ -222,59 +223,63 @@ Usage Collection allows collecting usage data for other services to consume (tel
To integrate with the telemetry services for usage collection of your feature, there are 2 steps:
- {kib-repo}blob/{branch}/src/plugins/vis_type_markdown[visTypeMarkdown]
- {kib-repo}blob/{branch}/src/plugins/vis_type_markdown/README.md[visTypeMarkdown]
WARNING: Missing README.
The markdown visualization that can be used to place text panels on dashboards.
- {kib-repo}blob/{branch}/src/plugins/vis_type_metric[visTypeMetric]
- {kib-repo}blob/{branch}/src/plugins/vis_type_metric/README.md[visTypeMetric]
WARNING: Missing README.
Contains the metric visualization.
- {kib-repo}blob/{branch}/src/plugins/vis_type_table[visTypeTable]
- {kib-repo}blob/{branch}/src/plugins/vis_type_table/README.md[visTypeTable]
WARNING: Missing README.
Contains the data table visualization, that allows presenting data in a simple table format.
- {kib-repo}blob/{branch}/src/plugins/vis_type_tagcloud[visTypeTagcloud]
- {kib-repo}blob/{branch}/src/plugins/vis_type_tagcloud/README.md[visTypeTagcloud]
WARNING: Missing README.
Contains the tagcloud visualization.
- {kib-repo}blob/{branch}/src/plugins/vis_type_timelion/README.md[visTypeTimelion]
If your grammar was changed in public/chain.peg you need to re-generate the static parser. You could use a grunt task:
Contains the timelion visualization and the timelion backend.
- {kib-repo}blob/{branch}/src/plugins/vis_type_timeseries[visTypeTimeseries]
- {kib-repo}blob/{branch}/src/plugins/vis_type_timeseries/README.md[visTypeTimeseries]
WARNING: Missing README.
Contains everything around TSVB (the editor, visualizatin implementations and backends).
- {kib-repo}blob/{branch}/src/plugins/vis_type_vega[visTypeVega]
- {kib-repo}blob/{branch}/src/plugins/vis_type_vega/README.md[visTypeVega]
WARNING: Missing README.
Contains the Vega visualization.
- {kib-repo}blob/{branch}/src/plugins/vis_type_vislib[visTypeVislib]
- {kib-repo}blob/{branch}/src/plugins/vis_type_vislib/README.md[visTypeVislib]
WARNING: Missing README.
Contains the vislib visualizations. These are the classical area/line/bar, pie, gauge/goal and
heatmap charts.
- {kib-repo}blob/{branch}/src/plugins/vis_type_xy[visTypeXy]
- {kib-repo}blob/{branch}/src/plugins/vis_type_xy/README.md[visTypeXy]
WARNING: Missing README.
Contains the new xy-axis chart using the elastic-charts library, which will eventually
replace the vislib xy-axis (bar, area, line) charts.
- {kib-repo}blob/{branch}/src/plugins/visualizations[visualizations]
- {kib-repo}blob/{branch}/src/plugins/visualizations/README.md[visualizations]
WARNING: Missing README.
Contains most of the visualization infrastructure, e.g. the visualization type registry or the
visualization embeddable.
- {kib-repo}blob/{branch}/src/plugins/visualize[visualize]
- {kib-repo}blob/{branch}/src/plugins/visualize/README.md[visualize]
WARNING: Missing README.
Contains the visualize application which includes the listing page and the app frame,
which will load the visualization's editor.
[discrete]
Expand Down Expand Up @@ -345,19 +350,22 @@ You can run a local cluster and simulate a remote cluster within a single Kibana
- {kib-repo}blob/{branch}/x-pack/plugins/dashboard_enhanced/README.md[dashboardEnhanced]
- {kib-repo}blob/{branch}/x-pack/plugins/dashboard_mode[dashboardMode]
Contains the enhancements to the OSS dashboard app.
WARNING: Missing README.
- {kib-repo}blob/{branch}/x-pack/plugins/dashboard_mode/README.md[dashboardMode]
The deprecated dashboard only mode.
- {kib-repo}blob/{branch}/x-pack/plugins/data_enhanced[dataEnhanced]
WARNING: Missing README.
- {kib-repo}blob/{branch}/x-pack/plugins/discover_enhanced[discoverEnhanced]
- {kib-repo}blob/{branch}/x-pack/plugins/discover_enhanced/README.md[discoverEnhanced]
WARNING: Missing README.
Contains the enhancements to the OSS discover app.
- {kib-repo}blob/{branch}/x-pack/plugins/embeddable_enhanced[embeddableEnhanced]
Expand Down
1 change: 1 addition & 0 deletions src/plugins/dashboard/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Contains the dashboard application.
1 change: 1 addition & 0 deletions src/plugins/discover/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Contains the Discover application and the saved search embeddable.
1 change: 1 addition & 0 deletions src/plugins/input_control_vis/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Contains the input control visualization allowing to place custom filter controls on a dashboard.
2 changes: 2 additions & 0 deletions src/plugins/timelion/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Contains the deprecated timelion application. For the timelion visualization,
which also contains the timelion APIs and backend, look at the vis_type_timelion plugin.
1 change: 1 addition & 0 deletions src/plugins/vis_type_markdown/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The markdown visualization that can be used to place text panels on dashboards.
1 change: 1 addition & 0 deletions src/plugins/vis_type_metric/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Contains the metric visualization.
1 change: 1 addition & 0 deletions src/plugins/vis_type_table/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Contains the data table visualization, that allows presenting data in a simple table format.
1 change: 1 addition & 0 deletions src/plugins/vis_type_tagcloud/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Contains the tagcloud visualization.
2 changes: 2 additions & 0 deletions src/plugins/vis_type_timelion/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Vis type Timelion

Contains the timelion visualization and the timelion backend.

# Generate a parser
If your grammar was changed in `public/chain.peg` you need to re-generate the static parser. You could use a grunt task:

Expand Down
1 change: 1 addition & 0 deletions src/plugins/vis_type_timeseries/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Contains everything around TSVB (the editor, visualizatin implementations and backends).
1 change: 1 addition & 0 deletions src/plugins/vis_type_vega/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Contains the Vega visualization.
2 changes: 2 additions & 0 deletions src/plugins/vis_type_vislib/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Contains the vislib visualizations. These are the classical area/line/bar, pie, gauge/goal and
heatmap charts.
2 changes: 2 additions & 0 deletions src/plugins/vis_type_xy/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Contains the new xy-axis chart using the elastic-charts library, which will eventually
replace the vislib xy-axis (bar, area, line) charts.
2 changes: 2 additions & 0 deletions src/plugins/visualizations/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Contains most of the visualization infrastructure, e.g. the visualization type registry or the
visualization embeddable.
2 changes: 2 additions & 0 deletions src/plugins/visualize/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Contains the visualize application which includes the listing page and the app frame,
which will load the visualization's editor.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import { EuiTitle } from '@elastic/eui';
import theme from '@elastic/eui/dist/eui_theme_light.json';
import { i18n } from '@kbn/i18n';
import { mean } from 'lodash';
import React, { useCallback } from 'react';
import { EuiPanel } from '@elastic/eui';
import { useChartsSync } from '../../../../hooks/useChartsSync';
Expand Down Expand Up @@ -79,7 +78,7 @@ export function ErroneousTransactionsRateChart() {
{
color: theme.euiColorVis7,
data: [],
legendValue: tickFormatY(mean(errorRates.map((rate) => rate.y))),
legendValue: tickFormatY(data?.average),
legendClickDisabled: true,
title: i18n.translate('xpack.apm.errorRateChart.avgLabel', {
defaultMessage: 'Avg.',
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/dashboard_enhanced/README.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# X-Pack part of Dashboard app
Contains the enhancements to the OSS dashboard app.
1 change: 1 addition & 0 deletions x-pack/plugins/dashboard_mode/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The deprecated dashboard only mode.
1 change: 1 addition & 0 deletions x-pack/plugins/discover_enhanced/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Contains the enhancements to the OSS discover app.
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ export const getListHandler: RequestHandler = async (context, request, response)
must: [
{
exists: {
field: 'dataset.namespace',
field: 'data_stream.namespace',
},
},
{
exists: {
field: 'dataset.name',
field: 'data_stream.dataset',
},
},
],
Expand All @@ -54,19 +54,19 @@ export const getListHandler: RequestHandler = async (context, request, response)
aggs: {
dataset: {
terms: {
field: 'dataset.name',
field: 'data_stream.dataset',
size: 1,
},
},
namespace: {
terms: {
field: 'dataset.namespace',
field: 'data_stream.namespace',
size: 1,
},
},
type: {
terms: {
field: 'dataset.type',
field: 'data_stream.type',
size: 1,
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -393,14 +393,14 @@ const updateExistingIndex = async ({
// are added in https://github.com/elastic/kibana/issues/66551. namespace value we will continue
// to skip updating and assume the value in the index mapping is correct
delete mappings.properties.stream;
delete mappings.properties.dataset;
delete mappings.properties.data_stream;

// get the dataset values from the index template to compose data stream name
// get the data_stream values from the index template to compose data stream name
const indexMappings = await getIndexMappings(indexName, callCluster);
const dataset = indexMappings[indexName].mappings.properties.dataset.properties;
if (!dataset.type.value || !dataset.name.value || !dataset.namespace.value)
throw new Error(`dataset values are missing from the index template ${indexName}`);
const dataStreamName = `${dataset.type.value}-${dataset.name.value}-${dataset.namespace.value}`;
const dataStream = indexMappings[indexName].mappings.properties.data_stream.properties;
if (!dataStream.type.value || !dataStream.dataset.value || !dataStream.namespace.value)
throw new Error(`data_stream values are missing from the index template ${indexName}`);
const dataStreamName = `${dataStream.type.value}-${dataStream.dataset.value}-${dataStream.namespace.value}`;

// try to update the mappings first
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
* you may not use this file except in compliance with the Elastic License.
*/

export { PipelineFormProvider as PipelineForm } from './pipeline_form_provider';
export { PipelineForm } from './pipeline_form';
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import './pipeline_form.scss';
import { OnUpdateHandlerArg, OnUpdateHandler } from '../pipeline_processors_editor';

import { PipelineRequestFlyout } from './pipeline_request_flyout';
import { PipelineTestFlyout } from './pipeline_test_flyout';
import { PipelineFormFields } from './pipeline_form_fields';
import { PipelineFormError } from './pipeline_form_error';
import { pipelineFormSchema } from './schema';
Expand Down Expand Up @@ -48,8 +47,6 @@ export const PipelineForm: React.FunctionComponent<PipelineFormProps> = ({
}) => {
const [isRequestVisible, setIsRequestVisible] = useState<boolean>(false);

const [isTestingPipeline, setIsTestingPipeline] = useState<boolean>(false);

const {
processors: initialProcessors,
on_failure: initialOnFailureProcessors,
Expand Down Expand Up @@ -79,18 +76,13 @@ export const PipelineForm: React.FunctionComponent<PipelineFormProps> = ({
}
};

const handleTestPipelineClick = () => {
setIsTestingPipeline(true);
};

const { form } = useForm<IPipelineForm>({
schema: pipelineFormSchema,
defaultValue: defaultFormValues,
onSubmit: handleSave,
});

const onEditorFlyoutOpen = useCallback(() => {
setIsTestingPipeline(false);
setIsRequestVisible(false);
}, [setIsRequestVisible]);

Expand Down Expand Up @@ -137,8 +129,6 @@ export const PipelineForm: React.FunctionComponent<PipelineFormProps> = ({
onFailure={processorsState.onFailure}
onProcessorsUpdate={onProcessorsChangeHandler}
hasVersion={Boolean(defaultValue.version)}
isTestButtonDisabled={isTestingPipeline || form.isValid === false}
onTestPipelineClick={handleTestPipelineClick}
isEditing={isEditing}
/>

Expand Down Expand Up @@ -198,18 +188,6 @@ export const PipelineForm: React.FunctionComponent<PipelineFormProps> = ({
closeFlyout={() => setIsRequestVisible((prevIsRequestVisible) => !prevIsRequestVisible)}
/>
) : null}

{/* Test pipeline flyout */}
{isTestingPipeline ? (
<PipelineTestFlyout
readProcessors={() =>
processorStateRef.current?.getData() || { processors: [], on_failure: [] }
}
closeFlyout={() => {
setIsTestingPipeline((prevIsTestingPipeline) => !prevIsTestingPipeline);
}}
/>
) : null}
</Form>

<EuiSpacer size="m" />
Expand Down
Loading

0 comments on commit d794d96

Please sign in to comment.