Merge branch '7.10' into backport/7.10/pr-80215

Author: kibanamachine

src/cli_keystore/add.js

@@ -59,7 +59,15 @@ export async function add(keystore, key, options = {}) {
     value = await question(`Enter value for ${key}`, { mask: '*' });
   }
 
-  keystore.add(key, value.trim());
+  const parsedValue = value.trim();
+  let parsedJsonValue;
+  try {
+    parsedJsonValue = JSON.parse(parsedValue);
+  } catch {
+    // noop, only treat value as json if it parses as JSON
+  }
+
+  keystore.add(key, parsedJsonValue ?? parsedValue);
   keystore.save();
 }
 

src/cli_keystore/add.test.js

@@ -129,6 +129,17 @@ describe('Kibana keystore', () => {
       expect(keystore.data.foo).toEqual('bar');
     });
 
+    it('parses JSON values', async () => {
+      prompt.question.returns(Promise.resolve('["bar"]\n'));
+
+      const keystore = new Keystore('/data/test.keystore');
+      sandbox.stub(keystore, 'save');
+
+      await add(keystore, 'foo');
+
+      expect(keystore.data.foo).toEqual(['bar']);
+    });
+
     it('persists updated keystore', async () => {
       prompt.question.returns(Promise.resolve('bar\n'));
 

src/dev/build/tasks/os_packages/docker_generator/templates/build_docker_sh.template.ts

@@ -36,7 +36,33 @@ function generator({
   #
   set -euo pipefail
 
-  docker pull ${baseOSImage}
+  retry_docker_pull() {
+    image=$1
+    attempt=0
+    max_retries=5
+
+    while true
+    do
+      attempt=$((attempt+1))
+
+      if [ $attempt -gt $max_retries ]
+      then
+        echo "Docker pull retries exceeded, aborting."
+        exit 1
+      fi
+
+      if docker pull "$image"
+      then
+        echo "Docker pull successful."
+        break
+      else
+        echo "Docker pull unsuccessful, attempt '$attempt'."
+      fi
+
+    done
+  }
+
+  retry_docker_pull ${baseOSImage}
 
   echo "Building: kibana${imageFlavor}${ubiImageFlavor}-docker"; \\
   docker build -t ${imageTag}${imageFlavor}${ubiImageFlavor}:${version} -f Dockerfile . || exit 1;

src/legacy/server/keystore/keystore.test.js

@@ -157,11 +157,13 @@ describe('Keystore', () => {
     it('adds a key/value pair', () => {
       const keystore = new Keystore('/data/unprotected.keystore');
       keystore.add('a3', 'baz');
+      keystore.add('a4', [1, 'a', 2, 'b']);
 
       expect(keystore.data).toEqual({
         'a1.b2.c3': 'foo',
         a2: 'bar',
         a3: 'baz',
+        a4: [1, 'a', 2, 'b'],
       });
     });
   });

x-pack/plugins/apm/public/components/app/ServiceOverview/ServiceList/index.tsx

@@ -53,6 +53,17 @@ const AppLink = styled(TransactionOverviewLink)`
   ${truncate('100%')};
 `;
 
+const ToolTipWrapper = styled.span`
+  width: 100%;
+  .apmServiceList__serviceNameTooltip {
+    width: 100%;
+    .apmServiceList__serviceNameContainer {
+      // removes 24px referent to the icon placed on the left side of the text.
+      width: calc(100% - 24px);
+    }
+  }
+`;
+
 export const SERVICE_COLUMNS: Array<ITableColumn<ServiceListItem>> = [
   {
     field: 'healthStatus',
@@ -77,24 +88,27 @@ export const SERVICE_COLUMNS: Array<ITableColumn<ServiceListItem>> = [
     width: '40%',
     sortable: true,
     render: (_, { serviceName, agentName }) => (
-      <EuiToolTip
-        delay="long"
-        content={formatString(serviceName)}
-        id="service-name-tooltip"
-      >
-        <EuiFlexGroup gutterSize="s" alignItems="center">
-          {agentName && (
-            <EuiFlexItem grow={false}>
-              <AgentIcon agentName={agentName} />
+      <ToolTipWrapper>
+        <EuiToolTip
+          delay="long"
+          content={formatString(serviceName)}
+          id="service-name-tooltip"
+          anchorClassName="apmServiceList__serviceNameTooltip"
+        >
+          <EuiFlexGroup gutterSize="s" alignItems="center">
+            {agentName && (
+              <EuiFlexItem grow={false}>
+                <AgentIcon agentName={agentName} />
+              </EuiFlexItem>
+            )}
+            <EuiFlexItem className="apmServiceList__serviceNameContainer">
+              <AppLink serviceName={serviceName} className="eui-textTruncate">
+                {formatString(serviceName)}
+              </AppLink>
             </EuiFlexItem>
-          )}
-          <EuiFlexItem>
-            <AppLink serviceName={serviceName}>
-              {formatString(serviceName)}
-            </AppLink>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </EuiToolTip>
+          </EuiFlexGroup>
+        </EuiToolTip>
+      </ToolTipWrapper>
     ),
   },
   {

x-pack/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/service_overview.test.tsx.snap

@@ -62,6 +62,45 @@ export const getActions = (): FindActionResult[] => [
     isPreconfigured: false,
     referencedByCount: 0,
   },
+  {
+    id: '456',
+    actionTypeId: '.jira',
+    name: 'Connector without isCaseOwned',
+    config: {
+      incidentConfiguration: {
+        mapping: [
+          {
+            source: 'title',
+            target: 'short_description',
+            actionType: 'overwrite',
+          },
+          {
+            source: 'description',
+            target: 'description',
+            actionType: 'overwrite',
+          },
+          {
+            source: 'comments',
+            target: 'comments',
+            actionType: 'append',
+          },
+        ],
+      },
+      apiUrl: 'https://elastic.jira.com',
+    },
+    isPreconfigured: false,
+    referencedByCount: 0,
+  },
+  {
+    id: '789',
+    actionTypeId: '.resilient',
+    name: 'Connector without mapping',
+    config: {
+      apiUrl: 'https://elastic.resilient.com',
+    },
+    isPreconfigured: false,
+    referencedByCount: 0,
+  },
 ];
 
 export const newConfiguration: CasesConfigureRequest = {