Merge remote-tracking branch 'origin/master' into datatable-click

elastic · Apr 29, 2020 · fb8c322 · fb8c322
2 parents 6a94994 + 6338cef
commit fb8c322
Show file tree

Hide file tree

Showing 25 changed files with 365 additions and 64 deletions.
diff --git a/test/functional/page_objects/common_page.ts b/test/functional/page_objects/common_page.ts
@@ -44,6 +44,7 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
     ensureCurrentUrl: boolean;
     shouldLoginIfPrompted: boolean;
     useActualUrl: boolean;
+    insertTimestamp: boolean;
   }
 
   class CommonPage {
@@ -65,7 +66,7 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
      * Logins to Kibana as default user and navigates to provided app
      * @param appUrl Kibana URL
      */
-    private async loginIfPrompted(appUrl: string) {
+    private async loginIfPrompted(appUrl: string, insertTimestamp: boolean) {
       let currentUrl = await browser.getCurrentUrl();
       log.debug(`currentUrl = ${currentUrl}\n    appUrl = ${appUrl}`);
       await testSubjects.find('kibanaChrome', 6 * defaultFindTimeout); // 60 sec waiting
@@ -87,15 +88,21 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
           '[data-test-subj="kibanaChrome"] nav:not(.ng-hide)',
           6 * defaultFindTimeout
         );
-        await browser.get(appUrl);
+        await browser.get(appUrl, insertTimestamp);
         currentUrl = await browser.getCurrentUrl();
         log.debug(`Finished login process currentUrl = ${currentUrl}`);
       }
       return currentUrl;
     }
 
     private async navigate(navigateProps: NavigateProps) {
-      const { appConfig, ensureCurrentUrl, shouldLoginIfPrompted, useActualUrl } = navigateProps;
+      const {
+        appConfig,
+        ensureCurrentUrl,
+        shouldLoginIfPrompted,
+        useActualUrl,
+        insertTimestamp,
+      } = navigateProps;
       const appUrl = getUrl.noAuth(config.get('servers.kibana'), appConfig);
 
       await retry.try(async () => {
@@ -111,7 +118,7 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
         }
 
         const currentUrl = shouldLoginIfPrompted
-          ? await this.loginIfPrompted(appUrl)
+          ? await this.loginIfPrompted(appUrl, insertTimestamp)
           : await browser.getCurrentUrl();
 
         if (ensureCurrentUrl && !currentUrl.includes(appUrl)) {
@@ -134,6 +141,7 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
         ensureCurrentUrl = true,
         shouldLoginIfPrompted = true,
         useActualUrl = false,
+        insertTimestamp = true,
       } = {}
     ) {
       const appConfig = {
@@ -146,6 +154,7 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
         ensureCurrentUrl,
         shouldLoginIfPrompted,
         useActualUrl,
+        insertTimestamp,
       });
     }
 
@@ -165,6 +174,7 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
         ensureCurrentUrl = true,
         shouldLoginIfPrompted = true,
         useActualUrl = true,
+        insertTimestamp = true,
       } = {}
     ) {
       const appConfig = {
@@ -178,6 +188,7 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
         ensureCurrentUrl,
         shouldLoginIfPrompted,
         useActualUrl,
+        insertTimestamp,
       });
     }
 
