Merge branch 'master' of https://github.com/elastic/kibana into alert…

…ing/updated-at

Jenkinsfile

@@ -1,5 +1,6 @@
 #!/bin/groovy
 
+env.KBN_ES_SNAPSHOT_USE_UNVERIFIED = 'true'
 library 'kibana-pipeline-library'
 kibanaLibrary.load()
 

docs/developer/contributing/index.asciidoc

@@ -2,7 +2,7 @@
 == Contributing
 
 Whether you want to fix a bug, implement a feature, or add some other improvements or apis, the following sections will 
-guide you on the process.
+guide you on the process. After committing your code, check out the link:https://www.elastic.co/community/contributor[Elastic Contributor Program] where you can earn points and rewards for your contributions.
 
 Read <<development-getting-started>> to get your environment up and running, then read <<development-best-practices>>.
 

package.json

@@ -106,7 +106,7 @@
     "@elastic/datemath": "link:packages/elastic-datemath",
     "@elastic/elasticsearch": "7.10.0-rc.1",
     "@elastic/ems-client": "7.10.0",
-    "@elastic/eui": "30.1.1",
+    "@elastic/eui": "30.2.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/node-crypto": "1.2.1",

src/cli/dev.js

@@ -19,4 +19,5 @@
 
 require('../apm')(process.env.ELASTIC_APM_SERVICE_NAME || 'kibana-proxy');
 require('../setup_node_env');
+require('../setup_node_env/root');
 require('./cli');

src/cli/dist.js

@@ -19,4 +19,5 @@
 
 require('../apm')();
 require('../setup_node_env/dist');
+require('../setup_node_env/root');
 require('./cli');

src/cli_keystore/dev.js

@@ -17,5 +17,5 @@
  * under the License.
  */
 
-require('../setup_node_env');
+require('../setup_node_env/no_transpilation');
 require('./cli_keystore');

src/dev/build/tasks/os_packages/docker_generator/resources/bin/kibana-docker

