Skip to content

Commit

Permalink
Merge branch 'master' into user-allowlist-artifacts-pt3
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Jul 9, 2020
2 parents 2bf4acb + a0b47ca commit 50b49a5
Show file tree
Hide file tree
Showing 226 changed files with 9,020 additions and 1,994 deletions.
35 changes: 0 additions & 35 deletions .ci/Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion .ci/runbld_no_junit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
profiles:
- ".*": # Match any job
tests:
junit-filename-pattern: false
junit-filename-pattern: "8d8bd494-d909-4e67-a052-7e8b5aaeb5e4" # A bogus path that should never exist
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ npm-debug.log*
.tern-project
.nyc_output
.ci/pipeline-library/build/
.ci/runbld
.ci/bash_standard_lib.sh
.gradle

# apm plugin
Expand Down
45 changes: 44 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,50 @@ kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true, setCommitStatus: true)
ciStats.trackBuild {
catchError {
retryable.enable()
kibanaPipeline.allCiTasks()
parallel([
'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
'oss-firefoxSmoke': kibanaPipeline.functionalTestProcess('kibana-firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh'),
'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4),
'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5),
'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6),
'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7),
'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8),
'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9),
'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10),
'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11),
'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12),
'oss-accessibility': kibanaPipeline.functionalTestProcess('kibana-accessibility', './test/scripts/jenkins_accessibility.sh'),
// 'oss-visualRegression': kibanaPipeline.functionalTestProcess('visualRegression', './test/scripts/jenkins_visual_regression.sh'),
]),
'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
'xpack-firefoxSmoke': kibanaPipeline.functionalTestProcess('xpack-firefoxSmoke', './test/scripts/jenkins_xpack_firefox_smoke.sh'),
'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
'xpack-savedObjectsFieldMetrics': kibanaPipeline.functionalTestProcess('xpack-savedObjectsFieldMetrics', './test/scripts/jenkins_xpack_saved_objects_field_metrics.sh'),
// 'xpack-pageLoadMetrics': kibanaPipeline.functionalTestProcess('xpack-pageLoadMetrics', './test/scripts/jenkins_xpack_page_load_metrics.sh'),
'xpack-securitySolutionCypress': { processNumber ->
whenChanged(['x-pack/plugins/security_solution/', 'x-pack/test/security_solution_cypress/']) {
kibanaPipeline.functionalTestProcess('xpack-securitySolutionCypress', './test/scripts/jenkins_security_solution_cypress.sh')(processNumber)
}
},

// 'xpack-visualRegression': kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh'),
]),
])
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,33 @@