@@ -208,7 +219,7 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
 
     async navigateToApp(
       appName: string,
-      { basePath = '', shouldLoginIfPrompted = true, hash = '' } = {}
+      { basePath = '', shouldLoginIfPrompted = true, hash = '', insertTimestamp = true } = {}
     ) {
       let appUrl: string;
       if (config.has(['apps', appName])) {
@@ -239,7 +250,7 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
           log.debug('returned from get, calling refresh');
           await browser.refresh();
           let currentUrl = shouldLoginIfPrompted
-            ? await this.loginIfPrompted(appUrl)
+            ? await this.loginIfPrompted(appUrl, insertTimestamp)
             : await browser.getCurrentUrl();
 
           if (currentUrl.includes('app/kibana')) {

diff --git a/x-pack/legacy/plugins/maps/index.js b/x-pack/legacy/plugins/maps/index.js
@@ -54,7 +54,7 @@ export function maps(kibana) {
           emsLandingPageUrl: mapConfig.emsLandingPageUrl,
           kbnPkgVersion: serverConfig.get('pkg.version'),
           regionmapLayers: _.get(mapConfig, 'regionmap.layers', []),
-          tilemap: _.get(mapConfig, 'tilemap', []),
+          tilemap: _.get(mapConfig, 'tilemap', {}),
         };
       },
       styleSheetPaths: `${__dirname}/public/index.scss`,

diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts
@@ -51,17 +51,19 @@ const getCurrentValueFromAggregations = (
 
 const getParsedFilterQuery: (
   filterQuery: string | undefined
-) => Record<string, any> = filterQuery => {
+) => Record<string, any> | Array<Record<string, any>> = filterQuery => {
   if (!filterQuery) return {};
   try {
     return JSON.parse(filterQuery).bool;
   } catch (e) {
-    return {
-      query_string: {
-        query: filterQuery,
-        analyze_wildcard: true,
+    return [
+      {
+        query_string: {
+          query: filterQuery,
+          analyze_wildcard: true,
+        },
       },
-    };
+    ];
   }
 };
 
@@ -159,8 +161,12 @@ export const getElasticsearchMetricQuery = (
   return {
     query: {
       bool: {
-        filter: [...rangeFilters, ...metricFieldFilters],
-        ...parsedFilterQuery,
+        filter: [
+          ...rangeFilters,
+          ...metricFieldFilters,
+          ...(Array.isArray(parsedFilterQuery) ? parsedFilterQuery : []),
+        ],
+        ...(!Array.isArray(parsedFilterQuery) ? parsedFilterQuery : {}),
       },
     },
     size: 0,
@@ -233,6 +239,7 @@ const getMetric: (
       body: searchBody,
       index,
     });
+
     return { '*': getCurrentValueFromAggregations(result.aggregations, aggType) };
   } catch (e) {
     return { '*': undefined }; // Trigger an Error state

diff --git a/x-pack/plugins/ingest_manager/common/constants/agent_config.ts b/x-pack/plugins/ingest_manager/common/constants/agent_config.ts
@@ -14,6 +14,7 @@ export const DEFAULT_AGENT_CONFIG = {
   status: AgentConfigStatus.Active,
   datasources: [],
   is_default: true,
+  monitoring_enabled: ['logs', 'metrics'] as Array<'logs' | 'metrics'>,
 };
 
 export const DEFAULT_AGENT_CONFIGS_PACKAGES = [DefaultPackages.system];
diff --git a/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts b/x-pack/plugins/ingest_manager/common/types/models/agent_config.ts
@@ -23,6 +23,7 @@ export interface NewAgentConfig {
   namespace?: string;
   description?: string;
   is_default?: boolean;
+  monitoring_enabled?: Array<'logs' | 'metrics'>;
 }
 
 export interface AgentConfig extends NewAgentConfig, SavedObjectAttributes {
@@ -60,4 +61,12 @@ export interface FullAgentConfig {
   };
   datasources: FullAgentConfigDatasource[];
   revision?: number;
+  settings?: {
+    monitoring: {
+      use_output?: string;
+      enabled: boolean;
+      metrics: boolean;
+      logs: boolean;
+    };
+  };
 }
diff --git a/...nager/public/applications/ingest_manager/sections/agent_config/components/config_form.tsx b/...nager/public/applications/ingest_manager/sections/agent_config/components/config_form.tsx
@@ -18,6 +18,7 @@ import {
   EuiText,
   EuiComboBox,
   EuiIconTip,
+  EuiCheckboxGroup,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
@@ -30,7 +31,7 @@ interface ValidationResults {
 
 const StyledEuiAccordion = styled(EuiAccordion)`
   .ingest-active-button {
-    color: ${props => props.theme.eui.euiColorPrimary}};
+    color: ${props => props.theme.eui.euiColorPrimary};
   }
 `;
 
@@ -244,6 +245,68 @@ export const AgentConfigForm: React.FunctionComponent<Props> = ({
             )}
           </EuiFlexItem>
         </EuiFlexGroup>
+        <EuiSpacer size="m" />
+        <EuiFlexGroup>
+          <EuiFlexItem>
+            <EuiText>
+              <h4>
+                <FormattedMessage
+                  id="xpack.ingestManager.agentConfigForm.monitoringLabel"
+                  defaultMessage="Agent monitoring"
+                />
+              </h4>
+            </EuiText>
+            <EuiSpacer size="m" />
+            <EuiText size="s">
+              <FormattedMessage
+                id="xpack.ingestManager.agentConfigForm.monitoringDescription"
+                defaultMessage="Collect data about your agents for debugging and tracking performance."
+              />
+            </EuiText>
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <EuiCheckboxGroup
+              options={[
+                {
+                  id: 'logs',
+                  label: i18n.translate(
+                    'xpack.ingestManager.agentConfigForm.monitoringLogsFieldLabel',
+                    { defaultMessage: 'Collect agent logs' }
+                  ),
+                },
+                {
+                  id: 'metrics',
+                  label: i18n.translate(
+                    'xpack.ingestManager.agentConfigForm.monitoringMetricsFieldLabel',
+                    { defaultMessage: 'Collect agent metrics' }
+                  ),
+                },
+              ]}
+              idToSelectedMap={(agentConfig.monitoring_enabled || []).reduce(
+                (acc: { logs: boolean; metrics: boolean }, key) => {
+                  acc[key] = true;
+                  return acc;
+                },
+                { logs: false, metrics: false }
+              )}
+              onChange={id => {
+                if (id !== 'logs' && id !== 'metrics') {
+                  return;
+                }
+
+                const hasLogs =
+                  agentConfig.monitoring_enabled && agentConfig.monitoring_enabled.indexOf(id) >= 0;
+
+                const previousValues = agentConfig.monitoring_enabled || [];
+                updateAgentConfig({
+                  monitoring_enabled: hasLogs
+                    ? previousValues.filter(type => type !== id)
+                    : [...previousValues, id],
+                });
+              }}
+            />
+          </EuiFlexItem>
+        </EuiFlexGroup>
       </StyledEuiAccordion>
     </EuiForm>
   );

diff --git a/.../applications/ingest_manager/sections/agent_config/list_page/components/create_config.tsx b/.../applications/ingest_manager/sections/agent_config/list_page/components/create_config.tsx
@@ -34,6 +34,7 @@ export const CreateAgentConfigFlyout: React.FunctionComponent<Props> = ({ onClos
     description: '',
     namespace: '',
     is_default: undefined,
+    monitoring_enabled: ['logs', 'metrics'],
   });
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const [withSysMonitoring, setWithSysMonitoring] = useState<boolean>(true);

diff --git a/x-pack/plugins/ingest_manager/server/saved_objects.ts b/x-pack/plugins/ingest_manager/server/saved_objects.ts
@@ -128,6 +128,7 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
         updated_on: { type: 'keyword' },
         updated_by: { type: 'keyword' },
         revision: { type: 'integer' },
+        monitoring_enabled: { type: 'keyword' },
       },
     },
   },