Design cleanup of Uptime app

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

@@ -7824,10 +7824,6 @@
     "xpack.upgradeAssistant.tabs.incompleteCallout.calloutBody.breackingChangesDocButtonLabel": "弃用内容和重大更改",
     "xpack.upgradeAssistant.tabs.incompleteCallout.calloutBody.calloutDetail": "Elasticsearch {nextEsVersion} 中的 {breakingChangesDocButton} 完整列表将在最终的 {currentEsVersion} 次要版本中提供。完成列表后，此警告将消失。",
     "xpack.upgradeAssistant.tabs.incompleteCallout.calloutTitle": "问题列表可能不完整",
-    "xpack.uptime.appHeader.uptimeLogoAriaLabel": "前往运行时间主页",
-    "xpack.uptime.appHeader.uptimeLogoText": "运行时间",
-    "xpack.uptime.appHeader.uptimeLogoTitle": "运行时间",
-    "xpack.uptime.breadcrumbs.monitorBreadcrumbText": "监测",
     "xpack.uptime.breadcrumbs.overviewBreadcrumbText": "概览",
     "xpack.uptime.emptyState.configureHeartbeatLinkText": "配置 Heartbeat",
     "xpack.uptime.emptyState.configureHeartbeatToGetStartedMessage": "{configureHeartbeatLink} 以开始记录运行时间数据。",
@@ -7837,7 +7833,6 @@
     "xpack.uptime.errorList.CountColumnLabel": "计数",
     "xpack.uptime.errorList.errorMessage": "错误 {message}",
     "xpack.uptime.errorList.errorTypeColumnLabel": "错误类型",
-    "xpack.uptime.errorList.latestErrorColumnLabel": "最新错误",
     "xpack.uptime.errorList.latestMessageColumnLabel": "最新消息",
     "xpack.uptime.errorList.monitorIdColumnLabel": "监测 ID",
     "xpack.uptime.errorList.statusCodeColumnLabel": "状态代码",
@@ -7848,8 +7843,6 @@
     "xpack.uptime.filterBar.filterUpLabel": "运行",
     "xpack.uptime.filterBar.loadingMessage": "正在加载……",
     "xpack.uptime.filterBar.options.portLabel": "端口",
-    "xpack.uptime.header.helpLinkAriaLabel": "前往我们的讨论页",
-    "xpack.uptime.header.helpLinkText": "讨论",
     "xpack.uptime.monitorCharts.checkStatus.series.downCountLabel": "关闭计数",
     "xpack.uptime.monitorCharts.checkStatus.series.upCountLabel": "运行计数",
     "xpack.uptime.monitorCharts.checkStatus.title": "检查状态",
@@ -7860,14 +7853,11 @@
     "xpack.uptime.monitorCharts.monitorDuration.titleLabel": "监测持续时间 (ms)",
     "xpack.uptime.monitorList.downLineSeries.downLabel": "关闭",
     "xpack.uptime.monitorList.errorMessage": "错误 {message}",
-    "xpack.uptime.monitorList.ipColumnLabel": "IP",
-    "xpack.uptime.monitorList.lastUpdatedColumnLabel": "最后更新时间：1/23/2016",
     "xpack.uptime.monitorList.monitorHistoryColumnLabel": "监测历史记录",
     "xpack.uptime.monitorList.monitoringStatusTitle": "检测状态",
     "xpack.uptime.monitorList.statusColumn.downLabel": "关闭",
     "xpack.uptime.monitorList.statusColumn.upLabel": "运行",
     "xpack.uptime.monitorList.statusColumnLabel": "状态",
-    "xpack.uptime.monitorList.upLineSeries.upLabel": "运行",
     "xpack.uptime.monitorStatusBar.durationTextAriaLabel": "监测持续时间（毫秒）",
     "xpack.uptime.monitorStatusBar.errorMessage": "错误 {message}",
     "xpack.uptime.monitorStatusBar.healthStatus.durationInMillisecondsMessage": "{duration}ms",
@@ -7881,7 +7871,6 @@
     "xpack.uptime.pingList.errorMessage": "错误 {message}",
     "xpack.uptime.pingList.errorMessageColumnLabel": "错误消息",
     "xpack.uptime.pingList.errorTypeColumnLabel": "错误类型",
-    "xpack.uptime.pingList.idColumnLabel": "ID",
     "xpack.uptime.pingList.ipAddressColumnLabel": "IP",
     "xpack.uptime.pingList.responseCodeColumnLabel": "响应代码",
     "xpack.uptime.pingList.statusColumnHealthDownLabel": "关闭",
