Merge branch 'master' into smith-traffic-pr-squashed

elastic · Nov 30, 2020 · 072e95e · 072e95e
2 parents 20bd7fc + bdf7b88
commit 072e95e
Show file tree

Hide file tree

Showing 27 changed files with 398 additions and 88 deletions.
diff --git a/test/api_integration/apis/saved_objects/migrations.ts b/test/api_integration/apis/saved_objects/migrations.ts
@@ -54,7 +54,8 @@ function getLogMock() {
 export default ({ getService }: FtrProviderContext) => {
   const esClient = getService('es');
 
-  describe('Kibana index migration', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/84445
+  describe.skip('Kibana index migration', () => {
     before(() => esClient.indices.delete({ index: '.migrate-*' }));
 
     it('Migrates an existing index that has never been migrated before', async () => {

diff --git a/x-pack/plugins/apm/public/components/app/service_node_metrics/index.tsx b/x-pack/plugins/apm/public/components/app/service_node_metrics/index.tsx
@@ -59,7 +59,11 @@ export function ServiceNodeMetrics({ match }: ServiceNodeMetricsProps) {
   const { urlParams, uiFilters } = useUrlParams();
   const { serviceName, serviceNodeName } = match.params;
   const { agentName } = useApmService();
-  const { data } = useServiceMetricCharts(urlParams, agentName);
+  const { data } = useServiceMetricCharts(
+    urlParams,
+    agentName,
+    serviceNodeName
+  );
   const { start, end } = urlParams;
 
   const { data: { host, containerId } = INITIAL_DATA, status } = useFetcher(
@@ -177,25 +181,6 @@ export function ServiceNodeMetrics({ match }: ServiceNodeMetricsProps) {
           </EuiFlexItem>
         </MetadataFlexGroup>
       )}
-      {agentName && (
-        <ChartPointerEventContextProvider>
-          <EuiFlexGrid columns={2} gutterSize="s">
-            {data.charts.map((chart) => (
-              <EuiFlexItem key={chart.key}>
-                <EuiPanel>
-                  <MetricsChart
-                    start={start}
-                    end={end}
-                    chart={chart}
-                    fetchStatus={status}
-                  />
-                </EuiPanel>
-              </EuiFlexItem>
-            ))}
-          </EuiFlexGrid>
-          <EuiSpacer size="xxl" />
-        </ChartPointerEventContextProvider>
-      )}
       <SearchBar />
       <EuiPage>
         {agentName && (

diff --git a/x-pack/plugins/apm/public/hooks/useServiceMetricCharts.ts b/x-pack/plugins/apm/public/hooks/useServiceMetricCharts.ts
@@ -17,7 +17,8 @@ const INITIAL_DATA: MetricsChartsByAgentAPIResponse = {
 
 export function useServiceMetricCharts(
   urlParams: IUrlParams,
-  agentName?: string
+  agentName?: string,
+  serviceNodeName?: string
 ) {
   const { serviceName } = useParams<{ serviceName?: string }>();
   const { start, end } = urlParams;
@@ -30,6 +31,7 @@ export function useServiceMetricCharts(
           params: {
             path: { serviceName },
             query: {
+              serviceNodeName,
               start,
               end,
               agentName,
@@ -39,7 +41,7 @@ export function useServiceMetricCharts(
         });
       }
     },
-    [serviceName, start, end, agentName, uiFilters]
+    [serviceName, start, end, agentName, serviceNodeName, uiFilters]
   );
 
   return {

diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/default.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/default.ts
@@ -13,8 +13,8 @@ export async function getDefaultMetricsCharts(
   serviceName: string
 ) {
   const charts = await Promise.all([
-    getCPUChartData(setup, serviceName),
-    getMemoryChartData(setup, serviceName),
+    getCPUChartData({ setup, serviceName }),
+    getMemoryChartData({ setup, serviceName }),
   ]);
 
   return { charts };

diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_rate_chart.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_rate_chart.ts
@@ -30,18 +30,22 @@ const chartBase: ChartBase = {
   series,
 };
 
-const getGcRateChart = (
-  setup: Setup & SetupTimeRange,
-  serviceName: string,
-  serviceNodeName?: string
-) => {
+function getGcRateChart({
+  setup,
+  serviceName,
+  serviceNodeName,
+}: {
+  setup: Setup & SetupTimeRange;
+  serviceName: string;
+  serviceNodeName?: string;
+}) {
   return fetchAndTransformGcMetrics({
     setup,
     serviceName,
     serviceNodeName,
     chartBase,
     fieldName: METRIC_JAVA_GC_COUNT,
   });
-};
+}
 
 export { getGcRateChart };
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_time_chart.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_time_chart.ts
@@ -30,18 +30,22 @@ const chartBase: ChartBase = {
   series,
 };
 
-const getGcTimeChart = (
-  setup: Setup & SetupTimeRange,
-  serviceName: string,
-  serviceNodeName?: string
-) => {
+function getGcTimeChart({
+  setup,
+  serviceName,
+  serviceNodeName,
+}: {
+  setup: Setup & SetupTimeRange;
+  serviceName: string;
+  serviceNodeName?: string;
+}) {
   return fetchAndTransformGcMetrics({
     setup,
     serviceName,
     serviceNodeName,
     chartBase,
     fieldName: METRIC_JAVA_GC_TIME,
   });
-};
+}
 
 export { getGcTimeChart };
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/heap_memory/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/heap_memory/index.ts
@@ -50,11 +50,15 @@ const chartBase: ChartBase = {
   series,
 };
 
-export async function getHeapMemoryChart(
-  setup: Setup & SetupTimeRange,
-  serviceName: string,
-  serviceNodeName?: string
-) {
+export async function getHeapMemoryChart({
+  setup,
+  serviceName,
+  serviceNodeName,
+}: {
+  setup: Setup & SetupTimeRange;
+  serviceName: string;
+  serviceNodeName?: string;
+}) {
   return fetchAndTransformMetrics({
     setup,
     serviceName,

diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/index.ts
@@ -13,19 +13,23 @@ import { getMemoryChartData } from '../shared/memory';
 import { getGcRateChart } from './gc/get_gc_rate_chart';
 import { getGcTimeChart } from './gc/get_gc_time_chart';
 
-export async function getJavaMetricsCharts(
-  setup: Setup & SetupTimeRange,
-  serviceName: string,
-  serviceNodeName?: string
-) {
+export async function getJavaMetricsCharts({
+  setup,
+  serviceName,
+  serviceNodeName,
+}: {
+  setup: Setup & SetupTimeRange;
+  serviceName: string;
+  serviceNodeName?: string;
+}) {
   const charts = await Promise.all([
-    getCPUChartData(setup, serviceName, serviceNodeName),
-    getMemoryChartData(setup, serviceName, serviceNodeName),
-    getHeapMemoryChart(setup, serviceName, serviceNodeName),
-    getNonHeapMemoryChart(setup, serviceName, serviceNodeName),
-    getThreadCountChart(setup, serviceName, serviceNodeName),
-    getGcRateChart(setup, serviceName, serviceNodeName),
-    getGcTimeChart(setup, serviceName, serviceNodeName),
+    getCPUChartData({ setup, serviceName, serviceNodeName }),
+    getMemoryChartData({ setup, serviceName, serviceNodeName }),
+    getHeapMemoryChart({ setup, serviceName, serviceNodeName }),
+    getNonHeapMemoryChart({ setup, serviceName, serviceNodeName }),
+    getThreadCountChart({ setup, serviceName, serviceNodeName }),
+    getGcRateChart({ setup, serviceName, serviceNodeName }),
+    getGcTimeChart({ setup, serviceName, serviceNodeName }),
   ]);
 
   return { charts };

diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/non_heap_memory/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/non_heap_memory/index.ts
@@ -47,11 +47,15 @@ const chartBase: ChartBase = {
   series,
 };
 
-export async function getNonHeapMemoryChart(
-  setup: Setup & SetupTimeRange,
-  serviceName: string,
-  serviceNodeName?: string
-) {
+export async function getNonHeapMemoryChart({
+  setup,
+  serviceName,
+  serviceNodeName,
+}: {
+  setup: Setup & SetupTimeRange;
+  serviceName: string;
+  serviceNodeName?: string;
+}) {
   return fetchAndTransformMetrics({
     setup,
     serviceName,

diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/thread_count/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/thread_count/index.ts
@@ -39,11 +39,15 @@ const chartBase: ChartBase = {
   series,
 };
 
-export async function getThreadCountChart(
-  setup: Setup & SetupTimeRange,
-  serviceName: string,
-  serviceNodeName?: string
-) {
+export async function getThreadCountChart({
+  setup,
+  serviceName,
+  serviceNodeName,
+}: {
+  setup: Setup & SetupTimeRange;
+  serviceName: string;
+  serviceNodeName?: string;
+}) {
   return fetchAndTransformMetrics({
     setup,
     serviceName,

diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/cpu/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/cpu/index.ts
@@ -51,11 +51,15 @@ const chartBase: ChartBase = {
   series,
 };
 
-export async function getCPUChartData(
-  setup: Setup & SetupTimeRange,
-  serviceName: string,
-  serviceNodeName?: string
-) {
+export async function getCPUChartData({
+  setup,
+  serviceName,
+  serviceNodeName,
+}: {
+  setup: Setup & SetupTimeRange;
+  serviceName: string;
+  serviceNodeName?: string;
+}) {
   const metricsChart = await fetchAndTransformMetrics({
     setup,
     serviceName,

diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/memory/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/memory/index.ts
@@ -68,11 +68,15 @@ export const percentCgroupMemoryUsedScript = {
     `,
 };
 
-export async function getMemoryChartData(
-  setup: Setup & SetupTimeRange,
-  serviceName: string,
-  serviceNodeName?: string
-) {
+export async function getMemoryChartData({
+  setup,
+  serviceName,
+  serviceNodeName,
+}: {
+  setup: Setup & SetupTimeRange;
+  serviceName: string;
+  serviceNodeName?: string;
+}) {
   const cgroupResponse = await fetchAndTransformMetrics({
     setup,
     serviceName,

diff --git a/x-pack/plugins/apm/server/lib/metrics/get_metrics_chart_data_by_agent.ts b/x-pack/plugins/apm/server/lib/metrics/get_metrics_chart_data_by_agent.ts
@@ -25,7 +25,7 @@ export async function getMetricsChartDataByAgent({
 }): Promise<MetricsChartsByAgentAPIResponse> {
   switch (agentName) {
     case 'java': {
-      return getJavaMetricsCharts(setup, serviceName, serviceNodeName);
+      return getJavaMetricsCharts({ setup, serviceName, serviceNodeName });
     }
 
     default: {

diff --git a/x-pack/plugins/apm/server/lib/metrics/queries.test.ts b/x-pack/plugins/apm/server/lib/metrics/queries.test.ts
@@ -21,39 +21,39 @@ describe('metrics queries', () => {
   const createTests = (serviceNodeName?: string) => {
     it('fetches cpu chart data', async () => {
       mock = await inspectSearchParams((setup) =>
-        getCPUChartData(setup, 'foo', serviceNodeName)
+        getCPUChartData({ setup, serviceName: 'foo', serviceNodeName })
       );
 
       expect(mock.params).toMatchSnapshot();
     });
 
     it('fetches memory chart data', async () => {
       mock = await inspectSearchParams((setup) =>
-        getMemoryChartData(setup, 'foo', serviceNodeName)
+        getMemoryChartData({ setup, serviceName: 'foo', serviceNodeName })
       );
 
       expect(mock.params).toMatchSnapshot();
     });
 
     it('fetches heap memory chart data', async () => {
       mock = await inspectSearchParams((setup) =>
-        getHeapMemoryChart(setup, 'foo', serviceNodeName)
+        getHeapMemoryChart({ setup, serviceName: 'foo', serviceNodeName })
       );
 
       expect(mock.params).toMatchSnapshot();
     });
 
     it('fetches non heap memory chart data', async () => {
       mock = await inspectSearchParams((setup) =>
-        getNonHeapMemoryChart(setup, 'foo', serviceNodeName)
+        getNonHeapMemoryChart({ setup, serviceName: 'foo', serviceNodeName })
       );
 
       expect(mock.params).toMatchSnapshot();
     });
 
     it('fetches thread count chart data', async () => {
       mock = await inspectSearchParams((setup) =>
-        getThreadCountChart(setup, 'foo', serviceNodeName)
+        getThreadCountChart({ setup, serviceName: 'foo', serviceNodeName })
       );
 
       expect(mock.params).toMatchSnapshot();

diff --git a/...lugins/security_solution/server/lib/detection_engine/routes/index/get_signals_template.ts b/...lugins/security_solution/server/lib/detection_engine/routes/index/get_signals_template.ts
@@ -7,7 +7,7 @@
 import signalsMapping from './signals_mapping.json';
 import ecsMapping from './ecs_mapping.json';
 
-export const SIGNALS_TEMPLATE_VERSION = 2;
+export const SIGNALS_TEMPLATE_VERSION = 3;
 export const MIN_EQL_RULE_INDEX_VERSION = 2;
 
 export const getSignalsTemplate = (index: string) => {

diff --git a/...k/plugins/security_solution/server/lib/detection_engine/routes/index/signals_mapping.json b/...k/plugins/security_solution/server/lib/detection_engine/routes/index/signals_mapping.json
@@ -337,6 +337,16 @@
           "threshold_count": {
             "type": "float"
           },
+          "threshold_result": {
+            "properties": {
+              "count": {
+                "type": "long"
+              },
+              "value": {
+                "type": "keyword"
+              }
+            }
+          },
           "depth": {
             "type": "integer"
           }