Merge branch 'main' into alerting/actions-telemetry

elastic · Mar 30, 2022 · 87a03b6 · 87a03b6
2 parents 4e7af15 + f6b3928
commit 87a03b6
Show file tree

Hide file tree

Showing 26 changed files with 114 additions and 140 deletions.
diff --git a/.backportrc.json b/.backportrc.json
@@ -3,6 +3,7 @@
   "repoName": "kibana",
   "targetBranchChoices": [
     "main",
+    "8.2",
     "8.1",
     "8.0",
     "7.17",
@@ -38,7 +39,7 @@
     "backport"
   ],
   "branchLabelMapping": {
-    "^v8.2.0$": "main",
+    "^v8.3.0$": "main",
     "^v(\\d+).(\\d+).\\d+$": "$1.$2"
   },
   "autoMerge": true,

diff --git a/.buildkite/scripts/steps/es_snapshots/build.sh b/.buildkite/scripts/steps/es_snapshots/build.sh
@@ -69,7 +69,6 @@ echo "--- Build Elasticsearch"
   :distribution:archives:darwin-aarch64-tar:assemble \
   :distribution:archives:darwin-tar:assemble \
   :distribution:docker:docker-export:assemble \
-  :distribution:docker:cloud-docker-export:assemble \
   :distribution:archives:linux-aarch64-tar:assemble \
   :distribution:archives:linux-tar:assemble \
   :distribution:archives:windows-zip:assemble \
