Merge branch '7.11' into backport/7.11/pr-87873

elastic · Jan 25, 2021 · 05538c8 · 05538c8
2 parents bfc83e7 + 3459521
commit 05538c8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/...uptime/public/components/monitor/synthetics/step_detail/waterfall/data_formatting.test.ts b/...uptime/public/components/monitor/synthetics/step_detail/waterfall/data_formatting.test.ts
@@ -11,7 +11,7 @@ import { WaterfallDataEntry } from '../../waterfall/types';
 describe('Palettes', () => {
   it('A colour palette comprising timing and mime type colours is correctly generated', () => {
     expect(colourPalette).toEqual({
-      blocked: '#b9a888',
+      blocked: '#dcd4c4',
       connect: '#da8b45',
       dns: '#54b399',
       font: '#aa6556',
@@ -173,10 +173,10 @@ describe('getSeriesAndDomain', () => {
         "series": Array [
           Object {
             "config": Object {
-              "colour": "#b9a888",
+              "colour": "#dcd4c4",
               "showTooltip": true,
               "tooltipProps": Object {
-                "colour": "#b9a888",
+                "colour": "#dcd4c4",
                 "value": "Queued / Blocked: 0.854ms",
               },
             },
@@ -264,10 +264,10 @@ describe('getSeriesAndDomain', () => {
           },
           Object {
             "config": Object {
-              "colour": "#b9a888",
+              "colour": "#dcd4c4",
               "showTooltip": true,
               "tooltipProps": Object {
-                "colour": "#b9a888",
+                "colour": "#dcd4c4",
                 "value": "Queued / Blocked: 84.546ms",
               },
             },
@@ -330,10 +330,10 @@ describe('getSeriesAndDomain', () => {
         "series": Array [
           Object {
             "config": Object {
-              "colour": "#b9a888",
+              "colour": "#dcd4c4",
               "showTooltip": true,
               "tooltipProps": Object {
-                "colour": "#b9a888",
+                "colour": "#dcd4c4",
                 "value": "Queued / Blocked: 0.854ms",
               },
             },

diff --git a/...gins/uptime/public/components/monitor/synthetics/step_detail/waterfall/data_formatting.ts b/...gins/uptime/public/components/monitor/synthetics/step_detail/waterfall/data_formatting.ts
@@ -197,7 +197,7 @@ const buildTimingPalette = (): TimingColourPalette => {
   const palette = Object.values(Timings).reduce<Partial<TimingColourPalette>>((acc, value) => {
     switch (value) {
       case Timings.Blocked:
-        acc[value] = SAFE_PALETTE[6];
+        acc[value] = SAFE_PALETTE[16];
         break;
       case Timings.Dns:
         acc[value] = SAFE_PALETTE[0];