@@ -237,6 +237,7 @@ kibana_vars=(
     xpack.security.authc.oidc.realm
     xpack.security.authc.saml.realm
     xpack.security.authc.saml.maxRedirectURLSize
+    xpack.security.authc.selector.enabled
     xpack.security.cookieName
     xpack.security.enabled
     xpack.security.encryptionKey

src/dev/build/tasks/os_packages/docker_generator/run.ts

@@ -40,7 +40,7 @@ export async function runDockerGenerator(
   ubi: boolean = false
 ) {
   // UBI var config
-  const baseOSImage = ubi ? 'docker.elastic.co/ubi8/ubi-minimal:8.2' : 'centos:8';
+  const baseOSImage = ubi ? 'docker.elastic.co/ubi8/ubi-minimal:latest' : 'centos:8';
   const ubiVersionTag = 'ubi8';
   const ubiImageFlavor = ubi ? `-${ubiVersionTag}` : '';
 

src/dev/build/tasks/os_packages/docker_generator/templates/Dockerfile

@@ -46,16 +46,9 @@ EXPOSE 5601
 {{#ubi}}
   # https://github.com/rpm-software-management/microdnf/issues/50
   RUN mkdir -p /run/user/$(id -u)
-
-  # crypto-policies not currently compatible with libnss :sadpanda:
-  RUN printf "[main]\nexclude=crypto-policies" >  /etc/dnf/dnf.conf
 {{/ubi}}
 
 RUN for iter in {1..10}; do \
-      {{#ubi}}
-        # update microdnf to have exclusion feature for dnf configuration
-        {{packageManager}} update microdnf --setopt=tsflags=nodocs -y && \
-      {{/ubi}}
       {{packageManager}} update --setopt=tsflags=nodocs -y && \
       {{packageManager}} install --setopt=tsflags=nodocs -y \
         fontconfig freetype shadow-utils libnss3.so {{#ubi}}findutils{{/ubi}} && \

src/dev/build/tasks/os_packages/package_scripts/post_install.sh

@@ -44,9 +44,11 @@ case $1 in
       IS_UPGRADE=true
     fi
 
+    PACKAGE=deb
     setup
   ;;
   abort-deconfigure|abort-upgrade|abort-remove)
+    PACKAGE=deb
   ;;
 
   # Red Hat
@@ -63,7 +65,8 @@ case $1 in
     if [ "$1" = "2" ]; then
       IS_UPGRADE=true
     fi
-
+
+    PACKAGE=rpm
     setup
   ;;
 
@@ -86,3 +89,13 @@ if [ "$IS_UPGRADE" = "true" ]; then
     echo " OK"
   fi
 fi
+
+# the equivalent code for rpm is in posttrans
+if [ "$PACKAGE" = "deb" ]; then
+  if [ ! -f "${KBN_PATH_CONF}"/kibana.keystore ]; then
+      /usr/share/kibana/bin/kibana-keystore create
+      chown root:<%= group %> "${KBN_PATH_CONF}"/kibana.keystore
+      chmod 660 "${KBN_PATH_CONF}"/kibana.keystore
+      md5sum "${KBN_PATH_CONF}"/kibana.keystore > "${KBN_PATH_CONF}"/.kibana.keystore.initial_md5sum
+  fi
+fi

src/dev/build/tasks/os_packages/package_scripts/post_trans.sh

@@ -0,0 +1,8 @@
+export KBN_PATH_CONF=${KBN_PATH_CONF:-<%= configDir %>}
+
+if [ ! -f "${KBN_PATH_CONF}"/kibana.keystore ]; then
+    /usr/share/kibana/bin/kibana-keystore create
+    chown root:<%= group %> "${KBN_PATH_CONF}"/kibana.keystore
+    chmod 660 "${KBN_PATH_CONF}"/kibana.keystore
+    md5sum "${KBN_PATH_CONF}"/kibana.keystore > "${KBN_PATH_CONF}"/.kibana.keystore.initial_md5sum
+fi

src/dev/build/tasks/os_packages/run_fpm.ts

@@ -45,6 +45,8 @@ export async function runFpm(
     }
   };
 
+  const envFolder = type === 'rpm' ? 'sysconfig' : 'default';
+
   const args = [
     // Force output even if it will overwrite an existing file
     '--force',
@@ -92,6 +94,8 @@ export async function runFpm(
     resolve(__dirname, 'package_scripts/pre_remove.sh'),
     '--after-remove',
     resolve(__dirname, 'package_scripts/post_remove.sh'),
+    '--rpm-posttrans',
+    resolve(__dirname, 'package_scripts/post_trans.sh'),
 
     // tell fpm about the config file so that it is called out in the package definition
     '--config-files',
@@ -140,6 +144,11 @@ export async function runFpm(
 
     // copy package configurations
     `${resolveWithTrailingSlash(__dirname, 'service_templates/systemd/')}=/`,
+
+    `${resolveWithTrailingSlash(
+      __dirname,
+      'service_templates/env/kibana'
+    )}=/etc/${envFolder}/kibana`,
   ];
 
   log.debug('calling fpm with args:', args);

src/setup_node_env/no_transpilation.js

@@ -24,5 +24,4 @@ require('./harden');
 
 require('symbol-observable');
 require('source-map-support/register');
-require('./root');
 require('./node_version_validator');

x-pack/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/link_preview.test.tsx

@@ -14,6 +14,9 @@ import {
 } from '@testing-library/react';
 import * as apmApi from '../../../../../../services/rest/createCallApmApi';
 
+export const removeExternalLinkText = (str: string) =>
+  str.replace(/\(opens in a new tab or window\)/g, '');
+
 describe('LinkPreview', () => {
   let callApmApiSpy: jest.SpyInstance<any, never>;
   beforeAll(() => {
@@ -53,7 +56,9 @@ describe('LinkPreview', () => {
       );
       expect(getElementValue(container, 'preview-label')).toEqual('foo');
       expect(
-        (getByTestId(container, 'preview-link') as HTMLAnchorElement).text
+        removeExternalLinkText(
+          (getByTestId(container, 'preview-link') as HTMLAnchorElement).text
+        )
       ).toEqual('https://baz.co');
     });
   });
@@ -69,7 +74,9 @@ describe('LinkPreview', () => {
       );
       expect(getElementValue(container, 'preview-label')).toEqual('foo');
       expect(
-        (getByTestId(container, 'preview-link') as HTMLAnchorElement).text
+        removeExternalLinkText(
+          (getByTestId(container, 'preview-link') as HTMLAnchorElement).text
+        )
       ).toEqual('https://baz.co?service.name={{invalid}');
       expect(getByTestId(container, 'preview-warning')).toBeInTheDocument();
     });
@@ -85,7 +92,9 @@ describe('LinkPreview', () => {
     await waitFor(() => expect(callApmApiSpy).toHaveBeenCalled());
     expect(getElementValue(container, 'preview-label')).toEqual('foo');
     expect(
-      (getByTestId(container, 'preview-link') as HTMLAnchorElement).text
+      removeExternalLinkText(
+        (getByTestId(container, 'preview-link') as HTMLAnchorElement).text
+      )
     ).toEqual('https://baz.co?transaction=foo');
   });
 });

x-pack/plugins/apm/public/components/shared/Links/MachineLearningLinks/MLLink.test.tsx

@@ -19,6 +19,6 @@ test('MLLink produces the correct URL', async () => {
   );
 
   expect(href).toMatchInlineSnapshot(
-    `"/app/ml/jobs?_a=(queryText:'id:(something)%20groups:(apm)')&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-5h,to:now-2h))"`
+    `"/app/ml/jobs?_a=(jobs:(queryText:'id:(something)%20groups:(apm)'))&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-5h,to:now-2h))"`
   );
 });