Uptime overview overhaul

x-pack/plugins/translations/translations/ja-JP.json

@@ -20666,11 +20666,8 @@
     "xpack.uptime.monitorList.defineConnector.description": "アラートを有効にするには、デフォルトのアラートアクションコネクターを定義してください。",
     "xpack.uptime.monitorList.disableDownAlert": "ステータスアラートを無効にする",
     "xpack.uptime.monitorList.downLineSeries.downLabel": "ダウン",
-    "xpack.uptime.monitorList.drawer.locations.statusDown": "{locations}でダウン",
-    "xpack.uptime.monitorList.drawer.locations.statusUp": "{locations}でアップ",
     "xpack.uptime.monitorList.drawer.missingLocation": "一部のHeartbeatインスタンスには位置情報が定義されていません。Heartbeat構成への{link}。",
     "xpack.uptime.monitorList.enabledAlerts.noAlert": "このモニターではアラートが有効ではありません。",
-    "xpack.uptime.monitorList.enabledAlerts.title": "有効なアラート：",
     "xpack.uptime.monitorList.enableDownAlert": "ステータスアラートを有効にする",
     "xpack.uptime.monitorList.expandDrawerButton.ariaLabel": "ID {id}のモニターの行を展開",
     "xpack.uptime.monitorList.geoName.helpLinkAnnotation": "場所を追加",

x-pack/plugins/translations/translations/zh-CN.json

@@ -20686,11 +20686,8 @@
     "xpack.uptime.monitorList.defineConnector.description": "要开始启用告警，请在以下位置定义默认告警操作连接器",
     "xpack.uptime.monitorList.disableDownAlert": "禁用状态告警",
     "xpack.uptime.monitorList.downLineSeries.downLabel": "关闭",
-    "xpack.uptime.monitorList.drawer.locations.statusDown": "在 {locations} 已关闭",
-    "xpack.uptime.monitorList.drawer.locations.statusUp": "在 {locations} 正运行",
     "xpack.uptime.monitorList.drawer.missingLocation": "某些 Heartbeat 实例未定义位置。{link}到您的 Heartbeat 配置。",
     "xpack.uptime.monitorList.enabledAlerts.noAlert": "没有为此监测启用告警。",
-    "xpack.uptime.monitorList.enabledAlerts.title": "已启用的告警：",
     "xpack.uptime.monitorList.enableDownAlert": "启用状态告警",
     "xpack.uptime.monitorList.expandDrawerButton.ariaLabel": "展开 ID {id} 的监测行",
     "xpack.uptime.monitorList.geoName.helpLinkAnnotation": "添加位置",

x-pack/plugins/uptime/common/runtime_types/monitor/state.ts

@@ -23,9 +23,14 @@ export const StateType = t.intersection([
       up: t.number,
       down: t.number,
     }),
-    monitor: t.partial({
-      name: t.string,
-    }),
+    monitor: t.intersection([
+      t.partial({
+        name: t.string,
+      }),
+      t.type({
+        type: t.string,
+      }),
+    ]),
   }),
   t.partial({
     tls: t.partial({

x-pack/plugins/uptime/public/apps/uptime_app.tsx

@@ -35,6 +35,7 @@ import { ScopedHistory } from '../../../../../src/core/public';
 
 export interface UptimeAppColors {
   danger: string;
+  dangerBehindText: string;
   success: string;
   gray: string;
   range: string;

x-pack/plugins/uptime/public/components/monitor/status_details/status_bar/ssl_certificate.tsx

@@ -11,7 +11,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { Tls, X509Expiry } from '../../../../../common/runtime_types';
 import { CERTIFICATES_ROUTE } from '../../../../../common/constants';
 import { MonListDescription, MonListTitle } from './status_bar';
-import { CertStatusColumn } from '../../../overview/monitor_list/cert_status_column';
+import { CertStatusColumn } from '../../../overview/monitor_list/columns/cert_status_column';
 
 interface Props {
   /**

x-pack/plugins/uptime/public/components/overview/filter_group/filter_popover.tsx

@@ -54,6 +54,7 @@ export const FilterPopover = ({
     const mItems = selectedItems.concat(allItems ?? []);
     const newItems = mItems.filter((item, index) => mItems.indexOf(item) === index);
     setItems(newItems);
+    setTempSelectedItems(selectedItems);
   }, [allItems, selectedItems]);
 
   useEffect(() => {
@@ -73,7 +74,7 @@ export const FilterPopover = ({
             isDisabled={disabled && selectedItems.length === 0}
             isSelected={tempSelectedItems.length > 0}
             numFilters={items.length}
-            numActiveFilters={tempSelectedItems.length}
+            numActiveFilters={isOpen ? tempSelectedItems.length : selectedItems.length}
             onClick={() => {
               setIsOpen(!isOpen);
               onFilterFieldChange(fieldName, tempSelectedItems);