```typescript
UI_SETTINGS: {
META_FIELDS: string;
DOC_HIGHLIGHT: string;
QUERY_STRING_OPTIONS: string;
QUERY_ALLOW_LEADING_WILDCARDS: string;
SEARCH_QUERY_LANGUAGE: string;
SORT_OPTIONS: string;
COURIER_IGNORE_FILTER_IF_FIELD_NOT_IN_INDEX: string;
COURIER_SET_REQUEST_PREFERENCE: string;
COURIER_CUSTOM_REQUEST_PREFERENCE: string;
COURIER_MAX_CONCURRENT_SHARD_REQUESTS: string;
COURIER_BATCH_SEARCHES: string;
SEARCH_INCLUDE_FROZEN: string;
HISTOGRAM_BAR_TARGET: string;
HISTOGRAM_MAX_BARS: string;
HISTORY_LIMIT: string;
SHORT_DOTS_ENABLE: string;
FORMAT_DEFAULT_TYPE_MAP: string;
FORMAT_NUMBER_DEFAULT_PATTERN: string;
FORMAT_PERCENT_DEFAULT_PATTERN: string;
FORMAT_BYTES_DEFAULT_PATTERN: string;
FORMAT_CURRENCY_DEFAULT_PATTERN: string;
FORMAT_NUMBER_DEFAULT_LOCALE: string;
TIMEPICKER_REFRESH_INTERVAL_DEFAULTS: string;
TIMEPICKER_QUICK_RANGES: string;
INDEXPATTERN_PLACEHOLDER: string;
FILTERS_PINNED_BY_DEFAULT: string;
FILTERS_EDITOR_SUGGEST_VALUES: string;
readonly META_FIELDS: "metaFields";
readonly DOC_HIGHLIGHT: "doc_table:highlight";
readonly QUERY_STRING_OPTIONS: "query:queryString:options";
readonly QUERY_ALLOW_LEADING_WILDCARDS: "query:allowLeadingWildcards";
readonly SEARCH_QUERY_LANGUAGE: "search:queryLanguage";
readonly SORT_OPTIONS: "sort:options";
readonly COURIER_IGNORE_FILTER_IF_FIELD_NOT_IN_INDEX: "courier:ignoreFilterIfFieldNotInIndex";
readonly COURIER_SET_REQUEST_PREFERENCE: "courier:setRequestPreference";
readonly COURIER_CUSTOM_REQUEST_PREFERENCE: "courier:customRequestPreference";
readonly COURIER_MAX_CONCURRENT_SHARD_REQUESTS: "courier:maxConcurrentShardRequests";
readonly COURIER_BATCH_SEARCHES: "courier:batchSearches";
readonly SEARCH_INCLUDE_FROZEN: "search:includeFrozen";
readonly HISTOGRAM_BAR_TARGET: "histogram:barTarget";
readonly HISTOGRAM_MAX_BARS: "histogram:maxBars";
readonly HISTORY_LIMIT: "history:limit";
readonly SHORT_DOTS_ENABLE: "shortDots:enable";
readonly FORMAT_DEFAULT_TYPE_MAP: "format:defaultTypeMap";
readonly FORMAT_NUMBER_DEFAULT_PATTERN: "format:number:defaultPattern";
readonly FORMAT_PERCENT_DEFAULT_PATTERN: "format:percent:defaultPattern";
readonly FORMAT_BYTES_DEFAULT_PATTERN: "format:bytes:defaultPattern";
readonly FORMAT_CURRENCY_DEFAULT_PATTERN: "format:currency:defaultPattern";
readonly FORMAT_NUMBER_DEFAULT_LOCALE: "format:number:defaultLocale";
readonly TIMEPICKER_REFRESH_INTERVAL_DEFAULTS: "timepicker:refreshIntervalDefaults";
readonly TIMEPICKER_QUICK_RANGES: "timepicker:quickRanges";
readonly TIMEPICKER_TIME_DEFAULTS: "timepicker:timeDefaults";
readonly INDEXPATTERN_PLACEHOLDER: "indexPattern:placeholder";
readonly FILTERS_PINNED_BY_DEFAULT: "filters:pinnedByDefault";
readonly FILTERS_EDITOR_SUGGEST_VALUES: "filterEditor:suggestValues";
}
```
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,33 @@