@@ -7891,7 +7880,6 @@
     "xpack.uptime.pingList.statusOptions.allStatusOptionLabel": "全部",
     "xpack.uptime.pingList.statusOptions.downStatusOptionLabel": "关闭",
     "xpack.uptime.pingList.statusOptions.upStatusOptionLabel": "运行",
-    "xpack.uptime.pingList.timestampColumnLabel": "时间戳",
     "xpack.uptime.pluginDescription": "运行时间监测",
     "xpack.uptime.snapshot.endpointStatusTitle": "终端节点状态",
     "xpack.uptime.snapshot.errorMessage": "错误 {message}",

x-pack/plugins/uptime/common/constants/index.ts

@@ -6,3 +6,4 @@
 
 export { INDEX_NAMES } from './index_names';
 export { PLUGIN } from './plugin';
+export { QUERY } from './query';

x-pack/plugins/uptime/common/constants/query.ts

@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/**
+ * These are the fields that will be used when users enter simple_query_string
+ * searches into the FilterBar component.
+ */
+export const QUERY = {
+  SIMPLE_QUERY_STRING_FIELDS: [
+    'monitor.id',
+    'monitor.url',
+    'monitor.type',
+    'monitor.status',
+    'monitor.name',
+    'url.full',
+    'url.path',
+    'url.scheme',
+    'url.domain',
+    'error.type',
+  ],
+};

x-pack/plugins/uptime/common/graphql/introspection.json

@@ -1600,7 +1600,11 @@
             "type": {
               "kind": "LIST",
               "name": null,
-              "ofType": { "kind": "OBJECT", "name": "MonitorSeriesPoint", "ofType": null }
+              "ofType": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": { "kind": "OBJECT", "name": "MonitorSeriesPoint", "ofType": null }
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
@@ -1612,7 +1616,11 @@
             "type": {
               "kind": "LIST",
               "name": null,
-              "ofType": { "kind": "OBJECT", "name": "MonitorSeriesPoint", "ofType": null }
+              "ofType": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": { "kind": "OBJECT", "name": "MonitorSeriesPoint", "ofType": null }
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
@@ -2160,6 +2168,14 @@
             "type": { "kind": "SCALAR", "name": "String", "ofType": null },
             "isDeprecated": false,
             "deprecationReason": null
+          },
+          {
+            "name": "name",
+            "description": "",
+            "args": [],
+            "type": { "kind": "SCALAR", "name": "String", "ofType": null },
+            "isDeprecated": false,
+            "deprecationReason": null
           }
         ],
         "inputFields": null,

x-pack/plugins/uptime/common/graphql/types.ts

@@ -314,9 +314,9 @@ export interface LatestMonitor {
   /** Information from the latest document. */
   ping?: Ping | null;
   /** Buckets of recent up count status data. */
-  upSeries?: (MonitorSeriesPoint | null)[] | null;
+  upSeries?: MonitorSeriesPoint[] | null;
   /** Buckets of recent down count status data. */
-  downSeries?: (MonitorSeriesPoint | null)[] | null;
+  downSeries?: MonitorSeriesPoint[] | null;
 }
 
 export interface MonitorKey {
@@ -417,6 +417,8 @@ export interface ErrorListItem {
   statusCode?: string | null;
 
   timestamp?: string | null;
+
+  name?: string | null;
 }
 
 export interface MonitorPageTitle {

x-pack/plugins/uptime/public/breadcrumbs.ts

@@ -11,22 +11,16 @@ export interface UMBreadcrumb {
   href?: string;
 }
 
-export const monitorBreadcrumb: UMBreadcrumb = {
-  text: i18n.translate('xpack.uptime.breadcrumbs.monitorBreadcrumbText', {
-    defaultMessage: 'Monitor',
-  }),
-};
-
 export const overviewBreadcrumb: UMBreadcrumb = {
   text: i18n.translate('xpack.uptime.breadcrumbs.overviewBreadcrumbText', {
-    defaultMessage: 'Overview',
+    defaultMessage: 'Uptime',
   }),
   href: '#/',
 };
 
 export const getOverviewPageBreadcrumbs = (): UMBreadcrumb[] => [overviewBreadcrumb];
 
-export const getMonitorPageBreadcrumb = (): UMBreadcrumb[] => [
+export const getMonitorPageBreadcrumb = (name: string): UMBreadcrumb[] => [
   overviewBreadcrumb,
-  monitorBreadcrumb,
+  { text: name },
 ];