@@ -80,26 +79,11 @@ find distribution -type f \( -name 'elasticsearch-*-*-*-*.tar.gz' -o -name 'elas
 
 ls -alh "$destination"
 
-echo "--- Create docker default image archives"
+echo "--- Create docker image archives"
 docker images "docker.elastic.co/elasticsearch/elasticsearch"
 docker images "docker.elastic.co/elasticsearch/elasticsearch" --format "{{.Tag}}" | xargs -n1 echo 'docker save docker.elastic.co/elasticsearch/elasticsearch:${0} | gzip > ../es-build/elasticsearch-${0}-docker-image.tar.gz'
 docker images "docker.elastic.co/elasticsearch/elasticsearch" --format "{{.Tag}}" | xargs -n1 bash -c 'docker save docker.elastic.co/elasticsearch/elasticsearch:${0} | gzip > ../es-build/elasticsearch-${0}-docker-image.tar.gz'
 
-echo "--- Create kibana-ci docker cloud image archives"
-ES_CLOUD_ID=$(docker images "docker.elastic.co/elasticsearch-ci/elasticsearch-cloud" --format "{{.ID}}")
-ES_CLOUD_VERSION=$(docker images "docker.elastic.co/elasticsearch-ci/elasticsearch-cloud" --format "{{.Tag}}")
-KIBANA_ES_CLOUD_VERSION="$ES_CLOUD_VERSION-$ELASTICSEARCH_GIT_COMMIT"
-KIBANA_ES_CLOUD_IMAGE="docker.elastic.co/kibana-ci/elasticsearch-cloud:$KIBANA_ES_CLOUD_VERSION"
-
-docker tag "$ES_CLOUD_ID" "$KIBANA_ES_CLOUD_IMAGE"
-
-echo "$KIBANA_DOCKER_PASSWORD" | docker login -u "$KIBANA_DOCKER_USERNAME" --password-stdin docker.elastic.co
-trap 'docker logout docker.elastic.co' EXIT
-docker image push "$KIBANA_ES_CLOUD_IMAGE"
-
-export ELASTICSEARCH_CLOUD_IMAGE="$KIBANA_ES_CLOUD_IMAGE"
-export ELASTICSEARCH_CLOUD_IMAGE_CHECKSUM="$(docker images "$KIBANA_ES_CLOUD_IMAGE" --format "{{.Digest}}")"
-
 echo "--- Create checksums for snapshot files"
 cd "$destination"
 find ./* -exec bash -c "shasum -a 512 {} > {}.sha512" \;

diff --git a/.buildkite/scripts/steps/es_snapshots/create_manifest.js b/.buildkite/scripts/steps/es_snapshots/create_manifest.js
@@ -16,8 +16,6 @@ const { BASE_BUCKET_DAILY } = require('./bucket_config.js');
   const destination = process.argv[2] || __dirname + '/test';
 
   const ES_BRANCH = process.env.ELASTICSEARCH_BRANCH;
-  const ES_CLOUD_IMAGE = process.env.ELASTICSEARCH_CLOUD_IMAGE;
-  const ES_CLOUD_IMAGE_CHECKSUM = process.env.ELASTICSEARCH_CLOUD_IMAGE_CHECKSUM;
   const GIT_COMMIT = process.env.ELASTICSEARCH_GIT_COMMIT;
   const GIT_COMMIT_SHORT = process.env.ELASTICSEARCH_GIT_COMMIT_SHORT;
 
@@ -61,17 +59,6 @@ const { BASE_BUCKET_DAILY } = require('./bucket_config.js');
         };
       });
 
-    if (ES_CLOUD_IMAGE && ES_CLOUD_IMAGE_CHECKSUM) {
-      manifestEntries.push({
-        checksum: ES_CLOUD_IMAGE_CHECKSUM,
-        url: ES_CLOUD_IMAGE,
-        version: VERSION,
-        platform: 'docker',
-        architecture: 'image',
-        license: 'default',
-      });
-    }
-
     const manifest = {
       id: SNAPSHOT_ID,
       bucket: `${BASE_BUCKET_DAILY}/${DESTINATION}`.toString(),

diff --git a/.buildkite/scripts/steps/functional/synthetics.sh b/.buildkite/scripts/steps/functional/synthetics.sh
@@ -14,4 +14,4 @@ echo "--- Uptime @elastic/synthetics Tests"
 cd "$XPACK_DIR"
 
 checks-reporter-with-killswitch "Uptime @elastic/synthetics Tests" \
-  node plugins/uptime/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" --grep "MonitorManagement*"
+  node plugins/uptime/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" --grep "MonitorManagement-monitor*"
diff --git a/nav-kibana-dev.docnav.json b/nav-kibana-dev.docnav.json
@@ -68,6 +68,7 @@
     {
       "label": "Contributors Newsletters",
       "items": [
+        { "id": "kibMarch2022ContributorNewsletter" },
         { "id": "kibFebruary2022ContributorNewsletter" },
         { "id": "kibJanuary2022ContributorNewsletter" },
         { "id": "kibDecember2021ContributorNewsletter" },

diff --git a/package.json b/package.json
@@ -104,7 +104,7 @@
     "@elastic/apm-rum": "^5.10.2",
     "@elastic/apm-rum-react": "^1.3.4",
     "@elastic/apm-synthtrace": "link:bazel-bin/packages/elastic-apm-synthtrace",
-    "@elastic/charts": "45.0.1",
+    "@elastic/charts": "45.1.1",
     "@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
     "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@8.2.0-canary.1",
     "@elastic/ems-client": "8.2.0",

diff --git a/...xpressions/expression_gauge/public/components/__snapshots__/gauge_component.test.tsx.snap b/...xpressions/expression_gauge/public/components/__snapshots__/gauge_component.test.tsx.snap
diff --git a/src/plugins/controls/public/control_group/control_group.scss b/src/plugins/controls/public/control_group/control_group.scss
@@ -7,36 +7,9 @@ $controlMinWidth: $euiSize * 14;
   min-height: $euiSize * 4;
 }
 
-.controlsWrapper {
-  &--empty {
-    display: flex;
-    @include euiBreakpoint('m', 'l', 'xl') {
-      .addControlButton {
-        text-align: center;
-      }
-      .emptyStateText {
-        padding-left: $euiSize * 2;
-      }
-      height: $euiSize * 4;
-      overflow: hidden;
-    }
-    @include euiBreakpoint('xs', 's') {
-      .addControlButton {
-        text-align: center;
-      }
-      .emptyStateText {
-        text-align: center;
-      }
-      .controlsIllustration__container {
-        margin-bottom: 0 !important;
-      }
-    }
-  }
-
-  &--twoLine {
-    .groupEditActions {
-      padding-top: $euiSize;
-    }
+.controlsWrapper--twoLine {
+  .groupEditActions {
+    padding-top: $euiSize;
   }
 }
 
@@ -75,15 +48,16 @@ $controlMinWidth: $euiSize * 14;
     @include euiFontSizeXS;
   }
 
-  .controlFrame__formControlLayout, .controlFrame__draggable {
+  .controlFrame__formControlLayout,
+  .controlFrame__draggable {
     .controlFrame__dragHandle {
       cursor: grabbing;
     }
   }
 }
 
 .controlFrame__labelToolTip {
-  max-width: 50%;
+  max-width: 40%;
 }
 
 .controlFrameWrapper {
@@ -105,7 +79,7 @@ $controlMinWidth: $euiSize * 14;
   .controlFrame__formControlLayout {
     width: 100%;
     min-width: $controlMinWidth;
-    transition:background-color .1s, color .1s;
+    transition: background-color .1s, color .1s;
 
     &Label {
       @include euiTextTruncate;
@@ -163,7 +137,6 @@ $controlMinWidth: $euiSize * 14;
   &--insertBefore {
     .controlFrame__formControlLayout:after {
       left: -$euiSizeXS - 1;
-
     }
   }
 
@@ -184,7 +157,7 @@ $controlMinWidth: $euiSize * 14;
     position: absolute;
 
     &--oneLine {
-      right:$euiSizeXS;
+      right: $euiSizeXS;
       top: -$euiSizeL;
       padding: $euiSizeXS;
       border-radius: $euiBorderRadius;
@@ -193,14 +166,14 @@ $controlMinWidth: $euiSize * 14;
     }
 
     &--twoLine {
-      right:$euiSizeXS;
+      right: $euiSizeXS;
       top: -$euiSizeXS;
     }
   }
 
   &:hover {
     .controlFrameFloatingActions {
-      transition:visibility .1s, opacity .1s;
+      transition: visibility .1s, opacity .1s;
       visibility: visible;
       opacity: 1;
     }
@@ -224,4 +197,4 @@ $controlMinWidth: $euiSize * 14;
       }
     }
   }
-}
+}
diff --git a/src/plugins/controls/public/control_types/options_list/options_list_embeddable_factory.tsx b/src/plugins/controls/public/control_types/options_list/options_list_embeddable_factory.tsx
@@ -51,7 +51,7 @@ export class OptionsListEmbeddableFactory
   public isEditable = () => Promise.resolve(false);
 
   public getDisplayName = () => OptionsListStrings.getDisplayName();
-  public getIconType = () => 'list';
+  public getIconType = () => 'editorChecklist';
   public getDescription = () => OptionsListStrings.getDescription();
 
   public inject = createOptionsListInject();

diff --git a/src/plugins/controls/public/control_types/range_slider/range_slider.scss b/src/plugins/controls/public/control_types/range_slider/range_slider.scss
@@ -31,6 +31,7 @@
 
   .rangeSliderAnchor__delimiter {
     background-color: unset;
+    padding: $euiSizeS*1.5 0;
   }
   .rangeSliderAnchor__fieldNumber {
     font-weight: $euiFontWeightBold;

diff --git a/src/plugins/controls/public/control_types/range_slider/range_slider_popover.tsx b/src/plugins/controls/public/control_types/range_slider/range_slider_popover.tsx
@@ -110,7 +110,7 @@ export const RangeSliderPopover: FC<Props> = ({
       className="rangeSliderAnchor__button"
       data-test-subj={`range-slider-control-${id}`}
     >
-      <EuiFlexGroup gutterSize="none">
+      <EuiFlexGroup gutterSize="none" responsive={false}>
         <EuiFlexItem>
           <EuiFieldNumber
             controlOnly
@@ -178,8 +178,7 @@ export const RangeSliderPopover: FC<Props> = ({
       panelClassName="rangeSlider__panelOverride"
       closePopover={() => setIsPopoverOpen(false)}
       anchorPosition="downCenter"
-      initialFocus={false}
-      repositionOnScroll
+      attachToAnchor={false}
       disableFocusTrap
       onPanelResize={() => {
         if (rangeRef?.current) {
@@ -192,6 +191,7 @@ export const RangeSliderPopover: FC<Props> = ({
         className="rangeSlider__actions"
         gutterSize="none"
         data-test-subj="rangeSlider-control-actions"
+        responsive={false}
       >
         <EuiFlexItem>
           <EuiDualRange

diff --git a/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable_factory.tsx b/src/plugins/controls/public/control_types/time_slider/time_slider_embeddable_factory.tsx
@@ -53,6 +53,7 @@ export class TimesliderEmbeddableFactory
   public isEditable = () => Promise.resolve(false);
 
   public getDisplayName = () => TimeSliderStrings.getDisplayName();
+  public getIconType = () => 'clock';
   public getDescription = () => TimeSliderStrings.getDescription();
 
   public inject = createOptionsListInject();

diff --git a/src/plugins/controls/public/controls_callout/controls_callout.scss b/src/plugins/controls/public/controls_callout/controls_callout.scss
@@ -0,0 +1,36 @@
+@include euiBreakpoint('xs', 's') {
+  .controlsIllustration {
+    display: none;
+  }
+}
+
+.controlsWrapper {
+  &--empty {
+    display: flex;
+    overflow: hidden;
+    margin: 0 $euiSizeS 0 $euiSizeS;
+
+    .addControlButton {
+      text-align: center;
+    }
+
+    @include euiBreakpoint('m', 'l', 'xl') {
+      height: $euiSize * 4;
+
+      .emptyStateText {
+        padding-left: $euiSize * 2;
+      }
+    }
+    @include euiBreakpoint('xs', 's') {
+      min-height: $euiSize * 4;
+
+      .emptyStateText {
+        padding-left: 0;
+        text-align: center;
+      }
+      .controlsIllustration__container {
+        margin-bottom: 0 !important;
+      }
+    }
+  }
+}
diff --git a/src/plugins/controls/public/controls_callout/controls_callout.tsx b/src/plugins/controls/public/controls_callout/controls_callout.tsx
@@ -9,8 +9,8 @@
 import { EuiFlexGroup, EuiFlexItem, EuiText, EuiButtonEmpty, EuiPanel } from '@elastic/eui';
 import React from 'react';
 import useLocalStorage from 'react-use/lib/useLocalStorage';
-import classNames from 'classnames';
 
+import './controls_callout.scss';
 import { ControlGroupStrings } from '../control_group/control_group_strings';
 import { ControlsIllustration } from './controls_illustration';
 
@@ -32,15 +32,10 @@ export const ControlsCallout = ({ getCreateControlButton }: CalloutProps) => {
   if (controlsCalloutDismissed) return null;
 
   return (
-    <EuiPanel
-      borderRadius="m"
-      color="plain"
-      paddingSize={'s'}
-      className={classNames('controlsWrapper--empty', 'dshDashboardViewport-controls')}
-    >
+    <EuiPanel borderRadius="m" color="plain" paddingSize={'s'} className="controlsWrapper--empty">
       <EuiFlexGroup alignItems="center" gutterSize="xs" data-test-subj="controls-empty">
         <EuiFlexItem grow={1} className="controlsIllustration__container">
-          <EuiFlexGroup alignItems="center" gutterSize="xs" responsive={false}>
+          <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false} wrap>
             <EuiFlexItem grow={false}>
               <ControlsIllustration />
             </EuiFlexItem>
@@ -49,13 +44,15 @@ export const ControlsCallout = ({ getCreateControlButton }: CalloutProps) => {
                 <p>{ControlGroupStrings.emptyState.getCallToAction()}</p>
               </EuiText>
             </EuiFlexItem>
-            {getCreateControlButton ? (
-              <EuiFlexItem grow={false}>{getCreateControlButton()}</EuiFlexItem>
-            ) : null}
             <EuiFlexItem grow={false}>
-              <EuiButtonEmpty size="s" onClick={dismissControls}>
-                {ControlGroupStrings.emptyState.getDismissButton()}
-              </EuiButtonEmpty>
+              <EuiFlexGroup justifyContent="spaceAround" responsive={false} gutterSize="xs">
+                {getCreateControlButton && <EuiFlexItem>{getCreateControlButton()}</EuiFlexItem>}
+                <EuiFlexItem>
+                  <EuiButtonEmpty size="s" onClick={dismissControls}>
+                    {ControlGroupStrings.emptyState.getDismissButton()}
+                  </EuiButtonEmpty>
+                </EuiFlexItem>
+              </EuiFlexGroup>
             </EuiFlexItem>
           </EuiFlexGroup>
         </EuiFlexItem>

diff --git a/src/plugins/controls/public/controls_callout/controls_illustration.scss b/src/plugins/controls/public/controls_callout/controls_illustration.scss
diff --git a/src/plugins/controls/public/controls_callout/controls_illustration.tsx b/src/plugins/controls/public/controls_callout/controls_illustration.tsx
@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-import './controls_illustration.scss';
 import React from 'react';
 
 export const ControlsIllustration = () => (

diff --git a/src/plugins/presentation_util/public/components/solution_toolbar/solution_toolbar.tsx b/src/plugins/presentation_util/public/components/solution_toolbar/solution_toolbar.tsx
@@ -53,7 +53,7 @@ export const SolutionToolbar = ({ isDarkModeEnabled, children }: Props) => {
     >
       <EuiFlexItem grow={false}>{primaryActionButton}</EuiFlexItem>
       <EuiFlexItem grow={false}>
-        <EuiFlexGroup responsive={false} alignItems="center" gutterSize="xs">
+        <EuiFlexGroup wrap={true} responsive={false} alignItems="center" gutterSize="xs">
           {quickButtonGroup ? <EuiFlexItem grow={false}>{quickButtonGroup}</EuiFlexItem> : null}
           {extra}
         </EuiFlexGroup>