```typescript
UI_SETTINGS: {
META_FIELDS: string;
DOC_HIGHLIGHT: string;
QUERY_STRING_OPTIONS: string;
QUERY_ALLOW_LEADING_WILDCARDS: string;
SEARCH_QUERY_LANGUAGE: string;
SORT_OPTIONS: string;
COURIER_IGNORE_FILTER_IF_FIELD_NOT_IN_INDEX: string;
COURIER_SET_REQUEST_PREFERENCE: string;
COURIER_CUSTOM_REQUEST_PREFERENCE: string;
COURIER_MAX_CONCURRENT_SHARD_REQUESTS: string;
COURIER_BATCH_SEARCHES: string;
SEARCH_INCLUDE_FROZEN: string;
HISTOGRAM_BAR_TARGET: string;
HISTOGRAM_MAX_BARS: string;
HISTORY_LIMIT: string;
SHORT_DOTS_ENABLE: string;
FORMAT_DEFAULT_TYPE_MAP: string;
FORMAT_NUMBER_DEFAULT_PATTERN: string;
FORMAT_PERCENT_DEFAULT_PATTERN: string;
FORMAT_BYTES_DEFAULT_PATTERN: string;
FORMAT_CURRENCY_DEFAULT_PATTERN: string;
FORMAT_NUMBER_DEFAULT_LOCALE: string;
TIMEPICKER_REFRESH_INTERVAL_DEFAULTS: string;
TIMEPICKER_QUICK_RANGES: string;
INDEXPATTERN_PLACEHOLDER: string;
FILTERS_PINNED_BY_DEFAULT: string;
FILTERS_EDITOR_SUGGEST_VALUES: string;
readonly META_FIELDS: "metaFields";
readonly DOC_HIGHLIGHT: "doc_table:highlight";
readonly QUERY_STRING_OPTIONS: "query:queryString:options";
readonly QUERY_ALLOW_LEADING_WILDCARDS: "query:allowLeadingWildcards";
readonly SEARCH_QUERY_LANGUAGE: "search:queryLanguage";
readonly SORT_OPTIONS: "sort:options";
readonly COURIER_IGNORE_FILTER_IF_FIELD_NOT_IN_INDEX: "courier:ignoreFilterIfFieldNotInIndex";
readonly COURIER_SET_REQUEST_PREFERENCE: "courier:setRequestPreference";
readonly COURIER_CUSTOM_REQUEST_PREFERENCE: "courier:customRequestPreference";
readonly COURIER_MAX_CONCURRENT_SHARD_REQUESTS: "courier:maxConcurrentShardRequests";
readonly COURIER_BATCH_SEARCHES: "courier:batchSearches";
readonly SEARCH_INCLUDE_FROZEN: "search:includeFrozen";
readonly HISTOGRAM_BAR_TARGET: "histogram:barTarget";
readonly HISTOGRAM_MAX_BARS: "histogram:maxBars";
readonly HISTORY_LIMIT: "history:limit";
readonly SHORT_DOTS_ENABLE: "shortDots:enable";
readonly FORMAT_DEFAULT_TYPE_MAP: "format:defaultTypeMap";
readonly FORMAT_NUMBER_DEFAULT_PATTERN: "format:number:defaultPattern";
readonly FORMAT_PERCENT_DEFAULT_PATTERN: "format:percent:defaultPattern";
readonly FORMAT_BYTES_DEFAULT_PATTERN: "format:bytes:defaultPattern";
readonly FORMAT_CURRENCY_DEFAULT_PATTERN: "format:currency:defaultPattern";
readonly FORMAT_NUMBER_DEFAULT_LOCALE: "format:number:defaultLocale";
readonly TIMEPICKER_REFRESH_INTERVAL_DEFAULTS: "timepicker:refreshIntervalDefaults";
readonly TIMEPICKER_QUICK_RANGES: "timepicker:quickRanges";
readonly TIMEPICKER_TIME_DEFAULTS: "timepicker:timeDefaults";
readonly INDEXPATTERN_PLACEHOLDER: "indexPattern:placeholder";
readonly FILTERS_PINNED_BY_DEFAULT: "filters:pinnedByDefault";
readonly FILTERS_EDITOR_SUGGEST_VALUES: "filterEditor:suggestValues";
}
```
33 changes: 0 additions & 33 deletions docs/uptime-guide/alerting.asciidoc

This file was deleted.

70 changes: 0 additions & 70 deletions docs/uptime-guide/app-overview.asciidoc

This file was deleted.

15 changes: 0 additions & 15 deletions docs/uptime-guide/certificates.asciidoc

This file was deleted.

27 changes: 0 additions & 27 deletions docs/uptime-guide/deployment-arch.asciidoc

This file was deleted.

Binary file removed docs/uptime-guide/images/cert-exp.png
Binary file not shown.
Binary file removed docs/uptime-guide/images/certificates-page.png
Binary file not shown.
Binary file removed docs/uptime-guide/images/check-history.png
Binary file not shown.
Binary file removed docs/uptime-guide/images/create-alert.png
Binary file not shown.
Binary file removed docs/uptime-guide/images/crosshair-example.png
Binary file not shown.
Binary file removed docs/uptime-guide/images/filter-bar.png
Binary file not shown.
Binary file removed docs/uptime-guide/images/indices.png
Binary file not shown.
Binary file removed docs/uptime-guide/images/monitor-charts.png
Binary file not shown.
Binary file removed docs/uptime-guide/images/monitor-list.png
Binary file not shown.
Binary file removed docs/uptime-guide/images/monitor-status-alert.png
Binary file not shown.
Binary file not shown.
Binary file removed docs/uptime-guide/images/settings.png
Binary file not shown.
Binary file removed docs/uptime-guide/images/snapshot-view.png
Binary file not shown.
Binary file removed docs/uptime-guide/images/status-bar.png
Binary file not shown.
Binary file removed docs/uptime-guide/images/tls-alert.png
Binary file not shown.
Binary file removed docs/uptime-guide/images/uptime-multi-deployment.png
Binary file not shown.
Binary file removed docs/uptime-guide/images/uptime-overview.png
Binary file not shown.
Binary file removed docs/uptime-guide/images/uptime-setup.png
Binary file not shown.
Binary file not shown.
22 changes: 0 additions & 22 deletions docs/uptime-guide/index.asciidoc

This file was deleted.

Loading

0 comments on commit 50b49a5

Please sign in to comment.