Merge branch 'develop' into feat/choose-disks-monitor
This commit is contained in:
commit
135c3ff454
5 files changed
+34
-23
No files matched your search
+4
-4
@@ -66,7 +66,7 @@ cd Checkmate
|
|||||||
Navigate to the Docker dev directory:
|
Navigate to the Docker dev directory:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cd server/docker/dev
|
cd docker/dev
|
||||||
```
|
```
|
||||||
|
|
||||||
Build the Docker images:
|
Build the Docker images:
|
||||||
@@ -78,13 +78,13 @@ Build the Docker images:
|
|||||||
Run MongoDB container:
|
Run MongoDB container:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
docker run -d -p 27017:27017 -v $(pwd)/mongo/data:/data/db --name uptime_database_mongo uptime_database_mongo
|
docker run -d -p 27017:27017 -v uptime_mongo_data:/data/db --name uptime_database_mongo mongo:6.0
|
||||||
```
|
```
|
||||||
|
|
||||||
Navigate back to the root directory:
|
Navigate back to the root directory:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cd ../../..
|
cd ../..
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Step 3: Set Up the Backend (Server)
|
#### Step 3: Set Up the Backend (Server)
|
||||||
@@ -161,7 +161,7 @@ Start the frontend:
|
|||||||
npm run dev
|
npm run dev
|
||||||
```
|
```
|
||||||
|
|
||||||
The client will run at `http://localhost:5173`.
|
The client will run at `http://localhost:5173`.
|
||||||
|
|
||||||
#### Step 5: Access the Application
|
#### Step 5: Access the Application
|
||||||
|
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ Usage instructions can be found [here](https://docs.checkmate.so/checkmate-2.1).
|
|||||||
|
|
||||||
See installation instructions in [Checkmate documentation portal](https://docs.checkmate.so/checkmate-2.1/users-guide/quickstart).
|
See installation instructions in [Checkmate documentation portal](https://docs.checkmate.so/checkmate-2.1/users-guide/quickstart).
|
||||||
|
|
||||||
Alternatively, you can also use [Coolify](https://coolify.io/), [Elestio](https://elest.io/open-source/checkmate), [K8s](./charts/helm/checkmate/INSTALLATION.md), [Sive Host](https://sive.host) (South Africa) or [Pikapods](https://www.pikapods.com/) to quickly spin off a Checkmate instance. If you would like to monitor your server infrastructure, you'll need [Capture agent](https://github.com/bluewave-labs/capture). Capture repository also contains the installation instructions.
|
Alternatively, you can also use [Elestio](https://elest.io/open-source/checkmate), [K8s](./charts/helm/checkmate/INSTALLATION.md), [Sive Host](https://sive.host) (South Africa) or [Pikapods](https://www.pikapods.com/) to quickly spin off a Checkmate instance. If you would like to monitor your server infrastructure, you'll need [Capture agent](https://github.com/bluewave-labs/capture). Capture repository also contains the installation instructions.
|
||||||
|
|
||||||
### Using a Custom CA
|
### Using a Custom CA
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { Stack, Typography } from "@mui/material";
|
|||||||
import PropTypes from "prop-types";
|
import PropTypes from "prop-types";
|
||||||
import { useTheme } from "@emotion/react";
|
import { useTheme } from "@emotion/react";
|
||||||
import Dot from "../Dot/index.jsx";
|
import Dot from "../Dot/index.jsx";
|
||||||
|
import { StatusLabel } from "@/Components/v1/Label/index.jsx";
|
||||||
/**
|
/**
|
||||||
* Host component.
|
* Host component.
|
||||||
* This subcomponent receives a params object and displays the host details.
|
* This subcomponent receives a params object and displays the host details.
|
||||||
@@ -14,7 +15,7 @@ import Dot from "../Dot/index.jsx";
|
|||||||
* @param {number} params.percentage - The percentage to display.
|
* @param {number} params.percentage - The percentage to display.
|
||||||
* @returns {React.ElementType} Returns a div element with the host details.
|
* @returns {React.ElementType} Returns a div element with the host details.
|
||||||
*/
|
*/
|
||||||
const Host = ({ url, title, percentageColor, percentage, showURL }) => {
|
const Host = ({ url, title, percentageColor, percentage, showURL, status }) => {
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
return (
|
return (
|
||||||
<Stack>
|
<Stack>
|
||||||
@@ -22,21 +23,36 @@ const Host = ({ url, title, percentageColor, percentage, showURL }) => {
|
|||||||
direction="row"
|
direction="row"
|
||||||
position="relative"
|
position="relative"
|
||||||
alignItems="center"
|
alignItems="center"
|
||||||
gap={theme.spacing(4)}
|
gap={theme.spacing(5)}
|
||||||
>
|
>
|
||||||
{title}
|
<Typography
|
||||||
|
variant="h6"
|
||||||
|
sx={{
|
||||||
|
fontWeight: 600,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{title}
|
||||||
|
</Typography>
|
||||||
|
|
||||||
{percentageColor && percentage && (
|
{percentageColor && percentage && (
|
||||||
<>
|
<>
|
||||||
<Dot />
|
<Dot />
|
||||||
<Typography
|
<Typography
|
||||||
component="span"
|
variant="h6"
|
||||||
sx={{
|
sx={{
|
||||||
|
fontWeight: 600,
|
||||||
color: percentageColor,
|
color: percentageColor,
|
||||||
fontWeight: 500,
|
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{percentage}%
|
{percentage}%
|
||||||
</Typography>
|
</Typography>
|
||||||
|
{status && (
|
||||||
|
<StatusLabel
|
||||||
|
status={status}
|
||||||
|
text={status}
|
||||||
|
customStyles={{ textTransform: "capitalize" }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</Stack>
|
</Stack>
|
||||||
@@ -51,6 +67,7 @@ Host.propTypes = {
|
|||||||
percentage: PropTypes.string,
|
percentage: PropTypes.string,
|
||||||
url: PropTypes.string,
|
url: PropTypes.string,
|
||||||
showURL: PropTypes.bool,
|
showURL: PropTypes.bool,
|
||||||
|
status: PropTypes.string,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default Host;
|
export default Host;
|
||||||
@@ -147,11 +147,9 @@ const StatusLabel = ({ status, text, customStyles }) => {
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Box
|
<Box
|
||||||
width={7}
|
|
||||||
height={7}
|
|
||||||
bgcolor={theme.palette[themeColor].lowContrast}
|
bgcolor={theme.palette[themeColor].lowContrast}
|
||||||
borderRadius="50%"
|
borderRadius="0%"
|
||||||
marginRight="5px"
|
marginRight="1px"
|
||||||
/>
|
/>
|
||||||
</BaseLabel>
|
</BaseLabel>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -30,7 +30,9 @@ const MonitorsList = ({
|
|||||||
<Stack
|
<Stack
|
||||||
key={monitor._id}
|
key={monitor._id}
|
||||||
width="100%"
|
width="100%"
|
||||||
gap={theme.spacing(2)}
|
gap={theme.spacing(10)}
|
||||||
|
margin="0 auto"
|
||||||
|
maxWidth="95%"
|
||||||
>
|
>
|
||||||
<Host
|
<Host
|
||||||
key={monitor._id}
|
key={monitor._id}
|
||||||
@@ -39,24 +41,18 @@ const MonitorsList = ({
|
|||||||
percentageColor={monitor.percentageColor}
|
percentageColor={monitor.percentageColor}
|
||||||
percentage={monitor.percentage}
|
percentage={monitor.percentage}
|
||||||
showURL={showURL}
|
showURL={showURL}
|
||||||
|
status={status}
|
||||||
/>
|
/>
|
||||||
<Stack
|
<Stack
|
||||||
direction="row"
|
direction="row"
|
||||||
alignItems="center"
|
alignItems="center"
|
||||||
gap={theme.spacing(20)}
|
gap={theme.spacing(1)}
|
||||||
>
|
>
|
||||||
{statusPage.showCharts !== false && (
|
{statusPage.showCharts !== false && (
|
||||||
<Box flex={9}>
|
<Box flex={9}>
|
||||||
<StatusPageBarChart checks={monitor?.checks?.slice().reverse()} />
|
<StatusPageBarChart checks={monitor?.checks?.slice().reverse()} />
|
||||||
</Box>
|
</Box>
|
||||||
)}
|
)}
|
||||||
<Box flex={statusPage.showCharts !== false ? 1 : 10}>
|
|
||||||
<StatusLabel
|
|
||||||
status={status}
|
|
||||||
text={status}
|
|
||||||
customStyles={{ textTransform: "capitalize" }}
|
|
||||||
/>
|
|
||||||
</Box>
|
|
||||||
</Stack>
|
</Stack>
|
||||||
</Stack>
|
</Stack>
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in new issue
Block a user