Code clean up

x-pack/plugins/monitoring/common/formatting.ts

@@ -34,16 +34,12 @@ export function shortenPipelineHash(hash: string) {
 }
 
 export function getDateFromNow(timestamp: string | number | Date, tz: string) {
-  // const timestamp = state.state.ui.triggeredMS;
-  // const tz = Legacy.shims.uiSettings.get('dateFormat:tz');
   return moment(timestamp)
     .tz(tz === 'Browser' ? moment.tz.guess() : tz)
     .fromNow();
 }
 
 export function getCalendar(timestamp: string | number | Date, tz: string) {
-  // const timestamp = state.state.ui.triggeredMS;
-  // const tz = Legacy.shims.uiSettings.get('dateFormat:tz');
   return moment(timestamp)
     .tz(tz === 'Browser' ? moment.tz.guess() : tz)
     .calendar();

x-pack/plugins/monitoring/public/alerts/badge.tsx

@@ -44,13 +44,13 @@ const GROUP_BY_TYPE = i18n.translate('xpack.monitoring.alerts.badge.groupByType'
 });
 
 interface Props {
-  alerts: CommonAlertStatus[];
+  alerts: { [alertTypeId: string]: CommonAlertStatus };
   stateFilter: (state: AlertState) => boolean;
 }
 export const AlertsBadge: React.FC<Props> = (props: Props) => {
   // We do not always have the alerts that each consumer wants due to licensing
   const { stateFilter = () => true } = props;
-  const alerts = props.alerts.filter(Boolean);
+  const alerts = Object.values(props.alerts).filter((alertItem) => Boolean(alertItem?.rawAlert));
   const [showPopover, setShowPopover] = React.useState<AlertSeverity | boolean | null>(null);
   const inSetupMode = isInSetupMode(React.useContext(SetupModeContext));
   const alertsContext = React.useContext(AlertsContext);

x-pack/plugins/monitoring/public/alerts/lib/replace_tokens.tsx

@@ -19,7 +19,7 @@ import { AlertMessageTokenType } from '../../../common/enums';
 import { Legacy } from '../../legacy_shims';
 import { getSafeForExternalLink } from '../../lib/get_safe_for_external_link';
 
-export function replaceTokens(alertMessage: AlertMessage | null): JSX.Element | string | null {
+export function replaceTokens(alertMessage: AlertMessage): JSX.Element | string | null {
   if (!alertMessage) {
     return null;
   }

x-pack/plugins/monitoring/public/alerts/status.tsx

@@ -71,7 +71,7 @@ export const AlertsStatus: React.FC<Props> = (props: Props) => {
   }
 
   if (showBadge || inSetupMode) {
-    return <AlertsBadge alerts={Object.values(alerts)} stateFilter={stateFilter} />;
+    return <AlertsBadge alerts={alerts} stateFilter={stateFilter} />;
   }
 
   const severity = atLeastOneDanger ? AlertSeverity.Danger : AlertSeverity.Warning;

x-pack/plugins/monitoring/public/components/elasticsearch/node/advanced.js

@@ -20,7 +20,7 @@ import { MonitoringTimeseriesContainer } from '../../chart';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { AlertsCallout } from '../../../alerts/callout';
 
-export const AdvancedNode = ({ nodeSummary, metrics, alerts, ...props }) => {
+export const AdvancedNode = ({ nodeSummary, metrics, alerts, nodeId, ...props }) => {
   const metricsToShow = [
     metrics.node_gc,
     metrics.node_gc_time,
@@ -54,7 +54,7 @@ export const AdvancedNode = ({ nodeSummary, metrics, alerts, ...props }) => {
           <NodeDetailStatus stats={nodeSummary} alerts={alerts} />
         </EuiPanel>
         <EuiSpacer size="m" />
-        <AlertsCallout alerts={alerts} />
+        <AlertsCallout alerts={alerts} stateFilter={(state) => state.nodeId === nodeId} />
         <EuiPageContent>
           <EuiFlexGrid columns={2} gutterSize="s">
             {metricsToShow.map((metric, index) => (

x-pack/plugins/monitoring/public/components/kibana/instances/instances.js

@@ -90,9 +90,7 @@ const getColumns = (setupMode, alerts) => {
       field: 'isOnline',
       width: '175px',
       sortable: true,
-      render: () => {
-        return <AlertsStatus showBadge={true} alerts={alerts} />;
-      },
+      render: () => <AlertsStatus showBadge={true} alerts={alerts} />,
     },
     {
       name: i18n.translate('xpack.monitoring.kibana.listing.statusColumnTitle', {

x-pack/plugins/monitoring/public/views/base_controller.js

@@ -106,7 +106,6 @@ export class MonitoringViewBaseController {
     this._isDataInitialized = false;
     this.reactNodeId = reactNodeId;
     this.telemetryPageViewTitle = telemetryPageViewTitle || title;
-    this.alertConfig = alerts;
 
     let deferTimer;
     let zoomInLevel = 0;

x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_nodes.js

@@ -23,6 +23,11 @@ import { LISTING_METRICS_NAMES, LISTING_METRICS_PATHS } from './nodes_listing_me
  * only for determining if the node is a Master node. Time-based metric data is
  * included that adds information such as CPU and JVM stats.
  *
+ * @param {Object} req: server request object
+ * @param {String} esIndexPattern: index pattern for elasticsearch data in monitoring indices
+ * @param {Object} pageOfNodes: server-side paginated current page of ES nodes
+ * @param {Object} clusterStats: cluster stats from cluster state document
+ * @param {Object} nodesShardCount: per-node information about shards
  * @return {Array} node info combined with metrics for each node from handle_response
  */
 export async function getNodes(req, esIndexPattern, pageOfNodes, clusterStats, nodesShardCount) {

x-pack/plugins/monitoring/server/lib/kibana/get_kibanas.js

@@ -22,7 +22,7 @@ import { KibanaMetric } from '../metrics';
  *  - requests
  *  - response times
  */
-export async function getKibanas(req, kbnIndexPattern, { clusterUuid }) {
+export function getKibanas(req, kbnIndexPattern, { clusterUuid }) {
   checkParam(kbnIndexPattern, 'kbnIndexPattern in getKibanas');
 
   const config = req.server.config();
@@ -63,7 +63,7 @@ export async function getKibanas(req, kbnIndexPattern, { clusterUuid }) {
   };
 
   const { callWithRequest } = req.server.plugins.elasticsearch.getCluster('monitoring');
-  const instances = await callWithRequest(req, 'search', params).then((resp) => {
+  return callWithRequest(req, 'search', params).then((resp) => {
     const instances = get(resp, 'hits.hits', []);
 
     return instances.map((hit) => {
@@ -73,6 +73,4 @@ export async function getKibanas(req, kbnIndexPattern, { clusterUuid }) {
       };
     });
   });
-
-  return instances;
 }