Merge pull request #2335 from sonvir249/feature/show-port-monitors

Show port monitors with port numbers.

client/src/Components/Inputs/Search/index.jsx

@@ -155,6 +155,7 @@ const Search = ({
 			renderOption={(props, option) => {
 				const { key, ...optionProps } = props;
 				const hasSecondaryLabel = secondaryLabel && option[secondaryLabel] !== undefined;
+				const port = option["port"];
 				return (
 					<ListItem
 						key={key}
@@ -169,7 +170,9 @@ const Search = ({
 						}
 					>
 						{option[filteredBy] +
-							(hasSecondaryLabel ? ` (${option[secondaryLabel]})` : "")}
+							(hasSecondaryLabel
+								? ` (${option[secondaryLabel]}${port ? `: ${port}` : ""})`
+								: "")}
 					</ListItem>
 				);
 			}}

client/src/Pages/Maintenance/CreateMaintenance/index.jsx

@@ -137,7 +137,7 @@ const CreateMaintenance = () => {
 				const response = await networkService.getMonitorsByTeamId({
 					teamId: user.teamId,
 					limit: null,
-					types: ["http", "ping", "pagespeed"],
+					types: ["http", "ping", "pagespeed", "port"],
 				});
 				const monitors = response.data.data.monitors;
 				setMonitors(monitors);

server/db/mongo/modules/monitorModuleQueries.js

@@ -490,6 +490,7 @@ const buildMonitorsByTeamIdPipeline = ({ matchStage, field, order }) => {
 				_id: 1,
 				name: 1,
 				type: 1,
+				port: 1,
 			},
 		},
 	];